X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.C;h=70a8aaad4204d20c66f3ec7a7b6330bc8c2fc357;hb=fd2124c83dfcfeaf33b64d1d33c8ceb8d9f5f9b9;hp=d6bbbe3a43ac5aafa9534affbd209bfd081da6ce;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/lyxlength.C b/src/lyxlength.C
index d6bbbe3a43..70a8aaad42 100644
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -19,13 +19,13 @@
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
-#include "support/lstrings.h"
+#include <sstream>
+#include <iomanip>
 
-#include "Lsstream.h"
 
-#include <cstdlib>
+using std::ostringstream;
+using std::string;
 
-using std::abs;
 
 LyXLength::LyXLength()
 	: val_(0), unit_(LyXLength::UNIT_NONE)
@@ -52,45 +52,39 @@ LyXLength::LyXLength(string const & data)
 
 string const LyXLength::asString() const
 {
-	ostringstream buffer;
-	buffer << val_ << unit_name[unit_]; // setw?
-	return STRCONV(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 STRCONV(buffer.str());
+	return os.str();
 }
 
 
@@ -150,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_) {