diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-01 15:46:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-07 13:08:13 +0200 |
| commit | feecbabd01870ed83a04baa6cb13d7a8af832ac3 (patch) | |
| tree | b3eac2bed9c5936287a04badea90a508be57f623 /sc/source/ui/formdlg | |
| parent | d25fef637897bdf9e680700451e9207ac6aa7cbe (diff) | |
weld FormulaDialog
drop xFocusWin hack, I don't see what gain it gives
Change-Id: I31952b5440797e6209ed1de6b546f1e4c0238d08
Reviewed-on: https://gerrit.libreoffice.org/71675
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/formdlg')
| -rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 4dd504d7d809..780bd1d65985 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -56,12 +56,12 @@ using namespace com::sun::star; // init/ shared functions for dialog -ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - vcl::Window* pParent, const ScViewData* pViewData, const formula::IFunctionManager* _pFunctionMgr ) - : formula::FormulaDlg( pB, pCW, pParent, _pFunctionMgr,this) +ScFormulaDlg::ScFormulaDlg(SfxBindings* pB, SfxChildWindow* pCW, + weld::Window* pParent, const ScViewData* pViewData, const formula::IFunctionManager* _pFunctionMgr) + : formula::FormulaDlg(pB, pCW, pParent, _pFunctionMgr, this) , m_aHelper(this,pB) { - m_aHelper.SetWindow(this); + m_aHelper.SetDialog(m_xDialog.get()); ScModule* pScMod = SC_MOD(); pScMod->InputEnterHandler(); ScTabViewShell* pScViewShell = nullptr; @@ -235,11 +235,6 @@ void ScFormulaDlg::fill() ScFormulaDlg::~ScFormulaDlg() { - disposeOnce(); -} - -void ScFormulaDlg::dispose() -{ ScModule* pScMod = SC_MOD(); ScFormEditData* pData = pScMod->GetFormEditData(); m_aHelper.dispose(); @@ -250,7 +245,6 @@ void ScFormulaDlg::dispose() pScMod->SetRefInputHdl(nullptr); StoreFormEditData(pData); } - formula::FormulaDlg::dispose(); } bool ScFormulaDlg::IsInputHdl(const ScInputHandler* pHdl) @@ -291,10 +285,9 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(const ScDocShell* pDocShell, S return pHdl; } -bool ScFormulaDlg::Close() +void ScFormulaDlg::Close() { DoEnter(); - return true; } // functions for right side |