svx/inc/RectangleAlignmentItem.hxx | 4 +---
svx/inc/def3d.hxx | 6 +-----
svx/inc/dragmt3d.hxx | 2 +-
svx/inc/sdr/contact/viewcontactofsdrmediaobj.hxx | 6 +-----
svx/source/items/RectangleAlignmentItem.cxx | 2 +-
svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx | 2 +-
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx | 2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2 +-
svx/source/svdraw/MediaShellHelpers.cxx | 2 +-
svx/source/svdraw/svdattr.cxx | 2 +-
svx/source/svdraw/svdomedia.cxx | 2 +-
11 files changed, 11 insertions(+), 21 deletions(-)
New commits:
commit 93573e11d641983865ad84711fb0a52bd17579eb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 24 13:23:23 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 24 15:45:23 2025 +0200
move some svx headers inside the module
Change-Id: Id4c1f6cd4e01a6e053ce6b7dce21f60c9b392578
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188279
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/include/svx/RectangleAlignmentItem.hxx
b/svx/inc/RectangleAlignmentItem.hxx
similarity index 89%
rename from include/svx/RectangleAlignmentItem.hxx
rename to svx/inc/RectangleAlignmentItem.hxx
index 42cf3aebc689..10fa842cb180 100644
--- a/include/svx/RectangleAlignmentItem.hxx
+++ b/svx/inc/RectangleAlignmentItem.hxx
@@ -11,7 +11,6 @@
#include <config_options.h>
#include <svl/eitem.hxx>
-#include <svx/svxdllapi.h>
namespace model
{
@@ -23,8 +22,7 @@ enum class RectangleAlignment;
e.g. Top Left, Top, Top Right, Center.
@see model::RectangleAlignment
*/
-class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxRectangleAlignmentItem final
- : public SfxEnumItem<model::RectangleAlignment>
+class SvxRectangleAlignmentItem final : public
SfxEnumItem<model::RectangleAlignment>
{
public:
DECLARE_ITEM_TYPE_FUNCTION(SvxRectangleAlignmentItem)
diff --git a/include/svx/def3d.hxx b/svx/inc/def3d.hxx
similarity index 94%
rename from include/svx/def3d.hxx
rename to svx/inc/def3d.hxx
index 37770602d5ff..821ac8c78ec5 100644
--- a/include/svx/def3d.hxx
+++ b/svx/inc/def3d.hxx
@@ -16,9 +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_DEF3D_HXX
-#define INCLUDED_SVX_DEF3D_HXX
+#pragma once
#include <o3tl/typed_flags_set.hxx>
@@ -38,6 +36,4 @@ template <> struct typed_flags<E3dDragConstraint> :
is_typed_flags<E3dDragConstr
};
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 466e207fbf09..add735676573 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_INC_DRAGMT3D_HXX
#define INCLUDED_SVX_INC_DRAGMT3D_HXX
-#include <svx/def3d.hxx>
+#include "def3d.hxx"
#include <svx/svddrgmt.hxx>
#include <basegfx/polygon/b3dpolypolygon.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
b/svx/inc/sdr/contact/viewcontactofsdrmediaobj.hxx
similarity index 92%
rename from include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
rename to svx/inc/sdr/contact/viewcontactofsdrmediaobj.hxx
index 6b7356a24811..349b5c9239fe 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -16,9 +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_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
-#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
+#pragma once
#include <svx/sdr/contact/viewcontactofsdrobj.hxx>
#include <svx/svxdllapi.h>
@@ -70,6 +68,4 @@ private:
};
}
-#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/items/RectangleAlignmentItem.cxx
b/svx/source/items/RectangleAlignmentItem.cxx
index 62599bff44c9..eec64ffd59d7 100644
--- a/svx/source/items/RectangleAlignmentItem.cxx
+++ b/svx/source/items/RectangleAlignmentItem.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <svx/RectangleAlignmentItem.hxx>
+#include <RectangleAlignmentItem.hxx>
#include <docmodel/theme/FormatScheme.hxx>
SvxRectangleAlignmentItem::SvxRectangleAlignmentItem(sal_uInt16 nWhich,
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 7c713bc4b7b9..db673f66bdd7 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -18,7 +18,7 @@
*/
-#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <svx/svdomedia.hxx>
#include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx>
#include <drawinglayer/primitive2d/mediaprimitive2d.hxx>
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 777017472bf6..3de0e5b43964 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -20,7 +20,7 @@
#include <config_features.h>
#include <sdr/contact/viewobjectcontactofsdrmediaobj.hxx>
-#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <svx/sdr/contact/objectcontact.hxx>
#include <vcl/outdev.hxx>
#include <vcl/window.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 185f691e3889..454e5e08e095 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -53,7 +53,7 @@
#include <svx/xflbmtit.hxx>
#include <svx/xflbstit.hxx>
#include <svx/xtextit0.hxx>
-#include <svx/RectangleAlignmentItem.hxx>
+#include <RectangleAlignmentItem.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <svx/svdotext.hxx>
#include <sdr/attribute/sdrtextattribute.hxx>
diff --git a/svx/source/svdraw/MediaShellHelpers.cxx
b/svx/source/svdraw/MediaShellHelpers.cxx
index 8cf760a7b093..22693adac32a 100644
--- a/svx/source/svdraw/MediaShellHelpers.cxx
+++ b/svx/source/svdraw/MediaShellHelpers.cxx
@@ -23,7 +23,7 @@
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/whiter.hxx>
-#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <svx/svdmrkv.hxx>
namespace svx::MediaShellHelpers
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index d1bf41730fdc..717562d789b3 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -144,7 +144,7 @@
#include <svx/sxmtritm.hxx>
#include <svx/sxmuitm.hxx>
#include <svx/xcolit.hxx>
-#include <svx/RectangleAlignmentItem.hxx>
+#include <RectangleAlignmentItem.hxx>
#include <sxoneitm.hxx>
#include <sxopitm.hxx>
#include <sxreaitm.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 2f702adba3d4..3e731bacbc1f 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -35,7 +35,7 @@
#include <svx/svdmodel.hxx>
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
-#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
+#include <sdr/contact/viewcontactofsdrmediaobj.hxx>
#include <avmedia/mediawindow.hxx>
#include <comphelper/diagnose_ex.hxx>
