diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-04-09 11:23:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-10 21:23:21 +0200 |
| commit | 3d648f76ac90fe8e28691313d0d4e78a8278e511 (patch) | |
| tree | f3e0de959d8ddff61a9ff4af79e481bec25aa29d /reportdesign | |
| parent | 47500ab25b9c5bbeeb6fde3866bdd924948fd88a (diff) | |
weld ScCorrelationDialog
this is first of the calc dialogs with a range selector, so some temp
scaffolding is required during interim case of both welded/unwelded
in existence
Change-Id: I5480179092da7b56864cef066af781b35f735ebc
Reviewed-on: https://gerrit.libreoffice.org/70474
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 | 9 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/Formula.hxx | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 3e3d5f03206f..ac91552c351d 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -201,6 +201,10 @@ 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 ); @@ -228,6 +232,11 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) } +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 68c20917af4f..e28438325329 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -101,7 +101,9 @@ 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; }; |