Kaydet (Commit) 28d73ca4 authored tarafından Caolán McNamara's avatar Caolán McNamara

can get the window from the SwView

Change-Id: Ifa3033b928db817ccdc4337f8995179bc488fcb6
Reviewed-on: https://gerrit.libreoffice.org/51425Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst d0b35b2e
......@@ -400,7 +400,7 @@ public:
SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) = 0;
virtual VclPtr<AbstractSwConvertTableDlg> CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
virtual VclPtr<VclAbstractDialog> CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) = 0;
virtual VclPtr<VclAbstractDialog> CreateSignatureLineDialog(weld::Window* pParent, SwView& rView) = 0;
virtual VclPtr<VclAbstractDialog> CreateSignatureLineDialog(SwView& rView) = 0;
virtual VclPtr<AbstractSwInsertDBColAutoPilot> CreateSwInsertDBColAutoPilot(SwView& rView,
css::uno::Reference< css::sdbc::XDataSource> rxSource,
......
......@@ -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,
......
......@@ -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,
......
......@@ -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"))
......
......@@ -37,8 +37,9 @@ using namespace css::view;
using namespace css::drawing;
using namespace css::graphic;
SignatureLineDialog::SignatureLineDialog(weld::Window* pParent, SwView& rView)
: GenericDialogController(pParent, "modules/swriter/ui/signatureline.ui", "SignatureLineDialog")
SignatureLineDialog::SignatureLineDialog(SwView& rView)
: GenericDialogController(rView.GetFrameWeld(), "modules/swriter/ui/signatureline.ui",
"SignatureLineDialog")
, m_xEditName(m_xBuilder->weld_entry("edit_name"))
, m_xEditTitle(m_xBuilder->weld_entry("edit_title"))
, m_xEditEmail(m_xBuilder->weld_entry("edit_email"))
......
......@@ -21,7 +21,7 @@ class SwView;
class SW_DLLPUBLIC SignatureLineDialog : public weld::GenericDialogController
{
public:
SignatureLineDialog(weld::Window* pParent, SwView& rView);
SignatureLineDialog(SwView& rView);
short execute();
......
......@@ -67,7 +67,7 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
ScopedVclPtr<VclAbstractDialog> pDialog(pFact->CreateSignatureLineDialog(rMDI.GetFrameWeld(), *this));
ScopedVclPtr<VclAbstractDialog> pDialog(pFact->CreateSignatureLineDialog(*this));
assert(pDialog && "Dialog creation failed!");
if (pDialog)
pDialog->Execute();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment