diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 12:02:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 21:29:24 +0100 |
| commit | d416fa9a212e0421a7c925507ddee07132f3cab3 (patch) | |
| tree | c8cd27c2d8cddf84dd65460b07cf508ee3a3317e /sw/source/ui/dialog | |
| parent | 009d2756b1678477ec23d5647bd5004c4bff3a62 (diff) | |
weld SignatureLineDialog
Change-Id: I14cbc7e1aa70696abdeb21eae31176566f17e066
Reviewed-on: https://gerrit.libreoffice.org/51422
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 | 16 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 1 |
3 files changed, 21 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 4ddbae92c8b3..b0724dcf18e7 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -104,6 +104,10 @@ short AbstractSwSortDlg_Impl::Execute() { return m_xDlg->execute(); } +short AbstractSignatureLineDialog_Impl::Execute() +{ + return m_xDlg->execute(); +} IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); short AbstractSwConvertTableDlg_Impl::Execute() { @@ -724,10 +728,9 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(vcl::Window* pParent, SwView& rV) +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(weld::Window* pParent, SwView& rV) { - VclPtr<Dialog> pDlg = VclPtr<SignatureLineDialog>::Create(pParent, rV); - return VclPtr<VclAbstractDialog_Impl>::Create(pDlg); + return VclPtr<AbstractSignatureLineDialog_Impl>::Create(new SignatureLineDialog(pParent, rV)); } VclPtr<AbstractSwInsertDBColAutoPilot> SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index b24f08177d0d..33db10f8cb49 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -26,6 +26,7 @@ class SwAsciiFilterDlg; class Dialog; class SwBreakDlg; class SwSortDlg; +class SignatureLineDialog; class SfxTabDialog; class SwConvertTableDlg; class SwInsertDBColAutoPilot; @@ -114,6 +115,18 @@ public: virtual short Execute() override; }; +class AbstractSignatureLineDialog_Impl : public VclAbstractDialog +{ +protected: + std::unique_ptr<SignatureLineDialog> m_xDlg; +public: + explicit AbstractSignatureLineDialog_Impl(SignatureLineDialog* p) + : m_xDlg(p) + { + } + virtual short Execute() override; +}; + class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg { protected: @@ -438,8 +451,7 @@ public: SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) override; virtual VclPtr<AbstractSwConvertTableDlg> CreateSwConvertTableDlg(SwView& rView, bool bToTable) override; virtual VclPtr<VclAbstractDialog> CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) override; - virtual VclPtr<VclAbstractDialog> CreateSignatureLineDialog(vcl::Window* pParent, - SwView& rView) override; + virtual VclPtr<VclAbstractDialog> CreateSignatureLineDialog(weld::Window* pParent, SwView& rView) override; virtual VclPtr<AbstractSwInsertDBColAutoPilot> CreateSwInsertDBColAutoPilot(SwView& rView, css::uno::Reference< css::sdbc::XDataSource> rxSource, diff --git a/sw/source/ui/dialog/swuiexp.cxx b/sw/source/ui/dialog/swuiexp.cxx index b6f412435c33..f938df0b3ff0 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -39,6 +39,7 @@ #include <selglos.hxx> #include <splittbl.hxx> #include <tautofmt.hxx> +#include <SignatureLineDialog.hxx> #include <swmodalredlineacceptdlg.hxx> #include <swrenamexnameddlg.hxx> #include <swuiidxmrk.hxx> |