diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-07 13:36:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-07 20:24:04 +0200 |
| commit | d46456b07df11bf774c3a7dcbcd843bb97efbe38 (patch) | |
| tree | df5be0a3ea649a44aa2e28a4e7d6a2870343380e /cui/source/factory/dlgfact.cxx | |
| parent | 76681af6d846f9b285b4034826722766e47415e2 (diff) | |
weld ScreenshotAnnotationDlg
Change-Id: I94e42c1d10922170f53af917bba6848c9f006a11
Reviewed-on: https://gerrit.libreoffice.org/80383
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/factory/dlgfact.cxx')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 7608d9f8cd3e..0a81690478ca 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -324,7 +324,10 @@ short AbstractQrCodeGenDialog_Impl::Execute() return m_xDlg->run(); } -IMPL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl); +short AbstractScreenshotAnnotationDlg_Impl::Execute() +{ + return m_xDlg->run(); +} short CuiAbstractTabController_Impl::Execute() { @@ -1606,11 +1609,10 @@ VclPtr<AbstractPasswordToOpenModifyDialog> AbstractDialogFactory_Impl::CreatePas } VclPtr<AbstractScreenshotAnnotationDlg> AbstractDialogFactory_Impl::CreateScreenshotAnnotationDlg( - vcl::Window * pParent, + weld::Window* pParent, Dialog& rParentDialog) { - VclPtrInstance<ScreenshotAnnotationDlg> pDlg(pParent, rParentDialog); - return VclPtr<AbstractScreenshotAnnotationDlg_Impl>::Create(pDlg); + return VclPtr<AbstractScreenshotAnnotationDlg_Impl>::Create(std::make_unique<ScreenshotAnnotationDlg>(pParent, rParentDialog)); } VclPtr<AbstractSignatureLineDialog> AbstractDialogFactory_Impl::CreateSignatureLineDialog( |