diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 15:13:36 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 21:03:43 +0200 |
| commit | ca8558a28d1dc271cd2f10362e5e0f7d218149cb (patch) | |
| tree | 73b624d66506093c66c858506016b9b44c6f659a /sd | |
| parent | 349d0e679a4ee296c703145afe73e65efc5d2bff (diff) | |
Related: tdf#120277 inherit from SfxDialogController
where the dialog originally inherited from SfxModalDialog.
Change-Id: Ibe0006de93b0a9f05fb3b6181baf3ba1b4cf04c8
Reviewed-on: https://gerrit.libreoffice.org/61313
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/brkdlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/copydlg.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/BreakDlg.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/inc/copydlg.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index 80e8fb8f6a8f..9dcefb6facf5 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -40,7 +40,7 @@ namespace sd { BreakDlg::BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount) - : GenericDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", "BreakDialog") + : SfxDialogController(pWindow, "modules/sdraw/ui/breakdialog.ui", "BreakDialog") , m_xFiObjInfo(m_xBuilder->weld_label("metafiles")) , m_xFiActInfo(m_xBuilder->weld_label("metaobjects")) , m_xFiInsInfo(m_xBuilder->weld_label("drawingobjects")) diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index ea414a9bdf7b..d4bad13ad7e1 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -41,7 +41,7 @@ namespace sd { #define TOKEN ';' CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pInView) - : GenericDialogController(pWindow, "modules/sdraw/ui/copydlg.ui", "DuplicateDialog") + : SfxDialogController(pWindow, "modules/sdraw/ui/copydlg.ui", "DuplicateDialog") , mrOutAttrs(rInAttrs) , maUIScale(pInView->GetDoc().GetUIScale()) , mpView(pInView) diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 02d7a3081aed..21414b64f29e 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_BREAKDLG_HXX #define INCLUDED_SD_SOURCE_UI_INC_BREAKDLG_HXX +#include <sfx2/basedlgs.hxx> #include <sfx2/progress.hxx> #include <svx/svdetc.hxx> #include <vcl/idle.hxx> -#include <vcl/weld.hxx> namespace sd { @@ -33,7 +33,7 @@ class DrawView; /** * dialog to break meta files */ -class BreakDlg : public weld::GenericDialogController +class BreakDlg : public SfxDialogController { public: BreakDlg(weld::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index db0181efe2d4..dd6da82c8499 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -34,7 +34,7 @@ class View; /** * dialog to adjust screen */ -class CopyDlg : public weld::GenericDialogController +class CopyDlg : public SfxDialogController { public: CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); |