summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-03-19 21:11:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-03-20 12:57:33 +0000
commit83ed5d4421ce2d4c7827a41b6c599b5475a8d8eb (patch)
tree5404c4c940cfd87d9420a44f8a9d1edbf90bf0b6 /tools
parentbdfba4dbf666868c6d10b972259884877dd01848 (diff)
GetStringRes inline doesn't have a purpose anymore
Diffstat (limited to 'tools')
-rw-r--r--tools/inc/tools/rc.hxx4
-rw-r--r--tools/source/rc/resmgr.cxx4
2 files changed, 2 insertions, 6 deletions
diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index a6310197e442..1bca5f99d35b 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.hxx
@@ -56,10 +56,6 @@ class TOOLS_DLLPUBLIC Resource
void* GetClassRes()
{ return m_pResMgr->GetClass(); }
- // read a string from the resource
- static sal_uInt32 GetStringRes( UniString& rStr, const sal_uInt8* pStr )
- { return ResMgr::GetString( rStr, pStr ); }
-
// increase the memory pointer gotten by GetClassRes()
void* IncrementRes( sal_uInt32 nBytes )
{ return m_pResMgr->Increment( nBytes ); }
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8c6358ea6e5c..8e9931e9f050 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1349,7 +1349,7 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const sal_uInt8* pStr )
UniString aString;
sal_uInt32 nRet = GetStringWithoutHook( aString, pStr );
if ( pImplResHookProc )
- pImplResHookProc( aString );
+ aString = pImplResHookProc( aString );
rStr = aString;
return nRet;
}
@@ -1754,7 +1754,7 @@ UniString ResMgr::ReadString()
{
UniString aRet = ReadStringWithoutHook();
if ( pImplResHookProc )
- pImplResHookProc( aRet );
+ aRet = pImplResHookProc( aRet );
return aRet;
}