diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-26 20:41:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-27 07:41:43 +0100 |
| commit | 6c657296f109ce4c0c74ab6b7c13f2c1c31fec64 (patch) | |
| tree | a0225a5aef75e95bf18be2164696cff93410b531 /include/svx | |
| parent | 826be413d6f3242ee5c5672ca0f1f2f8ac6b417a (diff) | |
more valient efforts to remove UniString from ResID ctor
Change-Id: I1227d42f5d24d1743212125ffbeb07513b7d092b
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdetc.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdglob.hxx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 22a91d3e55c1..b17927531c0e 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -248,9 +248,7 @@ inline SdrGlobalData& GetSdrGlobalData() namespace sdr { - -SVX_DLLPUBLIC String GetResourceString(sal_uInt16 nResID); - + SVX_DLLPUBLIC OUString GetResourceString(sal_uInt16 nResID); } ///////////////////////////////////////////////////////////////////// diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx index dbec676cfbb5..655fd6093dd9 100644 --- a/include/svx/svdglob.hxx +++ b/include/svx/svdglob.hxx @@ -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); //////////////////////////////////////////////////////////////////////////////////////////////////// |