diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 13:30:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 21:31:04 +0100 |
| commit | 28d73ca4b1297345cefed1a092d983bb59a6c445 (patch) | |
| tree | 7520828a0762407a60255b9c3666d7c23c06ec10 /sw/source/ui | |
| parent | d0b35b2ec2639d438930c5136e960ed4140a69f3 (diff) | |
can get the window from the SwView
Change-Id: Ifa3033b928db817ccdc4337f8995179bc488fcb6
Reviewed-on: https://gerrit.libreoffice.org/51425
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')
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/table/convert.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index b0724dcf18e7..9000ad0380e1 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -728,9 +728,9 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( return VclPtr<VclAbstractDialog_Impl>::Create( pDlg ); } -VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(weld::Window* pParent, SwView& rV) +VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(SwView& rV) { - return VclPtr<AbstractSignatureLineDialog_Impl>::Create(new SignatureLineDialog(pParent, rV)); + return VclPtr<AbstractSignatureLineDialog_Impl>::Create(new SignatureLineDialog(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 33db10f8cb49..caf3059c86ac 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -451,7 +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(weld::Window* pParent, SwView& rView) override; + virtual VclPtr<VclAbstractDialog> CreateSignatureLineDialog(SwView& rView) override; virtual VclPtr<AbstractSwInsertDBColAutoPilot> CreateSwInsertDBColAutoPilot(SwView& rView, css::uno::Reference< css::sdbc::XDataSource> rxSource, diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index f33d262bba41..dd7007cf0a13 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -94,7 +94,7 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, } SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) - : GenericDialogController(rView.GetViewFrame()->GetWindow().GetFrameWeld(), + : GenericDialogController(rView.GetFrameWeld(), "modules/swriter/ui/converttexttable.ui", "ConvertTextTableDialog") , m_xTabBtn(m_xBuilder->weld_radio_button("tabs")) , m_xSemiBtn(m_xBuilder->weld_radio_button("semicolons")) |