move some headers inside their module

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

editeng/inc/AccessibleStringWrap.hxx

@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
+#pragma once
-#define INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
 
 #include <editeng/editengdllapi.h>
 #include <sal/types.h>
@@ -49,6 +48,4 @@ private:
     OUString            maText;
 };
 
-#endif // INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

editeng/inc/unopracc.hxx

@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_UNOPRACC_HXX
+#pragma once
-#define INCLUDED_EDITENG_UNOPRACC_HXX
 
 #include <editeng/unotext.hxx>
 
@@ -55,6 +54,4 @@ public:
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

editeng/source/accessibility/AccessibleEditableTextPara.cxx

@@ -63,7 +63,7 @@
 
 #include <com/sun/star/beans/PropertyState.hpp>
 
-#include <editeng/unopracc.hxx>
+#include <unopracc.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 #include "AccessibleHyperlink.hxx"
 #include "AccessibleImageBullet.hxx"

editeng/source/accessibility/AccessibleStringWrap.cxx

@@ -23,7 +23,7 @@
 #include <vcl/outdev.hxx>
 
 #include <editeng/svxfont.hxx>
-#include <editeng/AccessibleStringWrap.hxx>
+#include <AccessibleStringWrap.hxx>
 
 
 // AccessibleStringWrap implementation

editeng/source/uno/unoedprx.cxx

@@ -36,7 +36,7 @@
 #include <editeng/unoedprx.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/AccessibleStringWrap.hxx>
+#include <AccessibleStringWrap.hxx>
 #include <editeng/outliner.hxx>
 
 using namespace ::com::sun::star;

editeng/source/uno/unopracc.cxx

@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <editeng/unopracc.hxx>
+#include <unopracc.hxx>
 #include <editeng/unoedsrc.hxx>
 
 using namespace ::com::sun::star;

sfx2/inc/pch/precompiled_sfx.hxx

@@ -445,7 +445,7 @@
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sidebar/TabBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/stbitem.hxx>
 #include <sfx2/styfitem.hxx>

sfx2/inc/sidebar/Tools.hxx

@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SFX2_SIDEBAR_TOOLS_HXX
+#pragma once
-#define INCLUDED_SFX2_SIDEBAR_TOOLS_HXX
 
 #include <vcl/image.hxx>
 #include <vcl/gradient.hxx>
@@ -61,6 +60,4 @@ public:
 
 } } // end of namespace sfx2::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sfx2/source/sidebar/ControllerFactory.cxx

@@ -18,7 +18,7 @@
  */
 
 #include <sidebar/ControllerFactory.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 
 #include <com/sun/star/frame/XToolbarController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>

sfx2/source/sidebar/Paint.cxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sidebar/Paint.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <com/sun/star/awt/Gradient.hpp>
 
 using namespace css;

sfx2/source/sidebar/PanelTitleBar.cxx

@@ -24,7 +24,7 @@
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sidebar/ControllerFactory.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <vcl/event.hxx>
 #include <vcl/image.hxx>
 #include <toolkit/helper/vclunohelper.hxx>

sfx2/source/sidebar/ResourceManager.cxx

@@ -20,7 +20,7 @@
 #include <sidebar/DeckDescriptor.hxx>
 #include <sidebar/PanelDescriptor.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 
 #include <officecfg/Office/UI/Sidebar.hxx>
 #include <unotools/confignode.hxx>

sfx2/source/sidebar/SidebarController.cxx

@@ -26,7 +26,7 @@
 #include <sfx2/sidebar/TabBar.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <sfx2/sidebar/SidebarDockingWindow.hxx>
 #include <sfx2/sidebar/Context.hxx>
 

sfx2/source/sidebar/TabBar.cxx

@@ -22,7 +22,7 @@
 #include <sidebar/DeckDescriptor.hxx>
 #include <sidebar/Paint.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/strings.hrc>

sfx2/source/sidebar/Theme.cxx

@@ -19,7 +19,7 @@
 
 #include <sfx2/sidebar/Theme.hxx>
 #include <sidebar/Paint.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 #include <sfx2/app.hxx>
 
 #include <vcl/svapp.hxx>

sfx2/source/sidebar/Tools.cxx

@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 
 #include <sfx2/sidebar/Theme.hxx>
 

