X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxgluelength.C;h=fbea55bbd0354fa397088258e4eaed6a6ab2f0ed;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=a32bc6f775d8b6acfc6db7e22fd885e6bbf04e73;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git diff --git a/src/lyxgluelength.C b/src/lyxgluelength.C index a32bc6f775..fbea55bbd0 100644 --- a/src/lyxgluelength.C +++ b/src/lyxgluelength.C @@ -15,7 +15,13 @@ #include "lyxgluelength.h" #include "lengthcommon.h" -#include "support/std_sstream.h" +#include + + +namespace lyx { + +using std::ostringstream; +using std::string; LyXGlueLength::LyXGlueLength(LyXLength const & len) @@ -43,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 @@ -52,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 @@ -61,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 @@ -72,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 ? @@ -81,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(); } @@ -95,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(); } @@ -129,3 +135,6 @@ bool operator!=(LyXGlueLength const & l1, LyXGlueLength const & l2) { return !(l1 == l2); } + + +} // namespace lyx