Skip to content

C
core
Kaydet (Commit) 34e556a9 authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

Prefix member variables with m_ 

Code is already confusing enough..

Change-Id: I5b6f5bce32342623374df67727c44cc50b77930c
üst a35b17dd
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 254 deletions
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @ 34e556a9
......@@ -151,7 +151,7 @@ public:
VclPtr<Dialog> m_pParent;
VclPtr<TabControl> m_pTabCtrl;
VclPtr<VclVBox> m_pParaWinBox;
VclPtr<ParaWin> pParaWin;
VclPtr<ParaWin> m_pParaWin;
VclPtr<FixedText> m_pFtHeadLine;
VclPtr<FixedText> m_pFtFuncName;
VclPtr<FixedText> m_pFtFuncDesc;
......@@ -177,37 +177,36 @@ public:
VclPtr<FixedText> m_pFtFormResult;
VclPtr<Edit> m_pWndFormResult;
VclPtr<RefEdit> pTheRefEdit;
VclPtr<RefButton> pTheRefButton;
VclPtr<FuncPage> pFuncPage;
VclPtr<StructPage> pStructPage;
OUString aOldFormula;
bool bStructUpdate;
VclPtr<MultiLineEdit> pMEdit;
bool bUserMatrixFlag;
Idle aIdle;
const OUString aTitle1;
const OUString aTitle2;
OUString aTxtOk; // behind aBtnEnd
FormulaHelper m_aFormulaHelper;
OString m_aEditHelpId;
OString aOldHelp;
bool bIsShutDown;
bool bMakingTree; //in method of constructing tree
vcl::Font aFntBold;
vcl::Font aFntLight;
sal_uInt16 nEdFocus;
bool bEditFlag;
const IFunctionDescription* pFuncDesc;
sal_Int32 nArgs;
VclPtr<RefEdit> m_pTheRefEdit;
VclPtr<RefButton> m_pTheRefButton;
VclPtr<FuncPage> m_pFuncPage;
VclPtr<StructPage> m_pStructPage;
OUString m_aOldFormula;
bool m_bStructUpdate;
VclPtr<MultiLineEdit> m_pMEdit;
bool m_bUserMatrixFlag;
Idle m_aIdle;
const OUString m_aTitle1;
const OUString m_aTitle2;
FormulaHelper m_aFormulaHelper;
OString m_aEditHelpId;
OString m_aOldHelp;
bool m_bIsShutDown;
bool m_bMakingTree; // in method of constructing tree
vcl::Font m_aFntBold;
vcl::Font m_aFntLight;
sal_uInt16 m_nEdFocus;
bool m_bEditFlag;
const IFunctionDescription* m_pFuncDesc;
sal_Int32 m_nArgs;
::std::vector< OUString > m_aArguments;
Selection aFuncSel;
Selection m_aFuncSel;
sal_Int32 mnFuncExpStart; ///< current formula position for treeview results
sal_Int32 m_nFuncExpStart; ///< current formula position for treeview results
FormulaDlg_Impl(Dialog* pParent
, bool _bSupportFunctionResult
......@@ -231,19 +230,19 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pFunctionOpCodesEnd(nullptr),
m_pHelper (_pHelper),
m_pParent (pParent),
pTheRefEdit (nullptr),
pTheRefButton (nullptr),
pMEdit (nullptr),
bUserMatrixFlag (false),
aTitle1 ( ModuleRes( STR_TITLE1 ) ),
aTitle2 ( ModuleRes( STR_TITLE2 ) ),
m_pTheRefEdit (nullptr),
m_pTheRefButton (nullptr),
m_pMEdit (nullptr),
m_bUserMatrixFlag(false),
m_aTitle1 ( ModuleRes( STR_TITLE1 ) ),
m_aTitle2 ( ModuleRes( STR_TITLE2 ) ),
m_aFormulaHelper(_pFunctionMgr),
bIsShutDown (false),
bMakingTree (false),
nEdFocus (0),
pFuncDesc (nullptr),
nArgs (0),
mnFuncExpStart (0)
m_bIsShutDown (false),
m_bMakingTree (false),
m_nEdFocus (0),
m_pFuncDesc (nullptr),
m_nArgs (0),
m_nFuncExpStart (0)
{
pParent->get(m_pParaWinBox, "BOX");
pParent->get(m_pTabCtrl, "tabs");
......@@ -276,7 +275,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pParent->get(m_pBtnBackward, "back");
pParent->get(m_pBtnForward, "next");
pParent->get(m_pBtnEnd, "ok");
aTxtOk = m_pBtnEnd->GetText();
pParent->get(m_pFtFormResult, "label1");
pParent->get(m_pWndFormResult, "formula_result");
pParent->get(m_pEdRef, "ED_REF");
......@@ -284,32 +282,32 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
pParent->get(m_pRefBtn, "RB_REF");
m_pRefBtn->SetReferences(_pDlg, m_pEdRef);
pParaWin = VclPtr<ParaWin>::Create(m_pParaWinBox, _pDlg);
pParaWin->Show();
m_pParaWin = VclPtr<ParaWin>::Create(m_pParaWinBox, _pDlg);
m_pParaWin->Show();
m_pParaWinBox->Hide();
m_pFtEditName->Hide();
m_pEdRef->Hide();
m_pRefBtn->Hide();
pMEdit = m_pMEFormula->GetEdit();
m_pMEdit = m_pMEFormula->GetEdit();
pMEdit->SetAccessibleName(m_pFtFormula->GetText());
m_pMEdit->SetAccessibleName(m_pFtFormula->GetText());
m_aEditHelpId = pMEdit->GetHelpId();
m_aEditHelpId = m_pMEdit->GetHelpId();
bEditFlag =false;
bStructUpdate =true;
pParaWin->SetArgModifiedHdl( LINK( this, FormulaDlg_Impl, ModifyHdl ) );
pParaWin->SetFxHdl( LINK( this, FormulaDlg_Impl, FxHdl ) );
m_bEditFlag =false;
m_bStructUpdate =true;
m_pParaWin->SetArgModifiedHdl( LINK( this, FormulaDlg_Impl, ModifyHdl ) );
m_pParaWin->SetFxHdl( LINK( this, FormulaDlg_Impl, FxHdl ) );
pFuncPage = VclPtr<FuncPage>::Create( m_pTabCtrl, _pFunctionMgr);
pStructPage = VclPtr<StructPage>::Create( m_pTabCtrl);
pFuncPage->Hide();
pStructPage->Hide();
m_pTabCtrl->SetTabPage( TP_FUNCTION, pFuncPage);
m_pTabCtrl->SetTabPage( TP_STRUCT, pStructPage);
m_pFuncPage = VclPtr<FuncPage>::Create( m_pTabCtrl, _pFunctionMgr);
m_pStructPage = VclPtr<StructPage>::Create( m_pTabCtrl);
m_pFuncPage->Hide();
m_pStructPage->Hide();
m_pTabCtrl->SetTabPage( TP_FUNCTION, m_pFuncPage);
m_pTabCtrl->SetTabPage( TP_STRUCT, m_pStructPage);
aOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1"
m_aOldHelp = pParent->GetHelpId(); // HelpId from resource always for "Page 1"
m_pFtResult->Show( _bSupportResult );
m_pWndResult->Show( _bSupportResult );
......@@ -327,41 +325,41 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
m_pBtnForward ->SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) );
m_pBtnBackward->SetClickHdl( LINK( this, FormulaDlg_Impl, BtnHdl ) );
pFuncPage->SetDoubleClickHdl( LINK( this, FormulaDlg_Impl, DblClkHdl ) );
pFuncPage->SetSelectHdl( LINK( this, FormulaDlg_Impl, FuncSelHdl) );
pStructPage->SetSelectionHdl( LINK( this, FormulaDlg_Impl, StructSelHdl ) );
pMEdit->SetModifyHdl( LINK( this, FormulaDlg_Impl, FormulaHdl ) );
m_pFuncPage->SetDoubleClickHdl( LINK( this, FormulaDlg_Impl, DblClkHdl ) );
m_pFuncPage->SetSelectHdl( LINK( this, FormulaDlg_Impl, FuncSelHdl) );
m_pStructPage->SetSelectionHdl( LINK( this, FormulaDlg_Impl, StructSelHdl ) );
m_pMEdit->SetModifyHdl( LINK( this, FormulaDlg_Impl, FormulaHdl ) );
m_pMEFormula->SetSelChangedHdl( LINK( this, FormulaDlg_Impl, FormulaCursorHdl ) );
aFntLight = m_pFtFormula->GetFont();
aFntLight.SetTransparent( true );
aFntBold = aFntLight;
aFntBold.SetWeight( WEIGHT_BOLD );
m_aFntLight = m_pFtFormula->GetFont();
m_aFntLight.SetTransparent( true );
m_aFntBold = m_aFntLight;
m_aFntBold.SetWeight( WEIGHT_BOLD );
pParaWin->SetArgumentFonts( aFntBold, aFntLight);
m_pParaWin->SetArgumentFonts( m_aFntBold, m_aFntLight);
// function description for choosing a function is no longer in a different color
m_pFtHeadLine->SetFont(aFntBold);
m_pFtFuncName->SetFont(aFntLight);
m_pFtFuncDesc->SetFont(aFntLight);
m_pFtHeadLine->SetFont(m_aFntBold);
m_pFtFuncName->SetFont(m_aFntLight);
m_pFtFuncDesc->SetFont(m_aFntLight);
}
FormulaDlg_Impl::~FormulaDlg_Impl()
{
if (aIdle.IsActive())
if (m_aIdle.IsActive())
{
aIdle.ClearInvokeHandler();
aIdle.Stop();
m_aIdle.ClearInvokeHandler();
m_aIdle.Stop();
}
bIsShutDown = true; // Set it in order to PreNotify not to save GetFocus.
m_bIsShutDown = true; // Set it in order to PreNotify not to save GetFocus.
m_pTabCtrl->RemovePage(TP_FUNCTION);
m_pTabCtrl->RemovePage(TP_STRUCT);
pStructPage.disposeAndClear();
pFuncPage.disposeAndClear();
pParaWin.disposeAndClear();
m_pStructPage.disposeAndClear();
m_pFuncPage.disposeAndClear();
m_pParaWin.disposeAndClear();
DeleteArgs();
}
......@@ -369,14 +367,14 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
{
if (pData) // it won't be destroyed via Close
{
pData->SetFStart(pMEdit->GetSelection().Min());
pData->SetSelection(pMEdit->GetSelection());
pData->SetFStart(m_pMEdit->GetSelection().Min());
pData->SetSelection(m_pMEdit->GetSelection());
if (m_pTabCtrl->GetCurPageId() == TP_FUNCTION)
pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
else
pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_EDIT );
pData->SetUndoStr(pMEdit->GetText());
pData->SetUndoStr(m_pMEdit->GetText());
pData->SetMatrixFlag(m_pBtnMatrix->IsChecked());
}
}
......@@ -384,7 +382,7 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
{
if (bIsShutDown)
if (m_bIsShutDown)
return;
MouseNotifyEvent nSwitch = rNEvt.GetType();
if (nSwitch != MouseNotifyEvent::GETFOCUS)
......@@ -392,7 +390,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
vcl::Window* pWin = rNEvt.GetWindow();
if (!pWin)
return;
if (aIdle.IsActive()) // will be destroyed via Close
if (m_aIdle.IsActive()) // will be destroyed via Close
return;
FormEditData* pData = m_pHelper->getFormEditData();
if (!pData)
......@@ -425,7 +423,7 @@ void FormulaDlg_Impl::InitFormulaOpCodeMapper()
void FormulaDlg_Impl::DeleteArgs()
{
::std::vector< OUString>().swap(m_aArguments);
nArgs = 0;
m_nArgs = 0;
}
sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
......@@ -436,7 +434,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
const sal_Unicode sep = m_pHelper->getFunctionManager()->getSingleToken(IFunctionManager::eSep);
sal_Int32 nFuncPos = SAL_MAX_INT32;
OUString aFormString = m_aFormulaHelper.GetCharClass()->uppercase(pMEdit->GetText());
OUString aFormString = m_aFormulaHelper.GetCharClass()->uppercase(m_pMEdit->GetText());
const uno::Reference< sheet::XFormulaParser > xParser(m_pHelper->getFormulaParser());
const table::CellAddress aRefPos(m_pHelper->getReferencePosition());
......@@ -458,7 +456,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
const OUString aString = xParser->printFormula( aArgs, aRefPos);
const sheet::FormulaToken* pNextToken = pIter + 1;
if ( !bUserMatrixFlag && FormulaCompiler::IsMatrixFunction((OpCode)eOp) )
if ( !m_bUserMatrixFlag && FormulaCompiler::IsMatrixFunction((OpCode)eOp) )
{
m_pBtnMatrix->Check();
}
......@@ -519,7 +517,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
{
if ( nBracketCount < 1 )
{
nFuncPos = pMEdit->GetText().getLength();
nFuncPos = m_pMEdit->GetText().getLength();
}
else if ( !bFlag )
{
......@@ -569,10 +567,10 @@ void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
* FormulaToken::IsInForceArray() into account. As is, this is just the
* currently selected formula text part. */
OUString aStrResult;
if ( pFuncDesc && CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
if ( m_pFuncDesc && CalcValue( m_pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
m_pWndResult->SetText( aStrResult );
if (bMakingTree)
if (m_bMakingTree)
return;
aStrResult.clear();
......@@ -583,7 +581,7 @@ void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
aStrResult.clear();
m_pWndFormResult->SetText( aStrResult );
}
CalcStruct( pMEdit->GetText(), bForceRecalcStruct);
CalcStruct( m_pMEdit->GetText(), bForceRecalcStruct);
}
bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStruct )
......@@ -591,13 +589,13 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru
bool bResult = true;
sal_Int32 nLength = rStrExp.getLength();
if ( !rStrExp.isEmpty() && (bForceRecalcStruct || aOldFormula != rStrExp) && bStructUpdate)
if ( !rStrExp.isEmpty() && (bForceRecalcStruct || m_aOldFormula != rStrExp) && m_bStructUpdate)
{
// Only calculate the value when there isn't any more keyboard input:
if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
pStructPage->ClearStruct();
m_pStructPage->ClearStruct();
OUString aString = rStrExp;
if (rStrExp[nLength-1] == '(')
......@@ -612,9 +610,9 @@ bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru
m_pWndFormResult->SetText( aStrResult );
UpdateTokenArray(aString);
fillTree(pStructPage);
fillTree(m_pStructPage);
aOldFormula = rStrExp;
m_aOldFormula = rStrExp;
if (rStrExp[nLength-1] == '(')
UpdateTokenArray(rStrExp);
}
......@@ -683,10 +681,10 @@ void FormulaDlg_Impl::MakeTree( StructPage* _pTree, SvTreeListEntry* pParent, co
{
OUString aFormula;
if (!bMakingTree)
if (!m_bMakingTree)
{
// gets the last subformula result
bMakingTree = true;
m_bMakingTree = true;
aFormula = GetPrevFuncExpression( true);
}
else
......@@ -699,7 +697,7 @@ void FormulaDlg_Impl::MakeTree( StructPage* _pTree, SvTreeListEntry* pParent, co
if (CalcValue( aFormula, aStr, _pToken->IsInForceArray()))
m_pWndResult->SetText( aStr );
aStr = m_pWndResult->GetText();
pStructPage->GetTlbStruct()->SetEntryText( pEntry, aResult + " = " + aStr);
m_pStructPage->GetTlbStruct()->SetEntryText( pEntry, aResult + " = " + aStr);
}
--Count;
......@@ -783,7 +781,7 @@ void FormulaDlg_Impl::fillTree(StructPage* _pTree)
if ( pToken != nullptr)
{
MakeTree( _pTree, nullptr, nullptr, pToken, 1);
bMakingTree = false;
m_bMakingTree = false;
}
}
......@@ -850,29 +848,29 @@ void FormulaDlg_Impl::FillListboxes()
FormEditData* pData = m_pHelper->getFormEditData();
OUString aNewTitle;
// 1. Page: select function
if ( pFuncDesc && pFuncDesc->getCategory() )
if ( m_pFuncDesc && m_pFuncDesc->getCategory() )
{
// We'll never have more than int32 max categories so this is safe ...
if ( pFuncPage->GetCategory() != static_cast<sal_Int32>(pFuncDesc->getCategory()->getNumber() + 1) )
pFuncPage->SetCategory(pFuncDesc->getCategory()->getNumber() + 1);
if ( m_pFuncPage->GetCategory() != static_cast<sal_Int32>(m_pFuncDesc->getCategory()->getNumber() + 1) )
m_pFuncPage->SetCategory(m_pFuncDesc->getCategory()->getNumber() + 1);
sal_Int32 nPos = pFuncPage->GetFuncPos(pFuncDesc);
sal_Int32 nPos = m_pFuncPage->GetFuncPos(m_pFuncDesc);
pFuncPage->SetFunction(nPos);
m_pFuncPage->SetFunction(nPos);
}
else if ( pData )
{
pFuncPage->SetCategory( 1 );
pFuncPage->SetFunction( LISTBOX_ENTRY_NOTFOUND );
m_pFuncPage->SetCategory( 1 );
m_pFuncPage->SetFunction( LISTBOX_ENTRY_NOTFOUND );
}
FuncSelHdl(*pFuncPage);
FuncSelHdl(*m_pFuncPage);
m_pHelper->setDispatcherLock( true ); // Activate Modal-Mode
aNewTitle = aTitle1;
aNewTitle = m_aTitle1;
// HelpId for 1. page is the one from the resource
m_pParent->SetHelpId( aOldHelp );
m_pParent->SetHelpId( m_aOldHelp );
}
void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
......@@ -890,24 +888,24 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
sal_Int32 nNextFEnd = 0;
DeleteArgs();
const IFunctionDescription* pOldFuncDesc = pFuncDesc;
const IFunctionDescription* pOldFuncDesc = m_pFuncDesc;
if ( m_aFormulaHelper.GetNextFunc( aFormula, false,
nNextFStart, &nNextFEnd, &pFuncDesc, &m_aArguments ) )
nNextFStart, &nNextFEnd, &m_pFuncDesc, &m_aArguments ) )
{
const bool bTestFlag = (pOldFuncDesc != pFuncDesc);
const bool bTestFlag = (pOldFuncDesc != m_pFuncDesc);
if (bTestFlag)
{
m_pFtHeadLine->Hide();
m_pFtFuncName->Hide();
m_pFtFuncDesc->Hide();
pParaWin->SetFunctionDesc(pFuncDesc);
m_pFtEditName->SetText( pFuncDesc->getFunctionName() );
m_pParaWin->SetFunctionDesc(m_pFuncDesc);
m_pFtEditName->SetText( m_pFuncDesc->getFunctionName() );
m_pFtEditName->Show();
m_pParaWinBox->Show();
const OString aHelpId = pFuncDesc->getHelpId();
const OString aHelpId = m_pFuncDesc->getHelpId();
if ( !aHelpId.isEmpty() )
pMEdit->SetHelpId(aHelpId);
m_pMEdit->SetHelpId(aHelpId);
}
sal_Int32 nOldStart, nOldEnd;
......@@ -916,33 +914,33 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
{
m_pHelper->setSelection( nNextFStart, nNextFEnd );
}
aFuncSel.Min() = nNextFStart;
aFuncSel.Max() = nNextFEnd;
m_aFuncSel.Min() = nNextFStart;
m_aFuncSel.Max() = nNextFEnd;
if (!bEditFlag)
pMEdit->SetText(m_pHelper->getCurrentFormula());
if (!m_bEditFlag)
m_pMEdit->SetText(m_pHelper->getCurrentFormula());
sal_Int32 PrivStart, PrivEnd;
m_pHelper->getSelection( PrivStart, PrivEnd);
if (!bEditFlag)
pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
if (!m_bEditFlag)
m_pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
nArgs = pFuncDesc->getSuppressedArgumentCount();
m_nArgs = m_pFuncDesc->getSuppressedArgumentCount();
sal_uInt16 nOffset = pData->GetOffset();
nEdFocus = pData->GetEdFocus();
m_nEdFocus = pData->GetEdFocus();
// Concatenate the Edit's for Focus-Control
if (bTestFlag)
pParaWin->SetArgumentOffset(nOffset);
m_pParaWin->SetArgumentOffset(nOffset);
sal_uInt16 nActiv = 0;
sal_Int32 nArgPos = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
sal_Int32 nEditPos = pMEdit->GetSelection().Min();
sal_Int32 nEditPos = m_pMEdit->GetSelection().Min();
bool bFlag = false;
for (sal_Int32 i = 0; i < nArgs; i++)
for (sal_Int32 i = 0; i < m_nArgs; i++)
{
sal_Int32 nLength = m_aArguments[i].getLength()+1;
pParaWin->SetArgument( i, m_aArguments[i]);
m_pParaWin->SetArgument( i, m_aArguments[i]);
if (nArgPos <= nEditPos && nEditPos < nArgPos+nLength)
{
nActiv = i;
......@@ -950,11 +948,11 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
}
nArgPos = nArgPos + nLength;
}
pParaWin->UpdateParas();
m_pParaWin->UpdateParas();
if (bFlag)
{
pParaWin->SetActiveLine(nActiv);
m_pParaWin->SetActiveLine(nActiv);
}
UpdateValues();
......@@ -962,13 +960,13 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
else
{
m_pFtEditName->SetText("");
pMEdit->SetHelpId( m_aEditHelpId );
m_pMEdit->SetHelpId( m_aEditHelpId );
}
// test if before/after are anymore functions
sal_Int32 nTempStart = m_aFormulaHelper.GetArgStart( aFormula, nFStart, 0 );
rbNext = m_aFormulaHelper.GetNextFunc( aFormula, false, nTempStart );
nTempStart = pMEdit->GetSelection().Min();
nTempStart = m_pMEdit->GetSelection().Min();
pData->SetFStart(nTempStart);
rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, true, nTempStart );
}
......@@ -977,13 +975,13 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
void FormulaDlg_Impl::ClearAllParas()
{
DeleteArgs();
pFuncDesc = nullptr;
pParaWin->ClearAll();
m_pFuncDesc = nullptr;
m_pParaWin->ClearAll();
m_pWndResult->SetText(OUString());
m_pFtFuncName->SetText(OUString());
FuncSelHdl(*pFuncPage);
FuncSelHdl(*m_pFuncPage);
if (pFuncPage->IsVisible())
if (m_pFuncPage->IsVisible())
{
m_pFtEditName->Hide();
m_pParaWinBox->Hide();
......@@ -1027,7 +1025,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk)
{
// remove dummy arguments
OUString aInputFormula = m_pHelper->getCurrentFormula();
OUString aString = RepairFormula(pMEdit->GetText());
OUString aString = RepairFormula(m_pMEdit->GetText());
m_pHelper->setSelection( 0, aInputFormula.getLength());
m_pHelper->setCurrentFormula(aString);
}
......@@ -1056,27 +1054,27 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void )
else if ( pBtn == m_pBtnForward )
{
const IFunctionDescription* pDesc;
sal_Int32 nSelFunc = pFuncPage->GetFunction();
sal_Int32 nSelFunc = m_pFuncPage->GetFunction();
if (nSelFunc != LISTBOX_ENTRY_NOTFOUND)
pDesc = pFuncPage->GetFuncDesc( nSelFunc );
pDesc = m_pFuncPage->GetFuncDesc( nSelFunc );
else
{
// Do not overwrite the selected formula expression, just edit the
// unlisted function.
pFuncDesc = pDesc = nullptr;
m_pFuncDesc = pDesc = nullptr;
}
if (pDesc == pFuncDesc || !pFuncPage->IsVisible())
if (pDesc == m_pFuncDesc || !m_pFuncPage->IsVisible())
EditNextFunc( true );
else
{
DblClkHdl(*pFuncPage); //new
DblClkHdl(*m_pFuncPage); //new
m_pBtnForward->Enable(false); //new
}
}
else if ( pBtn == m_pBtnBackward )
{
bEditFlag = false;
m_bEditFlag = false;
m_pBtnForward->Enable();
EditNextFunc( false );
m_pMEFormula->Invalidate();
......@@ -1092,31 +1090,31 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, Button*, pBtn, void )
IMPL_LINK_NOARG( FormulaDlg_Impl, DblClkHdl, FuncPage&, void)
{
sal_Int32 nFunc = pFuncPage->GetFunction();
sal_Int32 nFunc = m_pFuncPage->GetFunction();
// ex-UpdateLRUList
const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc(nFunc);
const IFunctionDescription* pDesc = m_pFuncPage->GetFuncDesc(nFunc);
m_pHelper->insertEntryToLRUList(pDesc);
OUString aFuncName = pFuncPage->GetSelFunctionName() + "()";
OUString aFuncName = m_pFuncPage->GetSelFunctionName() + "()";
m_pHelper->setCurrentFormula(aFuncName);
pMEdit->ReplaceSelected(aFuncName);
m_pMEdit->ReplaceSelected(aFuncName);
Selection aSel = pMEdit->GetSelection();
Selection aSel = m_pMEdit->GetSelection();
aSel.Max() = aSel.Max()-1;
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
FormulaHdl(*pMEdit);
FormulaHdl(*m_pMEdit);
aSel.Min() = aSel.Max();
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
if (nArgs == 0)
if (m_nArgs == 0)
{
BtnHdl(m_pBtnBackward);
}
pParaWin->SetEdFocus();
m_pParaWin->SetEdFocus();
m_pBtnForward->Enable(false); //@New
}
......@@ -1130,14 +1128,14 @@ void FormulaDlg_Impl::SetData( sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int
// Notice and set new selection
m_pHelper->getSelection( nFStart, nFEnd );
m_pHelper->setSelection( nNextFStart, nNextFEnd );
if (!bEditFlag)
pMEdit->SetText(m_pHelper->getCurrentFormula());
if (!m_bEditFlag)
m_pMEdit->SetText(m_pHelper->getCurrentFormula());
m_pHelper->getSelection( PrivStart, PrivEnd);
if (!bEditFlag)
if (!m_bEditFlag)
{
pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
m_pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
m_pMEFormula->UpdateOldSel();
}
......@@ -1233,15 +1231,15 @@ OUString FormulaDlg_Impl::GetPrevFuncExpression( bool bStartFromEnd )
if (aFormula.isEmpty())
return aExpression;
if (bStartFromEnd || mnFuncExpStart >= aFormula.getLength())
mnFuncExpStart = aFormula.getLength() - 1;
if (bStartFromEnd || m_nFuncExpStart >= aFormula.getLength())
m_nFuncExpStart = aFormula.getLength() - 1;
sal_Int32 nFStart = mnFuncExpStart;
sal_Int32 nFStart = m_nFuncExpStart;
sal_Int32 nFEnd = 0;
if (m_aFormulaHelper.GetNextFunc( aFormula, true, nFStart, &nFEnd))
{
aExpression = aFormula.copy( nFStart, nFEnd - nFStart); // nFEnd is exclusive
mnFuncExpStart = nFStart;
m_nFuncExpStart = nFStart;
}
return aExpression;
......@@ -1249,26 +1247,26 @@ OUString FormulaDlg_Impl::GetPrevFuncExpression( bool bStartFromEnd )
void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
{
if (nEd < nArgs)
if (nEd < m_nArgs)
{
for (sal_uInt16 i = 0; i <= nEd; i++)
{
if ( m_aArguments[i].isEmpty() )
m_aArguments[i] = " ";
}
if (!pParaWin->GetArgument(nEd).isEmpty())
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
if (!m_pParaWin->GetArgument(nEd).isEmpty())
m_aArguments[nEd] = m_pParaWin->GetArgument(nEd);
sal_uInt16 nClearPos = nEd+1;
for (sal_Int32 i = nEd+1; i < nArgs; i++)
for (sal_Int32 i = nEd+1; i < m_nArgs; i++)
{
if ( !pParaWin->GetArgument(i).isEmpty() )
if ( !m_pParaWin->GetArgument(i).isEmpty() )
{
nClearPos = i+1;
}
}
for (sal_Int32 i = nClearPos; i < nArgs; i++)
for (sal_Int32 i = nClearPos; i < m_nArgs; i++)
{
m_aArguments[i].clear();
}
......@@ -1277,7 +1275,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
{
if (&rPtr == pParaWin)
if (&rPtr == m_pParaWin)
{
m_pBtnForward->Enable(); //@ In order to be able to input another function.
m_pTabCtrl->SetCurPageId(TP_FUNCTION);
......@@ -1287,8 +1285,8 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
if (!pData)
return;
sal_uInt16 nArgNo = pParaWin->GetActiveLine();
nEdFocus = nArgNo;
sal_uInt16 nArgNo = m_pParaWin->GetActiveLine();
m_nEdFocus = nArgNo;
SaveArg(nArgNo);
UpdateSelection();
......@@ -1296,9 +1294,9 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
sal_Int32 nFormulaStrPos = pData->GetFStart();
OUString aFormula = m_pHelper->getCurrentFormula();
sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, nEdFocus+pData->GetOffset() );
sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, m_nEdFocus+pData->GetOffset() );
pData->SetEdFocus( nEdFocus );
pData->SetEdFocus( m_nEdFocus );
pData->SaveValues();
pData->SetMode( (sal_uInt16) FORMULA_FORMDLG_FORMULA );
pData->SetFStart( n1 );
......@@ -1306,19 +1304,19 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
ClearAllParas();
FillDialog(false);
pFuncPage->SetFocus(); //There Parawin is not visible anymore
m_pFuncPage->SetFocus(); //There Parawin is not visible anymore
}
}
IMPL_LINK( FormulaDlg_Impl, ModifyHdl, ParaWin&, rPtr, void )
{
if (&rPtr == pParaWin)
if (&rPtr == m_pParaWin)
{
SaveArg(pParaWin->GetActiveLine());
SaveArg(m_pParaWin->GetActiveLine());
UpdateValues();
UpdateSelection();
CalcStruct(pMEdit->GetText());
CalcStruct(m_pMEdit->GetText());
}
}
......@@ -1329,27 +1327,27 @@ IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaHdl, Edit&, void)
if (!pData)
return;
bEditFlag = true;
m_bEditFlag = true;
OUString aInputFormula = m_pHelper->getCurrentFormula();
OUString aString = pMEdit->GetText();
OUString aString = m_pMEdit->GetText();
Selection aSel = pMEdit->GetSelection();
Selection aSel = m_pMEdit->GetSelection();
if (aString.isEmpty()) // in case everything was cleared
{
aString += "=";
pMEdit->SetText(aString);
m_pMEdit->SetText(aString);
aSel .Min() = 1;
aSel .Max() = 1;
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
}
else if (aString[0]!='=') // in case it's replaced
{
aString = "=" + aString;
pMEdit->SetText(aString);
m_pMEdit->SetText(aString);
aSel .Min() += 1;
aSel .Max() += 1;
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
}
......@@ -1383,7 +1381,7 @@ IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaHdl, Edit&, void)
}
m_pHelper->setSelection( aSel.Min(), aSel.Max());
bEditFlag = false;
m_bEditFlag = false;
}
IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void)
......@@ -1392,17 +1390,17 @@ IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void)
if (!pData)
return;
bEditFlag = true;
m_bEditFlag = true;
OUString aString = pMEdit->GetText();
OUString aString = m_pMEdit->GetText();
Selection aSel = pMEdit->GetSelection();
Selection aSel = m_pMEdit->GetSelection();
m_pHelper->setSelection( aSel.Min(), aSel.Max());
if (aSel.Min() == 0)
{
aSel.Min() = 1;
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
}
if (aSel.Min() != aString.getLength())
......@@ -1451,25 +1449,25 @@ IMPL_LINK_NOARG( FormulaDlg_Impl, FormulaCursorHdl, EditBox&, void)
}
m_pHelper->setSelection( aSel.Min(), aSel.Max());
bEditFlag = false;
m_bEditFlag = false;
}
void FormulaDlg_Impl::UpdateSelection()
{
m_pHelper->setSelection( aFuncSel.Min(), aFuncSel.Max());
m_pHelper->setCurrentFormula( pFuncDesc->getFormula( m_aArguments ) );
pMEdit->SetText(m_pHelper->getCurrentFormula());
m_pHelper->setSelection( m_aFuncSel.Min(), m_aFuncSel.Max());
m_pHelper->setCurrentFormula( m_pFuncDesc->getFormula( m_aArguments ) );
m_pMEdit->SetText(m_pHelper->getCurrentFormula());
sal_Int32 PrivStart, PrivEnd;
m_pHelper->getSelection( PrivStart, PrivEnd);
aFuncSel.Min() = PrivStart;
aFuncSel.Max() = PrivEnd;
m_aFuncSel.Min() = PrivStart;
m_aFuncSel.Max() = PrivEnd;
nArgs = pFuncDesc->getSuppressedArgumentCount();
m_nArgs = m_pFuncDesc->getSuppressedArgumentCount();
OUString aFormula = pMEdit->GetText();
OUString aFormula = m_pMEdit->GetText();
sal_Int32 nArgPos = m_aFormulaHelper.GetArgStart( aFormula, PrivStart, 0);
sal_uInt16 nPos = pParaWin->GetActiveLine();
sal_uInt16 nPos = m_pParaWin->GetActiveLine();
if (nPos >= m_aArguments.size())
{
SAL_WARN("formula.ui","FormulaDlg_Impl::UpdateSelection - shot in foot: nPos " <<
......@@ -1488,7 +1486,7 @@ void FormulaDlg_Impl::UpdateSelection()
Selection aSel( nArgPos, nArgPos+nLength);
m_pHelper->setSelection( (sal_uInt16)nArgPos,(sal_uInt16)(nArgPos+nLength));
pMEdit->SetSelection(aSel);
m_pMEdit->SetSelection(aSel);
m_pMEFormula->UpdateOldSel();
}
......@@ -1499,14 +1497,14 @@ void FormulaDlg_Impl::UpdateSelection()
//size to work when retro-fitting this to .ui
m_pEdRef->SetSizePixel(m_pEdRef->GetOptimalSize());
m_pEdRef->Show();
pTheRefEdit = pEdit;
pTheRefButton = pButton;
m_pTheRefEdit = pEdit;
m_pTheRefButton = pButton;
if ( pTheRefEdit )
if ( m_pTheRefEdit )
{
m_pEdRef->SetRefString( pTheRefEdit->GetText() );
m_pEdRef->SetSelection( pTheRefEdit->GetSelection() );
m_pEdRef->SetHelpId( pTheRefEdit->GetHelpId() );
m_pEdRef->SetRefString( m_pTheRefEdit->GetText() );
m_pEdRef->SetSelection( m_pTheRefEdit->GetSelection() );
m_pEdRef->SetHelpId( m_pTheRefEdit->GetHelpId() );
}
m_pRefBtn->Show( pButton != nullptr );
......@@ -1521,14 +1519,14 @@ void FormulaDlg_Impl::RefInputStartAfter()
{
m_pRefBtn->SetEndImage();
if ( pTheRefEdit )
if ( m_pTheRefEdit )
{
OUString aStr = aTitle2 + " " + m_pFtEditName->GetText() + "( ";
OUString aStr = m_aTitle2 + " " + m_pFtEditName->GetText() + "( ";
if ( pParaWin->GetActiveLine() > 0 )
if ( m_pParaWin->GetActiveLine() > 0 )
aStr += "...; ";
aStr += pParaWin->GetActiveArgName();
if ( pParaWin->GetActiveLine() + 1 < nArgs )
aStr += m_pParaWin->GetActiveArgName();
if ( m_pParaWin->GetActiveLine() + 1 < m_nArgs )
aStr += "; ...";
aStr += " )";
......@@ -1543,33 +1541,33 @@ void FormulaDlg_Impl::RefInputDoneAfter( bool bForced )
{
m_pEdRef->Hide();
m_pRefBtn->Hide();
if ( pTheRefEdit )
if ( m_pTheRefEdit )
{
pTheRefEdit->SetRefString( m_pEdRef->GetText() );
pTheRefEdit->GrabFocus();
m_pTheRefEdit->SetRefString( m_pEdRef->GetText() );
m_pTheRefEdit->GrabFocus();
if ( pTheRefButton )
pTheRefButton->SetStartImage();
if ( m_pTheRefButton )
m_pTheRefButton->SetStartImage();
sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
pParaWin->SetArgument( nPrivActiv, m_pEdRef->GetText() );
ModifyHdl( *pParaWin );
pTheRefEdit = nullptr;
sal_uInt16 nPrivActiv = m_pParaWin->GetActiveLine();
m_pParaWin->SetArgument( nPrivActiv, m_pEdRef->GetText() );
ModifyHdl( *m_pParaWin );
m_pTheRefEdit = nullptr;
}
m_pParent->SetText( aTitle1 );
m_pParent->SetText( m_aTitle1 );
}
}
RefEdit* FormulaDlg_Impl::GetCurrRefEdit()
{
return m_pEdRef->IsVisible() ? m_pEdRef.get() : pParaWin->GetActiveEdit();
return m_pEdRef->IsVisible() ? m_pEdRef.get() : m_pParaWin->GetActiveEdit();
}
void FormulaDlg_Impl::Update()
{
FormEditData* pData = m_pHelper->getFormEditData();
const OUString sExpression = pMEdit->GetText();
aOldFormula.clear();
const OUString sExpression = m_pMEdit->GetText();
m_aOldFormula.clear();
UpdateTokenArray(sExpression);
FormulaCursorHdl(*m_pMEFormula);
CalcStruct(sExpression);
......@@ -1584,30 +1582,30 @@ void FormulaDlg_Impl::Update(const OUString& _sExp)
{
CalcStruct(_sExp);
FillDialog();
FuncSelHdl(*pFuncPage);
FuncSelHdl(*m_pFuncPage);
}
void FormulaDlg_Impl::SetMeText(const OUString& _sText)
{
FormEditData* pData = m_pHelper->getFormEditData();
pMEdit->SetText(_sText);
pMEdit->SetSelection( pData->GetSelection());
m_pMEdit->SetText(_sText);
m_pMEdit->SetSelection( pData->GetSelection());
m_pMEFormula->UpdateOldSel();
}
FormulaDlgMode FormulaDlg_Impl::SetMeText( const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate)
{
FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA;
if (!bEditFlag)
pMEdit->SetText(_sText);
if (!m_bEditFlag)
m_pMEdit->SetText(_sText);
if ( _bSelect || !bEditFlag )
pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
if ( _bSelect || !m_bEditFlag )
m_pMEdit->SetSelection( Selection( PrivStart, PrivEnd));
if ( _bUpdate )
{
m_pMEFormula->UpdateOldSel();
pMEdit->Invalidate();
m_pHelper->showReference(pMEdit->GetSelected());
m_pMEdit->Invalidate();
m_pHelper->showReference(m_pMEdit->GetSelected());
eMode = FORMULA_FORMDLG_EDIT;
m_pBtnMatrix->Check( bMatrix );
......@@ -1617,7 +1615,7 @@ FormulaDlgMode FormulaDlg_Impl::SetMeText( const OUString& _sText, sal_Int32 Pri
bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
{
pMEdit->GrabFocus();
m_pMEdit->GrabFocus();
sal_Int32 nLen = aFormula.getLength();
bool bMatrix = nLen > 3 // Matrix-Formula
&& aFormula[0] == '{'
......@@ -1636,26 +1634,26 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
IMPL_LINK_NOARG( FormulaDlg_Impl, StructSelHdl, StructPage&, void)
{
bStructUpdate = false;
if (pStructPage->IsVisible())
m_bStructUpdate = false;
if (m_pStructPage->IsVisible())
m_pBtnForward->Enable(false); //@New
bStructUpdate = true;
m_bStructUpdate = true;
}
IMPL_LINK_NOARG( FormulaDlg_Impl, MatrixHdl, Button*, void)
{
bUserMatrixFlag = true;
m_bUserMatrixFlag = true;
UpdateValues(true);
}
IMPL_LINK_NOARG( FormulaDlg_Impl, FuncSelHdl, FuncPage&, void)
{
if ( (pFuncPage->GetFunctionEntryCount() > 0)
&& (pFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) )
if ( (m_pFuncPage->GetFunctionEntryCount() > 0)
&& (m_pFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) )
{
const IFunctionDescription* pDesc = pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
const IFunctionDescription* pDesc = m_pFuncPage->GetFuncDesc( m_pFuncPage->GetFunction() );
if (pDesc != pFuncDesc)
if (pDesc != m_pFuncDesc)
m_pBtnForward->Enable(); //new
if (pDesc)
......@@ -1686,9 +1684,9 @@ void FormulaDlg_Impl::UpdateParaWin( const Selection& _rSelection, const OUStrin
// Manual Update of the results' fields:
sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
pParaWin->SetArgument( nPrivActiv, m_pEdRef->GetText());
pParaWin->UpdateParas();
sal_uInt16 nPrivActiv = m_pParaWin->GetActiveLine();
m_pParaWin->SetArgument( nPrivActiv, m_pEdRef->GetText());
m_pParaWin->UpdateParas();
Edit* pEd = GetCurrRefEdit();
if ( pEd != nullptr )
......@@ -1699,7 +1697,7 @@ bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
{
OUString aStrEd;
Edit* pEd = GetCurrRefEdit();
if (pEd != nullptr && pTheRefEdit == nullptr)
if (pEd != nullptr && m_pTheRefEdit == nullptr)
{
_rSelection = pEd->GetSelection();
_rSelection.Justify();
......@@ -1713,7 +1711,7 @@ bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection)
_rSelection.Justify();
aStrEd = m_pEdRef->GetText();
}
return pTheRefEdit == nullptr;
return m_pTheRefEdit == nullptr;
}
void FormulaDlg_Impl::SetEdSelection()
......@@ -1738,7 +1736,7 @@ FormulaModalDialog::FormulaModalDialog( vcl::Window* pParent
false/*_bSupportResult*/, false/*_bSupportMatrix*/,
this, _pFunctionMgr, _pDlg))
{
SetText(m_pImpl->aTitle1);
SetText(m_pImpl->m_aTitle1);
}
FormulaModalDialog::~FormulaModalDialog() { disposeOnce(); }
......@@ -1809,7 +1807,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
, true/*_bSupportMatrix*/
, this, _pFunctionMgr, _pDlg))
{
SetText(m_pImpl->aTitle1);
SetText(m_pImpl->m_aTitle1);
}
FormulaDlg::~FormulaDlg() {disposeOnce();}
......@@ -1843,14 +1841,14 @@ bool FormulaDlg::CheckMatrix(OUString& aFormula)
OUString FormulaDlg::GetMeText() const
{
return m_pImpl->pMEdit->GetText();
return m_pImpl->m_pMEdit->GetText();
}
void FormulaDlg::Update()
{
m_pImpl->Update();
m_pImpl->aIdle.SetInvokeHandler( LINK( this, FormulaDlg, UpdateFocusHdl));
m_pImpl->aIdle.Start();
m_pImpl->m_aIdle.SetInvokeHandler( LINK( this, FormulaDlg, UpdateFocusHdl));
m_pImpl->m_aIdle.Start();
}
void FormulaDlg::DoEnter()
......@@ -1892,11 +1890,11 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
{
SAL_WARN_IF( (m_pImpl->pFuncDesc && m_pImpl->pFuncDesc->getSuppressedArgumentCount() != m_pImpl->nArgs),
SAL_WARN_IF( (m_pImpl->m_pFuncDesc && m_pImpl->m_pFuncDesc->getSuppressedArgumentCount() != m_pImpl->m_nArgs),
"formula.ui", "FormulaDlg::getCurrentFunctionDescription: getSuppressedArgumentCount " <<
m_pImpl->pFuncDesc->getSuppressedArgumentCount() << " != nArgs " << m_pImpl->nArgs << " for " <<
m_pImpl->pFuncDesc->getFunctionName());
return m_pImpl->pFuncDesc;
m_pImpl->m_pFuncDesc->getSuppressedArgumentCount() << " != m_nArgs " << m_pImpl->m_nArgs << " for " <<
m_pImpl->m_pFuncDesc->getFunctionName());
return m_pImpl->m_pFuncDesc;
}
void FormulaDlg::UpdateParaWin( const Selection& _rSelection, const OUString& _sRefStr)
......@@ -1911,7 +1909,7 @@ bool FormulaDlg::UpdateParaWin(Selection& _rSelection)
RefEdit* FormulaDlg::GetActiveEdit()
{
return m_pImpl->pParaWin->GetActiveEdit();
return m_pImpl->m_pParaWin->GetActiveEdit();
}
const FormulaHelper& FormulaDlg::GetFormulaHelper() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment