diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-29 15:35:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-12-03 11:34:47 +0200 |
| commit | 418b5df94b5a06ba4c18a82f9ff7a0c215a2060b (patch) | |
| tree | 5df27df364780a5713c076e38afe744774f3749d /reportdesign | |
| parent | 8c787dec1ae4e415fdcfdf16b5cd9b749308b2c7 (diff) | |
convert getSuppressedArgumentCount from xub_StrLen -> sal_Int32
convert IFunctionDescription::getSuppressedArgumentCount from xub_StrLen
-> sal_Int32
Change-Id: Iee7a094a6f067fa57ee828c434417f7583c0f32b
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inc/FunctionHelper.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/FunctionHelper.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 99dbd351a40d..bb9cb8531d05 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -67,7 +67,7 @@ public: virtual OUString getFunctionName() const ; virtual const formula::IFunctionCategory* getCategory() const ; virtual OUString getDescription() const ; - virtual xub_StrLen getSuppressedArgumentCount() const ; + virtual sal_Int32 getSuppressedArgumentCount() const ; virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const ; virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ; virtual void initArgumentInfo() const; diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 0b8ed51dcb06..59bb0bba9b32 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -168,9 +168,9 @@ OUString FunctionDescription::getDescription() const return m_xFunctionDescription->getDescription(); } // ----------------------------------------------------------------------------- -xub_StrLen FunctionDescription::getSuppressedArgumentCount() const +sal_Int32 FunctionDescription::getSuppressedArgumentCount() const { - return static_cast<xub_StrLen>(m_aParameter.getLength()); + return m_aParameter.getLength(); } // ----------------------------------------------------------------------------- OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 965f429fedd1..479beeea9954 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -1032,10 +1032,10 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula if ( bSuccess ) { OUString sFormula = aDlg.getCurrentFormula(); - xub_StrLen nIndex = 0; if ( sFormula[0] == '=' ) - nIndex = 1; - _in_out_rFormula = "rpt:" + sFormula.copy(nIndex); + _in_out_rFormula = "rpt:" + sFormula.copy(1); + else + _in_out_rFormula = "rpt:" + sFormula; } } } |