gnumake2: move svtools toolpanel header

24 files changed, 42 insertions, 33 deletions

diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index cc767b803ede..38cd74c74a6f 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -178,3 +178,12 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wiz
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wmf.hxx,svtools/wmf.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/xtextedt.hxx,svtools/xtextedt.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/decklayouter.hxx,svtools/decklayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/refbase.hxx,svtools/refbase.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tablayouter.hxx,svtools/tablayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/drawerlayouter.hxx,svtools/drawerlayouter.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabalignment.hxx,svtools/tabalignment.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpaneldeck.hxx,svtools/toolpaneldeck.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/paneltabbar.hxx,svtools/paneltabbar.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabitemcontent.hxx,svtools/tabitemcontent.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel.hxx,svtools/toolpanel.hxx))
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/decklayouter.hxx
index da03d7c6c3aa..da03d7c6c3aa 100755
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ b/svtools/inc/svtools/decklayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx b/svtools/inc/svtools/drawerlayouter.hxx
index 0ecf493d0e98..5174fa613697 100644
--- a/svtools/inc/svtools/toolpanel/drawerlayouter.hxx
+++ b/svtools/inc/svtools/drawerlayouter.hxx
@@ -28,9 +28,9 @@
 #define SVT_DRAWERLAYOUTER_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/refbase.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/decklayouter.hxx"
+#include "svtools/refbase.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/decklayouter.hxx"
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/svtools/inc/svtools/toolpanel/paneltabbar.hxx b/svtools/inc/svtools/paneltabbar.hxx
index 668935d8a739..e499ce70ff6c 100644
--- a/svtools/inc/svtools/toolpanel/paneltabbar.hxx
+++ b/svtools/inc/svtools/paneltabbar.hxx
@@ -28,8 +28,8 @@
 #define SVT_PANELTABBAR_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/tabalignment.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
+#include "svtools/tabalignment.hxx"
+#include "svtools/tabitemcontent.hxx"
 
 #include <vcl/ctrl.hxx>
 
diff --git a/svtools/inc/svtools/toolpanel/refbase.hxx b/svtools/inc/svtools/refbase.hxx
index 991d6e619090..991d6e619090 100644
--- a/svtools/inc/svtools/toolpanel/refbase.hxx
+++ b/svtools/inc/svtools/refbase.hxx
diff --git a/svtools/inc/svtools/toolpanel/tabalignment.hxx b/svtools/inc/svtools/tabalignment.hxx
index cc3f17469ffe..cc3f17469ffe 100644
--- a/svtools/inc/svtools/toolpanel/tabalignment.hxx
+++ b/svtools/inc/svtools/tabalignment.hxx
diff --git a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx b/svtools/inc/svtools/tabitemcontent.hxx
index a1cf9deae9f4..a1cf9deae9f4 100644
--- a/svtools/inc/svtools/toolpanel/tabitemcontent.hxx
+++ b/svtools/inc/svtools/tabitemcontent.hxx
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/tablayouter.hxx
index 92b36acf9114..2cd20bc7fcda 100755
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ b/svtools/inc/svtools/tablayouter.hxx
@@ -28,10 +28,10 @@
 #define SVT_TABLAYOUTER_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/decklayouter.hxx"
-#include "svtools/toolpanel/tabalignment.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/decklayouter.hxx"
+#include "svtools/tabalignment.hxx"
+#include "svtools/tabitemcontent.hxx"
+#include "svtools/refbase.hxx"
 
 #include <memory>
 
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel.hxx
index d38d8e7d257d..084182231480 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel.hxx
@@ -28,7 +28,7 @@
 #define SVT_TOOLPANEL_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/refbase.hxx"
 
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpaneldeck.hxx
index a1009591ffba..75d210c5ad2a 100755
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ b/svtools/inc/svtools/toolpaneldeck.hxx
@@ -28,8 +28,8 @@
 #define SVT_TOOLPANELDECK_HXX
 
 #include "svtools/svtdllapi.h"
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/decklayouter.hxx"
+#include "svtools/toolpanel.hxx"
+#include "svtools/decklayouter.hxx"
 
 #include <vcl/ctrl.hxx>
 
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 7fc7d05ea0c9..63b35f5835b7 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include "svtools/drawerlayouter.hxx"
 #include "toolpaneldrawer.hxx"
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index d2ca4480fce5..0a3cb407a0b9 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -27,8 +27,8 @@
 #ifndef DUMMYPANEL_HXX
 #define DUMMYPANEL_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/toolpanel.hxx"
