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

Turn m_nEdFocus into local variable, it's not read elsewhere

Browse Source 
... and not read after having been set in FillControls()

Change-Id: I09ae5655b6187bcedc95232797bddb24b9064847
This commit is contained in:
Eike Rathke
2017-07-14 19:43:02 +02:00
parent 34e556a97c
commit d6a16aedca
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
formula/source/ui/dlg/formula.cxx
View File

@@ -199,7 +199,6 @@ public:
vcl::Font m_aFntBold; vcl::Font m_aFntBold;
vcl::Font m_aFntLight; vcl::Font m_aFntLight;
sal_uInt16 m_nEdFocus;
bool m_bEditFlag; bool m_bEditFlag;
const IFunctionDescription* m_pFuncDesc; const IFunctionDescription* m_pFuncDesc;
sal_Int32 m_nArgs; sal_Int32 m_nArgs;
@@ -239,7 +238,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_aFormulaHelper(_pFunctionMgr), m_aFormulaHelper(_pFunctionMgr),
m_bIsShutDown (false), m_bIsShutDown (false),
m_bMakingTree (false), m_bMakingTree (false),
m_nEdFocus (0),
m_pFuncDesc (nullptr), m_pFuncDesc (nullptr),
m_nArgs (0), m_nArgs (0),
m_nFuncExpStart (0) m_nFuncExpStart (0)
@@ -926,7 +924,6 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
m_nArgs = m_pFuncDesc->getSuppressedArgumentCount(); m_nArgs = m_pFuncDesc->getSuppressedArgumentCount();
sal_uInt16 nOffset = pData->GetOffset(); sal_uInt16 nOffset = pData->GetOffset();
m_nEdFocus = pData->GetEdFocus();
// Concatenate the Edit's for Focus-Control // Concatenate the Edit's for Focus-Control
@@ -1286,7 +1283,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
return; return;
sal_uInt16 nArgNo = m_pParaWin->GetActiveLine(); sal_uInt16 nArgNo = m_pParaWin->GetActiveLine();
m_nEdFocus = nArgNo; sal_uInt16 nEdFocus = nArgNo;
SaveArg(nArgNo); SaveArg(nArgNo);
UpdateSelection(); UpdateSelection();
@@ -1294,9 +1291,9 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
sal_Int32 nFormulaStrPos = pData->GetFStart(); sal_Int32 nFormulaStrPos = pData->GetFStart();
OUString aFormula = m_pHelper->getCurrentFormula(); OUString aFormula = m_pHelper->getCurrentFormula();
sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, m_nEdFocus+pData->GetOffset() ); sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, nEdFocus + pData->GetOffset() );
pData->SetEdFocus( m_nEdFocus ); pData->SetEdFocus( nEdFocus );
pData->SaveValues(); pData->SaveValues();
pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA ); pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
pData->SetFStart( n1 ); pData->SetFStart( n1 );