convert getSuppressedArgumentCount from xub_StrLen -> sal_Int32

convert IFunctionDescription::getSuppressedArgumentCount from xub_StrLen
-> sal_Int32

Change-Id: Iee7a094a6f067fa57ee828c434417f7583c0f32b

7 files changed, 10 insertions, 10 deletions

diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 29e60f881ace..6ca380f744e3 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -36,7 +36,7 @@ namespace formula
             virtual OUString getFunctionName() const { return OUString(); }
             virtual const IFunctionCategory* getCategory() const { return NULL; }
             virtual OUString getDescription() const { return OUString(); }
-            virtual xub_StrLen getSuppressedArgumentCount() const { return 0; }
+            virtual sal_Int32 getSuppressedArgumentCount() const { return 0; }
             virtual OUString getFormula(const ::std::vector< OUString >& ) const { return OUString(); }
             virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const {}
             virtual void initArgumentInfo()  const {}
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index e27d82d1a8b4..c27a7f5c5e74 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -82,7 +82,7 @@ namespace formula
         virtual const IFunctionCategory* getCategory() const = 0;
         virtual OUString getDescription() const = 0;
         // GetSuppressedArgCount
-        virtual xub_StrLen getSuppressedArgumentCount() const = 0;
+        virtual sal_Int32 getSuppressedArgumentCount() const = 0;
         // GetFormulaString
         virtual OUString getFormula(const ::std::vector< OUString >& _aArguments) const = 0;
         // GetVisibleArgMapping
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;
             }
         }
     }
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index a507962df6d3..fb892eca9fe2 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -153,7 +153,7 @@ public:
       @return    number of non-suppressed arguments
     */
     sal_uInt16  GetSuppressedArgCount() const;
-    virtual xub_StrLen getSuppressedArgumentCount() const ;
+    virtual sal_Int32 getSuppressedArgumentCount() const ;
 
     /**
       Requests function data from AddInCollection
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 66c323485769..e59249af5635 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -312,7 +312,7 @@ OUString ScFuncDesc::getDescription() const
     return sRet;
 }
 
-xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const
+sal_Int32 ScFuncDesc::getSuppressedArgumentCount() const
 {
     return GetSuppressedArgCount();
 }