move headers inside modules

Change-Id: I002f42d83820c86737ddceab805aa53ccb388e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98203
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

13 files changed, 13 insertions, 17 deletions

diff --git a/bin/find-headers-to-move-inside-modules.py b/bin/find-headers-to-move-inside-modules.py
index 313e30762de2..f33922ee457d 100755
--- a/bin/find-headers-to-move-inside-modules.py
+++ b/bin/find-headers-to-move-inside-modules.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python2
 
 # Look for headers inside include/ that can be moved into their respective modules.
+# Not 100% accurate
 
 import subprocess
 import sys
@@ -31,7 +32,8 @@ a = subprocess.Popen("git grep '^#include <'", stdout=subprocess.PIPE, shell=Tru
 with a.stdout as txt:
     for line in txt:
         idx1 = line.find("#include <")
-        include = line[idx1 + 10 : len(line)-2]
+        idx2 = line.find(">", idx1 + 10)
+        include = line[idx1 + 10 : idx2]
         headerSetUnused.discard(include)
         #
         idx1 = line.find("/")
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 72366ca871b4..eda629a26010 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6953,7 +6953,6 @@ include/svx/tabarea.hxx
 include/svx/tabline.hxx
 include/svx/tbcontrl.hxx
 include/svx/tbxcolor.hxx
-include/svx/tbxcolorupdate.hxx
 include/svx/tbxctl.hxx
 include/svx/transfrmhelper.hxx
 include/svx/txencbox.hxx
@@ -13253,6 +13252,7 @@ svx/inc/sxsalitm.hxx
 svx/inc/sxsiitm.hxx
 svx/inc/sxsoitm.hxx
 svx/inc/sxtraitm.hxx
+svx/inc/tbxcolorupdate.hxx
 svx/inc/textchain.hxx
 svx/inc/textchaincursor.hxx
 svx/inc/textchainflow.hxx
diff --git a/include/svx/labelitemwindow.hxx b/svx/inc/labelitemwindow.hxx
index 5271482b11ad..5271482b11ad 100644
--- a/include/svx/labelitemwindow.hxx
+++ b/svx/inc/labelitemwindow.hxx
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 7a73d1b51b3c..31db07043fc0 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -397,7 +397,6 @@
 #include <svx/galmisc.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/itextprovider.hxx>
-#include <svx/labelitemwindow.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/pageitem.hxx>
 #include <svx/rotmodit.hxx>
diff --git a/include/svx/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx
index 1c2ff45e185a..d413b31d9c44 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/svx/inc/tbxcolorupdate.hxx
@@ -17,10 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_TBXCOLORUPDATE_HXX
-#define INCLUDED_SVX_TBXCOLORUPDATE_HXX
-
-#include <svx/svxdllapi.h>
+#pragma once
 
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
@@ -137,6 +134,4 @@ namespace svx
     };
 }
 
-#endif // INCLUDED_SVX_TBXCOLORUPDATE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6653be858078..a4a16795d4d8 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -71,7 +71,7 @@
 
 #include <findtextfield.hxx>
 
-#include <svx/labelitemwindow.hxx>
+#include <labelitemwindow.hxx>
 #include <svx/xdef.hxx>
 #include <officecfg/Office/Common.hxx>
 
diff --git a/svx/source/form/labelitemwindow.cxx b/svx/source/form/labelitemwindow.cxx
index 45c5160f4c4f..fb6f6220d646 100644
--- a/svx/source/form/labelitemwindow.cxx
+++ b/svx/source/form/labelitemwindow.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <svx/labelitemwindow.hxx>
+#include <labelitemwindow.hxx>
 
 LabelItemWindow::LabelItemWindow(vcl::Window* pParent, const OUString& rLabel)
     : InterimItemWindow(pParent, "svx/ui/labelbox.ui", "LabelBox")
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index e6138af09060..9103f200a7e6 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -25,7 +25,7 @@
 #include <vcl/settings.hxx>
 
 #include <svx/dialmgr.hxx>
-#include <svx/labelitemwindow.hxx>
+#include <labelitemwindow.hxx>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
 #include <tbxform.hxx>
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 1431793c3a70..642a5ea18bcd 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -27,7 +27,7 @@
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include <svx/tbxcolorupdate.hxx>
+#include <tbxcolorupdate.hxx>
 #include <svtools/colrdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 6d91f0226677..2eccbeef8ad6 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -40,7 +40,7 @@
 #include <svx/linectrl.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/tbxcolorupdate.hxx>
+#include <tbxcolorupdate.hxx>
 
 #include <memory>
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2d398c992dff..a0513494409f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -82,7 +82,7 @@
 #include <svx/PaletteManager.hxx>
 #include <memory>
 
-#include <svx/tbxcolorupdate.hxx>
+#include <tbxcolorupdate.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
 #include <svx/xdef.hxx>
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 2e85738fce85..4305e95d1c9f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -56,7 +56,7 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
-#include <svx/labelitemwindow.hxx>
+#include <labelitemwindow.hxx>
 #include <svx/srchdlg.hxx>
 #include <vcl/event.hxx>
 
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index f21ad6b9c0d0..12c25038602f 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -19,7 +19,7 @@
 
 #include <sfx2/objsh.hxx>
 #include <svx/drawitem.hxx>
-#include <svx/tbxcolorupdate.hxx>
+#include <tbxcolorupdate.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xdef.hxx>
 #include <svx/xlineit0.hxx>