[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source

[Mert Tumer (via logerrit)]

 sw/source/uibase/dialog/watermarkdialog.cxx |    2 +-
 sw/source/uibase/inc/watermarkdialog.hxx    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4a439151f3b21b3381060d7c7e616f469e5f090f
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Fri Jan 18 00:52:23 2019 +0300
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sat Sep 7 08:14:52 2019 +0200

    lok: Make the welded Watermark dialog work with dialog tunneling.
    
    Change-Id: Ib5acd6fe4838aa09b74333c46cf38b9e0a926682
    Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/66555
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 2a1ea372daa12c0041d2c080a8fab33a6a87950d)
    Reviewed-on: https://gerrit.libreoffice.org/78738
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index 378f20e2b9cb..a40977792873 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -20,7 +20,7 @@
 #include <svtools/ctrltool.hxx>
 
 SwWatermarkDialog::SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindings)
-    : GenericDialogController(pParent, "modules/swriter/ui/watermarkdialog.ui", "WatermarkDialog")
+    : SfxDialogController(pParent, "modules/swriter/ui/watermarkdialog.ui", "WatermarkDialog")
     , m_rBindings(rBindings)
     , m_xTextInput(m_xBuilder->weld_entry("TextInput"))
     , m_xOKButton(m_xBuilder->weld_button("ok"))
diff --git a/sw/source/uibase/inc/watermarkdialog.hxx b/sw/source/uibase/inc/watermarkdialog.hxx
index 65801fcba3a9..dff87a792a57 100644
--- a/sw/source/uibase/inc/watermarkdialog.hxx
+++ b/sw/source/uibase/inc/watermarkdialog.hxx
@@ -12,8 +12,9 @@
 #include <sfx2/bindings.hxx>
 #include <vcl/weld.hxx>
 #include <svx/colorbox.hxx>
+#include <sfx2/basedlgs.hxx>
 
-class SwWatermarkDialog : public weld::GenericDialogController
+class SwWatermarkDialog : public SfxDialogController
 {
 public:
     SwWatermarkDialog(weld::Window* pParent, SfxBindings& rBindings);