X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphParameters.cpp;h=d0d4b261278f61fa21450865f68a4b600eacaf79;hb=1ab314f8e6e145dc73d0a26b7e82a280b497ea3c;hp=c8c0a5dab470d71b1659d96ccc5fed305405f8c0;hpb=9383f4c3c6f9cfab2d658701ba66e2b54cd68bea;p=lyx.git

diff --git a/src/ParagraphParameters.cpp b/src/ParagraphParameters.cpp
index c8c0a5dab4..d0d4b26127 100644
--- a/src/ParagraphParameters.cpp
+++ b/src/ParagraphParameters.cpp
@@ -28,10 +28,10 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::rtrim;
 
 //NOTE The order of these MUST be the same as in Layout.h.
 static char const * const string_align[] = {
@@ -169,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);
@@ -229,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));