diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-20 11:36:00 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-22 16:06:41 +0100 |
| commit | 5b348b1a8ca3c5ba1049aacba1ac2e3c43ed26b7 (patch) | |
| tree | 2e9b28dd1d7c803fe30684d8138603281bae53a0 /sw/source/ui | |
| parent | 178715e7ca365de98bcd3656b9ce0bfce5aa95e7 (diff) | |
tdf#83877 Move SignatureLineDialog to svx
To prepare using from Calc
Change-Id: I102ecf2c956922dd1458c99bd7cd7be30f6f5ec4
Reviewed-on: https://gerrit.libreoffice.org/51726
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 11 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swuiexp.cxx | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 9000ad0380e1..2d1da118cd18 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -83,9 +83,11 @@ #include <mailconfigpage.hxx> #include <uiborder.hxx> #include <mmresultdialogs.hxx> -#include <SignatureLineDialog.hxx> +#include <svx/SignatureLineDialog.hxx> using namespace ::com::sun::star; +using namespace css::frame; +using namespace css::uno; IMPL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl); @@ -728,9 +730,12 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(SwView& rV) +VclPtr<VclAbstractDialog> +SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(SwView& rV, Reference<XModel> xModel, + bool bEditExisting) { - return VclPtr<AbstractSignatureLineDialog_Impl>::Create(new SignatureLineDialog(rV)); + return VclPtr<AbstractSignatureLineDialog_Impl>::Create( + new SignatureLineDialog(rV.GetFrameWeld(), xModel, bEditExisting)); } VclPtr<AbstractSwInsertDBColAutoPilot> SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 018a2710f36d..cf2343bb9e66 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -451,7 +451,9 @@ 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(SwView& rView) override; + virtual VclPtr<VclAbstractDialog> + CreateSignatureLineDialog(SwView& rView, css::uno::Reference<css::frame::XModel> xModel, + bool bEditExisting) 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 f938df0b3ff0..336a779100b8 100644 --- a/sw/source/ui/dialog/swuiexp.cxx +++ b/sw/source/ui/dialog/swuiexp.cxx @@ -39,7 +39,7 @@ #include <selglos.hxx> #include <splittbl.hxx> #include <tautofmt.hxx> -#include <SignatureLineDialog.hxx> +#include <svx/SignatureLineDialog.hxx> #include <swmodalredlineacceptdlg.hxx> #include <swrenamexnameddlg.hxx> #include <swuiidxmrk.hxx> |