[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 solenv/clang-format/blacklist       |    2 +-
 vcl/inc/iconviewimpl.hxx            |    2 +-
 vcl/inc/svimpbox.hxx                |    2 +-
 vcl/inc/treeglue.hxx                |    2 +-
 vcl/source/app/salvtables.cxx       |    2 +-
 vcl/source/treelist/svimpbox.cxx    |    2 +-
 vcl/source/treelist/treelistbox.cxx |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2813400886ad1b8dda4675e2696d4aa4c599fc8c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 29 13:01:57 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Oct 29 17:12:39 2019 +0100

    svimpbox.hxx now only included by vcl
    
    Change-Id: I0dd7691d0be8a3f54a7bcace17a36dce0ed17931
    Reviewed-on: https://gerrit.libreoffice.org/81677
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index f06f7467c991..4dce7973c601 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7882,7 +7882,6 @@ include/vcl/status.hxx
 include/vcl/stdtext.hxx
 include/vcl/strhelper.hxx
 include/vcl/svapp.hxx
-include/vcl/svimpbox.hxx
 include/vcl/svlbitm.hxx
 include/vcl/svmain.hxx
 include/vcl/svtabbx.hxx
@@ -17351,6 +17350,7 @@ vcl/inc/sft.hxx
 vcl/inc/spin.hxx
 vcl/inc/strings.hxx
 vcl/inc/svdata.hxx
+vcl/inc/svimpbox.hxx
 vcl/inc/svmconverter.hxx
 vcl/inc/svsys.h
 vcl/inc/test/outputdevice.hxx
diff --git a/vcl/inc/iconviewimpl.hxx b/vcl/inc/iconviewimpl.hxx
index df11f5952426..a2f1aef16c37 100644
--- a/vcl/inc/iconviewimpl.hxx
+++ b/vcl/inc/iconviewimpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX
 #define INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX
 
-#include <vcl/svimpbox.hxx>
+#include "svimpbox.hxx"
 
 class SvTreeListBox;
 class Point;
diff --git a/include/vcl/svimpbox.hxx b/vcl/inc/svimpbox.hxx
similarity index 99%
rename from include/vcl/svimpbox.hxx
rename to vcl/inc/svimpbox.hxx
index 924e9783af9d..a97f8e3c6b9e 100644
--- a/include/vcl/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -85,7 +85,7 @@ namespace o3tl
 #define NODE_BMP_TABDIST_NOTVALID   -2000000
 #define FIRST_ENTRY_TAB             1
 
-class VCL_DLLPUBLIC SvImpLBox
+class SvImpLBox
 {
 friend class ImpLBSelEng;
 friend class SvTreeListBox;
diff --git a/vcl/inc/treeglue.hxx b/vcl/inc/treeglue.hxx
index d67ce09d6d96..69641906aa17 100644
--- a/vcl/inc/treeglue.hxx
+++ b/vcl/inc/treeglue.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <vcl/svimpbox.hxx>
 #include <vcl/svtabbx.hxx>
+#include "svimpbox.hxx"
 
 //the default NotifyStartDrag is weird to me, and defaults to enabling all
 //possibilities when drag starts, while restricting it to some subset of
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 83def998e546..c2701e4525ee 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -33,6 +33,7 @@
 #include <salmenu.hxx>
 #include <strings.hrc>
 #include <svdata.hxx>
+#include <svimpbox.hxx>
 #include <messagedialog.hxx>
 #include <treeglue.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
@@ -56,7 +57,6 @@
 #include <vcl/ptrstyle.hxx>
 #include <vcl/slider.hxx>
 #include <vcl/sysdata.hxx>
-#include <vcl/svimpbox.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/svtabbx.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 5a7308b8a3a3..e2dca323dd26 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -29,9 +29,9 @@
 
 #include <vcl/treelistbox.hxx>
 #include <vcl/svlbitm.hxx>
-#include <vcl/svimpbox.hxx>
 #include <tools/wintypes.hxx>
 #include <bitmaps.hlst>
+#include <svimpbox.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 239325e2ba0c..b7bd338ff831 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -42,7 +42,7 @@
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/viewdataentry.hxx>
-#include <vcl/svimpbox.hxx>
+#include <svimpbox.hxx>
 
 #include <set>
 #include <string.h>