Update it.po

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index 4a7434435f78ace9441882c8560ba167fc8b83a8..10cdd2972615768ec518ef688adf2cd20ad1ac8b 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -67,7 +67,8 @@ void Length::swap(Length & rhs)
 string const Length::asString() const
 {
        ostringstream os;
-       os << val_ << unit_name[unit_]; // setw?
+       if (unit_ != UNIT_NONE)
+               os << val_ << unit_name[unit_]; // setw?
        return os.str();
 }
 
@@ -75,7 +76,8 @@ string const Length::asString() const
 docstring const Length::asDocstring() const
 {
        odocstringstream os;
-       os << val_ << unit_name[unit_]; // setw?
+       if (unit_ != UNIT_NONE)
+               os << val_ << unit_name[unit_]; // setw?
        return os.str();
 }
 
@@ -102,6 +104,8 @@ string const Length::asLatexString() const
        case PPH:
                os << val_ / 100.0 << "\\paperheight";
                break;
+       case UNIT_NONE:
+               break;
        default:
                os << val_ << unit_name[unit_];
          break;
@@ -320,8 +324,7 @@ int Length::inBP() const
 
 Length::UNIT Length::defaultUnit()
 {
-       // FIXME: use a preference
-       return Length::CM;
+       return lyxrc.default_length_unit;
 }
 
 
@@ -364,6 +367,9 @@ GlueLength::GlueLength(string const & data)
 
 string const GlueLength::asString() const
 {
+       if (len_.empty())
+               return string();
+
        ostringstream buffer;
 
        buffer << len_.value();