diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-19 10:39:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-22 12:48:27 +0100 |
| commit | a22a7923c05df85a1f9c9435754c5feda66ce576 (patch) | |
| tree | f6887b26c84261bfe3f09c08c25e8a4a84b2dcdc /tools/source | |
| parent | 8521ad498e6214f4194171e2f47f73fda73808c1 (diff) | |
ditch some XubStrings
Change-Id: I00e1202de7bf5d20b4ac314dd138a3bb486245cb
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/generic/config.cxx | 12 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
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); |