[Libreoffice-commits] core.git: cui/source

[Markus Mohrhard]

 cui/source/dialogs/hlmarkwn.cxx |    4 ++--
 cui/source/inc/hlmarkwn.hxx     |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 765c98d89fb5b682cc6fb106baec32295a4aabca
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Feb 6 17:48:22 2018 +0100

    Don't inherit from ModalDialog for a random UI element
    
    Change-Id: I2f734b1f034eaa4203a21968bc8eca455afa7f72
    Reviewed-on: https://gerrit.libreoffice.org/49312
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index cfcda09e2a2c..ee011732a24f 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -118,7 +118,7 @@ void SvxHlmarkTreeLBox::Paint(vcl::RenderContext& rRenderContext, const ::tools:
 //*** Window-Class ***
 // Constructor / Destructor
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
-    : ModalDialog(pParent, "HyperlinkMark", "cui/ui/hyperlinkmarkdialog.ui")
+    : FloatingWindow(pParent, "HyperlinkMark", "cui/ui/hyperlinkmarkdialog.ui")
     , mbUserMoved(false)
     , mpParent(pParent)
     , mnError(LERR_NOERROR)
@@ -150,7 +150,7 @@ void SvxHlinkDlgMarkWnd::dispose()
     mpBtClose.clear();
     mpLbTree.clear();
     mpParent.clear();
-    ModalDialog::dispose();
+    FloatingWindow::dispose();
 }
 
 // Set an errorstatus
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 5a879197b3ed..518ac7ce7e8b 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
+#include <vcl/floatwin.hxx>
 #include <svtools/treelistbox.hxx>
 
 #include "hlmarkwn_def.hxx"
@@ -59,7 +60,7 @@ public:
 //#                                                                      #
 //# Window-Class                                                         #
 //#                                                                      #
-class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow
+class SvxHlinkDlgMarkWnd : public FloatingWindow //FloatingWindow
 {
 private:
     friend class SvxHlmarkTreeLBox;