Translations for listings insets

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index af61d0fe7681a4f5dbf698e0eca5063be40ac206..f8eb920c0ff48e5b58bd0065d0aad38d00c9009a 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -96,12 +96,12 @@ string const Length::asLatexString() const
        case PLW:
                os << val_ / 100.0 << "\\linewidth";
                break;
-       case PPH:
-               os << val_ / 100.0 << "\\paperheight";
-               break;
        case PTH:
                os << val_ / 100.0 << "\\textheight";
                break;
+       case PPH:
+               os << val_ / 100.0 << "\\paperheight";
+               break;
        default:
                os << val_ << unit_name[unit_];
          break;
@@ -320,20 +320,7 @@ int Length::inBP() const
 
 Length::UNIT Length::defaultUnit()
 {
-       // FIXME user a proper pref, since we should get rid of
-       // default_papersize in lyxrc.
-       UNIT u = Length::CM;
-       switch (lyxrc.default_papersize) {
-               case PAPER_USLETTER:
-               case PAPER_USLEGAL:
-               case PAPER_USEXECUTIVE:
-                       u = Length::IN;
-                       break;
-               default:
-                       break;
-       }
-
-       return u;
+       return lyxrc.default_length_unit;
 }
 
 
@@ -427,13 +414,12 @@ string const GlueLength::asString() const
 string const GlueLength::asLatexString() const
 {
        ostringstream buffer;
-
-       buffer << len_.value() << unit_name[len_.unit()];
-
+       // use Length::asLatexString() to handle also the percent lengths
+       buffer << len_.Length::asLatexString();
        if (!plus_.zero())
-               buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
+               buffer << " plus " << plus_.Length::asLatexString();
        if (!minus_.zero())
-               buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
+               buffer << " minus " << minus_.Length::asLatexString();
        return buffer.str();
 }