ditch some XubStrings

Change-Id: I00e1202de7bf5d20b4ac314dd138a3bb486245cb

4 files changed, 9 insertions, 9 deletions

diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index a40111838235..d2f609c43cf5 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -56,7 +56,7 @@ private:
 #endif
 
 public:
-                        Config( const XubString& rFileName );
+                        Config( const rtl::OUString& rFileName );
                         ~Config();
 
     const rtl::OUString& GetPathName() const { return maFileName; }
diff --git a/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index cee100fe8138..7e2a7d3b862d 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.hxx
@@ -78,7 +78,7 @@ public:
             an existent string
         @seealso IsAvailable
     */
-    UniString               ReadString( sal_uInt32 nId );
+    rtl::OUString           ReadString( sal_uInt32 nId );
 
     /** checks whether a certain resource is availble
         @param  _resourceType
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 767e17a736c1..91c0193437ef 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -68,7 +68,7 @@ struct ImplGroupData
 struct ImplConfigData
 {
     ImplGroupData*  mpFirstGroup;
-    XubString       maFileName;
+    rtl::OUString   maFileName;
     sal_uIntPtr         mnDataUpdateId;
     sal_uIntPtr         mnTimeStamp;
     LineEnd         meLineEnd;
@@ -93,7 +93,7 @@ static String toUncPath( const String& rPath )
     return aFileURL;
 }
 
-static sal_uIntPtr ImplSysGetConfigTimeStamp( const XubString& rFileName )
+static sal_uIntPtr ImplSysGetConfigTimeStamp( const rtl::OUString& rFileName )
 {
     sal_uIntPtr nTimeStamp = 0;
     ::osl::DirectoryItem aItem;
@@ -110,7 +110,7 @@ static sal_uIntPtr ImplSysGetConfigTimeStamp( const XubString& rFileName )
 
 // -----------------------------------------------------------------------
 
-static sal_uInt8* ImplSysReadConfig( const XubString& rFileName,
+static sal_uInt8* ImplSysReadConfig( const rtl::OUString& rFileName,
                                 sal_uInt64& rRead, sal_Bool& rbRead, sal_Bool& rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
 {
     sal_uInt8*          pBuf = NULL;
@@ -156,7 +156,7 @@ static sal_uInt8* ImplSysReadConfig( const XubString& rFileName,
 
 // -----------------------------------------------------------------------
 
-static sal_Bool ImplSysWriteConfig( const XubString& rFileName,
+static sal_Bool ImplSysWriteConfig( const rtl::OUString& rFileName,
                                 const sal_uInt8* pBuf, sal_uIntPtr nBufLen, sal_Bool rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
 {
     sal_Bool bSuccess = sal_False;
@@ -626,7 +626,7 @@ static void ImplDeleteConfigData( ImplConfigData* pData )
 
 // =======================================================================
 
-static ImplConfigData* ImplGetConfigData( const XubString& rFileName )
+static ImplConfigData* ImplGetConfigData( const rtl::OUString& rFileName )
 {
     ImplConfigData* pData;
 
@@ -710,7 +710,7 @@ ImplGroupData* Config::ImplGetGroup() const
 
 // =======================================================================
 
-Config::Config( const XubString& rFileName )
+Config::Config( const rtl::OUString& rFileName )
 {
     // Daten initialisieren und einlesen
     maFileName      = toUncPath( rFileName );
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 2c315f189596..977f04354015 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1946,7 +1946,7 @@ bool SimpleResMgr::IsAvailable( RESOURCE_TYPE _resourceType, sal_uInt32 _resourc
 }
 
 // -----------------------------------------------------------------------
-UniString SimpleResMgr::ReadString( sal_uInt32 nId )
+rtl::OUString SimpleResMgr::ReadString( sal_uInt32 nId )
 {
     osl::MutexGuard aGuard(m_aAccessSafety);