mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert ScInputHandler::InputGetSelection from xub_StrLen -> sal_Int32

Browse Source 
Change-Id: If01d21824964a0fefecc34bcf8b0b3910d2b4d48
This commit is contained in:
Noel Grandin
2013-11-29 15:13:29 +02:00
parent 35afee4de1
commit 8c787dec1a
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sc/inc/scmod.hxx
View File

@@ -214,8 +214,8 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO
void ViewShellGone(ScTabViewShell* pViewSh); void ViewShellGone(ScTabViewShell* pViewSh);
void ViewShellChanged(); void ViewShellChanged();
// communication with function-autopilot // communication with function-autopilot
void InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd );
void InputSetSelection( xub_StrLen nStart, xub_StrLen nEnd ); void InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd );
void InputReplaceSelection( const OUString& rStr ); void InputReplaceSelection( const OUString& rStr );
OUString InputGetFormulaStr(); OUString InputGetFormulaStr();
void ActivateInputWindow( const OUString* pStr = NULL, void ActivateInputWindow( const OUString* pStr = NULL,

4
sc/source/ui/app/inputhdl.cxx
View File

@@ -3817,7 +3817,7 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
// InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr // InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr
//------------------------------------------------------------------------ //------------------------------------------------------------------------
void ScInputHandler::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ) void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
{ {
rStart = nFormSelStart; rStart = nFormSelStart;
rEnd = nFormSelEnd; 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 ) if ( nStart <= nEnd )
{ {

4
sc/source/ui/app/scmod.cxx
View File

@@ -1522,14 +1522,14 @@ ScInputHandler* ScModule::GetRefInputHdl()
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// Olk's Krempel: // Olk's Krempel:
void ScModule::InputGetSelection( xub_StrLen& rStart, xub_StrLen& rEnd ) void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
{ {
ScInputHandler* pHdl = GetInputHdl(); ScInputHandler* pHdl = GetInputHdl();
if (pHdl) if (pHdl)
pHdl->InputGetSelection( rStart, rEnd ); 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(); ScInputHandler* pHdl = GetInputHdl();
if (pHdl) if (pHdl)

9
sc/source/ui/formdlg/formula.cxx
View File

@@ -156,7 +156,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
{ {
pScMod->InputReplaceSelection( aFormula ); pScMod->InputReplaceSelection( aFormula );
pScMod->InputSetSelection( nFStart, nFEnd ); pScMod->InputSetSelection( nFStart, nFEnd );
xub_StrLen PrivStart, PrivEnd; sal_Int32 PrivStart, PrivEnd;
pScMod->InputGetSelection( PrivStart, PrivEnd); pScMod->InputGetSelection( PrivStart, PrivEnd);
eMode = SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,sal_True,sal_True); 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->InputReplaceSelection( aNewFormula );
pScMod->InputSetSelection( 1, aNewFormula.getLength()+1 ); pScMod->InputSetSelection( 1, aNewFormula.getLength()+1 );
xub_StrLen PrivStart, PrivEnd; sal_Int32 PrivStart, PrivEnd;
pScMod->InputGetSelection( PrivStart, PrivEnd); pScMod->InputGetSelection( PrivStart, PrivEnd);
SetMeText(pScMod->InputGetFormulaStr(),PrivStart, PrivEnd,bMatrix,false,false); 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 void ScFormulaDlg::getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const
{ {
ScModule* pScMod = SC_MOD(); ScModule* pScMod = SC_MOD();
sal_uInt16 nStart1 = _nStart, nEnd1 = _nEnd; pScMod->InputGetSelection( _nStart, _nEnd );
pScMod->InputGetSelection( nStart1, nEnd1 );
_nStart = nStart1;
_nEnd = nEnd1;
} }
OUString ScFormulaDlg::getCurrentFormula() const OUString ScFormulaDlg::getCurrentFormula() const
{ {

22
sc/source/ui/inc/inputhdl.hxx
View File

@@ -69,19 +69,19 @@ private:
ScTypedCaseStrSet::const_iterator miAutoPosFormula; ScTypedCaseStrSet::const_iterator miAutoPosFormula;
Window* pTipVisibleParent; Window* pTipVisibleParent;
sal_uLong nTipVisible; sal_uLong nTipVisible;
Window* pTipVisibleSecParent; Window* pTipVisibleSecParent;
sal_uLong nTipVisibleSec; sal_uLong nTipVisibleSec;
OUString aManualTip; OUString aManualTip;
OUString aAutoSearch; OUString aAutoSearch;
OUString aCurrentText; OUString aCurrentText;
OUString aFormText; // for autopilot function OUString aFormText; // for autopilot function
xub_StrLen nFormSelStart; // Selection for autopilot function sal_Int32 nFormSelStart; // Selection for autopilot function
xub_StrLen nFormSelEnd; sal_Int32 nFormSelEnd;
sal_uInt16 nAutoPar; // autom.parentheses than can be overwritten sal_uInt16 nAutoPar; // autom.parentheses than can be overwritten
ScAddress aCursorPos; ScAddress aCursorPos;
ScInputMode eMode; ScInputMode eMode;
@@ -230,8 +230,8 @@ public:
void UpdateRange( sal_uInt16 nIndex, const ScRange& rNew ); void UpdateRange( sal_uInt16 nIndex, const ScRange& rNew );
// Communication with the autopilot function // Communication with the autopilot function
void InputGetSelection ( xub_StrLen& rStart, xub_StrLen& rEnd ); void InputGetSelection ( sal_Int32& rStart, sal_Int32& rEnd );
void InputSetSelection ( xub_StrLen nStart, xub_StrLen nEnd ); void InputSetSelection ( sal_Int32 nStart, sal_Int32 nEnd );
void InputReplaceSelection ( const OUString& rStr ); void InputReplaceSelection ( const OUString& rStr );
bool IsFormulaMode() const { return bFormulaMode; } bool IsFormulaMode() const { return bFormulaMode; }