bin/find-headers-to-move-inside-modules.py | 44 ++++++++--------
include/IwyuFilter_include.yaml | 4 -
sfx2/inc/charmappopup.hxx | 5 -
sfx2/inc/emojipopup.hxx | 5 -
sfx2/source/control/charmapcontrol.cxx | 2
sfx2/source/control/emojicontrol.cxx | 2
sfx2/source/control/emojipopup.cxx | 2
sfx2/source/dialog/charmappopup.cxx | 2
solenv/clang-format/excludelist | 2
svtools/IwyuFilter_svtools.yaml | 4 +
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/uno/framestatuslistener.cxx | 2
svx/inc/ParaLineSpacingPopup.hxx | 5 -
svx/inc/TextCharacterSpacingPopup.hxx | 5 -
svx/inc/TextUnderlinePopup.hxx | 5 -
svx/inc/dstribut_enum.hxx | 5 -
svx/inc/layctrl.hxx | 5 -
svx/inc/lboxctrl.hxx | 5 -
svx/inc/verttexttbxctrl.hxx | 5 -
svx/source/gallery2/gallerybinaryengine.cxx | 2
svx/source/gallery2/galleryobjectbinarystorage.cxx | 2
svx/source/gallery2/galleryobjectxmlstorage.cxx | 2
svx/source/gallery2/galtheme.cxx | 2
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 2
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 2
svx/source/sidebar/text/TextUnderlineControl.cxx | 2
svx/source/sidebar/text/TextUnderlinePopup.cxx | 2
svx/source/svdraw/svdedtv2.cxx | 2
svx/source/tbxctrls/layctrl.cxx | 2
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/tbxctrls/verttexttbxctrl.cxx | 2
vcl/source/gdi/impgraph.cxx | 2
34 files changed, 57 insertions(+), 84 deletions(-)
New commits:
commit 3c41913181f8663f9f1970b13ee038386016d22e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 20 12:45:01 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 20 14:59:02 2021 +0200
move some headers inside modules
Change-Id: I2baa9e9334850cf72e8ea1e96a2177a1c052e589
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115868
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/bin/find-headers-to-move-inside-modules.py
b/bin/find-headers-to-move-inside-modules.py
index af2ca619a461..9ec0f623128d 100755
--- a/bin/find-headers-to-move-inside-modules.py
+++ b/bin/find-headers-to-move-inside-modules.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# Look for headers inside include/ that can be moved into their respective
modules.
# Not 100% accurate
@@ -11,18 +11,18 @@ a = subprocess.Popen("git ls-files include/",
stdout=subprocess.PIPE, shell=True
with a.stdout as txt:
for line in txt:
header = line[8:].strip();
- if "README" in header: continue
- if header == "version.hrc": continue
+ if b"README" in header: continue
+ if header == b"version.hrc": continue
# ignore URE headers
- if header.startswith("IwyuFilter_include.yaml"): continue
- if header.startswith("cppu/"): continue
- if header.startswith("cppuhelper/"): continue
- if header.startswith("osl/"): continue
- if header.startswith("sal/"): continue
- if header.startswith("salhelper/"): continue
- if header.startswith("uno/"): continue
+ if header.startswith(b"IwyuFilter_include.yaml"): continue
+ if header.startswith(b"cppu/"): continue
+ if header.startswith(b"cppuhelper/"): continue
+ if header.startswith(b"osl/"): continue
+ if header.startswith(b"sal/"): continue
+ if header.startswith(b"salhelper/"): continue
+ if header.startswith(b"uno/"): continue
# these are direct copies of mozilla code
- if header.startswith("onlineupdate/mozilla/"): continue
+ if header.startswith(b"onlineupdate/mozilla/"): continue
headerSet.add(header)
headerSetUnused = headerSet.copy()
@@ -30,24 +30,24 @@ headerSetOnlyInOwnModule = headerSet.copy()
a = subprocess.Popen("git grep '^#include <'", stdout=subprocess.PIPE,
shell=True)
with a.stdout as txt:
for line in txt:
- idx1 = line.find("#include <")
- idx2 = line.find(">", idx1 + 10)
+ idx1 = line.find(b"#include <")
+ idx2 = line.find(b">", idx1 + 10)
include = line[idx1 + 10 : idx2]
headerSetUnused.discard(include)
#
- idx1 = line.find("/")
+ idx1 = line.find(b"/")
includedFromModule = line[0 : idx1]
- idx1 = include.find("/")
+ idx1 = include.find(b"/")
module = include[0 : idx1]
if module != includedFromModule:
headerSetOnlyInOwnModule.discard(include)
-print "completely unused"
-print "----------------------------"
+print("completely unused")
+print("----------------------------")
for x in sorted(headerSetUnused):
- print x
-print ""
-print "only used in own module"
-print "----------------------------"
+ print(x)
+print("")
+print("only used in own module")
+print("----------------------------")
for x in sorted(headerSetOnlyInOwnModule):
- print x
+ print(x)
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 76a8bb8c19f8..b7696960d04f 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -449,10 +449,6 @@ excludelist:
include/svtools/dialogclosedlistener.hxx:
# base class has to be a complete type
- com/sun/star/ui/dialogs/XDialogClosedListener.hpp
- include/svtools/framestatuslistener.hxx:
- # base class has to be a complete type
- - com/sun/star/frame/XFrameActionListener.hpp
- - com/sun/star/frame/XStatusListener.hpp
include/svtools/genericunodialog.hxx:
# base class has to be a complete type
- com/sun/star/lang/XInitialization.hpp
diff --git a/include/sfx2/charmappopup.hxx b/sfx2/inc/charmappopup.hxx
similarity index 94%
rename from include/sfx2/charmappopup.hxx
rename to sfx2/inc/charmappopup.hxx
index 28540d58e941..eb847dc57395 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/sfx2/inc/charmappopup.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
-#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -39,6 +38,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/emojipopup.hxx b/sfx2/inc/emojipopup.hxx
similarity index 94%
rename from include/sfx2/emojipopup.hxx
rename to sfx2/inc/emojipopup.hxx
index 0005c467fe1a..9961c8a84ce1 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/sfx2/inc/emojipopup.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
-#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -39,6 +38,4 @@ public:
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>&
rArguments) override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/charmapcontrol.cxx
b/sfx2/source/control/charmapcontrol.cxx
index b88defff73b9..b86cc52111ee 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -20,7 +20,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <officecfg/Office/Common.hxx>
#include <charmapcontrol.hxx>
-#include <sfx2/charmappopup.hxx>
+#include <charmappopup.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/sfxresid.hxx>
diff --git a/sfx2/source/control/emojicontrol.cxx
b/sfx2/source/control/emojicontrol.cxx
index 0d51ce805e68..8ace6e79c5a9 100644
--- a/sfx2/source/control/emojicontrol.cxx
+++ b/sfx2/source/control/emojicontrol.cxx
@@ -18,7 +18,7 @@
*/
#include <emojicontrol.hxx>
-#include <sfx2/emojipopup.hxx>
+#include <emojipopup.hxx>
#include <emojiview.hxx>
#include <sfx2/thumbnailviewitem.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sfx2/source/control/emojipopup.cxx
b/sfx2/source/control/emojipopup.cxx
index a69fd80ed2cc..237c21418137 100644
--- a/sfx2/source/control/emojipopup.cxx
+++ b/sfx2/source/control/emojipopup.cxx
@@ -16,7 +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 .
*/
-#include <sfx2/emojipopup.hxx>
+#include <emojipopup.hxx>
#include <emojicontrol.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sfx2/source/dialog/charmappopup.cxx
b/sfx2/source/dialog/charmappopup.cxx
index 40b4ae43a9d9..93cfa1adb281 100644
--- a/sfx2/source/dialog/charmappopup.cxx
+++ b/sfx2/source/dialog/charmappopup.cxx
@@ -16,7 +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 .
*/
-#include <sfx2/charmappopup.hxx>
+#include <charmappopup.hxx>
#include <charmapcontrol.hxx>
#include <vcl/toolbox.hxx>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 52ba27658b7f..b51a9d8edb0c 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5789,7 +5789,6 @@ include/svtools/embedtransfer.hxx
include/svtools/extcolorcfg.hxx
include/svtools/filechangedchecker.hxx
include/svtools/fontsubstconfig.hxx
-include/svtools/framestatuslistener.hxx
include/svtools/genericunodialog.hxx
include/svtools/helpids.h
include/svtools/helpopt.hxx
@@ -11254,6 +11253,7 @@ svl/source/undo/undo.cxx
svl/source/uno/pathservice.cxx
svl/unx/source/svdde/ddedummy.cxx
svtools/inc/strings.hxx
+svtools/inc/framestatuslistener.hxx
svtools/inc/table/defaultinputhandler.hxx
svtools/inc/table/gridtablerenderer.hxx
svtools/inc/table/tablecontrol.hxx
diff --git a/svtools/IwyuFilter_svtools.yaml b/svtools/IwyuFilter_svtools.yaml
index 19ad784bc3ef..be8ac06407fa 100644
--- a/svtools/IwyuFilter_svtools.yaml
+++ b/svtools/IwyuFilter_svtools.yaml
@@ -1,6 +1,10 @@
---
assumeFilename: svtools/source/control/ruler.cxx
excludelist:
+ svtools/inc/framestatuslistener.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XFrameActionListener.hpp
+ - com/sun/star/frame/XStatusListener.hpp
svtools/source/control/accessibleruler.hxx:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessible.hpp
diff --git a/include/svtools/framestatuslistener.hxx
b/svtools/inc/framestatuslistener.hxx
similarity index 100%
rename from include/svtools/framestatuslistener.hxx
rename to svtools/inc/framestatuslistener.hxx
diff --git a/svtools/source/control/toolbarmenu.cxx
b/svtools/source/control/toolbarmenu.cxx
index 949cd747b2a1..e3234184e533 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -24,7 +24,7 @@
#include <vcl/taskpanelist.hxx>
#include <vcl/svapp.hxx>
-#include <svtools/framestatuslistener.hxx>
+#include <framestatuslistener.hxx>
#include <svtools/toolbarmenu.hxx>
using namespace ::com::sun::star::uno;
diff --git a/svtools/source/uno/framestatuslistener.cxx
b/svtools/source/uno/framestatuslistener.cxx
index 33c475e25dae..0ad4271a1987 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svtools/framestatuslistener.hxx>
+#include <framestatuslistener.hxx>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
diff --git a/include/svx/ParaLineSpacingPopup.hxx
b/svx/inc/ParaLineSpacingPopup.hxx
similarity index 92%
rename from include/svx/ParaLineSpacingPopup.hxx
rename to svx/inc/ParaLineSpacingPopup.hxx
index dfbfac9ef2fb..0b042f44b171 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/svx/inc/ParaLineSpacingPopup.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_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
-#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -44,6 +43,4 @@ public:
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/TextCharacterSpacingPopup.hxx
b/svx/inc/TextCharacterSpacingPopup.hxx
similarity index 94%
rename from include/svx/TextCharacterSpacingPopup.hxx
rename to svx/inc/TextCharacterSpacingPopup.hxx
index dbc9ad2fee87..bb1092c820ac 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/svx/inc/TextCharacterSpacingPopup.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_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
-#define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -42,6 +41,4 @@ public:
} // end of namespace svx
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/TextUnderlinePopup.hxx b/svx/inc/TextUnderlinePopup.hxx
similarity index 93%
rename from include/svx/TextUnderlinePopup.hxx
rename to svx/inc/TextUnderlinePopup.hxx
index 301052aac823..973f50c53170 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/svx/inc/TextUnderlinePopup.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_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
-#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -42,6 +41,4 @@ public:
} // end of namespace svx
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dstribut_enum.hxx b/svx/inc/dstribut_enum.hxx
similarity index 90%
rename from include/svx/dstribut_enum.hxx
rename to svx/inc/dstribut_enum.hxx
index a69e6f10ecb6..98d962850702 100644
--- a/include/svx/dstribut_enum.hxx
+++ b/svx/inc/dstribut_enum.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_SVX_DSTRIBUT_ENUM_HXX
-#define INCLUDED_SVX_DSTRIBUT_ENUM_HXX
+#pragma once
enum class SvxDistributeHorizontal
{
@@ -37,6 +36,4 @@ enum class SvxDistributeVertical
Bottom
};
-#endif // INCLUDED_SVX_DSTRIBUT_ENUM_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galleryobjectbinarystorage.hxx
b/svx/inc/galleryobjectbinarystorage.hxx
similarity index 100%
rename from include/svx/galleryobjectbinarystorage.hxx
rename to svx/inc/galleryobjectbinarystorage.hxx
diff --git a/include/svx/galleryobjectxmlstorage.hxx
b/svx/inc/galleryobjectxmlstorage.hxx
similarity index 100%
rename from include/svx/galleryobjectxmlstorage.hxx
rename to svx/inc/galleryobjectxmlstorage.hxx
diff --git a/include/svx/layctrl.hxx b/svx/inc/layctrl.hxx
similarity index 97%
rename from include/svx/layctrl.hxx
rename to svx/inc/layctrl.hxx
index 10e870b19b7c..34ccc6e5469b 100644
--- a/include/svx/layctrl.hxx
+++ b/svx/inc/layctrl.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_SVX_LAYCTRL_HXX
-#define INCLUDED_SVX_LAYCTRL_HXX
+#pragma once
#include <svtools/popupwindowcontroller.hxx>
@@ -60,6 +59,4 @@ public:
void InsertColumns(const css::uno::Sequence<css::beans::PropertyValue>&
rArgs);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/lboxctrl.hxx b/svx/inc/lboxctrl.hxx
similarity index 96%
rename from include/svx/lboxctrl.hxx
rename to svx/inc/lboxctrl.hxx
index 031115dc65b5..e09477d722ed 100644
--- a/include/svx/lboxctrl.hxx
+++ b/svx/inc/lboxctrl.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_LBOXCTRL_HXX
-#define INCLUDED_SVX_LBOXCTRL_HXX
+#pragma once
#include <rtl/ustring.hxx>
#include <vector>
@@ -55,6 +54,4 @@ public:
void SetInfo(sal_Int32 nCount);
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/verttexttbxctrl.hxx b/svx/inc/verttexttbxctrl.hxx
similarity index 96%
rename from include/svx/verttexttbxctrl.hxx
rename to svx/inc/verttexttbxctrl.hxx
index 262b7f9267f1..05b675f1e32d 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/svx/inc/verttexttbxctrl.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_SVX_VERTTEXTTBXCTRL_HXX
-#define INCLUDED_SVX_VERTTEXTTBXCTRL_HXX
+#pragma once
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -72,6 +71,4 @@ public:
virtual OUString SAL_CALL getImplementationName() override;
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallerybinaryengine.cxx
b/svx/source/gallery2/gallerybinaryengine.cxx
index c093d899d756..661b3dd03bed 100644
--- a/svx/source/gallery2/gallerybinaryengine.cxx
+++ b/svx/source/gallery2/gallerybinaryengine.cxx
@@ -23,7 +23,7 @@
#include <svx/gallerybinaryengine.hxx>
#include <svx/galleryobjectcollection.hxx>
#include <svx/gallery1.hxx>
-#include <svx/galleryobjectbinarystorage.hxx>
+#include <galleryobjectbinarystorage.hxx>
#include <osl/thread.hxx>
#include "codec.hxx"
#include "gallerydrawmodel.hxx"
diff --git a/svx/source/gallery2/galleryobjectbinarystorage.cxx
b/svx/source/gallery2/galleryobjectbinarystorage.cxx
index c18ed6441df1..14bdc8b0848c 100644
--- a/svx/source/gallery2/galleryobjectbinarystorage.cxx
+++ b/svx/source/gallery2/galleryobjectbinarystorage.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/galleryobjectbinarystorage.hxx>
+#include <galleryobjectbinarystorage.hxx>
#include <tools/urlobj.hxx>
void GalleryObjectBinaryStorage::setURL(INetURLObject aURL) { m_aURL = aURL; }
diff --git a/svx/source/gallery2/galleryobjectxmlstorage.cxx
b/svx/source/gallery2/galleryobjectxmlstorage.cxx
index cadd94c03439..f07b7b869075 100644
--- a/svx/source/gallery2/galleryobjectxmlstorage.cxx
+++ b/svx/source/gallery2/galleryobjectxmlstorage.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/galleryobjectxmlstorage.hxx>
+#include <galleryobjectxmlstorage.hxx>
#include <tools/urlobj.hxx>
void GalleryObjectXMLStorage::setURL(INetURLObject aURL) { m_aURL = aURL; }
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index cf0e6c9c2d98..dff3696b8cd8 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -41,7 +41,7 @@
#include <svx/galtheme.hxx>
#include <svx/svdpage.hxx>
#include <svx/galleryobjectcollection.hxx>
-#include <svx/galleryobjectbinarystorage.hxx>
+#include <galleryobjectbinarystorage.hxx>
#include <galobj.hxx>
#include <svx/gallery1.hxx>
#include "gallerydrawmodel.hxx"
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 34ce9159d268..bbd0b74de631 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -30,7 +30,7 @@
#include <svl/intitem.hxx>
#include <svl/itempool.hxx>
-#include <svx/ParaLineSpacingPopup.hxx>
+#include <ParaLineSpacingPopup.hxx>
#define DEFAULT_LINE_SPACING 200
#define FIX_DIST_DEF 283
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 97edf21f304b..d8e4278406ce 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -19,7 +19,7 @@
#include "ParaLineSpacingControl.hxx"
-#include <svx/ParaLineSpacingPopup.hxx>
+#include <ParaLineSpacingPopup.hxx>
#include <vcl/toolbox.hxx>
using namespace svx;
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 58c25e76bef0..e3685146b6f5 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -24,7 +24,7 @@
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svx/TextCharacterSpacingPopup.hxx>
+#include <TextCharacterSpacingPopup.hxx>
#include <svl/itempool.hxx>
#include <helpids.h>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 141238b10c92..a8eef9000c02 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -16,7 +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 .
*/
-#include <svx/TextCharacterSpacingPopup.hxx>
+#include <TextCharacterSpacingPopup.hxx>
#include "TextCharacterSpacingControl.hxx"
#include <vcl/toolbox.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx
b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 1ae19e653bc0..4ce94e0cfb29 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -20,7 +20,7 @@
#include <svx/svxids.hrc>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svx/TextUnderlinePopup.hxx>
+#include <TextUnderlinePopup.hxx>
#include <editeng/editids.hrc>
#include <editeng/udlnitem.hxx>
#include <helpids.h>
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx
b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index dd6929382093..75529f297baf 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -16,7 +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 .
*/
-#include <svx/TextUnderlinePopup.hxx>
+#include <TextUnderlinePopup.hxx>
#include "TextUnderlineControl.hxx"
#include <vcl/toolbox.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 481ffb8d690d..27df56d91d76 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -50,7 +50,7 @@
#include <vector>
#include <vcl/graph.hxx>
#include <svx/svxids.hrc>
-#include <svx/dstribut_enum.hxx>
+#include <dstribut_enum.hxx>
#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index da696a2306c5..dcc567e0112e 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -24,7 +24,7 @@
#include <vcl/toolbox.hxx>
#include <svx/strings.hrc>
-#include <svx/layctrl.hxx>
+#include <layctrl.hxx>
#include <svx/dialmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <svtools/colorcfg.hxx>
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index c8a6b77b74e3..9c31edf4e7a3 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -25,7 +25,7 @@
#include <sfx2/bindings.hxx>
#include <svtools/toolbarmenu.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/lboxctrl.hxx>
+#include <lboxctrl.hxx>
#include <tools/urlobj.hxx>
#include <svx/strings.hrc>
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx
b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 7d7d12006180..6be76a79f6c7 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -18,7 +18,7 @@
*/
#include <cppuhelper/supportsservice.hxx>
-#include <svx/verttexttbxctrl.hxx>
+#include <verttexttbxctrl.hxx>
#include <svl/languageoptions.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/weld.hxx>
diff --git a/include/vcl/SwapFile.hxx b/vcl/inc/SwapFile.hxx
similarity index 100%
rename from include/vcl/SwapFile.hxx
rename to vcl/inc/SwapFile.hxx
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 9d04ab7bde12..2aa4763ad256 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -20,7 +20,7 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <vcl/SwapFile.hxx>
+#include <SwapFile.hxx>
#include <comphelper/fileformat.h>
#include <o3tl/make_shared.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
