remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 18 insertions, 18 deletions

diff --git a/idlc/source/scanner.l b/idlc/source/scanner.l
index 180381c3ff38..a7c23f458b96 100644
--- a/idlc/source/scanner.l
+++ b/idlc/source/scanner.l
@@ -58,7 +58,7 @@ int yycolumn = 1;
     yycolumn += yyleng;
 
 sal_Int32		beginLine = 0;
-::rtl::OString	docu;
+OString	docu;
 
 static int asciiToInteger(char const * s, sal_Int64  * sval, sal_uInt64 * uval) {
     bool neg = false;
@@ -202,12 +202,12 @@ static double asciiToFloat(const sal_Char *s)
 
 static void	idlParsePragma(sal_Char* pPragma)
 {
-	::rtl::OString pragma(pPragma);
+	OString pragma(pPragma);
 	sal_Int32 index = pragma.indexOf("include");
 	sal_Char* begin = pPragma + index + 8;
 	sal_Char* offset = begin;
 	while (*offset != ',') offset++;
-	//::rtl::OString include = pragma.copy(index + 8, offset - begin);
+	//OString include = pragma.copy(index + 8, offset - begin);
 	//unused// idlc()->insertInclude(pragma.copy(index + 8, (sal_Int32)(offset - begin)));
 }	
 
@@ -239,9 +239,9 @@ static void parseLineAndFile(sal_Char* pBuf)
 	for (; *r != '"'; r++) ;
 	*r = 0;
 	if (*h == '\0')
-		idlc()->setFileName(::rtl::OString("standard input"));
+		idlc()->setFileName(OString("standard input"));
 	else
-		idlc()->setFileName(::rtl::OString(h));
+		idlc()->setFileName(OString(h));
 
 	bIsInMain = idlc()->getFileName() == idlc()->getRealFileName();
 	idlc()->setInMainfile(bIsInMain);		
@@ -364,7 +364,7 @@ published       return IDL_PUBLISHED;
             }
 
 {IDENTIFIER}	{
-				yylval.sval = new ::rtl::OString(yytext);
+				yylval.sval = new OString(yytext);
 				return IDL_IDENTIFIER;
 			}
 
@@ -383,26 +383,26 @@ published       return IDL_PUBLISHED;
 
 "/*"	{ 
 			BEGIN( COMMENT );
-			docu = ::rtl::OString();
+			docu = OString();
 			beginLine = idlc()->getLineNumber();
 		}
 
 "/***"	{ 
 			BEGIN( COMMENT );
-			docu = ::rtl::OString();
+			docu = OString();
 			beginLine = idlc()->getLineNumber();
 		}
 
 <COMMENT>[^*]+	{
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			} 
 
 <COMMENT>"*"[^*/]+ 	{
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			}
 
 <COMMENT>"**" 	{
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			}
 
 <COMMENT>[*]+"/"  {
@@ -416,26 +416,26 @@ published       return IDL_PUBLISHED;
 
 "/**"	{
 			BEGIN( DOCU );
-			docu = ::rtl::OString();
+			docu = OString();
 			beginLine = idlc()->getLineNumber();
 		}
 
 <DOCU>[^*\n]+	{
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			}
 
 <DOCU>"\n"[ \t]*"*"{1} 	{
 				idlc()->setLineNumber( idlc()->getLineNumber()  + 1);
-				docu += ::rtl::OString("\n");
+				docu += OString("\n");
 			}
 
 <DOCU>"\n"	{
 				idlc()->setLineNumber( idlc()->getLineNumber()  + 1);
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			}
 
 <DOCU>"*"[^*^/\n]* 	{
-				docu += ::rtl::OString(yytext);
+				docu += OString(yytext);
 			}
 
 <DOCU>"\n"[ \t]*"*/" 	{
@@ -474,7 +474,7 @@ published       return IDL_PUBLISHED;
 
 "//"[^/]{1}.*"\n" {
 				/* only a comment */
-				::rtl::OString docStr(yytext);
+				OString docStr(yytext);
 				docStr = docStr.copy( 0, docStr.lastIndexOf('\n') );
 				docStr = docStr.copy( docStr.lastIndexOf('/')+1 );
 				docStr = docStr.trim();
@@ -482,7 +482,7 @@ published       return IDL_PUBLISHED;
 			}
 
 "///".*"\n"  {
-				::rtl::OString docStr(yytext);
+				OString docStr(yytext);
 				docStr = docStr.copy( 0, docStr.lastIndexOf('\n') );
 				docStr = docStr.copy( docStr.lastIndexOf('/')+1 );
 				docStr = docStr.trim();