move some toolkit/ headers inside the module

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

19 files changed, 43 insertions, 43 deletions

diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index f5343b552088..c2d0b46db6a6 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/accessiblecontrolcontext.hxx>
+#include <controls/accessiblecontrolcontext.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index d35224d3ac93..c304782e8d1f 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <toolkit/controls/animatedimages.hxx>
+#include <controls/animatedimages.hxx>
 #include <toolkit/helper/property.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index a3f79e893cff..eb39c1ba1b95 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -18,18 +18,18 @@
  */
 
 
-#include <toolkit/controls/controlmodelcontainerbase.hxx>
+#include <controls/controlmodelcontainerbase.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
-#include <toolkit/controls/geometrycontrolmodel.hxx>
+#include <helper/servicenames.hxx>
+#include <controls/geometrycontrolmodel.hxx>
 #include <toolkit/controls/unocontrols.hxx>
-#include <toolkit/controls/formattedcontrol.hxx>
-#include <toolkit/controls/roadmapcontrol.hxx>
-#include <toolkit/controls/tkscrollbar.hxx>
-#include <toolkit/controls/tabpagemodel.hxx>
-#include <toolkit/controls/stdtabcontroller.hxx>
+#include <controls/formattedcontrol.hxx>
+#include <controls/roadmapcontrol.hxx>
+#include <controls/tkscrollbar.hxx>
+#include <controls/tabpagemodel.hxx>
+#include <controls/stdtabcontroller.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -43,14 +43,14 @@
 
 #include "tree/treecontrol.hxx"
 #include "grid/gridcontrol.hxx"
-#include <toolkit/controls/tabpagecontainer.hxx>
+#include <controls/tabpagecontainer.hxx>
 
 #include <map>
 #include <algorithm>
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
-#include <toolkit/controls/dialogcontrol.hxx>
+#include <controls/dialogcontrol.hxx>
 
 #include <helper/unopropertyarrayhelper.hxx>
 #include "controlmodelcontainerbase_internal.hxx"
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index d9b0580aca3e..4ea2a81f4c76 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -20,10 +20,10 @@
 
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <toolkit/controls/dialogcontrol.hxx>
-#include <toolkit/controls/geometrycontrolmodel.hxx>
+#include <controls/dialogcontrol.hxx>
+#include <controls/geometrycontrolmodel.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index 24b832020bbb..73701446384c 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.cxx
@@ -19,7 +19,7 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <toolkit/controls/eventcontainer.hxx>
+#include <controls/eventcontainer.hxx>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 
 
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index c7ff000eac80..52fc287b2dee 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/formattedcontrol.hxx>
+#include <controls/formattedcontrol.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 8bcc53aaccd0..fac21963a372 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/geometrycontrolmodel.hxx>
+#include <controls/geometrycontrolmodel.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <comphelper/sequence.hxx>
-#include <toolkit/controls/eventcontainer.hxx>
+#include <controls/eventcontainer.hxx>
 #include <toolkit/helper/property.hxx>
 #include <algorithm>
 #include <functional>
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 0c09f75ab428..a1e02bd94edb 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include <toolkit/controls/roadmapcontrol.hxx>
-#include <toolkit/controls/roadmapentry.hxx>
+#include <controls/roadmapcontrol.hxx>
+#include <controls/roadmapentry.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index b79a23b2aa15..b7d12820238f 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/roadmapentry.hxx>
+#include <controls/roadmapentry.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index af06ad1820c5..ccd295d1a988 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <toolkit/controls/animatedimages.hxx>
+#include <controls/animatedimages.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/toolkit/throbber.hxx>
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 8ef6d84302f3..5e4d81da4e77 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -22,8 +22,8 @@
 #include <com/sun/star/awt/XVclContainerPeer.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
-#include <toolkit/controls/stdtabcontroller.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <controls/stdtabcontroller.hxx>
+#include <helper/servicenames.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 83f9d9f6bee1..e675710b91f2 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@@ -20,9 +20,9 @@
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <toolkit/controls/stdtabcontrollermodel.hxx>
+#include <controls/stdtabcontrollermodel.hxx>
 #include <toolkit/helper/macros.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
 
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 87d6203ca7bb..b733ef56064e 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include <toolkit/controls/geometrycontrolmodel.hxx>
-#include <toolkit/controls/tabpagecontainer.hxx>
-#include <toolkit/controls/tabpagemodel.hxx>
+#include <controls/geometrycontrolmodel.hxx>
+#include <controls/tabpagecontainer.hxx>
+#include <controls/tabpagemodel.hxx>
 #include <toolkit/helper/property.hxx>
 
 #include <com/sun/star/awt/XControlModel.hpp>
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 8b9ebbc1036b..8a0856f2d08a 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/tabpagemodel.hxx>
+#include <controls/tabpagemodel.hxx>
 
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/property.hxx>
@@ -29,8 +29,8 @@
 #include <tools/debug.hxx>
 #include <vcl/outdev.hxx>
 
-#include <toolkit/controls/controlmodelcontainerbase.hxx>
-#include <toolkit/controls/unocontrolcontainer.hxx>
+#include <controls/controlmodelcontainerbase.hxx>
+#include <controls/unocontrolcontainer.hxx>
 
 #include <helper/unopropertyarrayhelper.hxx>
 
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 5ca66a34ab9b..c45810420e68 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <toolkit/controls/tkscrollbar.hxx>
+#include <controls/tkscrollbar.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index c58faaed4b96..b501abf7eb29 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -37,7 +37,7 @@
 #include <vcl/svapp.hxx>
 #include <toolkit/helper/property.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
-#include <toolkit/controls/accessiblecontrolcontext.hxx>
+#include <controls/accessiblecontrolcontext.hxx>
 
 #include <algorithm>
 #include <map>
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 46cfe583f673..956b5d542393 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -25,7 +25,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <toolkit/controls/unocontrolcontainer.hxx>
+#include <controls/unocontrolcontainer.hxx>
 #include <comphelper/sequence.hxx>
 
 #include <tools/debug.hxx>
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 64b99a1ff8a6..8487f55c18c2 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <toolkit/controls/unocontrolcontainermodel.hxx>
+#include <controls/unocontrolcontainermodel.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 
 #include <helper/unopropertyarrayhelper.hxx>
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index b80d89f2d01b..268a619e4aed 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -29,10 +29,10 @@
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 
 #include <o3tl/safeint.hxx>
-#include <toolkit/controls/formattedcontrol.hxx>
+#include <controls/formattedcontrol.hxx>
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/helper/property.hxx>
-#include <toolkit/helper/servicenames.hxx>
+#include <helper/servicenames.hxx>
 #include <toolkit/helper/macros.hxx>
 
 // for introspection