Use Gtk::ComboBoxText::clear() instead of clear_items(), which only exists in newer...

[lyx.git] / src / lyxlength.C

diff --git a/src/lyxlength.C b/src/lyxlength.C
index b9e12d91342718158bbbc6005e4aef5e37746a5d..70a8aaad4204d20c66f3ec7a7b6330bc8c2fc357 100644 (file)
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -19,11 +19,12 @@
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
+#include <sstream>
+#include <iomanip>
 
-#include "support/std_sstream.h"
 
-using std::abs;
 using std::ostringstream;
+using std::string;
 
 
 LyXLength::LyXLength()
@@ -51,45 +52,39 @@ LyXLength::LyXLength(string const & data)
 
 string const LyXLength::asString() const
 {
-       ostringstream buffer;
-       buffer << val_ << unit_name[unit_]; // setw?
-       return buffer.str();
+       ostringstream os;
+       os << val_ << unit_name[unit_]; // setw?
+       return os.str();
 }
 
 
 string const LyXLength::asLatexString() const
 {
-       ostringstream buffer;
+       ostringstream os;
        switch (unit_) {
        case PTW:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\textwidth";
-           break;
+               os << val_ / 100.0 << "\\textwidth";
+               break;
        case PCW:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\columnwidth";
-           break;
+               os << val_ / 100.0 << "\\columnwidth";
+               break;
        case PPW:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\paperwidth";
-           break;
+               os << val_ / 100.0 << "\\paperwidth";
+               break;
        case PLW:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\linewidth";
-           break;
+               os << val_ / 100.0 << "\\linewidth";
+               break;
        case PPH:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\paperheight";
-           break;
+               os << val_ / 100.0 << "\\paperheight";
+               break;
        case PTH:
-           buffer << abs(static_cast<int>(val_/100)) << '.'
-                  << abs(static_cast<int>(val_)%100) << "\\textheight";
-           break;
+               os << val_ / 100.0 << "\\textheight";
+               break;
        default:
-           buffer << val_ << unit_name[unit_]; // setw?
-           break;
+               os << val_ << unit_name[unit_];
+         break;
        }
-       return buffer.str();
+       return os.str();
 }
 
 
@@ -149,10 +144,6 @@ int LyXLength::inPixels(int text_width, int em_width_base) const
        // between lengths and font sizes on the screen
        // is the same as on paper.
 
-#ifdef WITH_WARNINGS
-#warning if you don't care than either call this function differently or let it return negative values and call abs() explicitly when needed (Andre')
-#endif
-
        double result = 0.0;
 
        switch (unit_) {