X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlength.C;h=fded92c19bcfe53b595f0d24e86a7cc713607f6f;hb=d2574b7d8e2716d3d3aea92df6576bd01c421a6c;hp=027e17b21a67e7789b5e185115f6d03791cc2d78;hpb=c6204d60c2a5631d1ad38a2f77687d454c1a92a5;p=lyx.git

diff --git a/src/lyxlength.C b/src/lyxlength.C
index 027e17b21a..fded92c19b 100644
--- a/src/lyxlength.C
+++ b/src/lyxlength.C
@@ -19,7 +19,12 @@
 #include "lengthcommon.h"
 #include "lyxrc.h"
 
+#include "support/docstream.h"
 #include <sstream>
+#include <iomanip>
+
+
+namespace lyx {
 
 
 using std::ostringstream;
@@ -57,35 +62,41 @@ string const LyXLength::asString() const
 }
 
 
+docstring const LyXLength::asDocstring() const
+{
+	odocstringstream os;
+	os << val_ << unit_name[unit_]; // setw?
+	return os.str();
+}
+
+
 string const LyXLength::asLatexString() const
 {
-	char buffer[80];
+	ostringstream os;
 	switch (unit_) {
 	case PTW:
-		snprintf(buffer, 78, "%.2f\\textwidth", val_/100.0);
+		os << val_ / 100.0 << "\\textwidth";
 		break;
 	case PCW:
-		snprintf(buffer, 78, "%.2f\\columnwidth", val_/100.0);
+		os << val_ / 100.0 << "\\columnwidth";
 		break;
 	case PPW:
-		snprintf(buffer, 78, "%.2f\\paperwidth", val_/100.0);
+		os << val_ / 100.0 << "\\paperwidth";
 		break;
 	case PLW:
-		snprintf(buffer, 78, "%.2f\\linewidth", val_/100.0);
+		os << val_ / 100.0 << "\\linewidth";
 		break;
 	case PPH:
-		snprintf(buffer, 78, "%.2f\\paperheight", val_/100.0);
+		os << val_ / 100.0 << "\\paperheight";
 		break;
 	case PTH:
-		snprintf(buffer, 78, "%.2f\\textheight", val_/100.0);
+		os << val_ / 100.0 << "\\textheight";
 		break;
 	default:
-		snprintf(buffer, 78, "%f%s", val_, unit_name[unit_]);
+		os << val_ << unit_name[unit_];
 	  break;
 	}
-	// paranoia
-	buffer[79] = 0;
-	return buffer;
+	return os.str();
 }
 
 
@@ -137,7 +148,7 @@ int LyXLength::inPixels(int text_width, int em_width_base) const
 		? em_width_base
 		: 10*(dpi/72.27)*zoom;
 	// A different estimate for em_width is
-	// font_metrics::width('M', LyXFont(LyXFont::ALL_SANE))
+	// theFontMetrics(LyXFont(LyXFont::ALL_SANE)).width('M')
 	// but this estimate might not be more accurate as the screen font
 	// is different then the latex font.
 
@@ -265,3 +276,6 @@ bool operator!=(LyXLength const & l1, LyXLength const & l2)
 {
 	return !(l1 == l2);
 }
+
+
+} // namespace lyx