X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=bd76faffe5c9838b498865116053c8a520e098c4;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=c7c90432293f931ee3363c06b256f65244ee42bb;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C
index c7c9043229..bd76faffe5 100644
--- a/src/lyxgluelength.C
+++ b/src/lyxgluelength.C
@@ -1,19 +1,24 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxgluelength.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Matthias Ettrich
+ * \author John Levon
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
 #include "lyxgluelength.h"
 #include "lengthcommon.h"
 
-#include "Lsstream.h"
+#include <sstream>
+
+using std::ostringstream;
+using std::string;
 
 
 LyXGlueLength::LyXGlueLength(LyXLength const & len)
@@ -41,7 +46,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
@@ -50,7 +55,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
@@ -59,7 +64,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
@@ -70,7 +75,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 ?
@@ -79,7 +84,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();
 }
 
 
@@ -93,7 +98,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();
 }