strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more valient efforts to remove UniString from ResID ctor

Browse source 
Change-Id: I1227d42f5d24d1743212125ffbeb07513b7d092b
This commit is contained in:
Caolán McNamara 2013-07-26 20:41:48 +01:00
parent 826be413d6
commit 6c657296f1
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/svx/svdetc.hxx
View file

@ -248,9 +248,7 @@ inline SdrGlobalData& GetSdrGlobalData()
namespace sdr
{
SVX_DLLPUBLIC String GetResourceString(sal_uInt16 nResID);
SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID);
}
/////////////////////////////////////////////////////////////////////

2
include/svx/svdglob.hxx
View file

@ -39,7 +39,7 @@ ResMgr* ImpGetResMgr();
// SDR_StringCacheBegin (256) to SDR_StringCacheEnd
// are cached.
// See also SvdStr.Hrc
SVX_DLLPUBLIC String ImpGetResStr(sal_uInt16 nResID);
SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
////////////////////////////////////////////////////////////////////////////////////////////////////

12
svx/source/svdraw/svdetc.cxx
View file

@ -442,19 +442,19 @@ ResMgr* ImpGetResMgr()
////////////////////////////////////////////////////////////////////////////////////////////////////
String ImpGetResStr(sal_uInt16 nResID)
OUString ImpGetResStr(sal_uInt16 nResID)
{
return String(ResId(nResID, *ImpGetResMgr()));
return ResId(nResID, *ImpGetResMgr()).toString();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
namespace sdr
{
String GetResourceString(sal_uInt16 nResID)
{
return ImpGetResStr( nResID );
}
OUString GetResourceString(sal_uInt16 nResID)
{
return ImpGetResStr(nResID);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////