[Libreoffice-commits] core.git: include/svx svx/source

[Caolán McNamara]

 include/svx/svdetc.hxx       |    4 +---
 include/svx/svdglob.hxx      |    2 +-
 svx/source/svdraw/svdetc.cxx |   12 ++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 6c657296f109ce4c0c74ab6b7c13f2c1c31fec64
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 26 20:41:48 2013 +0100

    more valient efforts to remove UniString from ResID ctor
    
    Change-Id: I1227d42f5d24d1743212125ffbeb07513b7d092b

diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 22a91d3..b179275 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 dbec676..655fd60 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);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index f133ca8..4caca94 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -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);
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////