diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-08 11:14:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-11 20:31:04 +0200 |
| commit | d56ee7339f1a2ca73167791a5b39b6da38b401d5 (patch) | |
| tree | 72c5572c4a68b8c14b8c5cfc853c3be173caeb64 /reportdesign | |
| parent | d6a43b40736fef259402177cb50e6d1428112cfc (diff) | |
remove unused RefEdit/RefButton
and rename WeldRefEdit/WeldRefButton back
Change-Id: I3aab8585d4ba1017cc755bf21e827522e7ee6980
Reviewed-on: https://gerrit.libreoffice.org/71957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 15 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 9a2b11e8633c..919deaeec869 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -95,7 +95,7 @@ FormulaDialog::~FormulaDialog() } StoreFormEditData( m_pFormulaData ); - m_pEdit.clear(); + m_pEdit = nullptr; m_pAddField.clear(); } @@ -196,18 +196,14 @@ void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/) { } -void FormulaDialog::ReleaseFocus( WeldRefEdit* /*pEdit*/) -{ -} - void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { ::std::pair<RefButton*,RefEdit*> aPair = RefInputStartBefore( _pEdit, _pButton ); m_pEdit = aPair.second; if ( m_pEdit ) - m_pEdit->Hide(); + m_pEdit->GetWidget()->hide(); if ( aPair.first ) - aPair.first->Hide(); + aPair.first->GetWidget()->hide(); if ( !m_pAddField ) { @@ -226,11 +222,6 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) m_pAddField->Show(); } -void FormulaDialog::ToggleCollapsed( WeldRefEdit* /*_pEdit*/, WeldRefButton* /*_pButton*/) -{ - assert(false); -} - IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void) { const uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors(); diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index 569332e17d40..394d0b147b4e 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -51,7 +51,7 @@ class FormulaDialog : public formula::FormulaModalDialog, css::uno::Reference < css::beans::XPropertySet > m_xRowSet; css::uno::Reference< css::report::meta::XFormulaParser> m_xParser; css::uno::Reference< css::sheet::XFormulaOpCodeMapper> m_xOpCodeMapper; - VclPtr<formula::RefEdit> m_pEdit; + formula::RefEdit* m_pEdit; OUString m_sFormula; sal_Int32 m_nStart; sal_Int32 m_nEnd; @@ -100,9 +100,7 @@ public: virtual void ShowReference(const OUString& _sRef) override; virtual void HideReference( bool bDoneRefMode = true ) override; virtual void ReleaseFocus( formula::RefEdit* pEdit ) override; - virtual void ReleaseFocus( formula::WeldRefEdit* pEdit ) override; virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) override; - virtual void ToggleCollapsed( formula::WeldRefEdit* pEdit, formula::WeldRefButton* pButton ) override; }; |