Fix natbib bug spotted by JMarc.

[lyx.git] / src / lyxlength.C

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 2e16c84ed3ea28f122cd381397dfbcd31f59d159..62ef59b66605b8b2d0f0ecf77b2ff33e8a4d5f05 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -27,7 +27,7 @@
 using std::abs;
 
 LyXLength::LyXLength()
-       : val_(0), unit_(LyXLength::PT)
+       : val_(0), unit_(LyXLength::UNIT_NONE)
 {}
 
 
@@ -62,27 +62,27 @@ string const LyXLength::asLatexString() const
        ostringstream buffer;
        switch (unit_) {
        case PTW:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\textwidth";
            break;
        case PCW:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\columnwidth";
            break;
        case PPW:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\paperwidth";
            break;
        case PLW:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\linewidth";
            break;
        case PPH:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\paperheight";
            break;
        case PTH:
-           buffer << abs(static_cast<int>(val_/100)) << "."
+           buffer << abs(static_cast<int>(val_/100)) << '.'
                   << abs(static_cast<int>(val_)%100) << "\\textheight";
            break;
        default:
@@ -123,6 +123,12 @@ bool LyXLength::zero() const
 }
 
 
+bool LyXLength::empty() const
+{
+       return unit_ == LyXLength::UNIT_NONE;
+}
+
+
 int LyXLength::inPixels(int text_width, int em_width_base) const
 {
        // Zoom factor specified by user in percent