diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-08 09:06:10 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-08 14:57:16 +0000 |
| commit | 9e310cc32923ceb4b18d97ce68d54a339b935f01 (patch) | |
| tree | d79b44b80c15f6bdb3116db4c9b6955a9e6cb4c9 /tools/inc | |
| parent | 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5 (diff) | |
fdo#38838 Some removal/replacement of the String/UniString with OUString
Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275
Reviewed-on: https://gerrit.libreoffice.org/1962
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'tools/inc')
| -rw-r--r-- | tools/inc/tools/resmgr.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index 8a6e44cf481c..37aac4be9b6a 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -117,10 +117,10 @@ private: // the next two methods are needed to prevent the string hook called // with the res mgr mutex locked // like GetString, but doesn't call the string hook - TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( UniString& rStr, + TOOLS_DLLPRIVATE static sal_uInt32 GetStringWithoutHook( OUString& rStr, const sal_uInt8* pStr ); // like ReadString but doesn't call the string hook - TOOLS_DLLPRIVATE UniString ReadStringWithoutHook(); + TOOLS_DLLPRIVATE OUString ReadStringWithoutHook(); static ResMgr* ImplCreateResMgr( InternalResMgr* pImpl ) { return new ResMgr( pImpl ); } @@ -163,7 +163,7 @@ public: { return( pHT->GetGlobOff() ); } /// Return a string and its length out of the resource - static sal_uInt32 GetString( UniString& rStr, const sal_uInt8* pStr ); + static sal_uInt32 GetString( OUString& rStr, const sal_uInt8* pStr ); /// Return a byte string and its length out of the resource static sal_uInt32 GetByteString( rtl::OString& rStr, const sal_uInt8* pStr ); @@ -190,7 +190,7 @@ public: sal_Int16 ReadShort(); sal_Int32 ReadLong(); - UniString ReadString(); + OUString ReadString(); rtl::OString ReadByteString(); /// Generate auto help ID for current resource stack |