diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-05 11:57:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-06 12:45:15 +0200 |
| commit | 587899f9ced03d02fbf8ffa9a3f52ba31be30818 (patch) | |
| tree | 75b303c67aad161a1f9ac571bbb51f9536f9ab25 /sw/source/ui/dialog | |
| parent | 83f12a2d4e410014c70844085f19190a50e83429 (diff) | |
weld SwColumnPage and SwColumnDialog
Change-Id: Ia649785047db2551044b4d765881309f83b5c838
Reviewed-on: https://gerrit.libreoffice.org/60044
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dialog')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index f6faaabc74a8..413f886a78b4 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -119,6 +119,10 @@ short AbstractGenericDialog_Impl::Execute() { return m_xDlg->run(); } +bool AbstractGenericDialog_Impl::StartExecuteAsync(AsyncContext &rCtx) +{ + return weld::GenericDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn); +} short AbstractSwSortDlg_Impl::Execute() { return m_xDlg->execute(); @@ -820,10 +824,9 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwAutoMarkDialog(v return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwColumnDialog(vcl::Window *pParent, SwWrtShell &rSh) +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwColumnDialog(weld::Window *pParent, SwWrtShell &rSh) { - VclPtr<Dialog> pDlg = VclPtr<SwColumnDlg>::Create( pParent, rSh ); - return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); + return VclPtr<AbstractGenericDialog_Impl>::Create(o3tl::make_unique<SwColumnDlg>(pParent, rSh)); } VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwTableHeightDialog(weld::Window *pParent, SwWrtShell &rSh) diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 0e13836afdd1..c7315197ecb5 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -115,13 +115,14 @@ class VclAbstractDialog_Impl : public VclAbstractDialog class AbstractGenericDialog_Impl : public VclAbstractDialog { protected: - std::unique_ptr<weld::GenericDialogController> m_xDlg; + std::shared_ptr<weld::GenericDialogController> m_xDlg; public: explicit AbstractGenericDialog_Impl(std::unique_ptr<weld::GenericDialogController> p) : m_xDlg(std::move(p)) { } virtual short Execute() override; + virtual bool StartExecuteAsync(AsyncContext &rCtx) override; }; class AbstractSwSortDlg_Impl : public VclAbstractDialog @@ -583,7 +584,7 @@ public: virtual VclPtr<AbstractSwSelGlossaryDlg> CreateSwSelGlossaryDlg(const OUString &rShortName) override; virtual VclPtr<VclAbstractDialog> CreateSwSortingDialog(weld::Window * pParent, SwWrtShell &rSh) override; virtual VclPtr<VclAbstractDialog> CreateSwTableHeightDialog(weld::Window *pParent, SwWrtShell &rSh) override; - virtual VclPtr<VclAbstractDialog> CreateSwColumnDialog(vcl::Window *pParent, SwWrtShell &rSh) override; + virtual VclPtr<VclAbstractDialog> CreateSwColumnDialog(weld::Window *pParent, SwWrtShell &rSh) override; virtual VclPtr<AbstractSplitTableDialog> CreateSplitTableDialog(weld::Window* pParent, SwWrtShell &rSh) override; virtual VclPtr<AbstractSwAutoFormatDlg> CreateSwAutoFormatDlg(weld::Window* pParent, SwWrtShell* pShell, |