* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiBox.cpp

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 244b8a0f0ffd15eaad000e438be65256276a7054..087f8663a64c36e337f878d83bacda1dbba102ce 100644 (file)
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -17,7 +17,6 @@
 #include "FuncRequest.h"
 #include "LengthCombo.h"
 #include "Length.h"
-#include "LyXRC.h" // to set the default length values
 #include "qt_helpers.h"
 #include "Validator.h"
 
@@ -62,14 +61,14 @@ static QStringList boxGuiNames()
 
 static QStringList boxGuiSpecialLengthIds()
 {
-       return QStringList() << "none" << "height" << "depth"
+       return QStringList() << "height" << "depth"
                << "totalheight" << "width";
 }
 
 
 static QStringList boxGuiSpecialLengthNames()
 {
-       return QStringList() << qt_("None") << qt_("Height") << qt_("Depth")
+       return QStringList() << qt_("Height") << qt_("Depth")
                << qt_("Total Height") << qt_("Width");
 }
 
@@ -265,8 +264,7 @@ void GuiBox::updateContents()
        halignCO->setEnabled(!ibox);
        setSpecial(ibox);
 
-       Length::UNIT default_unit =
-               (lyxrc.default_papersize > 3) ? Length::CM : Length::IN;
+       Length::UNIT const default_unit = Length::defaultUnit();
 
        lengthToWidgets(widthED, widthUnitsLC,
                (params_.width).asString(), default_unit);
@@ -322,7 +320,7 @@ void GuiBox::applyView()
                params_.width = Length(widgetsToLength(widthED, widthUnitsLC));
        }
 
-       // the height parameter is omitted in if the value
+       // the height parameter is omitted if the value
        // is "1in" and "Total Height" is used as unit.
        // 1in + "Total Height" means "1\height" which is the LaTeX default
        // if no height is given