Related: fdo#38838 ToInt64 and a EqualsIgnoreCaseAscii variant are now unused

Change-Id: I2a2cc56cf005f564c798b8d43ef7e8c4b7f9eeff

6 files changed, 10 insertions, 10 deletions

diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx
index 2362dba807a2..d282df0f5b3a 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -86,7 +86,7 @@ ResMgr& AnalysisAddIn::GetResMgr( void ) throw( uno::RuntimeException )
 
 OUString AnalysisAddIn::GetDisplFuncStr( sal_uInt16 nFuncNum ) throw( uno::RuntimeException )
 {
-    return String( AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString() );
+    return AnalysisRscStrLoader( RID_ANALYSIS_FUNCTION_NAMES, nFuncNum, GetResMgr() ).GetString();
 }
 
 
@@ -108,7 +108,7 @@ public:
 
 AnalysisFuncRes::AnalysisFuncRes( ResId& rRes, ResMgr& rResMgr, sal_uInt16 nInd, OUString& rRet ) : Resource( rRes )
 {
-    rRet = String( AnalysisResId( nInd, rResMgr ) );
+    rRet = AnalysisResId(nInd, rResMgr).toString();
 
     FreeResource();
 }
diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx
index 7a3da3335cf4..66a25a525e79 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -298,7 +298,7 @@ class AnalysisResId : public ResId
 class AnalysisRscStrLoader : public Resource
 {
 private:
-    String          aStr;
+    OUString        aStr;
 public:
     AnalysisRscStrLoader( sal_uInt16 nRsc, sal_uInt16 nStrId, ResMgr& rResMgr ) :
         Resource( AnalysisResId( nRsc, rResMgr ) ),
@@ -307,7 +307,7 @@ public:
         FreeResource();
     }
 
-    const String&   GetString() const { return aStr; }
+    const OUString& GetString() const { return aStr; }
 
 };
 
diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx
index 07dcd841b67e..2615697b05c5 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -185,7 +185,7 @@ const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName ) con
 ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ) :
     Resource( rResId )
 {
-    rRet = String( ScaResId( nIndex, rResMgr ) );
+    rRet = ScaResId(nIndex, rResMgr).toString();
     FreeResource();
 }
 
diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx
index 03373e2c7fe2..9569138482af 100644
--- a/scaddins/source/datefunc/datefunc.hxx
+++ b/scaddins/source/datefunc/datefunc.hxx
@@ -144,12 +144,12 @@ public:
 class ScaResStringLoader : public Resource
 {
 private:
-    String                      aStr;
+    OUString                    aStr;
 
 public:
     inline                      ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr );
 
-    inline const String&        GetString() const   { return aStr; }
+    inline const OUString&      GetString() const   { return aStr; }
 
 };
 
diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx
index d4da90135819..92048e623512 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -188,7 +188,7 @@ const ScaFuncData* ScaFuncDataList::Get( const OUString& rProgrammaticName ) con
 ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, sal_uInt16 nIndex, OUString& rRet ) :
     Resource( rResId )
 {
-    rRet = String( ScaResId( nIndex, rResMgr ) );
+    rRet = ScaResId(nIndex, rResMgr).toString();
     FreeResource();
 }
 
diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx
index 29d0ff9f3270..dd76f647345a 100644
--- a/scaddins/source/pricing/pricing.hxx
+++ b/scaddins/source/pricing/pricing.hxx
@@ -156,12 +156,12 @@ public:
 class ScaResStringLoader : public Resource
 {
 private:
-    String                      aStr;
+    OUString                    aStr;
 
 public:
     inline                      ScaResStringLoader( sal_uInt16 nResId, sal_uInt16 nStrId, ResMgr& rResMgr );
 
-    inline const String&        GetString() const   { return aStr; }
+    inline const OUString&      GetString() const   { return aStr; }
 
 };