+#include "svtools/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index 32ba9b5c6a24..dc5407a79bb3 100755
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneldecklisteners.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index bc7e2ae7db88..8fb9414215f5 100755
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
@@ -27,7 +27,7 @@
 #ifndef PANELDECKLISTENERS_HXX
 #define PANELDECKLISTENERS_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 #include <boost/optional.hpp>
 #include <vector>
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 23067d3ee5d0..d0b52b577144 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -26,8 +26,8 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/paneltabbar.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/paneltabbar.hxx"
+#include "svtools/toolpaneldeck.hxx"
 #include "svtools/svtdata.hxx"
 #include "svtools/svtools.hrc"
 
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index d8329109ffb4..302c830a2253 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "paneltabbarpeer.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/paneltabbar.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index f41aa2d9bb9c..309a87c2f436 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/refbase.hxx"
+#include "svtools/refbase.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/tabbargeometry.hxx b/svtools/source/toolpanel/tabbargeometry.hxx
index 059d69a3e233..97e460ff1397 100644
--- a/svtools/source/toolpanel/tabbargeometry.hxx
+++ b/svtools/source/toolpanel/tabbargeometry.hxx
@@ -27,7 +27,7 @@
 #ifndef TABBARGEOMETRY_HXX
 #define TABBARGEOMETRY_HXX
 
-#include "svtools/toolpanel/tabalignment.hxx"
+#include "svtools/tabalignment.hxx"
 
 #include "tabitemdescriptor.hxx"
 
diff --git a/svtools/source/toolpanel/tabitemdescriptor.hxx b/svtools/source/toolpanel/tabitemdescriptor.hxx
index 8005816b0fe2..992f524cba94 100644
--- a/svtools/source/toolpanel/tabitemdescriptor.hxx
+++ b/svtools/source/toolpanel/tabitemdescriptor.hxx
@@ -27,8 +27,8 @@
 #ifndef TABITEMDESCRIPTOR_HXX
 #define TABITEMDESCRIPTOR_HXX
 
-#include "svtools/toolpanel/toolpanel.hxx"
-#include "svtools/toolpanel/tabitemcontent.hxx"
+#include "svtools/toolpanel.hxx"
+#include "svtools/tabitemcontent.hxx"
 
 #include <tools/gen.hxx>
 #include <osl/diagnose.h>
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index f68bbc1bbd0f..377ef0477752 100755
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -26,9 +26,9 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/paneltabbar.hxx"
+#include "svtools/tablayouter.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/paneltabbar.hxx"
 #include "svtaccessiblefactory.hxx"
 
 #include <tools/gen.hxx>
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index f7b999494563..128c3e2602e6 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_svtools.hxx"
 
-#include "svtools/toolpanel/toolpanel.hxx"
+#include "svtools/toolpanel.hxx"
 
 //........................................................................
 namespace svt
diff --git a/svtools/source/toolpanel/toolpanelcollection.hxx b/svtools/source/toolpanel/toolpanelcollection.hxx
index 2bdba38546c9..6f90469b543a 100644
--- a/svtools/source/toolpanel/toolpanelcollection.hxx
+++ b/svtools/source/toolpanel/toolpanelcollection.hxx
@@ -27,7 +27,7 @@
 #ifndef TOOLPANELCOLLECTION_HXX
 #define TOOLPANELCOLLECTION_HXX
 
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 #include <memory>
 
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index e157090bbf0e..67003c441216 100755
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -30,9 +30,9 @@
 #include "toolpanelcollection.hxx"
 #include "paneldecklisteners.hxx"
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
-#include "svtools/toolpanel/tablayouter.hxx"
-#include "svtools/toolpanel/drawerlayouter.hxx"
+#include "svtools/toolpaneldeck.hxx"
+#include "svtools/tablayouter.hxx"
+#include "svtools/drawerlayouter.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index 0a84a90b4fb3..26e9bbc43b47 100755
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -27,7 +27,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "toolpaneldeckpeer.hxx"
-#include "svtools/toolpanel/toolpaneldeck.hxx"
+#include "svtools/toolpaneldeck.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/DisposedException.hpp>