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

[Szymon KÅ‚os (via logerrit)]

 vcl/inc/salvtables.hxx        |    2 +-
 vcl/source/window/builder.cxx |    2 +-
 vcl/source/window/dialog.cxx  |    2 +-
 vcl/source/window/layout.cxx  |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 787fac3456ab706768cc4efb6fbc4fc235239091
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Mar 18 09:57:09 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 13 10:02:26 2020 +0200

    Move messagedialog header to shared include
    
    Change-Id: Ice8d01d2bb62667667a4c5f0366120cdb7600472
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94040
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/inc/messagedialog.hxx b/include/vcl/messagedialog.hxx
similarity index 100%
rename from vcl/inc/messagedialog.hxx
rename to include/vcl/messagedialog.hxx
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index a7d07f52efbe..f9e0ebafcaba 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -13,7 +13,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/layout.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 
 class SalInstanceBuilder : public weld::Builder
 {
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 306e504f8f48..9a9cb9af9ff1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -53,7 +53,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <svdata.hxx>
 #include <bitmaps.hlst>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <window.h>
 #include <xmlreader/xmlreader.hxx>
 #include <desktop/crashreport.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 79e2cd95300d..209179cc9591 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -63,7 +63,7 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/IDialogRenderable.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <salframe.hxx>
 
 #include <iostream>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ce7a69e6455d..355a0d338778 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -16,7 +16,7 @@
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <messagedialog.hxx>
+#include <vcl/messagedialog.hxx>
 #include <window.h>
 #include <boost/multi_array.hpp>
 #include <officecfg/Office/Common.hxx>