From d56ee7339f1a2ca73167791a5b39b6da38b401d5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 8 May 2019 11:14:52 +0100 Subject: remove unused RefEdit/RefButton MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and rename WeldRefEdit/WeldRefButton back Change-Id: I3aab8585d4ba1017cc755bf21e827522e7ee6980 Reviewed-on: https://gerrit.libreoffice.org/71957 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- formula/source/ui/dlg/ControlHelper.hxx | 10 +- formula/source/ui/dlg/formula.cxx | 55 +++---- formula/source/ui/dlg/funcutl.cxx | 244 +++++--------------------------- formula/source/ui/dlg/parawin.cxx | 12 +- formula/source/ui/dlg/parawin.hxx | 12 +- 5 files changed, 69 insertions(+), 264 deletions(-) (limited to 'formula/source') diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 8ec7d504279e..5e3811f90fa6 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -28,7 +28,7 @@ class ParaWin; // class ArgEdit -class ArgEdit : public WeldRefEdit +class ArgEdit : public RefEdit { public: ArgEdit(std::unique_ptr xControl); @@ -62,12 +62,12 @@ private: weld::Label*pFtArg; weld::Button* pBtnFx; ArgEdit* pEdArg; - WeldRefButton* pRefBtn; + RefButton* pRefBtn; DECL_LINK( FxBtnClickHdl, weld::Button&, void ); DECL_LINK( FxBtnFocusHdl, weld::Widget&, void ); - DECL_LINK( EdFocusHdl, WeldRefEdit&, void ); - DECL_LINK( EdModifyHdl, WeldRefEdit&, void ); + DECL_LINK( EdFocusHdl, RefEdit&, void ); + DECL_LINK( EdModifyHdl, RefEdit&, void ); public: @@ -76,7 +76,7 @@ public: void InitArgInput(weld::Label* pftArg, weld::Button* pbtnFx, ArgEdit* pedArg, - WeldRefButton* prefBtn); + RefButton* prefBtn); void SetArgName(const OUString &aArg); OUString GetArgName(); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 97b28f6a2009..889f21d8d724 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -72,10 +72,8 @@ using namespace ::com::sun::star; class FormulaDlg_Impl { public: - static ::std::pair + ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ); - ::std::pair - RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton ); void RefInputStartAfter(); void RefInputDoneAfter( bool bForced ); bool CalcValue( const OUString& rStrExp, OUString& rStrResult, bool bForceMatrixFormula = false ); @@ -118,7 +116,7 @@ public: void SetData( sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int32 nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd); - WeldRefEdit* GetCurrRefEdit(); + RefEdit* GetCurrRefEdit(); const FormulaHelper& GetFormulaHelper() const { return m_aFormulaHelper;} void InitFormulaOpCodeMapper(); @@ -173,8 +171,8 @@ public: int m_nSelectionStart; int m_nSelectionEnd; - WeldRefEdit* m_pTheRefEdit; - WeldRefButton* m_pTheRefButton; + RefEdit* m_pTheRefEdit; + RefButton* m_pTheRefButton; std::unique_ptr m_xTabCtrl; std::unique_ptr m_xParaWinBox; @@ -201,8 +199,8 @@ public: std::unique_ptr m_xFtFormResult; std::unique_ptr m_xWndFormResult; - std::unique_ptr m_xEdRef; - std::unique_ptr m_xRefBtn; + std::unique_ptr m_xEdRef; + std::unique_ptr m_xRefBtn; std::unique_ptr m_xFuncPage; std::unique_ptr m_xStructPage; @@ -258,8 +256,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog, , m_xBtnEnd(rBuilder.weld_button("ok")) , m_xFtFormResult(rBuilder.weld_label("label1")) , m_xWndFormResult(rBuilder.weld_entry("formula_result")) - , m_xEdRef(new WeldRefEdit(rBuilder.weld_entry("ED_REF"))) - , m_xRefBtn(new WeldRefButton(rBuilder.weld_button("RB_REF"))) + , m_xEdRef(new RefEdit(rBuilder.weld_entry("ED_REF"))) + , m_xRefBtn(new RefButton(rBuilder.weld_button("RB_REF"))) { //Space for two lines of text m_xFtHeadLine->set_label("X\nX\n"); @@ -1506,7 +1504,7 @@ void FormulaDlg_Impl::UpdateSelection() UpdateOldSel(); } -::std::pair FormulaDlg_Impl::RefInputStartBefore(WeldRefEdit* pEdit, WeldRefButton* pButton) +::std::pair FormulaDlg_Impl::RefInputStartBefore(RefEdit* pEdit, RefButton* pButton) { m_pTheRefEdit = pEdit; m_pTheRefButton = pButton; @@ -1533,21 +1531,12 @@ void FormulaDlg_Impl::UpdateSelection() m_xRefBtn->GetWidget()->set_visible(pButton != nullptr); - ::std::pair aPair; + ::std::pair aPair; aPair.first = pButton ? m_xRefBtn.get() : nullptr; aPair.second = m_xEdRef.get(); return aPair; } -::std::pair FormulaDlg_Impl::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ) -{ - assert(!pEdit && !pButton); - ::std::pair aPair; - aPair.first = pButton; - aPair.second = pEdit; - return aPair; -} - void FormulaDlg_Impl::RefInputStartAfter() { m_xRefBtn->SetEndImage(); @@ -1591,7 +1580,7 @@ void FormulaDlg_Impl::RefInputDoneAfter( bool bForced ) } } -WeldRefEdit* FormulaDlg_Impl::GetCurrRefEdit() +RefEdit* FormulaDlg_Impl::GetCurrRefEdit() { return m_xEdRef->GetWidget()->get_visible() ? m_xEdRef.get() : m_xParaWin->GetActiveEdit(); } @@ -1725,7 +1714,7 @@ void FormulaDlg_Impl::UpdateParaWin( const Selection& _rSelection, const OUStrin m_xParaWin->SetArgument( nPrivActiv, m_xEdRef->GetText()); m_xParaWin->UpdateParas(); - WeldRefEdit* pEd = GetCurrRefEdit(); + RefEdit* pEd = GetCurrRefEdit(); if (pEd) pEd->SetSelection( theSel ); } @@ -1733,7 +1722,7 @@ void FormulaDlg_Impl::UpdateParaWin( const Selection& _rSelection, const OUStrin bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) { OUString aStrEd; - WeldRefEdit* pEd = GetCurrRefEdit(); + RefEdit* pEd = GetCurrRefEdit(); if (pEd && !m_pTheRefEdit) { _rSelection = pEd->GetSelection(); @@ -1753,7 +1742,7 @@ bool FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) void FormulaDlg_Impl::SetEdSelection() { - WeldRefEdit* pEd = GetCurrRefEdit()/*aScParaWin.GetActiveEdit()*/; + RefEdit* pEd = GetCurrRefEdit()/*aScParaWin.GetActiveEdit()*/; if (pEd) { Selection theSel = m_xEdRef->GetSelection(); @@ -1798,14 +1787,9 @@ void FormulaModalDialog::Update() m_pImpl->Update(); } -::std::pair FormulaModalDialog::RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton ) -{ - return m_pImpl->RefInputStartBefore( pEdit, pButton ); -} - ::std::pair FormulaModalDialog::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ) { - return formula::FormulaDlg_Impl::RefInputStartBefore(pEdit, pButton); + return m_pImpl->RefInputStartBefore( pEdit, pButton ); } void FormulaModalDialog::RefInputStartAfter() @@ -1875,14 +1859,9 @@ void FormulaDlg::DoEnter() m_pImpl->DoEnter(false); } -::std::pair FormulaDlg::RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton ) -{ - return m_pImpl->RefInputStartBefore( pEdit, pButton ); -} - ::std::pair FormulaDlg::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton ) { - return formula::FormulaDlg_Impl::RefInputStartBefore(pEdit, pButton); + return m_pImpl->RefInputStartBefore( pEdit, pButton ); } void FormulaDlg::RefInputStartAfter() @@ -1924,7 +1903,7 @@ bool FormulaDlg::UpdateParaWin(Selection& _rSelection) return m_pImpl->UpdateParaWin(_rSelection); } -WeldRefEdit* FormulaDlg::GetActiveEdit() +RefEdit* FormulaDlg::GetActiveEdit() { return m_pImpl->m_xParaWin->GetActiveEdit(); } diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 13730efe00a8..e82da218b6a0 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -38,7 +38,7 @@ namespace formula // class ArgEdit ArgEdit::ArgEdit(std::unique_ptr xControl) - : WeldRefEdit(std::move(xControl)) + : RefEdit(std::move(xControl)) , pEdPrev(nullptr) , pEdNext(nullptr) , pSlider(nullptr) @@ -144,7 +144,7 @@ ArgInput::ArgInput() } void ArgInput::InitArgInput(weld::Label* pftArg, weld::Button* pbtnFx, - ArgEdit* pedArg, WeldRefButton* prefBtn) + ArgEdit* pedArg, RefButton* prefBtn) { pFtArg =pftArg; pBtnFx =pbtnFx; @@ -259,139 +259,38 @@ IMPL_LINK( ArgInput, FxBtnFocusHdl, weld::Widget&, rControl, void ) aFxFocusLink.Call(*this); } -IMPL_LINK( ArgInput, EdFocusHdl, WeldRefEdit&, rControl, void ) +IMPL_LINK( ArgInput, EdFocusHdl, RefEdit&, rControl, void ) { if (&rControl == pEdArg) aEdFocusLink.Call(*this); } -IMPL_LINK( ArgInput, EdModifyHdl, WeldRefEdit&, rEdit, void ) +IMPL_LINK( ArgInput, EdModifyHdl, RefEdit&, rEdit, void ) { if (&rEdit == pEdArg) aEdModifyLink.Call(*this); } -// class RefEdit - -RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle ) - : Edit( _pParent, nStyle ) - , aIdle("formula RefEdit Idle") - , pAnyRefDlg( nullptr ) - , pLabelWidget(pShrinkModeLabel) -{ - aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); -} - -extern "C" SAL_DLLPUBLIC_EXPORT void makeRefEdit(VclPtr & rRet, VclPtr & pParent, VclBuilder::stringmap &) -{ - rRet = VclPtr::Create(pParent, nullptr, WB_BORDER); -} - -RefEdit::~RefEdit() -{ - disposeOnce(); -} - -void RefEdit::dispose() -{ - aIdle.ClearInvokeHandler(); - aIdle.Stop(); - pLabelWidget.clear(); - Edit::dispose(); -} - -void RefEdit::SetRefString( const OUString& rStr ) -{ - // Prevent unwanted side effects by setting only a differing string. - // See commit message for reasons. - if (Edit::GetText() != rStr) - Edit::SetText( rStr ); -} - -void RefEdit::SetText(const OUString& rStr) -{ - Edit::SetText( rStr ); - UpdateHdl( &aIdle ); -} - -void RefEdit::StartUpdateData() -{ - aIdle.Start(); -} - -void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel ) -{ - pAnyRefDlg = pDlg; - pLabelWidget = pLabel; - - if( pDlg ) - { - aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); - } - else - { - aIdle.ClearInvokeHandler(); - aIdle.Stop(); - } -} - -void RefEdit::Modify() -{ - Edit::Modify(); - if( pAnyRefDlg ) - pAnyRefDlg->HideReference(); -} - -void RefEdit::KeyInput( const KeyEvent& rKEvt ) -{ - const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); - if( pAnyRefDlg && !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) ) - pAnyRefDlg->ReleaseFocus( this ); - else - Edit::KeyInput( rKEvt ); -} - -void RefEdit::GetFocus() -{ - Edit::GetFocus(); - StartUpdateData(); -} - -void RefEdit::LoseFocus() -{ - Edit::LoseFocus(); - if( pAnyRefDlg ) - pAnyRefDlg->HideReference(); -} - -IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void) -{ - if( pAnyRefDlg ) - pAnyRefDlg->ShowReference( GetText() ); -} - -// class RefEdit - -WeldRefEdit::WeldRefEdit(std::unique_ptr xControl) +RefEdit::RefEdit(std::unique_ptr xControl) : xEntry(std::move(xControl)) , aIdle("formula RefEdit Idle") , pAnyRefDlg(nullptr) , pLabelWidget(nullptr) { - xEntry->connect_focus_in(LINK(this, WeldRefEdit, GetFocus)); - xEntry->connect_focus_out(LINK(this, WeldRefEdit, LoseFocus)); - xEntry->connect_key_press(LINK(this, WeldRefEdit, KeyInput)); - xEntry->connect_changed(LINK(this, WeldRefEdit, Modify)); - aIdle.SetInvokeHandler( LINK( this, WeldRefEdit, UpdateHdl ) ); + xEntry->connect_focus_in(LINK(this, RefEdit, GetFocus)); + xEntry->connect_focus_out(LINK(this, RefEdit, LoseFocus)); + xEntry->connect_key_press(LINK(this, RefEdit, KeyInput)); + xEntry->connect_changed(LINK(this, RefEdit, Modify)); + aIdle.SetInvokeHandler( LINK( this, RefEdit, UpdateHdl ) ); } -WeldRefEdit::~WeldRefEdit() +RefEdit::~RefEdit() { aIdle.ClearInvokeHandler(); aIdle.Stop(); } -void WeldRefEdit::SetRefString( const OUString& rStr ) +void RefEdit::SetRefString( const OUString& rStr ) { // Prevent unwanted side effects by setting only a differing string. // See commit message for reasons. @@ -399,30 +298,30 @@ void WeldRefEdit::SetRefString( const OUString& rStr ) xEntry->set_text(rStr); } -void WeldRefEdit::SetRefValid(bool bValid) +void RefEdit::SetRefValid(bool bValid) { xEntry->set_message_type(bValid ? weld::EntryMessageType::Normal : weld::EntryMessageType::Error); } -void WeldRefEdit::SetText(const OUString& rStr) +void RefEdit::SetText(const OUString& rStr) { xEntry->set_text(rStr); UpdateHdl( &aIdle ); } -void WeldRefEdit::StartUpdateData() +void RefEdit::StartUpdateData() { aIdle.Start(); } -void WeldRefEdit::SetReferences(IControlReferenceHandler* pDlg, weld::Label* pLabel) +void RefEdit::SetReferences(IControlReferenceHandler* pDlg, weld::Label* pLabel) { pAnyRefDlg = pDlg; pLabelWidget = pLabel; if( pDlg ) { - aIdle.SetInvokeHandler(LINK(this, WeldRefEdit, UpdateHdl)); + aIdle.SetInvokeHandler(LINK(this, RefEdit, UpdateHdl)); } else { @@ -431,14 +330,14 @@ void WeldRefEdit::SetReferences(IControlReferenceHandler* pDlg, weld::Label* pLa } } -IMPL_LINK_NOARG(WeldRefEdit, Modify, weld::Entry&, void) +IMPL_LINK_NOARG(RefEdit, Modify, weld::Entry&, void) { maModifyHdl.Call(*this); if (pAnyRefDlg) pAnyRefDlg->HideReference(); } -IMPL_LINK(WeldRefEdit, KeyInput, const KeyEvent&, rKEvt, bool) +IMPL_LINK(RefEdit, KeyInput, const KeyEvent&, rKEvt, bool) { const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); if (pAnyRefDlg && !rKeyCode.GetModifier() && rKeyCode.GetCode() == KEY_F2) @@ -457,141 +356,68 @@ IMPL_LINK(WeldRefEdit, KeyInput, const KeyEvent&, rKEvt, bool) return false; } -IMPL_LINK_NOARG(WeldRefEdit, GetFocus, weld::Widget&, void) +IMPL_LINK_NOARG(RefEdit, GetFocus, weld::Widget&, void) { maGetFocusHdl.Call(*this); StartUpdateData(); } -IMPL_LINK_NOARG(WeldRefEdit, LoseFocus, weld::Widget&, void) +IMPL_LINK_NOARG(RefEdit, LoseFocus, weld::Widget&, void) { maLoseFocusHdl.Call(*this); if( pAnyRefDlg ) pAnyRefDlg->HideReference(); } -IMPL_LINK_NOARG(WeldRefEdit, UpdateHdl, Timer *, void) +IMPL_LINK_NOARG(RefEdit, UpdateHdl, Timer *, void) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference(xEntry->get_text()); } //class RefButton -RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) : - ImageButton(_pParent, nStyle), - aImgRefStart(BitmapEx(RID_BMP_REFBTN1)), - aImgRefDone(BitmapEx(RID_BMP_REFBTN2)), - aShrinkQuickHelp( ForResId( RID_STR_SHRINK ) ), - aExpandQuickHelp( ForResId( RID_STR_EXPAND ) ), - pAnyRefDlg( nullptr ), - pRefEdit( nullptr ) -{ - SetStartImage(); -} - -RefButton::~RefButton() -{ - disposeOnce(); -} - -void RefButton::dispose() -{ - pRefEdit.clear(); - ImageButton::dispose(); -} - -VCL_BUILDER_FACTORY_ARGS(RefButton, 0) - -void RefButton::SetStartImage() -{ - SetModeImage( aImgRefStart ); - SetQuickHelpText( aShrinkQuickHelp ); -} - -void RefButton::SetEndImage() -{ - SetModeImage( aImgRefDone ); - SetQuickHelpText( aExpandQuickHelp ); -} - -void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ) -{ - pAnyRefDlg = pDlg; - pRefEdit = pEdit; -} - -void RefButton::Click() -{ - if( pAnyRefDlg ) - pAnyRefDlg->ToggleCollapsed( pRefEdit, this ); -} - -void RefButton::KeyInput( const KeyEvent& rKEvt ) -{ - const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); - if( pAnyRefDlg && !rKeyCode.GetModifier() && (rKeyCode.GetCode() == KEY_F2) ) - pAnyRefDlg->ReleaseFocus( pRefEdit ); - else - ImageButton::KeyInput( rKEvt ); -} - -void RefButton::GetFocus() -{ - ImageButton::GetFocus(); - if( pRefEdit ) - pRefEdit->StartUpdateData(); -} - -void RefButton::LoseFocus() -{ - ImageButton::LoseFocus(); - if( pRefEdit ) - pRefEdit->Modify(); -} - -//class RefButton -WeldRefButton::WeldRefButton(std::unique_ptr xControl) +RefButton::RefButton(std::unique_ptr xControl) : xButton(std::move(xControl)) , pAnyRefDlg( nullptr ) , pRefEdit( nullptr ) { - xButton->connect_focus_in(LINK(this, WeldRefButton, GetFocus)); - xButton->connect_focus_out(LINK(this, WeldRefButton, LoseFocus)); - xButton->connect_key_press(LINK(this, WeldRefButton, KeyInput)); - xButton->connect_clicked(LINK(this, WeldRefButton, Click)); + xButton->connect_focus_in(LINK(this, RefButton, GetFocus)); + xButton->connect_focus_out(LINK(this, RefButton, LoseFocus)); + xButton->connect_key_press(LINK(this, RefButton, KeyInput)); + xButton->connect_clicked(LINK(this, RefButton, Click)); SetStartImage(); } -WeldRefButton::~WeldRefButton() +RefButton::~RefButton() { } -void WeldRefButton::SetStartImage() +void RefButton::SetStartImage() { xButton->set_from_icon_name(RID_BMP_REFBTN1); xButton->set_tooltip_text(ForResId(RID_STR_SHRINK)); } -void WeldRefButton::SetEndImage() +void RefButton::SetEndImage() { xButton->set_from_icon_name(RID_BMP_REFBTN2); xButton->set_tooltip_text(ForResId(RID_STR_EXPAND)); } -void WeldRefButton::SetReferences( IControlReferenceHandler* pDlg, WeldRefEdit* pEdit ) +void RefButton::SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ) { pAnyRefDlg = pDlg; pRefEdit = pEdit; } -IMPL_LINK_NOARG(WeldRefButton, Click, weld::Button&, void) +IMPL_LINK_NOARG(RefButton, Click, weld::Button&, void) { maClickHdl.Call(*this); if( pAnyRefDlg ) pAnyRefDlg->ToggleCollapsed( pRefEdit, this ); } -IMPL_LINK(WeldRefButton, KeyInput, const KeyEvent&, rKEvt, bool) +IMPL_LINK(RefButton, KeyInput, const KeyEvent&, rKEvt, bool) { const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); if (pAnyRefDlg && !rKeyCode.GetModifier() && rKeyCode.GetCode() == KEY_F2) @@ -610,14 +436,14 @@ IMPL_LINK(WeldRefButton, KeyInput, const KeyEvent&, rKEvt, bool) return false; } -IMPL_LINK_NOARG(WeldRefButton, GetFocus, weld::Widget&, void) +IMPL_LINK_NOARG(RefButton, GetFocus, weld::Widget&, void) { maGetFocusHdl.Call(*this); if (pRefEdit) pRefEdit->StartUpdateData(); } -IMPL_LINK_NOARG(WeldRefButton, LoseFocus, weld::Widget&, void) +IMPL_LINK_NOARG(RefButton, LoseFocus, weld::Widget&, void) { maLoseFocusHdl.Call(*this); if (pRefEdit) diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 4774b7ba415b..a255041abca8 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -60,10 +60,10 @@ ParaWin::ParaWin(weld::Container* pParent,IControlReferenceHandler* _pDlg) , m_xEdArg2(new ArgEdit(m_xBuilder->weld_entry("ED_ARG2"))) , m_xEdArg3(new ArgEdit(m_xBuilder->weld_entry("ED_ARG3"))) , m_xEdArg4(new ArgEdit(m_xBuilder->weld_entry("ED_ARG4"))) - , m_xRefBtn1(new WeldRefButton(m_xBuilder->weld_button("RB_ARG1"))) - , m_xRefBtn2(new WeldRefButton(m_xBuilder->weld_button("RB_ARG2"))) - , m_xRefBtn3(new WeldRefButton(m_xBuilder->weld_button("RB_ARG3"))) - , m_xRefBtn4(new WeldRefButton(m_xBuilder->weld_button("RB_ARG4"))) + , m_xRefBtn1(new RefButton(m_xBuilder->weld_button("RB_ARG1"))) + , m_xRefBtn2(new RefButton(m_xBuilder->weld_button("RB_ARG2"))) + , m_xRefBtn3(new RefButton(m_xBuilder->weld_button("RB_ARG3"))) + , m_xRefBtn4(new RefButton(m_xBuilder->weld_button("RB_ARG4"))) { // Space for three lines of text in function description. m_xFtEditDesc->set_label("X\nX\nX\n"); @@ -251,7 +251,7 @@ void ParaWin::SetActiveLine(sal_uInt16 no) } } -WeldRefEdit* ParaWin::GetActiveEdit() +RefEdit* ParaWin::GetActiveEdit() { if(nArgs>0 && nEdFocus!=NOT_FOUND) { @@ -371,7 +371,7 @@ void ParaWin::SetEdFocus() } void ParaWin::InitArgInput(sal_uInt16 nPos, weld::Label& rFtArg, weld::Button& rBtnFx, - ArgEdit& rEdArg, WeldRefButton& rRefBtn) + ArgEdit& rEdArg, RefButton& rRefBtn) { rRefBtn.SetReferences(pMyParent, &rEdArg); diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 8bb6443fed64..8af875d50337 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -88,10 +88,10 @@ private: std::unique_ptr m_xEdArg3; std::unique_ptr m_xEdArg4; - std::unique_ptr m_xRefBtn1; - std::unique_ptr m_xRefBtn2; - std::unique_ptr m_xRefBtn3; - std::unique_ptr m_xRefBtn4; + std::unique_ptr m_xRefBtn1; + std::unique_ptr m_xRefBtn2; + std::unique_ptr m_xRefBtn3; + std::unique_ptr m_xRefBtn4; DECL_LINK( ScrollHdl, weld::ScrolledWindow&, void); DECL_LINK( ModifyHdl, ArgInput&, void ); @@ -102,7 +102,7 @@ private: void ArgumentModified(); void InitArgInput(sal_uInt16 nPos, weld::Label& rFtArg, weld::Button& rBtnFx, - ArgEdit& rEdArg, WeldRefButton& rRefBtn); + ArgEdit& rEdArg, RefButton& rRefBtn); void SetArgumentDesc(const OUString& aText); void SetArgumentText(const OUString& aText); @@ -126,7 +126,7 @@ public: sal_uInt16 GetActiveLine() { return nActiveLine;} void SetActiveLine(sal_uInt16 no); - WeldRefEdit* GetActiveEdit(); + RefEdit* GetActiveEdit(); OUString GetActiveArgName(); OUString GetArgument(sal_uInt16 no); -- cgit