convert IFormulaEditorHelper::*Selection methods from xub_StrLen to sal_Int32

Change-Id: Ia7a6241c651106427e636bdc08085b97a2a41407

6 files changed, 29 insertions, 26 deletions

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 344ce5ee252c..4f1a66b4b032 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -127,7 +127,7 @@ namespace formula
         sal_Bool            UpdateParaWin(Selection& _rSelection);
         void            UpdateParaWin(const Selection& _rSelection,const OUString& _sRefStr);
 
-        void            SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd);
+        void            SetData(sal_Int32 nFStart, xub_StrLen nNextFStart, xub_StrLen nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd);
         void            PreNotify( NotifyEvent& rNEvt );
 
         RefEdit*        GetCurrRefEdit();
@@ -848,7 +848,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
                 pMEdit->SetHelpId(aHelpId);
         }
 
-        xub_StrLen nOldStart, nOldEnd;
+        sal_Int32 nOldStart, nOldEnd;
         m_pHelper->getSelection( nOldStart, nOldEnd );
         if ( nOldStart != nNextFStart || nOldEnd != nNextFEnd )
         {
@@ -859,7 +859,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
 
         if(!bEditFlag)
             pMEdit->SetText(m_pHelper->getCurrentFormula());
-        xub_StrLen PrivStart, PrivEnd;
+        sal_Int32 PrivStart, PrivEnd;
         m_pHelper->getSelection( PrivStart, PrivEnd);
         if(!bEditFlag)
             pMEdit->SetSelection( Selection(PrivStart, PrivEnd));
@@ -1061,9 +1061,9 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
 //  --------------------------------------------------------------------------
 //                          Functions for right Page
 //  --------------------------------------------------------------------------
-void FormulaDlg_Impl::SetData(xub_StrLen nFStart,xub_StrLen nNextFStart,xub_StrLen nNextFEnd,xub_StrLen& PrivStart,xub_StrLen& PrivEnd)
+void FormulaDlg_Impl::SetData(sal_Int32 nFStart, xub_StrLen nNextFStart, xub_StrLen nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd)
 {
-    xub_StrLen nFEnd;
+    sal_Int32 nFEnd;
 
     // Notice and set new selection
     m_pHelper->getSelection( nFStart, nFEnd );
@@ -1111,8 +1111,8 @@ void FormulaDlg_Impl::EditThisFunc(xub_StrLen nFStart)
     bFound = m_aFormulaHelper.GetNextFunc( aFormula, sal_False, nNextFStart, &nNextFEnd);
     if ( bFound )
     {
-        xub_StrLen PrivStart, PrivEnd;
-        SetData(nFStart,nNextFStart,nNextFEnd,PrivStart, PrivEnd);
+        sal_Int32 PrivStart, PrivEnd;
+        SetData(nFStart, nNextFStart, nNextFEnd, PrivStart, PrivEnd);
         m_pHelper->showReference(aFormula.copy(PrivStart, PrivEnd-PrivStart));
     }
     else
@@ -1155,8 +1155,8 @@ void FormulaDlg_Impl::EditNextFunc( sal_Bool bForward, xub_StrLen nFStart )
 
     if ( bFound )
     {
-        xub_StrLen PrivStart, PrivEnd;
-        SetData(nFStart,nNextFStart,nNextFEnd,PrivStart, PrivEnd);
+        sal_Int32 PrivStart, PrivEnd;
+        SetData(nFStart, nNextFStart, nNextFEnd, PrivStart, PrivEnd);
     }
 }
 
@@ -1374,10 +1374,10 @@ void FormulaDlg_Impl::UpdateSelection()
     m_pHelper->setSelection((xub_StrLen)aFuncSel.Min(),(xub_StrLen)aFuncSel.Max());
     m_pHelper->setCurrentFormula( pFuncDesc->getFormula( m_aArguments ) );
     pMEdit->SetText(m_pHelper->getCurrentFormula());
-    xub_StrLen PrivStart, PrivEnd;
+    sal_Int32 PrivStart, PrivEnd;
     m_pHelper->getSelection( PrivStart, PrivEnd);
-    aFuncSel.Min()=PrivStart;
-    aFuncSel.Max()=PrivEnd;
+    aFuncSel.Min() = PrivStart;
+    aFuncSel.Max() = PrivEnd;
 
     nArgs = pFuncDesc->getSuppressedArgumentCount();
 
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index a22b71a47303..e27d82d1a8b4 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -135,8 +135,8 @@ namespace formula
         virtual OUString getCurrentFormula() const = 0;
         virtual void     setCurrentFormula(const OUString& _sReplacement) = 0;
 
-        virtual void getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const = 0;
-        virtual void setSelection(xub_StrLen _nStart,xub_StrLen _nEnd) = 0;
+        virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const = 0;
+        virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd) = 0;
 
         virtual FormEditData* getFormEditData() const = 0;
         virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) = 0;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 0d37c49b74b2..e578436ac68f 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -138,7 +138,7 @@ FormEditData* FormulaDialog::getFormEditData() const
 }
 void FormulaDialog::setCurrentFormula(const OUString& _sReplacement)
 {
-    const xub_StrLen nOldLen = m_nEnd - m_nStart;
+    const sal_Int32 nOldLen = m_nEnd - m_nStart;
     const sal_Int32 nNewLen = _sReplacement.getLength();
     if (nOldLen)
         m_sFormula = m_sFormula.replaceAt( m_nStart, nOldLen, "" );
@@ -146,7 +146,7 @@ void FormulaDialog::setCurrentFormula(const OUString& _sReplacement)
         m_sFormula = m_sFormula.replaceAt( m_nStart, 0, _sReplacement );
     m_nEnd = m_nStart + nNewLen;
 }
