diff options
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/EnhancedCustomShapeFunctionParser.hxx | 3 | ||||
-rw-r--r-- | include/svx/deflt3d.hxx | 3 | ||||
-rw-r--r-- | include/svx/dialcontrol.hxx | 3 | ||||
-rw-r--r-- | include/svx/fmtools.hxx | 3 | ||||
-rw-r--r-- | include/svx/passwd.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdgcpitm.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdprcitm.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdr/animation/objectanimator.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdtfchim.hxx | 3 | ||||
-rw-r--r-- | include/svx/shapepropertynotifier.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdmark.hxx | 3 | ||||
-rw-r--r-- | include/svx/svdundo.hxx | 3 | ||||
-rw-r--r-- | include/svx/svx3ditems.hxx | 19 | ||||
-rw-r--r-- | include/svx/tbcontrl.hxx | 3 | ||||
-rw-r--r-- | include/svx/unoprov.hxx | 3 |
15 files changed, 38 insertions, 23 deletions
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 122f0406a6d5..150c39efc0c5 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX #define INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX +#include <config_options.h> #include <sal/config.h> #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp> #include <memory> @@ -232,7 +233,7 @@ public: @return the generated function object. */ - SVXCORE_DLLPUBLIC static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); + UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); // this is a singleton FunctionParser() = delete; diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index 85a41872b783..f3312afd5fd8 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_DEFLT3D_HXX #define INCLUDED_SVX_DEFLT3D_HXX +#include <config_options.h> #include <basegfx/point/b3dpoint.hxx> #include <basegfx/vector/b3dvector.hxx> #include <svx/svxdllapi.h> @@ -30,7 +31,7 @@ |* \************************************************************************/ -class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dDefaultAttributes +class SAL_WARN_UNUSED UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) E3dDefaultAttributes { private: // Cube object diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 44e35e211151..d4eb26650703 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_DIALCONTROL_HXX #define INCLUDED_SVX_DIALCONTROL_HXX +#include <config_options.h> #include <memory> #include <vcl/customweld.hxx> #include <vcl/virdev.hxx> @@ -127,7 +128,7 @@ public: Hide(); } private: - struct DialControl_Impl + struct SAL_DLLPRIVATE DialControl_Impl { ScopedVclPtr<DialControlBmp> mxBmpEnabled; ScopedVclPtr<DialControlBmp> mxBmpDisabled; diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 21a93d41f048..f0fba4e0f32a 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SVX_FMTOOLS_HXX #define INCLUDED_SVX_FMTOOLS_HXX +#include <config_options.h> #include <svx/svxdllapi.h> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -74,7 +75,7 @@ private: public: // Construction/Destruction CursorWrapper(const css::uno::Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false); - SVXCORE_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false); + UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false); // if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement) // and then used diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 3f69209c8be3..acfbd82c1647 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -19,10 +19,11 @@ #ifndef INCLUDED_SVX_PASSWD_HXX #define INCLUDED_SVX_PASSWD_HXX +#include <config_options.h> #include <sfx2/basedlgs.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SvxPasswordDialog final : public SfxDialogController +class UNLESS_MERGELIBS(SVX_DLLPUBLIC) SvxPasswordDialog final : public SfxDialogController { private: OUString m_aOldPasswdErrStr; diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 7f5dfb4e6b48..1f309ea728f8 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SDGCPITM_HXX #define INCLUDED_SVX_SDGCPITM_HXX +#include <config_options.h> #include <svx/grfcrop.hxx> #include <svx/svddef.hxx> @@ -27,7 +28,7 @@ // SdrGrafCropItem - -class SVXCORE_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrGrafCropItem : public SvxGrfCrop { public: diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 6aff6b11929a..af5cb65d852d 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SVX_SDPRCITM_HXX #define INCLUDED_SVX_SDPRCITM_HXX +#include <config_options.h> #include <svl/intitem.hxx> #include <svx/svxdllapi.h> @@ -41,7 +42,7 @@ public: // Integer percents of +/- -class SVXCORE_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrSignedPercentItem : public SfxInt16Item { public: SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal ) : SfxInt16Item( nId,nVal ) {} diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx index 86d8ed8ac4a1..fca03a85466e 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX #define INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX +#include <config_options.h> #include <svx/sdr/animation/scheduler.hxx> @@ -32,7 +33,7 @@ namespace sdr public: // basic constructor and destructor primitiveAnimator(); - SVXCORE_DLLPUBLIC virtual ~primitiveAnimator() override; + UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) virtual ~primitiveAnimator() override; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 976bb72f1f8d..2fe5427c55bc 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -19,10 +19,11 @@ #ifndef INCLUDED_SVX_SDTFCHIM_HXX #define INCLUDED_SVX_SDTFCHIM_HXX +#include <config_options.h> #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -class SVXCORE_DLLPUBLIC SdrTextFixedCellHeightItem final : public SfxBoolItem +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SdrTextFixedCellHeightItem final : public SfxBoolItem { public: diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index bdef4e11e7b8..a9a416614162 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX #define INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX +#include <config_options.h> #include <svx/svxdllapi.h> #include <svx/shapeproperty.hxx> #include <rtl/ustring.hxx> @@ -45,7 +46,7 @@ namespace svx /** a provider for a property value */ - class SVXCORE_DLLPUBLIC IPropertyValueProvider + class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) IPropertyValueProvider { public: /** returns the name of the property which this provider is responsible for diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index e80c3573ab2c..f5f9c7b539d5 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SVDMARK_HXX #define INCLUDED_SVX_SVDMARK_HXX +#include <config_options.h> #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> #include <svx/sdrobjectuser.hxx> @@ -224,7 +225,7 @@ public: namespace sdr { - class SVXCORE_DLLPUBLIC ViewSelection + class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) ViewSelection { SdrMarkList maMarkedObjectList; SdrMarkList maEdgesOfMarkedNodes; diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 182d384ec0fa..d1aac69b1d65 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_SVDUNDO_HXX #define INCLUDED_SVX_SVDUNDO_HXX +#include <config_options.h> #include <sal/config.h> #include <memory> @@ -654,7 +655,7 @@ protected: SdrUndoPageMasterPage(SdrPage& rChangedPage); public: - SVXCORE_DLLPUBLIC virtual ~SdrUndoPageMasterPage() override; + UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) virtual ~SdrUndoPageMasterPage() override; }; /** 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; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 50efa73c62e2..0c7da003291f 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -130,6 +130,7 @@ // ITEMID_... defines in the *.cxx +#include <config_options.h> #include <svl/style.hxx> #include <sfx2/tbxctrl.hxx> #include <svx/svxdllapi.h> @@ -245,7 +246,7 @@ public: void EnsurePaletteManager(); }; -class SVXCORE_DLLPUBLIC SvxCurrencyToolBoxControl final : public svt::PopupWindowController +class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SvxCurrencyToolBoxControl final : public svt::PopupWindowController { private: OUString m_aFormatString; diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index b85685d128ec..d69ddfca1d8b 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_UNOPROV_HXX #define INCLUDED_SVX_UNOPROV_HXX +#include <config_options.h> #include <com/sun/star/uno/Sequence.hxx> #include <svl/itemprop.hxx> #include <svx/svxdllapi.h> @@ -113,7 +114,7 @@ namespace comphelper { class PropertySetInfo; } class SvxPropertySetInfoPool { public: - SVXCORE_DLLPUBLIC static rtl::Reference<comphelper::PropertySetInfo> const & getOrCreate( sal_Int32 nServiceId ) throw(); + UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) static rtl::Reference<comphelper::PropertySetInfo> const & getOrCreate( sal_Int32 nServiceId ) throw(); private: static rtl::Reference<comphelper::PropertySetInfo> mxInfos[SVXUNO_SERVICEID_LASTID+1]; |