diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 17:27:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 21:55:07 +0200 |
commit | 0c466688fef13295e2a5fcbe23e215b528c4f781 (patch) | |
tree | 38619027f0530bf143aa64243a359925a78b1142 /sw/source/ui/dialog | |
parent | cc78e723723bac34a43e5f3ad05947f775abe0db (diff) |
weld SwMergeTableDlg
Change-Id: Idbe96bb8150fc695408faa38342237191aceb777
Reviewed-on: https://gerrit.libreoffice.org/52271
Tested-by: Jenkins <ci@libreoffice.org>
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 | 15 | ||||
-rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 1 |
3 files changed, 21 insertions, 4 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 309a7393ea6a..1d1ad97285a2 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -111,6 +111,10 @@ short AbstractSwTableHeightDlg_Impl::Execute() { return m_xDlg->execute(); } +short AbstractSwMergeTableDlg_Impl::Execute() +{ + return m_xDlg->execute(); +} short AbstractSwSortDlg_Impl::Execute() { return m_xDlg->execute(); @@ -887,10 +891,9 @@ VclPtr<AbstractSwModalRedlineAcceptDlg> SwAbstractDialogFactory_Impl::CreateSwMo return VclPtr<AbstractSwModalRedlineAcceptDlg_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) { - VclPtr<Dialog> pDlg = VclPtr<SwMergeTableDlg>::Create( pParent, rWithPrev ); - return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); + return VclPtr<AbstractSwMergeTableDlg_Impl>::Create(new SwMergeTableDlg(pParent, rWithPrev)); } VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const OUString &rDialogType, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index d2cab9091623..882a5ffb2003 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -28,6 +28,7 @@ class SwBreakDlg; class SwSortDlg; class SwTableHeightDlg; class SwTableWidthDlg; +class SwMergeTableDlg; class SignatureLineDialog; class SfxTabDialog; class SwConvertTableDlg; @@ -168,6 +169,18 @@ public: virtual short Execute() override; }; +class AbstractSwMergeTableDlg_Impl : public VclAbstractDialog +{ +protected: + std::unique_ptr<SwMergeTableDlg> m_xDlg; +public: + explicit AbstractSwMergeTableDlg_Impl(SwMergeTableDlg* p) + : m_xDlg(p) + { + } + virtual short Execute() override; +}; + class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for { protected: @@ -523,7 +536,7 @@ public: css::uno::Reference< css::container::XNameAccess > & xNameAccess) override; virtual VclPtr<AbstractSwModalRedlineAcceptDlg> CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) override; - virtual VclPtr<VclAbstractDialog> CreateTableMergeDialog(vcl::Window* pParent, bool& rWithPrev) override; + virtual VclPtr<VclAbstractDialog> CreateTableMergeDialog(weld::Window* pParent, bool& rWithPrev) override; virtual VclPtr<SfxAbstractTabDialog> CreateFrameTabDialog( const OUString &rDialogType, SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index 657801c4af65..c063c8c924cd 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -36,6 +36,7 @@ #include <label.hxx> #include <mailmrge.hxx> #include <mailmergewizard.hxx> +#include <mergetbl.hxx> #include <regionsw.hxx> #include <rowht.hxx> #include <selglos.hxx> |