-void FormulaDialog::setSelection(xub_StrLen _nStart,xub_StrLen _nEnd)
+void FormulaDialog::setSelection(sal_Int32 _nStart, sal_Int32 _nEnd)
 {
     if ( _nStart <= _nEnd )
     {
@@ -159,7 +159,7 @@ void FormulaDialog::setSelection(xub_StrLen _nStart,xub_StrLen _nEnd)
         m_nStart = _nEnd;
     }
 }
-void FormulaDialog::getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const
+void FormulaDialog::getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const
 {
     _nStart = m_nStart;
     _nEnd = m_nEnd;
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index a341094991bf..0f11bb49fc24 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -48,8 +48,8 @@ class FormulaDialog : public formula::FormulaModalDialog,
     ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper>    m_xOpCodeMapper;
     formula::RefEdit*           m_pEdit;
     OUString                    m_sFormula;
-    xub_StrLen                  m_nStart;
-    xub_StrLen                  m_nEnd;
+    sal_Int32                   m_nStart;
+    sal_Int32                   m_nEnd;
 
     DECL_LINK( OnClickHdl, OAddFieldWindow*);
 public:
@@ -75,8 +75,8 @@ public:
     virtual void switchBack();
     virtual formula::FormEditData* getFormEditData() const;
     virtual void setCurrentFormula(const OUString& _sReplacement);
-    virtual void setSelection(xub_StrLen _nStart,xub_StrLen _nEnd);
-    virtual void getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const;
+    virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd);
+    virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const;
     virtual OUString getCurrentFormula() const;
 
     virtual formula::IFunctionManager* getFunctionManager();
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 70571d23e22e..b2a22eefbf3d 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -627,15 +627,18 @@ void ScFormulaDlg::setCurrentFormula(const OUString& _sReplacement)
     }
     pScMod->InputReplaceSelection(_sReplacement);
 }
-void ScFormulaDlg::setSelection(xub_StrLen _nStart,xub_StrLen _nEnd)
+void ScFormulaDlg::setSelection(sal_Int32 _nStart, sal_Int32 _nEnd)
 {
     ScModule* pScMod = SC_MOD();
     pScMod->InputSetSelection( _nStart, _nEnd );
 }
-void ScFormulaDlg::getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const
+void ScFormulaDlg::getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const
 {
     ScModule* pScMod = SC_MOD();
-    pScMod->InputGetSelection( _nStart, _nEnd );
+    sal_uInt16 nStart1 = _nStart, nEnd1 = _nEnd;
+    pScMod->InputGetSelection( nStart1, nEnd1 );
+    _nStart = nStart1;
+    _nEnd = nEnd1;
 }
 OUString ScFormulaDlg::getCurrentFormula() const
 {
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index bedc9596fc10..9209224287b2 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -73,8 +73,8 @@ public:
     virtual void switchBack();
     virtual formula::FormEditData* getFormEditData() const;
     virtual void setCurrentFormula(const OUString& _sReplacement);
-    virtual void setSelection(xub_StrLen _nStart,xub_StrLen _nEnd);
-    virtual void getSelection(xub_StrLen& _nStart,xub_StrLen& _nEnd) const;
+    virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd);
+    virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const;
     virtual OUString getCurrentFormula() const;
 
     virtual formula::IFunctionManager* getFunctionManager();