summaryrefslogtreecommitdiff
path: root/scaddins/source/analysis
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-16 08:36:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-08-16 13:59:30 +0100
commitd69d6f4dc8eef7cd85929a2655c523d2f17263e0 (patch)
tree1a598169dbfa6152061f3fa0b5383f9a1392a096 /scaddins/source/analysis
parentecbb33dd8044ad45cf05f868f829e635e03d7589 (diff)
Related: fdo#38838 ToInt64 and a EqualsIgnoreCaseAscii variant are now unused
Change-Id: I2a2cc56cf005f564c798b8d43ef7e8c4b7f9eeff
Diffstat (limited to 'scaddins/source/analysis')
-rw-r--r--scaddins/source/analysis/analysis.cxx4
-rw-r--r--scaddins/source/analysis/analysishelper.hxx4
2 files changed, 4 insertions, 4 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; }
};