X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.cpp;h=d0d4b261278f61fa21450865f68a4b600eacaf79;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=bbbdca4b394020317cd6a2ce9d1f2042d468cef0;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp index bbbdca4b39..d0d4b26127 100644 --- a/src/ParagraphParameters.cpp +++ b/src/ParagraphParameters.cpp @@ -27,16 +27,12 @@ #include -using lyx::support::rtrim; - -using std::istringstream; -using std::ostream; -using std::ostringstream; -using std::string; - +using namespace std; +using namespace lyx::support; namespace lyx { + //NOTE The order of these MUST be the same as in Layout.h. static char const * const string_align[] = { "block", "left", "right", "center", "default", "" @@ -173,9 +169,9 @@ void ParagraphParameters::leftIndent(Length const & li) } -void ParagraphParameters::read(std::string str, bool merge) +void ParagraphParameters::read(string str, bool merge) { - std::istringstream is(str); + istringstream is(str); Lexer lex(0, 0); lex.setStream(is); read(lex, merge); @@ -233,7 +229,7 @@ void ParagraphParameters::read(Lexer & lex, bool merge) } } else if (token == "\\align") { lex.next(); - int tmpret = support::findToken(string_align, lex.getString()); + int tmpret = findToken(string_align, lex.getString()); if (tmpret == -1) ++tmpret; align(LyXAlignment(1 << tmpret));