summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-03 15:13:36 +0100
committerBartosz Kosiorek <gang65@poczta.onet.pl>2018-11-06 19:24:26 +0100
commit20826019d8f77129853712c5fdf5134aff058171 (patch)
tree8ac9d3b9fde047884f20b205ab524a6fe7954c7f /include
parent3c8ad17c769753af50ef14770661a6c1ffed226e (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> Reviewed-on: https://gerrit.libreoffice.org/61326 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/new.hxx3
-rw-r--r--include/svx/passwd.hxx4
2 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index f5c30c23060f..0697414fa4ca 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -22,6 +22,7 @@
#include <memory>
#include <sal/config.h>
#include <sfx2/dllapi.h>
+#include <sfx2/basedlgs.hxx>
#include <sfx2/objsh.hxx>
#include <vcl/idle.hxx>
@@ -55,7 +56,7 @@ namespace o3tl
#define RET_TEMPLATE_LOAD 100
-class SFX2_DLLPUBLIC SfxNewFileDialog : public weld::GenericDialogController
+class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxDialogController
{
private:
Idle m_aPrevIdle;
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 9f726b0d747c..7915453fb05d 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_SVX_PASSWD_HXX
#define INCLUDED_SVX_PASSWD_HXX
-#include <vcl/weld.hxx>
+#include <sfx2/basedlgs.hxx>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC SvxPasswordDialog : public weld::GenericDialogController
+class SVX_DLLPUBLIC SvxPasswordDialog : public SfxDialogController
{
private:
OUString m_aOldPasswdErrStr;