convert ScInputHandler::InputGetSelection from xub_StrLen -> sal_Int32

Change-Id: If01d21824964a0fefecc34bcf8b0b3910d2b4d48

5 files changed, 20 insertions, 23 deletions

diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index a871663f2102..59329047bf64 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -214,8 +214,8 @@ SC_DLLPUBLIC    void                    SetAppOptions   ( const ScAppOptions& rO
     void                ViewShellGone(ScTabViewShell* pViewSh);
     void                ViewShellChanged();
     // communication with function-autopilot
-    void                InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd );
-    void                InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd );
+    void                InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd );
+    void                InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd );
     void                InputReplaceSelection( const OUString& rStr );
     OUString            InputGetFormulaStr();
     void                ActivateInputWindow( const OUString* pStr = NULL,
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 6f901ced2534..766271fdb475 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3817,7 +3817,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
 // InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr
 //------------------------------------------------------------------------
 
-void ScInputHandler::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd )
+void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
 {
     rStart = nFormSelStart;
     rEnd = nFormSelEnd;
@@ -3853,7 +3853,7 @@ EditView* ScInputHandler::GetFuncEditView()
 
 //------------------------------------------------------------------------
 
-void ScInputHandler::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd )
+void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd )
 {
     if ( nStart <= nEnd )
     {
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index b4398e570b79..59e8fcfb042d 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1522,14 +1522,14 @@ ScInputHandler* ScModule::GetRefInputHdl()
 //------------------------------------------------------------------------
 //  Olk's Krempel:
 
-void ScModule::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd )
+void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
 {
     ScInputHandler* pHdl = GetInputHdl();
     if (pHdl)
         pHdl->InputGetSelection( rStart, rEnd );
 }
 
-void ScModule::InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd )
+void ScModule::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd )
 {
     ScInputHandler* pHdl = GetInputHdl();
     if (pHdl)
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index b2a22eefbf3d..593b5e0238ad 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -156,7 +156,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
             {
                 pScMod->InputReplaceSelection( aFormula );
                 pScMod->InputSetSelection( nFStart, nFEnd );
-                xub_StrLen PrivStart, PrivEnd;
+                sal_Int32 PrivStart, PrivEnd;
                 pScMod->InputGetSelection( PrivStart, PrivEnd);
 
                 eMode = SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,sal_True,sal_True);
@@ -174,7 +174,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
 
             pScMod->InputReplaceSelection( aNewFormula );
             pScMod->InputSetSelection( 1, aNewFormula.getLength()+1 );
-            xub_StrLen PrivStart, PrivEnd;
+            sal_Int32 PrivStart, PrivEnd;
             pScMod->InputGetSelection( PrivStart, PrivEnd);
             SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,false,false);
 
@@ -635,10 +635,7 @@ void ScFormulaDlg::setSelection(sal_Int32 _nStart, sal_Int32 _nEnd)
 void ScFormulaDlg::getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const
 {
     ScModule* pScMod = SC_MOD();
-    sal_uInt16 nStart1 = _nStart, nEnd1 = _nEnd;
-    pScMod->InputGetSelection( nStart1, nEnd1 );
-    _nStart = nStart1;
-    _nEnd = nEnd1;
+    pScMod->InputGetSelection( _nStart, _nEnd );
 }
 OUString ScFormulaDlg::getCurrentFormula() const
 {
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 73e97c4a4337..03a7da167622 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -69,19 +69,19 @@ private:
     ScTypedCaseStrSet::const_iterator miAutoPosFormula;
 
     Window*                 pTipVisibleParent;
-    sal_uLong                   nTipVisible;
+    sal_uLong               nTipVisible;
     Window*                 pTipVisibleSecParent;
-    sal_uLong                   nTipVisibleSec;
-    OUString           aManualTip;
-    OUString           aAutoSearch;
+    sal_uLong               nTipVisibleSec;
+    OUString                aManualTip;
+    OUString                aAutoSearch;
 
-    OUString           aCurrentText;
+    OUString                aCurrentText;
 
-    OUString           aFormText;                  // for autopilot function
-    xub_StrLen              nFormSelStart;              // Selection for autopilot function
-    xub_StrLen              nFormSelEnd;
+    OUString                aFormText;                  // for autopilot function
+    sal_Int32               nFormSelStart;              // Selection for autopilot function
+    sal_Int32               nFormSelEnd;
 
-    sal_uInt16                  nAutoPar;                   // autom.parentheses than can be overwritten
+    sal_uInt16              nAutoPar;                   // autom.parentheses than can be overwritten
 
     ScAddress               aCursorPos;
     ScInputMode             eMode;
@@ -230,8 +230,8 @@ public:
     void            UpdateRange( sal_uInt16 nIndex, const ScRange& rNew );
 
     // Communication with the autopilot function
-    void            InputGetSelection       ( xub_StrLen& rStart, xub_StrLen& rEnd );
-    void            InputSetSelection       ( xub_StrLen nStart, xub_StrLen nEnd );
+    void            InputGetSelection       ( sal_Int32& rStart, sal_Int32& rEnd );
+    void            InputSetSelection       ( sal_Int32 nStart, sal_Int32 nEnd );
     void            InputReplaceSelection   ( const OUString& rStr );
 
     bool            IsFormulaMode() const                   { return bFormulaMode; }