X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=fbea55bbd0354fa397088258e4eaed6a6ab2f0ed;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=4ca88f4ed254bd934968306210b737496776f73b;hpb=f239801ae38551ada215494694dfe47bb4e610be;p=lyx.git

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index 4ca88f4ed2..fbea55bbd0 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -15,9 +15,13 @@
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
+
+
+namespace lyx {
 
 using std::ostringstream;
+using std::string;
 
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
@@ -45,7 +49,7 @@ string const LyXGlueLength::asString() const
 
 	if (plus_.zero() && minus_.zero()) {
 		buffer << unit_name[len_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// just len and plus
@@ -54,7 +58,7 @@ string const LyXGlueLength::asString() const
 			buffer << unit_name[len_.unit()];
 		buffer << '+' << plus_.value();
 		buffer << unit_name[plus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// just len and minus
@@ -63,7 +67,7 @@ string const LyXGlueLength::asString() const
 			buffer << unit_name[len_.unit()];
 		buffer << '-' << minus_.value();
 		buffer << unit_name[minus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// ok, len, plus AND minus
@@ -74,7 +78,7 @@ string const LyXGlueLength::asString() const
 			buffer << unit_name[len_.unit()];
 		buffer << "+-" << minus_.value();
 		buffer << unit_name[minus_.unit()];
-		return STRCONV(buffer.str());
+		return buffer.str();
 	}
 
 	// this is so rare a case, why bother minimising units ?
@@ -83,7 +87,7 @@ string const LyXGlueLength::asString() const
 	buffer << '+' << plus_.value() << unit_name[plus_.unit()];
 	buffer << '-' << minus_.value() << unit_name[minus_.unit()];
 
-	return STRCONV(buffer.str());
+	return buffer.str();
 }
 
 
@@ -97,7 +101,7 @@ string const LyXGlueLength::asLatexString() const
 		buffer << " plus " << plus_.value() << unit_name[plus_.unit()];
 	if (!minus_.zero())
 		buffer << " minus " << minus_.value() << unit_name[minus_.unit()];
-	return STRCONV(buffer.str());
+	return buffer.str();
 }
 
 
@@ -131,3 +135,6 @@ bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2)
 {
 	return !(l1 == l2);
 }
+
+
+} // namespace lyx