mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

5 files changed, 43 insertions, 43 deletions

diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 0ee28019e2dd..60fd2778b2d5 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -63,36 +63,36 @@ namespace fs
     class path
     {
     public:
-        ::rtl::OUString data;
+        OUString data;
     public:
         path() {}
         path(const path &rOther) : data(rOther.data) {}
         path(const std::string &in, convert)
         {
-            rtl::OUString sWorkingDir;
+            OUString sWorkingDir;
             osl_getProcessWorkingDir(&sWorkingDir.pData);
-            rtl::OString tmp(in.c_str());
-            rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
+            OString tmp(in.c_str());
+            OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
             osl::File::getFileURLFromSystemPath(ustrSystemPath, data);
             osl::File::getAbsoluteFileURL(sWorkingDir, data, data);
         }
         path(const std::string &FileURL)
         {
-            rtl::OString tmp(FileURL.c_str());
-            data = rtl::OStringToOUString(tmp, getThreadTextEncoding());
+            OString tmp(FileURL.c_str());
+            data = OStringToOUString(tmp, getThreadTextEncoding());
         }
         std::string native_file_string() const
         {
-            ::rtl::OUString ustrSystemPath;
+            OUString ustrSystemPath;
             osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
-            rtl::OString tmp(rtl::OUStringToOString(ustrSystemPath, getThreadTextEncoding()));
+            OString tmp(OUStringToOString(ustrSystemPath, getThreadTextEncoding()));
             HCDBG(std::cerr << "native_file_string is " << tmp.getStr() << std::endl);
             return std::string(tmp.getStr());
         }
 #ifdef WNT
         wchar_t const * native_file_string_w() const
         {
-            ::rtl::OUString ustrSystemPath;
+            OUString ustrSystemPath;
             osl::File::getSystemPathFromFileURL(data, ustrSystemPath);
             return (wchar_t const *) ustrSystemPath.getStr();
         }
@@ -100,7 +100,7 @@ namespace fs
         std::string native_directory_string() const { return native_file_string(); }
         std::string toUTF8() const
         {
-            rtl::OString tmp(rtl::OUStringToOString(data, RTL_TEXTENCODING_UTF8));
+            OString tmp(OUStringToOString(data, RTL_TEXTENCODING_UTF8));
             return std::string(tmp.getStr());
         }
         bool empty() const { return data.isEmpty(); }
@@ -108,19 +108,19 @@ namespace fs
         {
             path ret(*this);
             HCDBG(std::cerr << "orig was " <<
-                rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
-            rtl::OString tmp(in.c_str());
-            rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
-            ret.data += rtl::OUString(sal_Unicode('/'));
+                OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
+            OString tmp(in.c_str());
+            OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
+            ret.data += OUString(sal_Unicode('/'));
             ret.data += ustrSystemPath;
             HCDBG(std::cerr << "final is " <<
-                rtl::OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
+                OUStringToOString(ret.data, RTL_TEXTENCODING_UTF8).getStr() << std::endl);
             return ret;
         }
         void append(const char *in)
         {
-            rtl::OString tmp(in);
-            rtl::OUString ustrSystemPath(rtl::OStringToOUString(tmp, getThreadTextEncoding()));
+            OString tmp(in);
+            OUString ustrSystemPath(OStringToOUString(tmp, getThreadTextEncoding()));
             data = data + ustrSystemPath;
         }
         void append(const std::string &in) { append(in.c_str()); }
diff --git a/helpcompiler/inc/HelpIndexer.hxx b/helpcompiler/inc/HelpIndexer.hxx
index 0a2fb9421719..68bae8d825f2 100644
--- a/helpcompiler/inc/HelpIndexer.hxx
+++ b/helpcompiler/inc/HelpIndexer.hxx
@@ -51,13 +51,13 @@ class Reader;
 
 class L10N_DLLPUBLIC HelpIndexer {
 	private:
-		rtl::OUString d_lang;
-		rtl::OUString d_module;
-		rtl::OUString d_captionDir;
-		rtl::OUString d_contentDir;
-		rtl::OUString d_indexDir;
-		rtl::OUString d_error;
-		std::set<rtl::OUString> d_files;
+                OUString d_lang;
+                OUString d_module;
+                OUString d_captionDir;
+                OUString d_contentDir;
+                OUString d_indexDir;
+                OUString d_error;
+                std::set<OUString> d_files;
 
 	public:
 
@@ -67,8 +67,8 @@ class L10N_DLLPUBLIC HelpIndexer {
 	 * @param srcDir The help directory to index
 	 * @param outDir The directory to write the "module".idxl directory to
 	 */
-	HelpIndexer(rtl::OUString const &lang, rtl::OUString const &module,
-		rtl::OUString const &srcDir, rtl::OUString const &outDir);
+        HelpIndexer(OUString const &lang, OUString const &module,
+            OUString const &srcDir, OUString const &outDir);
 
 	/**
 	 * Run the indexer.
@@ -79,7 +79,7 @@ class L10N_DLLPUBLIC HelpIndexer {
 	/**
 	 * Get the error string (empty if no error occurred).
 	 */
-	rtl::OUString const & getErrorMessage();
+        OUString const & getErrorMessage();
 
 	private:
 
@@ -91,17 +91,17 @@ class L10N_DLLPUBLIC HelpIndexer {
 	/**
 	 * Scan for files in the given directory.
 	 */
-	bool scanForFiles(rtl::OUString const &path);
+        bool scanForFiles(OUString const &path);
 
 	/**
 	 * Fill the Document with information on the given help file.
 	 */
-	bool helpDocument(rtl::OUString const & fileName, lucene::document::Document *doc);
+        bool helpDocument(OUString const & fileName, lucene::document::Document *doc);
 
 	/**
 	 * Create a reader for the given file, and create an "empty" reader in case the file doesn't exist.
 	 */
-	lucene::util::Reader *helpFileReader(rtl::OUString const & path);
+        lucene::util::Reader *helpFileReader(OUString const & path);
 };
 
 #endif
diff --git a/helpcompiler/inc/HelpLinker.hxx b/helpcompiler/inc/HelpLinker.hxx
index b7e88932fcb3..4cafeec706c8 100644
--- a/helpcompiler/inc/HelpLinker.hxx
+++ b/helpcompiler/inc/HelpLinker.hxx
@@ -52,7 +52,7 @@ public:
     void main(std::vector<std::string> &args,
               std::string* pExtensionPath = NULL,
               std::string* pDestination = NULL,
-              const rtl::OUString* pOfficeHelpPath = NULL )
+              const OUString* pOfficeHelpPath = NULL )
 
             throw( HelpProcessingException );
 
diff --git a/helpcompiler/inc/HelpSearch.hxx b/helpcompiler/inc/HelpSearch.hxx
index e232b5ad2ff8..a8192bb1351c 100644
--- a/helpcompiler/inc/HelpSearch.hxx
+++ b/helpcompiler/inc/HelpSearch.hxx
@@ -37,8 +37,8 @@
 
 class L10N_DLLPUBLIC HelpSearch{
 	private:
-		rtl::OUString d_lang;
-		rtl::OString d_indexDir;
+                OUString d_lang;
+                OString d_indexDir;
 
 	public:
 
@@ -46,7 +46,7 @@ class L10N_DLLPUBLIC HelpSearch{
 	 * @param lang Help files language.
 	 * @param indexDir The directory where the index files are stored.
 	 */
-	HelpSearch(rtl::OUString const &lang, rtl::OUString const &indexDir);
+        HelpSearch(OUString const &lang, OUString const &indexDir);
 
 	/**
 	 * Query the index for a certain query string.
@@ -55,8 +55,8 @@ class L10N_DLLPUBLIC HelpSearch{
 	 * @param rDocuments Vector to write the paths of the found documents.
 	 * @param rScores Vector to write the scores to.
 	 */
-	bool query(rtl::OUString const &queryStr, bool captionOnly,
-		std::vector<rtl::OUString> &rDocuments, std::vector<float> &rScores);
+        bool query(OUString const &queryStr, bool captionOnly,
+            std::vector<OUString> &rDocuments, std::vector<float> &rScores);
 };
 
 #endif
diff --git a/helpcompiler/inc/compilehelp.hxx b/helpcompiler/inc/compilehelp.hxx
index cbac6e6c87b9..4ef706d32388 100644
--- a/helpcompiler/inc/compilehelp.hxx
+++ b/helpcompiler/inc/compilehelp.hxx
@@ -42,8 +42,8 @@ enum HelpProcessingErrorClass
 struct HelpProcessingErrorInfo
 {
     HelpProcessingErrorClass        m_eErrorClass;
-    rtl::OUString                   m_aErrorMsg;
-    rtl::OUString                   m_aXMLParsingFile;
+    OUString                   m_aErrorMsg;
+    OUString                   m_aXMLParsingFile;
     sal_Int32                       m_nXMLParsingLine;
 
     HelpProcessingErrorInfo( void )
@@ -58,11 +58,11 @@ struct HelpProcessingErrorInfo
 // Returns true in case of success, false in case of error
 HELPLINKER_DLLPUBLIC bool compileExtensionHelp
 (
-     const rtl::OUString& aOfficeHelpPath,
-    const rtl::OUString& aExtensionName,
-    const rtl::OUString& aExtensionLanguageRoot,
-    sal_Int32 nXhpFileCount, const rtl::OUString* pXhpFiles,
-    const rtl::OUString& aDestination,
+     const OUString& aOfficeHelpPath,
+    const OUString& aExtensionName,
+    const OUString& aExtensionLanguageRoot,
+    sal_Int32 nXhpFileCount, const OUString* pXhpFiles,
+    const OUString& aDestination,
     HelpProcessingErrorInfo& o_rHelpProcessingErrorInfo
 );