mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ditch some XubStrings

Browse Source 
Change-Id: I00e1202de7bf5d20b4ac314dd138a3bb486245cb
This commit is contained in:
Caolán McNamara
2012-05-19 10:39:40 +01:00
parent 8521ad498e
commit a22a7923c0
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/inc/tools/config.hxx
View File

@@ -56,7 +56,7 @@ private:
#endif #endif
public: public:
Config( const XubString& rFileName ); Config( const rtl::OUString& rFileName );
~Config(); ~Config();
const rtl::OUString& GetPathName() const { return maFileName; } const rtl::OUString& GetPathName() const { return maFileName; }

2
tools/inc/tools/simplerm.hxx
View File

@@ -78,7 +78,7 @@ public:
an existent string an existent string
@seealso IsAvailable @seealso IsAvailable
*/ */
UniString ReadString( sal_uInt32 nId ); rtl::OUString ReadString( sal_uInt32 nId );
/** checks whether a certain resource is availble /** checks whether a certain resource is availble
@param _resourceType @param _resourceType

12
tools/source/generic/config.cxx
View File

@@ -68,7 +68,7 @@ struct ImplGroupData
struct ImplConfigData struct ImplConfigData
{ {
ImplGroupData* mpFirstGroup; ImplGroupData* mpFirstGroup;
XubString maFileName; rtl::OUString maFileName;
sal_uIntPtr mnDataUpdateId; sal_uIntPtr mnDataUpdateId;
sal_uIntPtr mnTimeStamp; sal_uIntPtr mnTimeStamp;
LineEnd meLineEnd; LineEnd meLineEnd;
@@ -93,7 +93,7 @@ static String toUncPath( const String& rPath )
return aFileURL; return aFileURL;
} }
static sal_uIntPtr ImplSysGetConfigTimeStamp( const XubString& rFileName ) static sal_uIntPtr ImplSysGetConfigTimeStamp( const rtl::OUString& rFileName )
{ {
sal_uIntPtr nTimeStamp = 0; sal_uIntPtr nTimeStamp = 0;
::osl::DirectoryItem aItem; ::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_uInt64& rRead, sal_Bool& rbRead, sal_Bool& rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
{ {
sal_uInt8* pBuf = NULL; 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 ) const sal_uInt8* pBuf, sal_uIntPtr nBufLen, sal_Bool rbIsUTF8BOM, sal_uIntPtr& rTimeStamp )
{ {
sal_Bool bSuccess = sal_False; 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; 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 // Daten initialisieren und einlesen
maFileName = toUncPath( rFileName ); maFileName = toUncPath( rFileName );

2
tools/source/rc/resmgr.cxx
View File

@@ -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); osl::MutexGuard aGuard(m_aAccessSafety);