summaryrefslogtreecommitdiff
path: root/include/svx/svx3ditems.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx/svx3ditems.hxx')
-rw-r--r--include/svx/svx3ditems.hxx19
1 files changed, 10 insertions, 9 deletions
diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index 14b69019709c..46609570155a 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -19,6 +19,7 @@
#ifndef INCLUDED_SVX_SVX3DITEMS_HXX
#define INCLUDED_SVX_SVX3DITEMS_HXX
+#include <config_options.h>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
@@ -66,7 +67,7 @@ public:
Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override;
};
-class SVXCORE_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DNormalsKindItem : public SfxUInt16Item {
public:
Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
@@ -80,7 +81,7 @@ inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) {
return SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal);
}
-class SVXCORE_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionXItem : public SfxUInt16Item {
public:
Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
@@ -90,7 +91,7 @@ public:
SVX_DLLPRIVATE virtual Svx3DTextureProjectionXItem* Clone(SfxItemPool* pPool = nullptr) const override;
};
-class SVXCORE_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureProjectionYItem : public SfxUInt16Item {
public:
Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
@@ -116,7 +117,7 @@ inline SfxUInt16Item makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) {
return SfxUInt16Item(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY, nVal);
}
-class SVXCORE_DLLPUBLIC Svx3DTextureKindItem final : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureKindItem final : public SfxUInt16Item {
public:
Svx3DTextureKindItem(sal_uInt16 nVal = 3);
@@ -126,7 +127,7 @@ public:
SVX_DLLPRIVATE virtual Svx3DTextureKindItem* Clone(SfxItemPool* pPool = nullptr) const override;
};
-class SVXCORE_DLLPUBLIC Svx3DTextureModeItem final : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DTextureModeItem final : public SfxUInt16Item {
public:
Svx3DTextureModeItem(sal_uInt16 nVal = 2);
@@ -141,7 +142,7 @@ inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) {
}
// Svx3D _3DSCENE_ Items
-class SVXCORE_DLLPUBLIC Svx3DPerspectiveItem : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DPerspectiveItem : public SfxUInt16Item {
public:
Svx3DPerspectiveItem(ProjectionType nVal = ProjectionType::Perspective);
@@ -267,7 +268,7 @@ inline SfxUInt16Item makeSvx3DShadowSlantItem(sal_uInt16 nVal) {
return SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, nVal);
}
-class SVXCORE_DLLPUBLIC Svx3DShadeModeItem : public SfxUInt16Item {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DShadeModeItem : public SfxUInt16Item {
public:
Svx3DShadeModeItem(sal_uInt16 nVal = 2);
@@ -300,14 +301,14 @@ public:
};
// #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront
-class SVXCORE_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseFrontItem : public SfxBoolItem {
public:
Svx3DCloseFrontItem(bool bVal = true);
Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override;
};
// #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack
-class SVXCORE_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem {
+class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) Svx3DCloseBackItem : public SfxBoolItem {
public:
Svx3DCloseBackItem(bool bVal = true);
Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override;