[Libreoffice-commits] core.git: editeng/inc editeng/source include/editeng include/sfx2 include/xmloff sfx2/inc sfx2/source solenv/clang-format xmloff/inc xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Tue Mar 3 11:27:57 UTC 2020
editeng/inc/AccessibleStringWrap.hxx | 5 +----
editeng/inc/unopracc.hxx | 5 +----
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 +-
editeng/source/accessibility/AccessibleStringWrap.cxx | 2 +-
editeng/source/uno/unoedprx.cxx | 2 +-
editeng/source/uno/unopracc.cxx | 2 +-
sfx2/inc/pch/precompiled_sfx.hxx | 2 +-
sfx2/inc/sidebar/Tools.hxx | 5 +----
sfx2/source/sidebar/ControllerFactory.cxx | 2 +-
sfx2/source/sidebar/Paint.cxx | 2 +-
sfx2/source/sidebar/PanelTitleBar.cxx | 2 +-
sfx2/source/sidebar/ResourceManager.cxx | 2 +-
sfx2/source/sidebar/SidebarController.cxx | 2 +-
sfx2/source/sidebar/TabBar.cxx | 2 +-
sfx2/source/sidebar/Theme.cxx | 2 +-
sfx2/source/sidebar/Tools.cxx | 2 +-
sfx2/source/sidebar/UnoSidebar.cxx | 2 +-
solenv/clang-format/blacklist | 6 +++---
xmloff/inc/AutoStyleEntry.hxx | 7 ++-----
xmloff/source/style/XMLFontAutoStylePool.cxx | 2 +-
xmloff/source/style/impastpl.hxx | 2 +-
21 files changed, 24 insertions(+), 36 deletions(-)
New commits:
commit b55bf0cbdfdc68200ebf191b828a912373f1b7dc
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Mar 3 10:17:42 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Mar 3 12:27:18 2020 +0100
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 at collabora.co.uk>
diff --git a/include/editeng/AccessibleStringWrap.hxx b/editeng/inc/AccessibleStringWrap.hxx
similarity index 90%
rename from include/editeng/AccessibleStringWrap.hxx
rename to editeng/inc/AccessibleStringWrap.hxx
index 9cad86b2988a..022c63086b24 100644
--- a/include/editeng/AccessibleStringWrap.hxx
+++ b/editeng/inc/AccessibleStringWrap.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
-#define INCLUDED_EDITENG_ACCESSIBLESTRINGWRAP_HXX
+#pragma once
#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: */
diff --git a/include/editeng/unopracc.hxx b/editeng/inc/unopracc.hxx
similarity index 96%
rename from include/editeng/unopracc.hxx
rename to editeng/inc/unopracc.hxx
index 5f94956e081a..7617bed0a86e 100644
--- a/include/editeng/unopracc.hxx
+++ b/editeng/inc/unopracc.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_UNOPRACC_HXX
-#define INCLUDED_EDITENG_UNOPRACC_HXX
+#pragma once
#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: */
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 352557c85e8a..55f7940e5b10 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/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"
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 63a2fca3ef34..ccc4546e04df 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/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
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 2eabe3e6e0c5..46561a761345 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/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;
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 6b2e5b42c376..2262bdd9fcab 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/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;
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index 87d51ac85d54..ac2f242cc5ef 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/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>
diff --git a/include/sfx2/sidebar/Tools.hxx b/sfx2/inc/sidebar/Tools.hxx
similarity index 96%
rename from include/sfx2/sidebar/Tools.hxx
rename to sfx2/inc/sidebar/Tools.hxx
index 3132553f5991..74941f539510 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/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
-#define INCLUDED_SFX2_SIDEBAR_TOOLS_HXX
+#pragma once
#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: */
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 54fc5b774674..ef07c0827f7b 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index a3f4012eab66..1ab8b5d6dfb0 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/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;
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 78bd8bbe4123..21c423fcc34e 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 50da0dc46d54..45976530a9d3 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 2e56b5d2b2b8..55b953b207df 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index c5be30ca1122..515b2da36dba 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 62c440807f63..7a4d6a785e5c 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 27064e58af85..c49177e97a11 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/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>
diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx
index dcd8d6ee8f3e..c209c6766d03 100644
--- a/sfx2/source/sidebar/UnoSidebar.cxx
+++ b/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>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index b61456d84af8..da0e39543459 100644
--- a/solenv/clang-format/blacklist
+++ b/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
diff --git a/include/xmloff/AutoStyleEntry.hxx b/xmloff/inc/AutoStyleEntry.hxx
similarity index 79%
rename from include/xmloff/AutoStyleEntry.hxx
rename to xmloff/inc/AutoStyleEntry.hxx
index e56cf5924da3..15f99f1b113f 100644
--- a/include/xmloff/AutoStyleEntry.hxx
+++ b/xmloff/inc/AutoStyleEntry.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
-#define INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
+#pragma once
#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: */
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index d25bd5130545..d6abd7cff68d 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/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;
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index e33f41a835ab..f936b82f7dda 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/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;
More information about the Libreoffice-commits
mailing list