sfx2/source/sidebar/UnoSidebar.cxx

@@ -9,7 +9,7 @@
  */
 
 #include <sfx2/sidebar/UnoSidebar.hxx>
-#include <sfx2/sidebar/Tools.hxx>
+#include <sidebar/Tools.hxx>
 
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sidebar/UnoDecks.hxx>

solenv/clang-format/blacklist

@@ -3849,6 +3849,7 @@ dtrans/test/win32/dnd/targetlistener.cxx
 dtrans/test/win32/dnd/targetlistener.hxx
 dtrans/test/win32/dnd/transferable.cxx
 dtrans/test/win32/dnd/transferable.hxx
+editeng/inc/AccessibleStringWrap.hxx
 editeng/inc/editattr.hxx
 editeng/inc/editdoc.hxx
 editeng/inc/editeng.hxx
@@ -3857,6 +3858,7 @@ editeng/inc/edtspell.hxx
 editeng/inc/eerdll2.hxx
 editeng/inc/helpids.h
 editeng/inc/unomodel.hxx
+editeng/inc/unopracc.hxx
 editeng/qa/items/borderline_test.cxx
 editeng/qa/lookuptree/lookuptree_test.cxx
 editeng/qa/unit/core-test.cxx
@@ -5939,7 +5941,6 @@ include/editeng/AccessibleEditableTextPara.hxx
 include/editeng/AccessibleParaManager.hxx
 include/editeng/AccessibleSelectionBase.hxx
 include/editeng/AccessibleStaticTextBase.hxx
-include/editeng/AccessibleStringWrap.hxx
 include/editeng/CustomPropertyField.hxx
 include/editeng/SpellPortions.hxx
 include/editeng/Trie.hxx
@@ -6048,7 +6049,6 @@ include/editeng/unoipset.hxx
 include/editeng/unolingu.hxx
 include/editeng/unonames.hxx
 include/editeng/unonrule.hxx
-include/editeng/unopracc.hxx
 include/editeng/unoprnms.hxx
 include/editeng/unotext.hxx
 include/editeng/unoviwou.hxx
@@ -6486,7 +6486,6 @@ include/sfx2/sidebar/SidebarPanelBase.hxx
 include/sfx2/sidebar/SidebarToolBox.hxx
 include/sfx2/sidebar/TabBar.hxx
 include/sfx2/sidebar/Theme.hxx
-include/sfx2/sidebar/Tools.hxx
 include/sfx2/sidebar/UnoSidebar.hxx
 include/sfx2/signaturestate.hxx
 include/sfx2/stbitem.hxx
@@ -12074,6 +12073,7 @@ sfx2/inc/sidebar/PanelDescriptor.hxx
 sfx2/inc/sidebar/PanelTitleBar.hxx
 sfx2/inc/sidebar/TabItem.hxx
 sfx2/inc/sidebar/TitleBar.hxx
+sfx2/inc/sidebar/Tools.hxx
 sfx2/inc/sidebar/UnoDeck.hxx
 sfx2/inc/sidebar/UnoDecks.hxx
 sfx2/inc/sidebar/UnoPanel.hxx

xmloff/inc/AutoStyleEntry.hxx

@@ -8,8 +8,7 @@
  *
  */
 
-#ifndef INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
+#pragma once
-#define INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
 
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
@@ -20,13 +19,11 @@
 
 namespace xmloff
 {
-struct XMLOFF_DLLPUBLIC AutoStyleEntry
+struct AutoStyleEntry
 {
     std::vector<std::pair<OUString, css::uno::Any>> m_aXmlProperties;
 };
 
 } // end xmloff
 
-#endif // INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

xmloff/source/style/XMLFontAutoStylePool.cxx

@@ -40,7 +40,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <XMLBase64Export.hxx>
-#include <xmloff/AutoStyleEntry.hxx>
+#include <AutoStyleEntry.hxx>
 #include <comphelper/hash.hxx>
 
 using namespace ::com::sun::star;

xmloff/source/style/impastpl.hxx

@@ -31,7 +31,7 @@
 
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlexppr.hxx>
-#include <xmloff/AutoStyleEntry.hxx>
+#include <AutoStyleEntry.hxx>
 
 class SvXMLAutoStylePoolP;
 class XMLAutoStylePoolParent;