diff options
271 files changed, 465 insertions, 460 deletions
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx index 8b97a35a11c0..88e401aa332c 100644 --- a/include/svx/ColorSets.hxx +++ b/include/svx/ColorSets.hxx @@ -43,7 +43,7 @@ public: } }; -class SVX_DLLPUBLIC ColorSets +class SVXCORE_DLLPUBLIC ColorSets { std::vector<ColorSet> maColorSets; public: diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index 78d2b787ebb0..b7820beb5e07 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -22,7 +22,7 @@ class SfxStyleSheetBase; namespace svx { -class SVX_DLLPUBLIC CommonStyleManager final : public sfx2::StyleManager +class SVXCORE_DLLPUBLIC CommonStyleManager final : public sfx2::StyleManager { public: CommonStyleManager(SfxObjectShell& rShell) diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 87b9af0a7f11..a8e95ba52877 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -74,7 +74,7 @@ namespace o3tl // escher, but we are using it internally in to differentiate // between X_RANGE and Y_RANGE -class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet +class SVXCORE_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet { SdrObjCustomShape& mrSdrObjCustomShape; MSO_SPT eSpType; diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx index 6027fb755ad7..122f0406a6d5 100644 --- a/include/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx @@ -131,7 +131,7 @@ inline std::basic_ostream<charT, traits> & operator <<( #define EXPRESSION_FLAG_SUMANGLE_MODE 1 -SVX_DLLPUBLIC void FillEquationParameter( const css::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& ); +SVXCORE_DLLPUBLIC void FillEquationParameter( const css::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& ); class SAL_DLLPUBLIC_RTTI ExpressionNode { @@ -232,7 +232,7 @@ public: @return the generated function object. */ - SVX_DLLPUBLIC static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); + 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/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx index 4d52476ad189..c4caae2aa0ca 100644 --- a/include/svx/EnhancedCustomShapeGeometry.hxx +++ b/include/svx/EnhancedCustomShapeGeometry.hxx @@ -92,13 +92,13 @@ struct mso_CustomShape #define MSO_I | sal_Int32(0x80000000) bool SortFilledObjectsToBackByDefault( MSO_SPT eSpType ); -SVX_DLLPUBLIC bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ); -SVX_DLLPUBLIC sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ); +SVXCORE_DLLPUBLIC bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ); +SVXCORE_DLLPUBLIC sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ); // #i28269# -SVX_DLLPUBLIC bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ); +SVXCORE_DLLPUBLIC bool IsCustomShapeStrokedByDefault( MSO_SPT eSpType ); -SVX_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ); +SVXCORE_DLLPUBLIC const mso_CustomShape* GetCustomShapeContent( MSO_SPT eSpType ); #endif diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx index bf9049589341..2e5f49da0c89 100644 --- a/include/svx/EnhancedCustomShapeTypeNames.hxx +++ b/include/svx/EnhancedCustomShapeTypeNames.hxx @@ -25,9 +25,9 @@ namespace EnhancedCustomShapeTypeNames { - SVX_DLLPUBLIC MSO_SPT Get( const OUString& ); - SVX_DLLPUBLIC OUString Get( const MSO_SPT ); - SVX_DLLPUBLIC OUString GetAccName( const OUString& ); + SVXCORE_DLLPUBLIC MSO_SPT Get( const OUString& ); + SVXCORE_DLLPUBLIC OUString Get( const MSO_SPT ); + SVXCORE_DLLPUBLIC OUString GetAccName( const OUString& ); } #endif diff --git a/include/svx/ImageMapInfo.hxx b/include/svx/ImageMapInfo.hxx index 2bc4ea8cf21f..7cd8f4f1780a 100644 --- a/include/svx/ImageMapInfo.hxx +++ b/include/svx/ImageMapInfo.hxx @@ -25,7 +25,7 @@ #define SVX_IMAPINFO_ID 2 -class SVX_DLLPUBLIC SvxIMapInfo final : public SdrObjUserData, public SfxListener +class SVXCORE_DLLPUBLIC SvxIMapInfo final : public SdrObjUserData, public SfxListener { ImageMap aImageMap; diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index d468f0199588..40a4af22f7f8 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -32,7 +32,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace svx { class ToolboxButtonColorUpdaterBase; } namespace weld { class Window; } -class SVX_DLLPUBLIC PaletteManager +class SVXCORE_DLLPUBLIC PaletteManager { const sal_uInt16 mnMaxRecentColors; diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index 130ed8ccaaf3..18c23ad209ed 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -31,7 +31,7 @@ namespace svxform //= OSystemParseContext - class SVX_DLLPUBLIC OSystemParseContext final : public ::connectivity::IParseContext + class SVXCORE_DLLPUBLIC OSystemParseContext final : public ::connectivity::IParseContext { private: @@ -63,7 +63,7 @@ namespace svxform /** helper class which needs access to a (shared and ref-counted) OSystemParseContext instance. */ - class SVX_DLLPUBLIC OParseContextClient + class SVXCORE_DLLPUBLIC OParseContextClient { protected: OParseContextClient(); diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 42315203980a..8c1b50138c8b 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -25,7 +25,7 @@ class XColorList; -class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet +class SVXCORE_DLLPUBLIC SvxColorValueSet : public ValueSet { public: SvxColorValueSet(vcl::Window* pParent, WinBits nWinStyle); @@ -42,7 +42,7 @@ public: Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; -class SVX_DLLPUBLIC ColorValueSet : public SvtValueSet +class SVXCORE_DLLPUBLIC ColorValueSet : public SvtValueSet { public: ColorValueSet(std::unique_ptr<weld::ScrolledWindow> pWindow); diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx index c1ee2274258a..98766254dce2 100644 --- a/include/svx/SvxNumOptionsTabPageHelper.hxx +++ b/include/svx/SvxNumOptionsTabPageHelper.hxx @@ -27,7 +27,7 @@ using namespace css::uno; using namespace css::text; -class SVX_DLLPUBLIC SvxNumOptionsTabPageHelper +class SVXCORE_DLLPUBLIC SvxNumOptionsTabPageHelper { public: static Reference<XDefaultNumberingProvider> GetNumberingProvider(); diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index e2aadca2d75f..25ac0815384a 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -24,7 +24,7 @@ #include <svx/xtable.hxx> #include <tools/gen.hxx> -class SVX_DLLPUBLIC SvxPresetListBox final : public SvtValueSet +class SVXCORE_DLLPUBLIC SvxPresetListBox final : public SvtValueSet { private: static constexpr sal_uInt32 nColCount = 3; diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx index a7880202deae..22514d2b86fd 100644 --- a/include/svx/XPropertyEntry.hxx +++ b/include/svx/XPropertyEntry.hxx @@ -25,7 +25,7 @@ -class SVX_DLLPUBLIC XPropertyEntry +class SVXCORE_DLLPUBLIC XPropertyEntry { private: OUString maPropEntryName; diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx index cf61dfc326a7..4cd21601b5dd 100644 --- a/include/svx/camera3d.hxx +++ b/include/svx/camera3d.hxx @@ -31,7 +31,7 @@ |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC Camera3D final : public Viewport3D +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Camera3D final : public Viewport3D { basegfx::B3DPoint aPosition; basegfx::B3DPoint aLookAt; diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index e5435562cdca..c1fa1c1f9fd6 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace basegfx { class B2DRange; } -class SAL_WARN_UNUSED SVX_DLLPUBLIC ChartHelper +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ChartHelper { public: /// Use chart's XUpdatable::update() to update values. diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 07b0b5eea7c5..cb18efa0ad33 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -77,7 +77,7 @@ enum class SvxChartRegress #define CHREGRESS_COUNT (sal_uInt16(SvxChartRegress::Unknown) + 1) -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartRegressItem final : public SfxEnumItem<SvxChartRegress> +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartRegressItem final : public SfxEnumItem<SvxChartRegress> { public: SvxChartRegressItem(SvxChartRegress eRegress /*= SvxChartRegress::Linear*/, @@ -88,7 +88,7 @@ public: sal_uInt16 GetValueCount() const override { return CHREGRESS_COUNT; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem final : public SfxEnumItem<SvxChartTextOrder> +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartTextOrderItem final : public SfxEnumItem<SvxChartTextOrder> { public: SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/, @@ -102,7 +102,7 @@ public: sal_uInt16 GetValueCount() const override { return CHTXTORDER_COUNT; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartKindErrorItem final : public SfxEnumItem<SvxChartKindError> +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartKindErrorItem final : public SfxEnumItem<SvxChartKindError> { public: SvxChartKindErrorItem(SvxChartKindError /*eOrient = SvxChartKindError::NONE*/, @@ -113,7 +113,7 @@ public: sal_uInt16 GetValueCount() const override { return CHERROR_COUNT; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem final : public SfxEnumItem<SvxChartIndicate> +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxChartIndicateItem final : public SfxEnumItem<SvxChartIndicate> { public: SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/, @@ -124,7 +124,7 @@ public: sal_uInt16 GetValueCount() const override { return CHINDICATE_COUNT; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDoubleItem final : public SfxPoolItem { double fVal; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 74054a1d88bf..180c4eeccd7a 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -31,7 +31,7 @@ class SfxItemPool; struct SvxClipboardFormatItem_Impl; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxClipboardFormatItem final : public SfxPoolItem { virtual bool operator==( const SfxPoolItem& ) const override; virtual SvxClipboardFormatItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index f8a65715dd9e..23374d377fcd 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -28,7 +28,7 @@ private: VclPtr<SvxColorListBox> mxControl; }; -class SVX_DLLPUBLIC SvxColorListBox : public MenuButton +class SVXCORE_DLLPUBLIC SvxColorListBox : public MenuButton { private: friend class SvxListBoxColorWrapper; @@ -79,7 +79,7 @@ private: ColorListBox* mpControl; }; -class SVX_DLLPUBLIC ColorListBox +class SVXCORE_DLLPUBLIC ColorListBox { private: friend class ListBoxColorWrapper; diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 8a2f42751dfd..e19245e2ac73 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -34,7 +34,7 @@ namespace com::sun::star::frame { class XFrame; } class PaletteManager; -class SVX_DLLPUBLIC ColorStatus +class SVXCORE_DLLPUBLIC ColorStatus { Color maColor; Color maTLBRColor; @@ -51,7 +51,7 @@ typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunct #define COL_NONE_COLOR ::Color(0x80, 0xFF, 0xFF, 0xFF) -class SVX_DLLPUBLIC SvxColorWindow final : public svtools::ToolbarPopup +class SVXCORE_DLLPUBLIC SvxColorWindow final : public svtools::ToolbarPopup { private: const sal_uInt16 theSlotId; @@ -109,7 +109,7 @@ public: class SvxColorToolBoxControl; -class SVX_DLLPUBLIC MenuOrToolMenuButton +class SVXCORE_DLLPUBLIC MenuOrToolMenuButton { private: // either @@ -137,7 +137,7 @@ public: weld::Widget* get_widget() const; }; -class SVX_DLLPUBLIC ColorWindow final : public WeldToolbarPopup +class SVXCORE_DLLPUBLIC ColorWindow final : public WeldToolbarPopup { private: const sal_uInt16 theSlotId; diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index 1556c0f85087..6fdcce7256ef 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -44,7 +44,7 @@ class E3dDefaultAttributes; |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject { // Parameter basegfx::B3DPoint aCubePos; diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index c06e6474f3fe..bc3423999a4d 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -61,7 +61,7 @@ namespace svx /** class encapsulating the css::sdb::DataAccessDescriptor service. */ - class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessDescriptor final + class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ODataAccessDescriptor final { std::unique_ptr<ODADescriptorImpl> m_pImpl; diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index 0881d3760dbd..7401acbc9990 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -51,7 +51,7 @@ namespace svx //= OColumnTransferable - class SAL_WARN_UNUSED SVX_DLLPUBLIC OColumnTransferable final : public TransferDataContainer + class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC OColumnTransferable final : public TransferDataContainer { public: OColumnTransferable(ColumnTransferFormatFlags nFormats); @@ -152,7 +152,7 @@ namespace svx /** class for transferring data access objects (tables, queries, statements ...) */ - class SAL_WARN_UNUSED SVX_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper + class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ODataAccessObjectTransferable : public TransferableHelper { ODataAccessDescriptor m_aDescriptor; OUString m_sCompatibleObjectDescription; @@ -238,7 +238,7 @@ namespace svx /** class for transferring multiple columns */ - class SAL_WARN_UNUSED SVX_DLLPUBLIC OMultiColumnTransferable final : public TransferDataContainer + class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC OMultiColumnTransferable final : public TransferDataContainer { public: OMultiColumnTransferable(); diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index 8a482e37ab2c..85a41872b783 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dDefaultAttributes +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dDefaultAttributes { private: // Cube object diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx index 20a5c25b81eb..6dc6dcaa436d 100644 --- a/include/svx/dialmgr.hxx +++ b/include/svx/dialmgr.hxx @@ -22,8 +22,8 @@ #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -SVX_DLLPUBLIC std::locale SvxResLocale(); -SVX_DLLPUBLIC OUString SvxResId(const char* pId); +SVXCORE_DLLPUBLIC std::locale SvxResLocale(); +SVXCORE_DLLPUBLIC OUString SvxResId(const char* pId); #endif diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx index cc31297f5bb5..0359321e4030 100644 --- a/include/svx/dlgutil.hxx +++ b/include/svx/dlgutil.hxx @@ -26,9 +26,9 @@ class SfxItemSet; -SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); -SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit(); -SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); +SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); +SVXCORE_DLLPUBLIC FieldUnit GetModuleFieldUnit(); +SVXCORE_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); constexpr DrawModeFlags OUTPUT_DRAWMODE_COLOR = DrawModeFlags::Default; constexpr DrawModeFlags OUTPUT_DRAWMODE_CONTRAST = DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill | DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient; diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index a7b0933559a4..21a7d334fc66 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -23,7 +23,7 @@ #include <svx/xtable.hxx> #include <svx/svxdllapi.h> -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxColorListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxColorListItem final : public SfxPoolItem { XColorListRef pColorList; @@ -48,7 +48,7 @@ public: const XColorListRef& GetColorList() const { return pColorList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxGradientListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxGradientListItem final : public SfxPoolItem { XGradientListRef pGradientList; @@ -73,7 +73,7 @@ public: const XGradientListRef& GetGradientList() const { return pGradientList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxHatchListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxHatchListItem final : public SfxPoolItem { XHatchListRef pHatchList; @@ -97,7 +97,7 @@ public: const XHatchListRef& GetHatchList() const { return pHatchList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxBitmapListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxBitmapListItem final : public SfxPoolItem { XBitmapListRef pBitmapList; @@ -122,7 +122,7 @@ public: const XBitmapListRef& GetBitmapList() const { return pBitmapList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxPatternListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxPatternListItem final : public SfxPoolItem { XPatternListRef pPatternList; @@ -146,7 +146,7 @@ public: const XPatternListRef& GetPatternList() const { return pPatternList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxDashListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxDashListItem final : public SfxPoolItem { XDashListRef pDashList; @@ -171,7 +171,7 @@ public: const XDashListRef& GetDashList() const { return pDashList; } }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineEndListItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxLineEndListItem final : public SfxPoolItem { XLineEndListRef pLineEndList; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 8216c61ab3a1..29e7636e64da 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -24,7 +24,7 @@ #include <basegfx/vector/b3dvector.hxx> #include <svx/svxdllapi.h> -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem final : public SfxPoolItem +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SvxB3DVectorItem final : public SfxPoolItem { basegfx::B3DVector aVal; diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx index a6049843985c..6ba0afa888dc 100644 --- a/include/svx/e3dsceneupdater.hxx +++ b/include/svx/e3dsceneupdater.hxx @@ -44,7 +44,7 @@ namespace drawinglayer { namespace geometry { use it. This is only desirable if changes to the scene's content are intended to change the scene's 2D geometry attributes */ -class SVX_DLLPUBLIC E3DModifySceneSnapRectUpdater +class SVXCORE_DLLPUBLIC E3DModifySceneSnapRectUpdater { // the scene which may be changed. This gets set to the outmost scene // of the to-be-changed 3D object when the scene has a 3d transformation diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index c5eadb10dcf9..156b38e0c827 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -80,7 +80,7 @@ public: |* Undo for 3D attributes (implemented using Set3DAttributes()) |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dAttributesUndoAction final : public SdrUndoAction +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dAttributesUndoAction final : public SdrUndoAction { private: using SdrUndoAction::Repeat; diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx index f5994a96de80..0168068f66c8 100644 --- a/include/svx/extedit.hxx +++ b/include/svx/extedit.hxx @@ -19,7 +19,7 @@ class Graphic; class GraphicObject; class FileChangedChecker; -class SAL_WARN_UNUSED SVX_DLLPUBLIC ExternalToolEdit +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExternalToolEdit { protected: OUString m_aFileName; @@ -42,7 +42,7 @@ public: class FmFormView; class SdrObject; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SdrExternalToolEdit final +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SdrExternalToolEdit final : public ExternalToolEdit ,public SfxListener { diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index deb5687f6fe7..b66779957dc7 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -35,7 +35,7 @@ class E3dDefaultAttributes; |* \************************************************************************/ -class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dExtrudeObj final : public E3dCompoundObject { private: // to allow sdr::properties::E3dExtrudeProperties access to SetGeometryValid() diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index bd83a9938951..eec86cebfa5e 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -32,9 +32,9 @@ class SdrView; namespace svx { -SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ); +SVXCORE_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded ); -class SAL_WARN_UNUSED SVX_DLLPUBLIC ExtrusionBar final : public SfxShell +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExtrusionBar final : public SfxShell { public: SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR) diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 667a259d02e4..d5447879e317 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -22,7 +22,7 @@ #include <svx/unomod.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory +class SVXCORE_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory { public: diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index 152f862086af..e1bfb4089f8e 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -27,7 +27,7 @@ // SvxFmDrawPage -class SVX_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage +class SVXCORE_DLLPUBLIC SvxFmDrawPage :public SvxDrawPage ,public css::form::XFormsSupplier2 { protected: diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 82c98efe28c0..2483a4a5f652 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -31,7 +31,7 @@ namespace com::sun::star::container { class XNameAccess; } // FmGridHeader struct FmGridHeaderData; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridHeader :public ::svt::EditBrowserHeader ,public DropTargetHelper { @@ -86,7 +86,7 @@ private: // FmGridControl class FmXGridPeer; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridControl : public DbGridControl +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmGridControl : public DbGridControl { friend class FmGridHeader; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index b438e2aace31..1e7857dfbb94 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -205,7 +205,7 @@ typedef ::cppu::ImplHelper10< css::form::XBoundComponent, > FmXGridControl_BASE; class FmXGridPeer; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridControl :public UnoControl +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmXGridControl :public UnoControl ,public FmXGridControl_BASE { FmXModifyMultiplexer m_aModifyListeners; @@ -316,7 +316,7 @@ protected: // FmXGridPeer -> Peer for the Gridcontrol class FmGridControl; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmXGridPeer: +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmXGridPeer: public cppu::ImplInheritanceHelper< VCLXWindow, css::form::XGridPeer, diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 98261b7d80d6..31ef08679cf6 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -29,7 +29,7 @@ class SfxItemPool; class FmXUndoEnvironment; struct FmFormModelImplData; -class SVX_DLLPUBLIC FmFormModel : +class SVXCORE_DLLPUBLIC FmFormModel : public SdrModel { private: diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index b2d659363757..b3005014b757 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { class SdrView; class HelpEvent; -class SVX_DLLPUBLIC FmFormPage : public SdrPage +class SVXCORE_DLLPUBLIC FmFormPage : public SdrPage { FmFormPage& operator=(const FmFormPage&) = delete; FmFormPage(const FmFormPage&) = delete; diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index c702f0106212..bb0d303d1fd5 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -31,7 +31,7 @@ namespace com::sun::star::sdbc { class XResultSet; } // Helper methods -SVX_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl, +SVXCORE_DLLPUBLIC bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _xControl, OUString* pCurrentText = nullptr); // check if the control has one of the interfaces we can use for searching // *pCurrentText will be filled with the current text of the control (as used when searching this control) diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index cb57d5fad893..394acb685d52 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -59,7 +59,7 @@ namespace svx } -class SAL_WARN_UNUSED SVX_DLLPUBLIC FmDesignModeChangedHint final : public SfxHint +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FmDesignModeChangedHint final : public SfxHint { bool const m_bDesignMode; @@ -70,7 +70,7 @@ public: bool GetDesignMode() const { return m_bDesignMode; } }; -class SVX_DLLPUBLIC FmFormShell final : public SfxShell +class SVXCORE_DLLPUBLIC FmFormShell final : public SfxShell { friend class FmFormView; friend class FmXFormShell; diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 4ed9b7efcf7b..21a93d41f048 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -49,13 +49,13 @@ namespace vcl { class Window; } // displaying a database exception for the user // display info about a simple css::sdbc::SQLException void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent); -SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent); +SVXCORE_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent); void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = nullptr); void displayException(const css::uno::Any&, vcl::Window* _pParent = nullptr); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); -SVX_DLLPUBLIC OUString getLabelName(const css::uno::Reference< css::beans::XPropertySet>& xControlModel); +SVXCORE_DLLPUBLIC OUString getLabelName(const css::uno::Reference< css::beans::XPropertySet>& xControlModel); // = class CursorWrapper - a helper class which works in common with a css::uno::Reference<XDatabaseUpdateCursor>, @@ -74,7 +74,7 @@ private: public: // Construction/Destruction CursorWrapper(const css::uno::Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false); - SVX_DLLPUBLIC CursorWrapper(const css::uno::Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false); + 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/fmview.hxx b/include/svx/fmview.hxx index 508b3380eb91..b83420b43e0c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -51,7 +51,7 @@ namespace com { namespace sun { namespace star { namespace form { } } } } } -class SVX_DLLPUBLIC FmFormView : public E3dView +class SVXCORE_DLLPUBLIC FmFormView : public E3dView { rtl::Reference<FmXFormView> pImpl; FmFormShell* pFormShell; diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index 224aae1dbb1e..a11e015e9750 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -32,9 +32,9 @@ class SdrView; namespace svx { -bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus ); +bool SVXCORE_DLLPUBLIC checkForSelectedFontWork( SdrView const * pSdrView, sal_uInt32& nCheckStatus ); -class SAL_WARN_UNUSED SVX_DLLPUBLIC FontworkBar final : public SfxShell +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontworkBar final : public SfxShell { public: SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR) diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index af27c1eb0a5b..c492a1f143c5 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -44,7 +44,7 @@ public: sal_Int32 getScale() const; }; -class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog final : public weld::GenericDialogController +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC FontWorkGalleryDialog final : public weld::GenericDialogController { sal_uInt16 mnThemeId; SdrView& mrSdrView; diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx index 4c662700bec6..5296ab88d56e 100644 --- a/include/svx/framelink.hxx +++ b/include/svx/framelink.hxx @@ -98,7 +98,7 @@ enum class RefMode | |<- middle of the frame border */ -class SAL_WARN_UNUSED SVX_DLLPUBLIC Style +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Style { private: class implStyle diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx index 55938bde7ec6..d15e6d2bedc7 100644 --- a/include/svx/framelinkarray.hxx +++ b/include/svx/framelinkarray.hxx @@ -60,7 +60,7 @@ class Style; whether to mirror the double frame styles, and whether to swap diagonal frame borders. */ -class SAL_WARN_UNUSED SVX_DLLPUBLIC Array +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC Array { public: /** Constructs an empty array. */ diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index d88a156850e0..9e46720c9a52 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -67,7 +67,7 @@ public: static void PreviewMedia( const INetURLObject& rURL ); }; -class SVX_DLLPUBLIC DialogGalleryPreview final : public weld::CustomWidgetController +class SVXCORE_DLLPUBLIC DialogGalleryPreview final : public weld::CustomWidgetController { private: GraphicObject aGraphicObj; diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index 717fbcf129bf..28d99de9fa59 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -96,7 +96,7 @@ class SdrModel; class Graphic; class BitmapEx; -class SVX_DLLPUBLIC GalleryExplorer +class SVXCORE_DLLPUBLIC GalleryExplorer { public: diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index e0f4c4511bf6..7bf2c3456c57 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -82,7 +82,7 @@ class GalleryTheme; class GalleryThemeCacheEntry; -class SVX_DLLPUBLIC Gallery final : public SfxBroadcaster +class SVXCORE_DLLPUBLIC Gallery final : public SfxBroadcaster { typedef std::vector<GalleryThemeCacheEntry*> GalleryCacheThemeList; diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index aa513ed270c0..9ac8339d80b6 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -37,7 +37,7 @@ namespace com::sun::star::lang { class XComponent; } #define SVXGALLERYITEM_PARAMS 5 #define SVXGALLERYITEM_ARGNAME "GalleryItem" -class SVX_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem +class SVXCORE_DLLPUBLIC SvxGalleryItem final : public SfxPoolItem { sal_Int8 m_nType; OUString m_aURL; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 9fdd02ba3e5a..6cd95b4bf548 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -83,7 +83,7 @@ class FmFormModel; GalleryGraphicImportRet GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName ); bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); -SVX_DLLPUBLIC OUString +SVXCORE_DLLPUBLIC OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen ); OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); @@ -115,7 +115,7 @@ public: class GraphicFilter; -class SVX_DLLPUBLIC GalleryProgress +class SVXCORE_DLLPUBLIC GalleryProgress { css::uno::Reference< css::awt::XProgressBar > mxProgressBar; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index ff7200ded31b..d676ab6f3191 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -64,7 +64,7 @@ namespace unogallery } -class SVX_DLLPUBLIC GalleryTheme : public SfxBroadcaster +class SVXCORE_DLLPUBLIC GalleryTheme : public SfxBroadcaster { friend class Gallery; friend class GalleryThemeCacheEntry; diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index 8adfac1d4116..b582de4a2669 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -27,7 +27,7 @@ namespace com::sun::star::drawing { class XShape; } namespace weld { class Widget; } namespace weld { class Window; } -class SVX_DLLPUBLIC GraphicHelper +class SVXCORE_DLLPUBLIC GraphicHelper { public: diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index 3877f471da17..b24aa9c0a19b 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -26,7 +26,7 @@ #define GRFCROP_VERSION_SWDEFAULT 0 #define GRFCROP_VERSION_MOVETOSVX 1 -class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem +class SVXCORE_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 nLeft, nRight, nTop, nBottom; public: diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 8dbb1c106b78..33174e56aaef 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -160,7 +160,7 @@ enum class DbGridControlNavigationBarState class FmXGridSourcePropListener; class DisposeListenerGridBridge; -class SVX_DLLPUBLIC DbGridControl : public svt::EditBrowseBox +class SVXCORE_DLLPUBLIC DbGridControl : public svt::EditBrowseBox { friend class FmXGridSourcePropListener; friend class GridFieldValueListener; diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx index e8a4a9e77aae..0e07e309b9c4 100644 --- a/include/svx/helperhittest3d.hxx +++ b/include/svx/helperhittest3d.hxx @@ -73,7 +73,7 @@ E3dScene* fillViewInformation3DForCompoundObject( not empty, the first object is the object closest to the viewer */ -SVX_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( +SVXCORE_DLLPUBLIC void getAllHit3DObjectsSortedFrontToBack( const basegfx::B2DPoint& rPoint, const E3dScene& rScene, ::std::vector< const E3dCompoundObject* >& o_rResult); diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index 63b44992d370..3eaaae9ac8af 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -30,7 +30,7 @@ struct ImplSVEvent; namespace weld { -class SVX_DLLPUBLIC HexColorControl +class SVXCORE_DLLPUBLIC HexColorControl { private: std::unique_ptr<weld::Entry> m_xEntry; diff --git a/include/svx/itextprovider.hxx b/include/svx/itextprovider.hxx index 7a8ca44e859d..361b2293e36f 100644 --- a/include/svx/itextprovider.hxx +++ b/include/svx/itextprovider.hxx @@ -22,7 +22,7 @@ namespace svx /** This interface provides access to text object(s) in an SdrObject. */ - class SVX_DLLPUBLIC ITextProvider + class SVXCORE_DLLPUBLIC ITextProvider { public: /** Return the number of texts available for this object. */ diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 82c50321da6d..583de15aa5c4 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -43,9 +43,9 @@ namespace o3tl } // load language strings from resource -SVX_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg ); +SVXCORE_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg ); -class SVX_DLLPUBLIC SvxLanguageBox +class SVXCORE_DLLPUBLIC SvxLanguageBox { public: enum class EditedAndValid diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 2e92883b1977..a14ae9a0ea6c 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -39,7 +39,7 @@ class E3dDefaultAttributes; |* \************************************************************************/ -class SVX_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject +class SVXCORE_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject { basegfx::B2DPolyPolygon maPolyPoly2D; diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index bf7365b5859b..cd75dbe99eed 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -34,7 +34,7 @@ class XLineDashItem; typedef std::function<bool(const OUString&, const css::uno::Any&)> LineStyleSelectFunction; // SvxLineStyleController: -class SVX_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController +class SVXCORE_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController { private: std::unique_ptr<svx::ToolboxButtonLineStyleUpdater> m_xBtnUpdater; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 8916d145e45e..b4c7abf6d3b7 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -59,7 +59,7 @@ public: |* \************************************************************************/ -class SVX_DLLPUBLIC E3dObject : public SdrAttrObj +class SVXCORE_DLLPUBLIC E3dObject : public SdrAttrObj { private: // Allow everything for E3dObjList and E3dDragMethod @@ -150,7 +150,7 @@ public: |* \************************************************************************/ -class SVX_DLLPUBLIC E3dCompoundObject : public E3dObject +class SVXCORE_DLLPUBLIC E3dCompoundObject : public E3dObject { private: // to allow sdr::properties::E3dCompoundProperties access to SetGeometryValid() diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx index 19f7074e4088..e5defce5d9c8 100644 --- a/include/svx/objfac3d.hxx +++ b/include/svx/objfac3d.hxx @@ -33,7 +33,7 @@ class SdrObject; struct SdrObjCreatorParams; -class SVX_DLLPUBLIC E3dObjFactory +class SVXCORE_DLLPUBLIC E3dObjFactory { public: E3dObjFactory(); diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx index 08bb19220ccd..aa2137e66d42 100644 --- a/include/svx/pagenumberlistbox.hxx +++ b/include/svx/pagenumberlistbox.hxx @@ -24,7 +24,7 @@ #include <svx/svxdllapi.h> #include <vcl/weld.hxx> -class SVX_DLLPUBLIC SvxPageNumberListBox +class SVXCORE_DLLPUBLIC SvxPageNumberListBox { private: std::unique_ptr<weld::ComboBox> m_xControl; diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx index 5ede4fc81bc6..a80425ba8423 100644 --- a/include/svx/papersizelistbox.hxx +++ b/include/svx/papersizelistbox.hxx @@ -30,7 +30,7 @@ enum class PaperSizeApp Draw }; -class SVX_DLLPUBLIC SvxPaperSizeListBox +class SVXCORE_DLLPUBLIC SvxPaperSizeListBox { private: std::unique_ptr<weld::ComboBox> m_xControl; diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 8dc2a124afb4..0c6a7799d27a 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -23,7 +23,7 @@ #include <svx/obj3d.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject +class SVXCORE_DLLPUBLIC E3dPolygonObj final : public E3dCompoundObject { // parameters basegfx::B3DPolyPolygon aPolyPoly3D; diff --git a/include/svx/polypolygoneditor.hxx b/include/svx/polypolygoneditor.hxx index c5b079d707c8..e8b6138dffa4 100644 --- a/include/svx/polypolygoneditor.hxx +++ b/include/svx/polypolygoneditor.hxx @@ -31,7 +31,7 @@ namespace sdr { /** this class implements some helper functions to edit a B2DPolyPolygon */ -class SVX_DLLPUBLIC PolyPolygonEditor +class SVXCORE_DLLPUBLIC PolyPolygonEditor { public: PolyPolygonEditor( const basegfx::B2DPolyPolygon& rPolyPolygon); diff --git a/include/svx/samecontentlistbox.hxx b/include/svx/samecontentlistbox.hxx index f767fbd30e84..1f5a503e98cf 100644 --- a/include/svx/samecontentlistbox.hxx +++ b/include/svx/samecontentlistbox.hxx @@ -25,7 +25,7 @@ namespace SameContentListBox { - void SVX_DLLPUBLIC Fill(weld::ComboBox& rComboBox); + void SVXCORE_DLLPUBLIC Fill(weld::ComboBox& rComboBox); }; #endif diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index ac41ca082191..bd53b273a16c 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -54,7 +54,7 @@ class Imp3DDepthRemapper; |* \************************************************************************/ -class SVX_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList +class SVXCORE_DLLPUBLIC E3dScene : public E3dObject, public SdrObjList { protected: virtual std::unique_ptr<sdr::properties::BaseProperties> CreateObjectSpecificProperties() override; diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 3ee62cef7df0..81897d43c810 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -24,7 +24,7 @@ -class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { +class SVXCORE_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle): SfxInt32Item(nId,nAngle) {} virtual SdrAngleItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index a66fdefdd1e0..83ad600722a3 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -30,13 +30,13 @@ namespace com::sun::star::uno { class Any; } -class SVX_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem +class SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem : public SfxPoolItem { public: typedef std::pair < const OUString, const OUString > PropertyPair; private: - struct SVX_DLLPUBLIC PropertyPairHash + struct SVXCORE_DLLPUBLIC PropertyPairHash { size_t operator()( const SdrCustomShapeGeometryItem::PropertyPair& ) const; }; diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 5031bb336dbf..936d60bed35c 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -28,7 +28,7 @@ // SdrGrafRedItem - -class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem { public: @@ -42,7 +42,7 @@ public: // SdrGrafGreenItem - -class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem { public: @@ -56,7 +56,7 @@ public: // SdrGrafBlueItem - -class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem { public: diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index ba5bd28688b8..7f5dfb4e6b48 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -27,7 +27,7 @@ // SdrGrafCropItem - -class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop +class SVXCORE_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop { public: diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 3d84c44e13a8..5a81962e8792 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -28,7 +28,7 @@ // SdrGrafGamma100Item - -class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item +class SVXCORE_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item { public: diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 9e2b328cd56e..886b3cf22344 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -28,7 +28,7 @@ // SdrGrafLuminanceItem - -class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem { public: @@ -43,7 +43,7 @@ public: // SdrGrafContrastItem - -class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem +class SVXCORE_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem { public: diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 94c1a3076496..e04872ff975a 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -32,7 +32,7 @@ protected: SfxEnumItem(SDRATTR_GRAFMODE, eMode) {} }; -class SVX_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base +class SVXCORE_DLLPUBLIC SdrGrafModeItem : public SdrGrafModeItem_Base { public: SdrGrafModeItem( GraphicDrawMode eMode = GraphicDrawMode::Standard ) : SdrGrafModeItem_Base( eMode ) {} diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index ed65a379303a..05f2f8eb5554 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -28,7 +28,7 @@ // SdrGrafTransparenceItem - -class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem +class SVXCORE_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem { public: diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index f7342778b12c..8abecbad394c 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -27,7 +27,7 @@ // For all metrics. GetPresentation returns for example for // Value=2500 a "25mm". -class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { +class SVXCORE_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {} virtual SdrMetricItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 4010c8700549..a0e7cfe570e5 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -27,7 +27,7 @@ // here GetValueTextByVal() returns "on" or "off" instead // of "TRUE" or "FALSE" -class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { +class SVXCORE_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: SdrOnOffItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} virtual SdrOnOffItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index a3ad78402342..6aff6b11929a 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -27,7 +27,7 @@ // Integer percents of 0 -class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item +class SVXCORE_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal): SfxUInt16Item(nId,nVal) {} @@ -41,7 +41,7 @@ public: // Integer percents of +/- -class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item +class 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 aaa0e99c72d5..86d8ed8ac4a1 100644 --- a/include/svx/sdr/animation/objectanimator.hxx +++ b/include/svx/sdr/animation/objectanimator.hxx @@ -32,7 +32,7 @@ namespace sdr public: // basic constructor and destructor primitiveAnimator(); - SVX_DLLPUBLIC virtual ~primitiveAnimator() override; + SVXCORE_DLLPUBLIC virtual ~primitiveAnimator() override; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 59aba43460ca..43666f3982f7 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -31,7 +31,7 @@ namespace sdr namespace animation { - class SVX_DLLPUBLIC Event + class SVXCORE_DLLPUBLIC Event { // time of event in ms sal_uInt32 mnTime; @@ -49,7 +49,7 @@ namespace sdr virtual void Trigger(sal_uInt32 nTime) = 0; }; - class SVX_DLLPUBLIC Scheduler : public Timer + class SVXCORE_DLLPUBLIC Scheduler : public Timer { // time in ms sal_uInt32 mnTime; diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx index 79b2689784da..020401f0541f 100644 --- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx +++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx @@ -34,7 +34,7 @@ namespace drawinglayer { namespace attribute { - class SVX_DLLPUBLIC SdrAllFillAttributesHelper + class SVXCORE_DLLPUBLIC SdrAllFillAttributesHelper { private: basegfx::B2DRange maLastPaintRange; diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index 6a054eb5d824..4c5842b454cb 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -29,7 +29,7 @@ namespace sdr { namespace contact { - class SVX_DLLPUBLIC DisplayInfo final + class SVXCORE_DLLPUBLIC DisplayInfo final { // The Layers which shall be processed (visible) SdrLayerIDSet maProcessLayers; diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index e65630d1ec7e..27c219b2cba4 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -41,7 +41,7 @@ class DisplayInfo; class ViewContact; class ViewObjectContactRedirector; -class SVX_DLLPUBLIC ObjectContact +class SVXCORE_DLLPUBLIC ObjectContact { private: // make ViewObjectContact a friend to exclusively allow it to use diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 9a822d8fbd33..a7124bade869 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -30,7 +30,7 @@ class SdrObject; namespace sdr { namespace contact { -class SVX_DLLPUBLIC ObjectContactPainter : public ObjectContact +class SVXCORE_DLLPUBLIC ObjectContactPainter : public ObjectContact { protected: // Hierarchy access methods @@ -46,7 +46,7 @@ public: // typedef for transferring SdrObject typedef ::std::vector< SdrObject* > SdrObjectVector; -class SVX_DLLPUBLIC ObjectContactOfObjListPainter final : public ObjectContactPainter +class SVXCORE_DLLPUBLIC ObjectContactOfObjListPainter final : public ObjectContactPainter { // Target OutputDevice OutputDevice& mrTargetOutputDevice; diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index 3d4623de2812..c3f4ef9d3d19 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -30,7 +30,7 @@ namespace sdr { namespace contact { - class SVX_DLLPUBLIC ObjectContactOfPageView : public ObjectContact, public Idle + class SVXCORE_DLLPUBLIC ObjectContactOfPageView : public ObjectContact, public Idle { // the owner of this ObjectContactOfPageView. Set from constructor and not // to be changed in any way. diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index d3455ac77cd0..288a0007266a 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -33,7 +33,7 @@ namespace sdr { namespace contact { class ObjectContact; class ViewObjectContact; -class SVX_DLLPUBLIC ViewContact +class SVXCORE_DLLPUBLIC ViewContact { private: // make ViewObjectContact a friend to exclusively allow it to use diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index b27e7d1596da..890a964b0af7 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -34,7 +34,7 @@ namespace basegfx { namespace sdr { namespace contact { -class SVX_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj +class SVXCORE_DLLPUBLIC ViewContactOfE3dScene final : public ViewContactOfSdrObj { public: // basic constructor, used from SdrObject. diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 2039fc4a12a2..0d7813a71029 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -29,7 +29,7 @@ namespace avmedia { class MediaItem; } namespace sdr { namespace contact { -class SVX_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj +class SVXCORE_DLLPUBLIC ViewContactOfSdrMediaObj : public ViewContactOfSdrObj { friend class ViewObjectContactOfSdrMediaObj; diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 2508316a7c9f..d8d17d96c3f1 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -31,7 +31,7 @@ class Bitmap; namespace sdr { namespace contact { -class SVX_DLLPUBLIC ViewContactOfSdrObj : public ViewContact +class SVXCORE_DLLPUBLIC ViewContactOfSdrObj : public ViewContact { protected: // the owner of this ViewContact. Set from constructor and not diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index e82e6ce30fb5..3e514f116ee1 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -26,7 +26,7 @@ class SdrVirtObj; namespace sdr { namespace contact { -class SVX_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj +class SVXCORE_DLLPUBLIC ViewContactOfVirtObj : public ViewContactOfSdrObj { protected: // internal access to SdrObject. Implementation in *.cxx to avoid diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 460dd83b51f1..f7542908a8e6 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -37,7 +37,7 @@ class ObjectContact; class ViewContact; class ViewObjectContactRedirector; -class SVX_DLLPUBLIC ViewObjectContact +class SVXCORE_DLLPUBLIC ViewObjectContact { private: // must-exist and constant contacts diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 44296b96cf1c..7f2565576322 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -28,7 +28,7 @@ class OutputDevice; namespace sdr { namespace contact { -class SVX_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact +class SVXCORE_DLLPUBLIC ViewObjectContactOfSdrObj : public ViewObjectContact { /** Test whether the primitive is visible on any layer from @c aLayers diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx index 7679564028ff..c30be2b9ddca 100644 --- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx @@ -32,7 +32,7 @@ class ViewObjectContact; // single ViewObjectContacts. An own derivation may be set at single ViewContacts // or at the ObjectContact for redirecting all. If both is used, the one at single // objects will have priority. -class SVX_DLLPUBLIC ViewObjectContactRedirector +class SVXCORE_DLLPUBLIC ViewObjectContactRedirector { public: // basic constructor. diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index b6d9c46e3a47..35079a47e4c7 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -28,7 +28,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition + class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition { // the Bitmaps BitmapEx const maBitmapEx1; diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index 41c65b208126..a0022e1c7bda 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -28,7 +28,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition + class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition { // the Bitmap itself BitmapEx const maBitmapEx; diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index c84a3cbf2bc1..c3b9b340ab35 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -47,7 +47,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayManager + class SVXCORE_DLLPUBLIC OverlayManager : protected sdr::animation::Scheduler , public salhelper::SimpleReferenceObject { diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index 61dd91f91cbb..569d93a25de9 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -50,7 +50,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayObject : public sdr::animation::Event + class SVXCORE_DLLPUBLIC OverlayObject : public sdr::animation::Event { private: OverlayObject(const OverlayObject&) = delete; @@ -184,7 +184,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayObjectWithBasePosition : public OverlayObject + class SVXCORE_DLLPUBLIC OverlayObjectWithBasePosition : public OverlayObject { protected: // base position in logical coordinates diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx index 8044ae70147d..4859db33e6e6 100644 --- a/include/svx/sdr/overlay/overlayobjectlist.hxx +++ b/include/svx/sdr/overlay/overlayobjectlist.hxx @@ -33,7 +33,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayObjectList final + class SVXCORE_DLLPUBLIC OverlayObjectList final { // the vector of OverlayObjects ::std::vector< std::unique_ptr<OverlayObject> > maVector; diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index 6d9bcf812232..80442723395d 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -28,7 +28,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject + class SVXCORE_DLLPUBLIC OverlayPolyPolygonStripedAndFilled final : public OverlayObject { // geometry basegfx::B2DPolyPolygon const maLinePolyPolygon; diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index ccf3fcc7622a..84cf195f4b5c 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -28,7 +28,7 @@ namespace sdr { namespace overlay { - class SVX_DLLPUBLIC OverlayPrimitive2DSequenceObject final : public OverlayObjectWithBasePosition + class SVXCORE_DLLPUBLIC OverlayPrimitive2DSequenceObject final : public OverlayObjectWithBasePosition { // the sequence of primitives to show const drawinglayer::primitive2d::Primitive2DContainer maSequence; diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index 8dac9e108580..ec328f81da71 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -35,7 +35,7 @@ namespace sdr Transparent }; - class SVX_DLLPUBLIC OverlaySelection final : public OverlayObject + class SVXCORE_DLLPUBLIC OverlaySelection final : public OverlayObject { // type of overlay OverlayType const meOverlayType; diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx index 15e489b8e5ab..b26d516b239d 100644 --- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx @@ -55,17 +55,17 @@ namespace drawinglayer namespace primitive2d { // SdrAttribute creators - attribute::SdrLineAttribute SVX_DLLPUBLIC createNewSdrLineAttribute( + attribute::SdrLineAttribute SVXCORE_DLLPUBLIC createNewSdrLineAttribute( const SfxItemSet& rSet); - attribute::SdrLineStartEndAttribute SVX_DLLPUBLIC createNewSdrLineStartEndAttribute( + attribute::SdrLineStartEndAttribute SVXCORE_DLLPUBLIC createNewSdrLineStartEndAttribute( const SfxItemSet& rSet, double fWidth); attribute::SdrShadowAttribute createNewSdrShadowAttribute( const SfxItemSet& rSet); - attribute::SdrFillAttribute SVX_DLLPUBLIC createNewSdrFillAttribute( + attribute::SdrFillAttribute SVXCORE_DLLPUBLIC createNewSdrFillAttribute( const SfxItemSet& rSet); // #i101508# Support handing over given text-to-border distances @@ -77,7 +77,7 @@ namespace drawinglayer const sal_Int32* pRight = nullptr, const sal_Int32* pLower = nullptr); - attribute::FillGradientAttribute SVX_DLLPUBLIC createNewTransparenceGradientAttribute( + attribute::FillGradientAttribute SVXCORE_DLLPUBLIC createNewTransparenceGradientAttribute( const SfxItemSet& rSet); attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute( diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx index da3c54650746..e8e538d8e4ed 100644 --- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx @@ -45,23 +45,23 @@ namespace drawinglayer { namespace primitive2d { - Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive( + Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive( const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::SdrFillAttribute& rFill, const attribute::FillGradientAttribute& rFillGradient); - Primitive2DReference SVX_DLLPUBLIC createPolyPolygonFillPrimitive( + Primitive2DReference SVXCORE_DLLPUBLIC createPolyPolygonFillPrimitive( const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const attribute::SdrFillAttribute& rFill, const attribute::FillGradientAttribute& rFillGradient); - Primitive2DReference SVX_DLLPUBLIC createPolygonLinePrimitive( + Primitive2DReference SVXCORE_DLLPUBLIC createPolygonLinePrimitive( const basegfx::B2DPolygon& rPolygon, const attribute::SdrLineAttribute& rLine, const attribute::SdrLineStartEndAttribute& rStroke); - Primitive2DReference SVX_DLLPUBLIC createTextPrimitive( + Primitive2DReference SVXCORE_DLLPUBLIC createTextPrimitive( const basegfx::B2DPolyPolygon& rUnitPolyPolygon, const basegfx::B2DHomMatrix& rObjectTransform, const attribute::SdrTextAttribute& rText, @@ -69,7 +69,7 @@ namespace drawinglayer bool bCellText, bool bWordWrap); - Primitive2DContainer SVX_DLLPUBLIC createEmbeddedShadowPrimitive( + Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedShadowPrimitive( const Primitive2DContainer& rContent, const attribute::SdrShadowAttribute& rShadow); diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx index c7355a296b72..ed41e9b79ddf 100644 --- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx @@ -29,7 +29,7 @@ namespace drawinglayer { namespace primitive2d { - class SVX_DLLPUBLIC SdrFrameBorderData + class SVXCORE_DLLPUBLIC SdrFrameBorderData { private: basegfx::B2DPoint maOrigin; /// start point of borderline @@ -88,7 +88,7 @@ namespace drawinglayer { namespace primitive2d { - class SVX_DLLPUBLIC SdrFrameBorderPrimitive2D final : public BufferedDecompositionPrimitive2D + class SVXCORE_DLLPUBLIC SdrFrameBorderPrimitive2D final : public BufferedDecompositionPrimitive2D { private: std::shared_ptr<SdrFrameBorderDataVector> maFrameBorders; diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 96d4fe5f1d84..852b5e88164c 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -34,7 +34,7 @@ namespace sdr { namespace properties { - class SVX_DLLPUBLIC DefaultProperties : public BaseProperties + class SVXCORE_DLLPUBLIC DefaultProperties : public BaseProperties { protected: // the to be used ItemSet diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx index 56182af840e2..22d9bf2f78b0 100644 --- a/include/svx/sdr/properties/properties.hxx +++ b/include/svx/sdr/properties/properties.hxx @@ -76,7 +76,7 @@ namespace sdr { namespace properties { - class SVX_DLLPUBLIC BaseProperties + class SVXCORE_DLLPUBLIC BaseProperties { private: // the owner of this Properties. Set from constructor and not @@ -203,7 +203,7 @@ namespace sdr }; // checks the FillStyle item and removes unneeded Gradient, FillBitmap and Hatch items - void SVX_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet ); + void SVXCORE_DLLPUBLIC CleanupFillProperties( SfxItemSet& rItemSet ); } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 3570cff6f56d..f186b32147f6 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -39,7 +39,7 @@ namespace sdr { namespace table { class TableModel; -class SVX_DLLPUBLIC SvxTableController final : public sdr::SelectionController +class SVXCORE_DLLPUBLIC SvxTableController final : public sdr::SelectionController { public: SVX_DLLPRIVATE SvxTableController( diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx index 0a10c7b3e32f..3dc9c81d69f5 100644 --- a/include/svx/sdrhittesthelper.hxx +++ b/include/svx/sdrhittesthelper.hxx @@ -38,7 +38,7 @@ namespace drawinglayer { namespace primitive2d { class Primitive2DContainer; }} // Wrappers for classic Sdr* Mode/View classes -SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit( +SVXCORE_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit( const SdrObject& rObject, const Point& rPnt, sal_uInt16 nTol, @@ -48,7 +48,7 @@ SVX_DLLPUBLIC SdrObject* SdrObjectPrimitiveHit( /// allow getting back an evtl. resulting primitive stack which lead to a hit drawinglayer::primitive2d::Primitive2DContainer* pHitContainer = nullptr); -SVX_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit( +SVXCORE_DLLPUBLIC SdrObject* SdrObjListPrimitiveHit( const SdrObjList& rList, const Point& rPnt, sal_uInt16 nTol, diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx index bb200991a298..497bf51a2d7b 100644 --- a/include/svx/sdrobjectfilter.hxx +++ b/include/svx/sdrobjectfilter.hxx @@ -33,7 +33,7 @@ namespace svx /** specifies a boolean predicate on the set of all SdrObjects - vulgo a filter. */ - class SVX_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter + class SVXCORE_DLLPUBLIC SAL_NO_VTABLE ISdrObjectFilter { public: virtual bool includeObject( const SdrObject& i_rObject ) const = 0; diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index 7cd6d3fdf6fb..e7d534ca1a9c 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -45,7 +45,7 @@ namespace basegfx { class B2DRange; } class SdrPaintWindow; class SdrPageView; -class SVX_DLLPUBLIC SdrPageWindow +class SVXCORE_DLLPUBLIC SdrPageWindow { struct Impl; diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 287ec01b6195..55ecb22fd159 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -41,7 +41,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) -void SVX_DLLPUBLIC +void SVXCORE_DLLPUBLIC PaintTransparentChildren(vcl::Window const & rWindow, tools::Rectangle const& rPixelRect); class SdrPreRenderDevice @@ -62,7 +62,7 @@ public: OutputDevice& GetPreRenderDevice() { return *mpPreRenderDevice; } }; -class SVX_DLLPUBLIC SdrPaintWindow +class SVXCORE_DLLPUBLIC SdrPaintWindow { private: // the OutputDevice this window represents diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 827758e177a9..ab92c931cf8f 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -25,7 +25,7 @@ class SfxObjectShell; -class SVX_DLLPUBLIC SdrUndoManager : public EditUndoManager +class SVXCORE_DLLPUBLIC SdrUndoManager : public EditUndoManager { private: using EditUndoManager::Undo; diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 03aba5f9b9fd..71764b2962a3 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -23,7 +23,7 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item { +class SVXCORE_DLLPUBLIC SdrTextAniAmountItem final : public SfxInt16Item { public: SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} virtual SdrTextAniAmountItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 87788994ad6e..1208dd7724c4 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -31,7 +31,7 @@ enum class SdrTextAniDirection Left, Right, Up, Down }; -class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> { +class SVXCORE_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem<SdrTextAniDirection> { public: SdrTextAniDirectionItem(SdrTextAniDirection eDir=SdrTextAniDirection::Left): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION, eDir) {} virtual SdrTextAniDirectionItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index 37291ce62bd8..d847208a6857 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -22,7 +22,7 @@ #include <svx/sdynitm.hxx> #include <svx/svddef.hxx> -class SVX_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrTextAniStartInsideItem final : public SdrYesNoItem { public: SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} virtual ~SdrTextAniStartInsideItem() override; @@ -34,7 +34,7 @@ public: SdrTextAniStartInsideItem & operator =(SdrTextAniStartInsideItem &&) = delete; // due to SdrYesNoItem }; -class SVX_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrTextAniStopInsideItem final : public SdrYesNoItem { public: SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} virtual ~SdrTextAniStopInsideItem() override; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 5a7ecdfc73bf..d977f83bec4e 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -32,7 +32,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally SDRTEXTVERTADJUST_BLOCK // support vertical full with supported now /*,SDRTEXTVERTADJUST_STRETCH*/}; // also stretch letters in their height (ni) -class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> { +class SVXCORE_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem<SdrTextVertAdjust> { public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST, eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich, eAdj) {} @@ -56,7 +56,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted SDRTEXTHORZADJUST_BLOCK // use the whole text frame width /*,SDRTEXTHORZADJUST_STRETCH*/}; // FitToSize in X direction (ni). -class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> { +class SVXCORE_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem<SdrTextHorzAdjust> { public: SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST, eAdj) {} virtual SdrTextHorzAdjustItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index d4d481cf40f7..f2dca7833118 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -76,7 +76,7 @@ enum class SdrTextAniKind { // of the text depends on the anchor of the drawing object. This // corresponds to the position of the text in normal Paint (without scrolling). -class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> { +class SVXCORE_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem<SdrTextAniKind> { public: SdrTextAniKindItem(SdrTextAniKind eKind=SdrTextAniKind::NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND, eKind) {} virtual SdrTextAniKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index b20172854838..7308991d00d5 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -23,7 +23,7 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC SdrTextAniDelayItem final : public SfxUInt16Item { public: SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} virtual SdrTextAniDelayItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 03faae2747b5..976bb72f1f8d 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -22,7 +22,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrTextFixedCellHeightItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC SdrTextFixedCellHeightItem final : public SfxBoolItem { public: diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index c95b5dd6754c..597da1ad591c 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -30,7 +30,7 @@ // TextMaxFrameWidth is reached). -class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem +class SVXCORE_DLLPUBLIC SdrTextFitToSizeTypeItem : public SfxEnumItem<css::drawing::TextFitToSizeType> { public: diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index d17fbdfa1f69..a67f3f41fd7e 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -27,7 +27,7 @@ // GetValueTextByVal() returns "yes" or "no" // instead of "TRUE" and "FALSE" //-------------------------------------------------- ---------- -class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { +class SVXCORE_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: SdrYesNoItem(sal_uInt16 nId, bool bOn): SfxBoolItem(nId,bOn) {} virtual SdrYesNoItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 79c19f60dc61..ded8adf06ca5 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -40,7 +40,7 @@ namespace sdr namespace table { struct CellPos; } -class SVX_DLLPUBLIC SelectionController: public cppu::OWeakObject +class SVXCORE_DLLPUBLIC SelectionController: public cppu::OWeakObject { public: virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 90fa7700a54a..bdef4e11e7b8 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -45,7 +45,7 @@ namespace svx /** a provider for a property value */ - class SVX_DLLPUBLIC IPropertyValueProvider + class SVXCORE_DLLPUBLIC IPropertyValueProvider { public: /** returns the name of the property which this provider is responsible for @@ -66,7 +66,7 @@ namespace svx This default implementation queries the object which it is constructed with for the XPropertySet interface, and calls the getPropertyValue method. */ - class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider + class SVXCORE_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider { public: PropertyValueProvider( ::cppu::OWeakObject& _rContext, const char* _pAsciiPropertyName ) @@ -97,7 +97,7 @@ namespace svx The class is intended to be held as member of the class which does the property change broadcasting. */ - class SVX_DLLPUBLIC PropertyChangeNotifier + class SVXCORE_DLLPUBLIC PropertyChangeNotifier { public: /** constructs a notifier instance diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index ed9ea771ed41..0571f1d5406d 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/frame/XFrame.hpp> /// This class is the base for the Widget Layout-based sidebar panels. -class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer +class SVXCORE_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer { protected: std::unique_ptr<weld::Builder> m_xBuilder; diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx index d40e45b549b4..455a5729c843 100644 --- a/include/svx/spacinglistbox.hxx +++ b/include/svx/spacinglistbox.hxx @@ -28,7 +28,7 @@ enum class SpacingType { SPACING_INCH, MARGINS_INCH, SPACING_CM, MARGINS_CM }; /// Custom Widget ListBox to hold entries for Spacing & Margin settings of Header/Footer namespace SpacingListBox { - void SVX_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&); + void SVXCORE_DLLPUBLIC Fill(SpacingType eType, weld::ComboBox&); } #endif diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx index 03a78ae36d68..3bc2ab2f192c 100644 --- a/include/svx/sphere3d.hxx +++ b/include/svx/sphere3d.hxx @@ -32,7 +32,7 @@ class E3dDefaultAttributes; * SphereObject with diameter r3DSize. * The count of planes depends on the horizontal and vertical segment count. */ -class SVX_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject +class SVXCORE_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject { private: basegfx::B3DPoint aCenter; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 95c7cad02e33..1bf7276a02cc 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -32,7 +32,7 @@ class SdrObjConnection; class ImplConnectMarkerOverlay; class ImpSdrCreateViewExtraData; -class SVX_DLLPUBLIC SdrCreateView : public SdrDragView +class SVXCORE_DLLPUBLIC SdrCreateView : public SdrDragView { friend class SdrPageView; diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx index d1fde32edda0..0deef29e4f10 100644 --- a/include/svx/svddrag.hxx +++ b/include/svx/svddrag.hxx @@ -43,7 +43,7 @@ struct SdrDragStatUserData virtual ~SdrDragStatUserData() = 0; }; -class SVX_DLLPUBLIC SdrDragStat final +class SVXCORE_DLLPUBLIC SdrDragStat final { SdrHdl* pHdl; // The Handle for the User SdrView* pView; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 2698817b7790..43a8c7ef1ece 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -48,7 +48,7 @@ public: }; -class SVX_DLLPUBLIC SdrDragEntryPolyPolygon final : public SdrDragEntry +class SVXCORE_DLLPUBLIC SdrDragEntryPolyPolygon final : public SdrDragEntry { private: basegfx::B2DPolyPolygon const maOriginalPolyPolygon; @@ -112,7 +112,7 @@ public: }; -class SVX_DLLPUBLIC SdrDragMethod +class SVXCORE_DLLPUBLIC SdrDragMethod { private: std::vector< std::unique_ptr<SdrDragEntry> > maSdrDragEntries; @@ -226,7 +226,7 @@ inline const tools::Rectangle& SdrDragMethod::GetMarkedRect() const // SdrDragMove -class SVX_DLLPUBLIC SdrDragMove : public SdrDragMethod +class SVXCORE_DLLPUBLIC SdrDragMove : public SdrDragMethod { private: long nBestXSnap; @@ -255,7 +255,7 @@ public: // SdrDragResize -class SVX_DLLPUBLIC SdrDragResize : public SdrDragMethod +class SVXCORE_DLLPUBLIC SdrDragResize : public SdrDragMethod { protected: Fraction aXFact; @@ -277,7 +277,7 @@ public: // SdrDragObjOwn -class SVX_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod +class SVXCORE_DLLPUBLIC SdrDragObjOwn : public SdrDragMethod { private: // SdrDragObjOwn always works on a clone since it has no transformation diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 2de2d23d0e26..654f010c7b3f 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -26,7 +26,7 @@ class SdrUndoGeoObj; -class SVX_DLLPUBLIC SdrDragView : public SdrExchangeView +class SVXCORE_DLLPUBLIC SdrDragView : public SdrExchangeView { friend class SdrPageView; friend class SdrDragMethod; diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 973a28cd1b9e..35236d6e2570 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -68,7 +68,7 @@ namespace o3tl template<> struct typed_flags<SdrInsertFlags> : is_typed_flags<SdrInsertFlags, 0x0f> {}; } -class SVX_DLLPUBLIC SdrEditView : public SdrMarkView +class SVXCORE_DLLPUBLIC SdrEditView : public SdrMarkView { friend class SdrPageView; friend class SdrDragDistort; diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index aab4e216feb9..f20863aecf69 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -58,7 +58,7 @@ enum class SdrEndTextEditKind // - macromode -class SVX_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public EditViewCallbacks +class SVXCORE_DLLPUBLIC SdrObjEditView : public SdrGlueEditView, public EditViewCallbacks { friend class SdrPageView; friend class ImpSdrEditPara; diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 895fc9d95789..1cde7792fa1b 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star { namespace lang { * The resulting default font height, however, stays the same (the logical * font height is converted). */ -SVX_DLLPUBLIC std::unique_ptr<SdrOutliner> SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod); +SVXCORE_DLLPUBLIC std::unique_ptr<SdrOutliner> SdrMakeOutliner(OutlinerMode nOutlinerMode, SdrModel& rMod); /** * Global default settings for the DrawingEngine. @@ -88,7 +88,7 @@ class SfxItemSet; * * @returns false for XFILL_NONE and rCol remains unchanged */ -SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); +SVXCORE_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); /** @@ -108,7 +108,7 @@ std::unique_ptr<sal_uInt16[]> RemoveWhichRange(const sal_uInt16* pOldWhichTable, * In order to break open Metafiles (sd/source/ui/dlg/brkdlg.cxx), * SdrEditView::DoImportMarkedMtf() and ImpSdrGDIMetaFileImport::DoImport() */ -class SVX_DLLPUBLIC SvdProgressInfo +class SVXCORE_DLLPUBLIC SvdProgressInfo { private: size_t m_nSumCurAction; // Sum of all handled Actions @@ -168,18 +168,18 @@ class OLEObjCache public: OLEObjCache(); - SVX_DLLPUBLIC ~OLEObjCache(); + SVXCORE_DLLPUBLIC ~OLEObjCache(); void InsertObj(SdrOle2Obj* pObj); void RemoveObj(SdrOle2Obj* pObj); - SVX_DLLPUBLIC size_t size() const; - SVX_DLLPUBLIC SdrOle2Obj* operator[](size_t nPos); - SVX_DLLPUBLIC const SdrOle2Obj* operator[](size_t nPos) const; + SVXCORE_DLLPUBLIC size_t size() const; + SVXCORE_DLLPUBLIC SdrOle2Obj* operator[](size_t nPos); + SVXCORE_DLLPUBLIC const SdrOle2Obj* operator[](size_t nPos) const; }; -class SVX_DLLPUBLIC SdrGlobalData +class SVXCORE_DLLPUBLIC SdrGlobalData { const SvtSysLocale* pSysLocale; // follows always locale settings const LocaleDataWrapper* pLocaleData; // follows always SysLocale @@ -197,13 +197,13 @@ public: OLEObjCache& GetOLEObjCache() { return aOLEObjCache; } }; -SVX_DLLPUBLIC SdrGlobalData & GetSdrGlobalData(); +SVXCORE_DLLPUBLIC SdrGlobalData & GetSdrGlobalData(); // #i101872# isolated GetTextEditBackgroundColor for tooling class SdrObjEditView; -SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); +SVXCORE_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView); #endif // INCLUDED_SVX_SVDETC_HXX diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx index e0261b7c0708..53dbef281786 100644 --- a/include/svx/svdglev.hxx +++ b/include/svx/svdglev.hxx @@ -29,7 +29,7 @@ class SdrGluePoint; // Edit GluePoints at the objects (GluePoints for connector) -class SVX_DLLPUBLIC SdrGlueEditView : public SdrPolyEditView +class SVXCORE_DLLPUBLIC SdrGlueEditView : public SdrPolyEditView { // copy marked GluePoints and mark instead of the old ones void ImpCopyMarkedGluePoints(); diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index 9efb73172db9..ab6d6760c085 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -65,7 +65,7 @@ namespace o3tl template<> struct typed_flags<SdrAlign> : is_typed_flags<SdrAlign, 0x1313> {}; } -class SVX_DLLPUBLIC SdrGluePoint { +class SVXCORE_DLLPUBLIC SdrGluePoint { // Reference Point is SdrObject::GetSnapRect().Center() // bNoPercent=false: position is -5000..5000 (1/100)% or 0..10000 (depending on align) // bNoPercent=true : position is in log unit, relative to the reference point @@ -115,7 +115,7 @@ public: #define SDRGLUEPOINT_NOTFOUND 0xFFFF -class SVX_DLLPUBLIC SdrGluePointList { +class SVXCORE_DLLPUBLIC SdrGluePointList { std::vector<std::unique_ptr<SdrGluePoint>> aList; public: SdrGluePointList() {}; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 2aaa3b7f7bc7..61a9aed78c62 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -127,7 +127,7 @@ enum class BitmapMarkerKind }; -class SVX_DLLPUBLIC SdrHdl +class SVXCORE_DLLPUBLIC SdrHdl { friend class SdrMarkView; // for the access to nObjHdlNum friend class SdrHdlList; @@ -252,7 +252,7 @@ public: #define SDR_HANDLE_COLOR_SIZE_NORMAL Size(13, 13) #define SDR_HANDLE_COLOR_SIZE_SELECTED Size(17, 17) -class SVX_DLLPUBLIC SdrHdlColor final : public SdrHdl +class SVXCORE_DLLPUBLIC SdrHdlColor final : public SdrHdl { // size of colr markers Size aMarkerSize; @@ -425,7 +425,7 @@ public: }; -class SVX_DLLPUBLIC SdrHdlList +class SVXCORE_DLLPUBLIC SdrHdlList { protected: size_t mnFocusIndex; @@ -485,7 +485,7 @@ public: }; -class SVX_DLLPUBLIC SdrCropHdl final : public SdrHdl +class SVXCORE_DLLPUBLIC SdrCropHdl final : public SdrHdl { public: SdrCropHdl( diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index acbc98dc9384..aa850773c4e2 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -58,7 +58,7 @@ public: #define SDRHELPLINE_NOTFOUND 0xFFFF -class SVX_DLLPUBLIC SdrHelpLineList { +class SVXCORE_DLLPUBLIC SdrHelpLineList { std::vector<std::unique_ptr<SdrHelpLine>> aList; public: diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx index 6f64ccb31677..17dae03fd2fc 100644 --- a/include/svx/svditer.hxx +++ b/include/svx/svditer.hxx @@ -35,7 +35,7 @@ class SdrMarkList; // SdrIterMode::DeepNoGroups : With recursive descent parser, Next() returns no group objects enum class SdrIterMode { Flat, DeepWithGroups, DeepNoGroups }; -class SVX_DLLPUBLIC SdrObjListIter +class SVXCORE_DLLPUBLIC SdrObjListIter { std::vector< const SdrObject* > maObjList; size_t mnIndex; diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 2289efb32975..3a7fa8d45fa8 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -55,7 +55,7 @@ class SdrModel; -class SVX_DLLPUBLIC SdrLayer +class SVXCORE_DLLPUBLIC SdrLayer { friend class SdrLayerAdmin; @@ -99,7 +99,7 @@ public: #define SDRLAYERPOS_NOTFOUND 0xffff // When Changing the layer data you currently have to set the Modify flag manually -class SVX_DLLPUBLIC SdrLayerAdmin { +class SVXCORE_DLLPUBLIC SdrLayerAdmin { friend class SdrView; friend class SdrModel; friend class SdrPage; diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 1c0dd2af670a..e80c3573ab2c 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -40,7 +40,7 @@ typedef std::set<sal_uInt16> SdrUShortCont; /** * Everything a View needs to know about a selected object */ -class SVX_DLLPUBLIC SdrMark final : public sdr::ObjectUser +class SVXCORE_DLLPUBLIC SdrMark final : public sdr::ObjectUser { sal_Int64 mnTimeStamp; SdrObject* mpSelectedSdrObject; // the selected object @@ -132,7 +132,7 @@ public: } }; -class SVX_DLLPUBLIC SdrMarkList final +class SVXCORE_DLLPUBLIC SdrMarkList final { std::vector<std::unique_ptr<SdrMark>> maList; @@ -224,7 +224,7 @@ public: namespace sdr { - class SVX_DLLPUBLIC ViewSelection + class SVXCORE_DLLPUBLIC ViewSelection { SdrMarkList maMarkedObjectList; SdrMarkList maEdgesOfMarkedNodes; diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 62980f1f000a..c1226a9c64a7 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -106,7 +106,7 @@ enum class SdrHintKind EndEdit // Is called after the object has left text edit mode }; -class SVX_DLLPUBLIC SdrHint final : public SfxHint +class SVXCORE_DLLPUBLIC SdrHint final : public SfxHint { private: SdrHintKind const meHint; @@ -136,7 +136,7 @@ public: struct SdrModelImpl; -class SVX_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase +class SVXCORE_DLLPUBLIC SdrModel : public SfxBroadcaster, public tools::WeakBase { private: #ifdef DBG_UTIL diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index cb5660018260..1f98236fafb5 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -85,7 +85,7 @@ enum class ImpGetDescriptionOptions class ImplMarkingOverlay; -class SVX_DLLPUBLIC SdrMarkView : public SdrSnapView +class SVXCORE_DLLPUBLIC SdrMarkView : public SdrSnapView { friend class SdrPageView; diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ff51e20ec974..535060caf5ca 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -72,7 +72,7 @@ struct SdrCustomShapeInteraction CustomShapeHandleModes nMode; }; -class SVX_DLLPUBLIC SdrObjCustomShape : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrObjCustomShape : public SdrTextObj { private: // fObjectRotation is containing the object rotation in degrees. diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 706a3e272b17..4c5dab883e4f 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -31,7 +31,7 @@ class SfxItemSet; class SfxItemPool; // SdrAttrObj -class SVX_DLLPUBLIC SdrAttrObj : public SdrObject +class SVXCORE_DLLPUBLIC SdrAttrObj : public SdrObject { private: friend class SdrOutliner; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 361062554a87..84792d2b8bd8 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -107,7 +107,7 @@ namespace svx class SvxShape; class SdrObject; -struct SVX_DLLPUBLIC SdrObjectFreeOp; +struct SVXCORE_DLLPUBLIC SdrObjectFreeOp; // helper for constructing std::unique_ptr for SdrObjects where a // deleter is needed - here, SdrObject::Free needs to be used. @@ -178,14 +178,14 @@ enum class SdrUserCallType { ChildRemoved // a child within a group has changed }; -class SVX_DLLPUBLIC SdrObjUserCall +class SVXCORE_DLLPUBLIC SdrObjUserCall { public: virtual ~SdrObjUserCall(); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& rOldBoundRect); }; -class SVX_DLLPUBLIC SdrObjMacroHitRec +class SVXCORE_DLLPUBLIC SdrObjMacroHitRec { public: Point aPos; @@ -201,7 +201,7 @@ public: * Every drawing object can have an arbitrary amount of such records (SV list). * Whoever wants to save data here, must inherit from this and set a corresponding link in the factory. */ -class SVX_DLLPUBLIC SdrObjUserData +class SVXCORE_DLLPUBLIC SdrObjUserData { SdrInventor const nInventor; sal_uInt16 const nIdentifier; @@ -245,7 +245,7 @@ public: /** * Provides information about various ZObject properties */ -class SVX_DLLPUBLIC SdrObjTransformInfoRec +class SVXCORE_DLLPUBLIC SdrObjTransformInfoRec { public: bool bMoveAllowed : 1; // if false, object cannot be moved @@ -309,7 +309,7 @@ public: // SwFlyDrawObj /// Abstract DrawObject -class SVX_DLLPUBLIC SdrObject : public SfxListener, public tools::WeakBase +class SVXCORE_DLLPUBLIC SdrObject : public SfxListener, public tools::WeakBase { private: friend class SdrObjListIter; @@ -1031,7 +1031,7 @@ private: SdrObject( const SdrObject& ) = delete; }; -struct SVX_DLLPUBLIC SdrObjectFreeOp +struct SVXCORE_DLLPUBLIC SdrObjectFreeOp { void operator()(SdrObject* obj) { @@ -1054,7 +1054,7 @@ struct SdrObjCreatorParams * and must create a new drawing object instance accordingly. * He must also make the pNewObj pointer reference to this instance. */ -class SVX_DLLPUBLIC SdrObjFactory +class SVXCORE_DLLPUBLIC SdrObjFactory { public: static SdrObject* MakeNewObject( diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 99db12d8e39e..20af0b898359 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -39,7 +39,7 @@ public: }; // SdrCaptionObj -class SVX_DLLPUBLIC SdrCaptionObj final : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrCaptionObj final : public SdrRectObj { private: // to allow sdr::properties::CaptionProperties access to ImpRecalcTail() diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 2e6d8a9bda15..2767fdd7d9f5 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -38,10 +38,10 @@ public: enum class SdrCircKind { Full, Section, Cut, Arc }; -extern SVX_DLLPUBLIC SdrCircKind ToSdrCircKind(SdrObjKind); +extern SVXCORE_DLLPUBLIC SdrCircKind ToSdrCircKind(SdrObjKind); -class SVX_DLLPUBLIC SdrCircObj final : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrCircObj final : public SdrRectObj { private: // to allow sdr::properties::CircleProperties access to ImpSetAttrToCircInfo() diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index e6399da73bda..66deeb072845 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -125,7 +125,7 @@ public: /// Utility class SdrEdgeObj -class SVX_DLLPUBLIC SdrEdgeObj : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrEdgeObj : public SdrTextObj { private: // to allow sdr::properties::ConnectorProperties access to ImpSetAttrToEdgeInfo() diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index fa2d5543cbbd..8944db82bc2d 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -76,7 +76,7 @@ class SdrGraphicLink; /** * This class represents an embedded or linked bitmap graphic object. */ -class SVX_DLLPUBLIC SdrGrafObj : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrGrafObj : public SdrRectObj { private: // to allow sdr::properties::GraphicProperties access to SetXPolyDirty() diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index f30afc12c62b..2f71c59361b3 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -29,7 +29,7 @@ class SfxItemSet; // SdrObjGroup -class SVX_DLLPUBLIC SdrObjGroup final : public SdrObject, public SdrObjList +class SVXCORE_DLLPUBLIC SdrObjGroup final : public SdrObject, public SdrObjList { private: virtual std::unique_ptr<sdr::contact::ViewContact> CreateObjectSpecificViewContact() override; diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index bb182c6e2f67..84a31fb3bb6e 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -43,7 +43,7 @@ public: virtual ~SdrMeasureObjGeoData() override; }; -class SVX_DLLPUBLIC SdrMeasureObj : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrMeasureObj : public SdrTextObj { private: // to allow sdr::properties::MeasureProperties access to SetTextDirty() diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 8676d8d1c2b1..1815341aa2e9 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -31,7 +31,7 @@ namespace sdr { namespace contact { class ViewContactOfSdrMediaObj; } } namespace com::sun::star::graphic { class XGraphic; } -class SVX_DLLPUBLIC SdrMediaObj final : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrMediaObj final : public SdrRectObj { friend class sdr::contact::ViewContactOfSdrMediaObj; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index b192a438bc19..c3ce4f0233ec 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -43,7 +43,7 @@ namespace svt { class EmbeddedObjectRef; } class SdrOle2ObjImpl; -class SVX_DLLPUBLIC SdrOle2Obj : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrOle2Obj : public SdrRectObj { private: std::unique_ptr<SdrOle2ObjImpl> mpImpl; @@ -185,7 +185,7 @@ public: virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText) const override; }; -class SVX_DLLPUBLIC SdrEmbedObjectLink final : public sfx2::SvBaseLink +class SVXCORE_DLLPUBLIC SdrEmbedObjectLink final : public sfx2::SvBaseLink { SdrOle2Obj* pObj; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index fa6e17994c75..af557b27be86 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -24,7 +24,7 @@ #include <svx/sdrpageuser.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrPageObj final : public SdrObject, public sdr::PageUser +class SVXCORE_DLLPUBLIC SdrPageObj final : public SdrObject, public sdr::PageUser { public: // this method is called from the destructor of the referenced page. diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index f6a51898158d..1436eca520ed 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -40,7 +40,7 @@ public: }; -class SVX_DLLPUBLIC SdrPathObj final : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrPathObj final : public SdrTextObj { private: friend class ImpPathForDragAndCreate; diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index a633706ab5f4..5732a33104d6 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -36,7 +36,7 @@ namespace sdr { namespace properties { // SdrRectObj /// Rectangle objects (rectangle, circle, ...) -class SVX_DLLPUBLIC SdrRectObj : public SdrTextObj +class SVXCORE_DLLPUBLIC SdrRectObj : public SdrTextObj { private: // to allow sdr::properties::RectangleProperties access to SetXPolyDirty() diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 7965d84afd1d..6333b9d6082f 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -91,7 +91,7 @@ struct TableStyleSettings /// SdrTableObj class SdrTableObjImpl; -class SVX_DLLPUBLIC SdrTableObj final : public ::SdrTextObj +class SVXCORE_DLLPUBLIC SdrTableObj final : public ::SdrTextObj { friend class Cell; friend class SdrTableObjImpl; @@ -258,10 +258,6 @@ public: virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) override; - /** Hack for clipboard with calc and writer, export and import table content as rtf table */ - static void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); - static void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); - virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; private: @@ -285,6 +281,9 @@ private: rtl::Reference<SdrTableObjImpl> mpImpl; }; +/** Hack for clipboard with calc and writer, export and import table content as rtf table */ +SVX_DLLPUBLIC void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); +SVX_DLLPUBLIC void ImportAsRTF( SvStream& rStrm, SdrTableObj& rObj ); } } diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index f995071617b5..6e60f20c9b1c 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -134,7 +134,7 @@ namespace sdr typedef std::unique_ptr<SdrPathObj, SdrObjectFreeOp> SdrPathObjUniquePtr; -class SVX_DLLPUBLIC SdrTextObj : public SdrAttrObj, public svx::ITextProvider +class SVXCORE_DLLPUBLIC SdrTextObj : public SdrAttrObj, public svx::ITextProvider { private: // Cell needs access to ImpGetDrawOutliner(); diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 40b1d3526ff9..c78ba0fa2e97 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -41,7 +41,7 @@ namespace sdr { namespace contact { // SdrUnoObj struct SdrUnoObjDataHolder; -class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj +class SVXCORE_DLLPUBLIC SdrUnoObj : public SdrRectObj { friend class SdrPageView; friend class SdrControlEventListenerImpl; diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index eb1b51523f53..0e1ee7f3dd4f 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -27,7 +27,7 @@ class SdrTextObj; class SdrPage; -class SVX_DLLPUBLIC SdrOutliner : public Outliner +class SVXCORE_DLLPUBLIC SdrOutliner : public Outliner { tools::WeakReference<SdrTextObj> mpTextObj; const SdrPage* mpVisualizedPage; diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 187ecb307d56..5c6c68d87601 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -27,7 +27,7 @@ * FIXME: The virtual object is not yet fully implemented and tested. * At the moment we only use it in a derived class in Writer. */ -class SVX_DLLPUBLIC SdrVirtObj : public SdrObject +class SVXCORE_DLLPUBLIC SdrVirtObj : public SdrObject { SdrVirtObj( const SdrVirtObj& ) = delete; public: diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index cfdea335ee1d..f3b2053ae08d 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -55,7 +55,7 @@ class SvxUnoDrawPagesAccess; // SdrPage -> see continuation there // class SdrObjList -class SVX_DLLPUBLIC SdrObjList +class SVXCORE_DLLPUBLIC SdrObjList { friend class SdrObjListIter; friend class SdrEditView; @@ -288,7 +288,7 @@ public: const tools::Rectangle& GetUserArea() const { return aUserArea; } }; -class SVX_DLLPUBLIC SdrPageGridFrameList final +class SVXCORE_DLLPUBLIC SdrPageGridFrameList final { std::vector<SdrPageGridFrame*> aList; @@ -307,7 +307,7 @@ public: }; // class SdrPageProperties -class SVX_DLLPUBLIC SdrPageProperties : public SfxListener, public svl::StyleSheetUser +class SVXCORE_DLLPUBLIC SdrPageProperties : public SfxListener, public svl::StyleSheetUser { private: // data @@ -363,7 +363,7 @@ public: // SwDPage // OReportPage -class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase +class SVXCORE_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase { // #i9076# friend class SdrModel; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 2a3fd7717545..6d703d5c6145 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -57,7 +57,7 @@ namespace sdr class SdrPageWindow; -class SVX_DLLPUBLIC SdrPageView +class SVXCORE_DLLPUBLIC SdrPageView { private: SdrView& mrView; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 903475cc343b..41736c3dae43 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -118,7 +118,7 @@ BitmapEx convertMetafileToBitmapEx( // SwDrawView // OSectionView -class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener +class SVXCORE_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { private: friend class SdrPageView; diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index ffe72230e0df..171baf536a8f 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -25,7 +25,7 @@ #include <svx/ipolypolygoneditorcontroller.hxx> -class SVX_DLLPUBLIC SdrPolyEditView : public SdrEditView, public IPolyPolygonEditorController +class SVXCORE_DLLPUBLIC SdrPolyEditView : public SdrEditView, public IPolyPolygonEditorController { friend class SdrEditView; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 0a079e1f060d..54847e568cc9 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -27,7 +27,7 @@ class XLineAttrSetItem; class XFillAttrSetItem; -class SVX_DLLPUBLIC SdrItemPool final : public XOutdevItemPool +class SVXCORE_DLLPUBLIC SdrItemPool final : public XOutdevItemPool { public: SdrItemPool(SfxItemPool* pMaster = nullptr); diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index e45b0ea9f96a..89dc40d6a8cc 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -90,7 +90,7 @@ enum class SdrCrookMode { // #114409#-1 Migrate PageOrigin class ImplPageOriginOverlay; -class SVX_DLLPUBLIC SdrSnapView : public SdrPaintView +class SVXCORE_DLLPUBLIC SdrSnapView : public SdrPaintView { protected: // #114409#-1 Migrate PageOrigin diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx index e67c467cae38..92725a329bae 100644 --- a/include/svx/svdsob.hxx +++ b/include/svx/svdsob.hxx @@ -30,7 +30,7 @@ Stores a bitfield of the layer values that have been set. */ -class SVX_DLLPUBLIC SdrLayerIDSet final +class SVXCORE_DLLPUBLIC SdrLayerIDSet final { sal_uInt8 aData[32]; diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx index f95714aab210..e95120722d79 100644 --- a/include/svx/svdtext.hxx +++ b/include/svx/svdtext.hxx @@ -41,7 +41,7 @@ namespace sdr { namespace properties { */ class SfxStyleSheet; -class SVX_DLLPUBLIC SdrText : public tools::WeakBase +class SVXCORE_DLLPUBLIC SdrText : public tools::WeakBase { public: explicit SdrText( SdrTextObj& rObject ); diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 0bc9bee518c5..cc3d7b14a6da 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -51,13 +51,13 @@ class XPolyPolygon; inline void MovePoly(tools::Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); } void MoveXPoly(XPolygon& rPoly, const Size& S); -SVX_DLLPUBLIC void ResizeRect(tools::Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); +SVXCORE_DLLPUBLIC void ResizeRect(tools::Rectangle& rRect, const Point& rRef, const Fraction& xFact, const Fraction& yFact); inline void ResizePoint(Point& rPnt, const Point& rRef, const Fraction& xFract, const Fraction& yFract); void ResizePoly(tools::Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact); inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs); -SVX_DLLPUBLIC void RotatePoly(tools::Polygon& rPoly, const Point& rRef, double sn, double cs); +SVXCORE_DLLPUBLIC void RotatePoly(tools::Polygon& rPoly, const Point& rRef, double sn, double cs); void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs); void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs); @@ -65,7 +65,7 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2); void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2); inline void ShearPoint(Point& rPnt, const Point& rRef, double tn, bool bVShear = false); -SVX_DLLPUBLIC void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn); +SVXCORE_DLLPUBLIC void ShearPoly(tools::Polygon& rPoly, const Point& rRef, double tn); void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear = false); /** @@ -159,11 +159,11 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad * @return the returned value is in the range of -180.00..179.99 deg * and is in 1/100 deg units */ -SVX_DLLPUBLIC long GetAngle(const Point& rPnt); +SVXCORE_DLLPUBLIC long GetAngle(const Point& rPnt); long NormAngle18000(long a); /// Normalize angle to -180.00..179.99 -SVX_DLLPUBLIC long NormAngle36000(long a); /// Normalize angle to 0.00..359.99 +SVXCORE_DLLPUBLIC long NormAngle36000(long a); /// Normalize angle to 0.00..359.99 sal_uInt16 GetAngleSector(long nAngle); /// Determine sector within the cartesian coordinate system @@ -232,7 +232,7 @@ void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho); // Multiplication and subsequent division // Calculation and intermediate values are in BigInt -SVX_DLLPUBLIC long BigMulDiv(long nVal, long nMul, long nDiv); +SVXCORE_DLLPUBLIC long BigMulDiv(long nVal, long nMul, long nDiv); class FrPair { Fraction aX; @@ -249,7 +249,7 @@ public: }; // To convert units of measurement -SVX_DLLPUBLIC FrPair GetMapFactor(MapUnit eS, MapUnit eD); +SVXCORE_DLLPUBLIC FrPair GetMapFactor(MapUnit eS, MapUnit eD); FrPair GetMapFactor(FieldUnit eS, FieldUnit eD); inline bool IsMetric(MapUnit eU) { @@ -272,7 +272,7 @@ inline bool IsInch(FieldUnit eU) { || eU == FieldUnit::FOOT || eU == FieldUnit::MILE); } -class SVX_DLLPUBLIC SdrFormatter { +class SVXCORE_DLLPUBLIC SdrFormatter { long nMul_; long nDiv_; short nComma_; diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 67316f7792c7..d863c3401f4f 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -50,7 +50,7 @@ class OutlinerParaObject; * Abstract base class (ABC) for all UndoActions of DrawingEngine */ -class SVX_DLLPUBLIC SdrUndoAction : public SfxUndoAction +class SVXCORE_DLLPUBLIC SdrUndoAction : public SfxUndoAction { protected: SdrModel& rMod; @@ -82,7 +82,7 @@ public: * added (FIFO). */ -class SVX_DLLPUBLIC SdrUndoGroup final : public SdrUndoAction +class SVXCORE_DLLPUBLIC SdrUndoGroup final : public SdrUndoAction { std::vector<std::unique_ptr<SdrUndoAction>> maActions; @@ -117,7 +117,7 @@ public: * Abstract base class for all UndoActions that handle objects. */ -class SVX_DLLPUBLIC SdrUndoObj : public SdrUndoAction +class SVXCORE_DLLPUBLIC SdrUndoObj : public SdrUndoAction { protected: SdrObject* pObj; @@ -139,7 +139,7 @@ protected: * Also for StyleSheets. */ -class SVX_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoAttrObj : public SdrUndoObj { protected: std::unique_ptr<SfxItemSet> pUndoSet; @@ -180,7 +180,7 @@ public: * Create Action right before moving. */ -class SVX_DLLPUBLIC SdrUndoMoveObj final : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoMoveObj final : public SdrUndoObj { Size const aDistance; // Distance by which we move @@ -203,7 +203,7 @@ public: * Create Action right before the geometric transformation. */ -class SVX_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoGeoObj : public SdrUndoObj { std::unique_ptr<SdrObjGeoData> pUndoGeo; std::unique_ptr<SdrObjGeoData> pRedoGeo; @@ -228,7 +228,7 @@ public: * Abstract base class. */ -class SVX_DLLPUBLIC SdrUndoObjList : public SdrUndoObj { +class SVXCORE_DLLPUBLIC SdrUndoObjList : public SdrUndoObj { class ObjListListener; friend class ObjListListener; @@ -254,7 +254,7 @@ protected: * Create Action before removing from the ObjList. */ -class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList +class SVXCORE_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: SdrUndoRemoveObj(SdrObject& rNewObj, bool bOrdNumDirect = false) @@ -272,7 +272,7 @@ public: * Create Action before removal from ObjList. */ -class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList +class SVXCORE_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: SdrUndoInsertObj(SdrObject& rNewObj, bool bOrdNumDirect = false) @@ -287,7 +287,7 @@ public: * Create Action before removing from ObjList. */ -class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj +class SVXCORE_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false); @@ -307,7 +307,7 @@ public: * Create Action after insertion into the ObjList. */ -class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj +class SVXCORE_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: SdrUndoNewObj(SdrObject& rNewObj, bool bOrdNumDirect = false) @@ -326,7 +326,7 @@ public: * Create Action before Replace in ObjList. */ -class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj { bool bOldOwner; bool bNewOwner; @@ -379,7 +379,7 @@ public: // #i11702# -class SVX_DLLPUBLIC SdrUndoObjectLayerChange final : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoObjectLayerChange final : public SdrUndoObj { SdrLayerID const maOldLayer; SdrLayerID const maNewLayer; @@ -391,7 +391,7 @@ public: virtual void Redo() override; }; -class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj +class SVXCORE_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj { protected: std::unique_ptr<OutlinerParaObject> @@ -534,7 +534,7 @@ protected: * ABC for manipulation of a PageList: New Page, DeletePage, MovePage (ChangePageNum). */ -class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage +class SVXCORE_DLLPUBLIC SdrUndoPageList : public SdrUndoPage { protected: sal_uInt16 nPageNum; @@ -553,7 +553,7 @@ protected: * Create Action before removing from the List. */ -class SVX_DLLPUBLIC SdrUndoDelPage final : public SdrUndoPageList +class SVXCORE_DLLPUBLIC SdrUndoDelPage final : public SdrUndoPageList { // When deleting a MasterPage, we remember all relations of the // Character Page with the MasterPage in this UndoGroup. @@ -585,7 +585,7 @@ private: * Create Action after inserting into the List. */ -class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList +class SVXCORE_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList { public: SdrUndoNewPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg) {} @@ -654,7 +654,7 @@ protected: SdrUndoPageMasterPage(SdrPage& rChangedPage); public: - SVX_DLLPUBLIC virtual ~SdrUndoPageMasterPage() override; + SVXCORE_DLLPUBLIC virtual ~SdrUndoPageMasterPage() override; }; /** @@ -699,7 +699,7 @@ public: * It is used by the drawing layer implementations to create undo actions. * It can be used by applications to create application specific undo actions. */ -class SVX_DLLPUBLIC SdrUndoFactory +class SVXCORE_DLLPUBLIC SdrUndoFactory { public: // Shapes diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index e59c2bbb4825..8c5bd6d5e92e 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -95,7 +95,7 @@ enum class SdrMouseEventKind }; // helper class SdrViewEvent -struct SVX_DLLPUBLIC SdrViewEvent +struct SVXCORE_DLLPUBLIC SdrViewEvent { SdrHdl* pHdl; SdrObject* pObj; @@ -128,7 +128,7 @@ public: }; // helper class for all D&D overlays -class SVX_DLLPUBLIC SdrDropMarkerOverlay +class SVXCORE_DLLPUBLIC SdrDropMarkerOverlay { // The OverlayObjects sdr::overlay::OverlayObjectList maObjects; @@ -145,7 +145,7 @@ public: }; -class SVX_DLLPUBLIC SdrView : public SdrCreateView, public tools::WeakBase +class SVXCORE_DLLPUBLIC SdrView : public SdrCreateView, public tools::WeakBase { friend class SdrPageView; diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 1343de7c3931..d8a3de57727f 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -60,7 +60,7 @@ class SdrPage; class SdrObject; class SdrLayerIDSet; -class SVX_DLLPUBLIC SdrViewIter +class SVXCORE_DLLPUBLIC SdrViewIter { const SdrModel* mpModel; const SdrPage* mpPage; diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index 731c9a392f53..ea96eefe180d 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -25,7 +25,7 @@ #include <vcl/gdimtf.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrExchangeView : public SdrObjEditView +class SVXCORE_DLLPUBLIC SdrExchangeView : public SdrObjEditView { friend class SdrPageView; diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 58887e2ac04a..14b69019709c 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -66,7 +66,7 @@ public: Svx3DReducedLineGeometryItem* Clone(SfxItemPool * = nullptr) const override; }; -class SVX_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); @@ -80,7 +80,7 @@ inline SfxBoolItem makeSvx3DNormalsInvertItem(bool bVal) { return SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal); } -class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item { public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); @@ -90,7 +90,7 @@ public: SVX_DLLPRIVATE virtual Svx3DTextureProjectionXItem* Clone(SfxItemPool* pPool = nullptr) const override; }; -class SVX_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); @@ -116,7 +116,7 @@ inline SfxUInt16Item makeSvx3DMaterialSpecularIntensityItem(sal_uInt16 nVal) { return SfxUInt16Item(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY, nVal); } -class SVX_DLLPUBLIC Svx3DTextureKindItem final : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DTextureKindItem final : public SfxUInt16Item { public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); @@ -126,7 +126,7 @@ public: SVX_DLLPRIVATE virtual Svx3DTextureKindItem* Clone(SfxItemPool* pPool = nullptr) const override; }; -class SVX_DLLPUBLIC Svx3DTextureModeItem final : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DTextureModeItem final : public SfxUInt16Item { public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); @@ -141,7 +141,7 @@ inline SfxBoolItem makeSvx3DTextureFilterItem(bool bVal) { } // Svx3D _3DSCENE_ Items -class SVX_DLLPUBLIC Svx3DPerspectiveItem : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DPerspectiveItem : public SfxUInt16Item { public: Svx3DPerspectiveItem(ProjectionType nVal = ProjectionType::Perspective); @@ -267,7 +267,7 @@ inline SfxUInt16Item makeSvx3DShadowSlantItem(sal_uInt16 nVal) { return SfxUInt16Item(SDRATTR_3DSCENE_SHADOW_SLANT, nVal); } -class SVX_DLLPUBLIC Svx3DShadeModeItem : public SfxUInt16Item { +class SVXCORE_DLLPUBLIC Svx3DShadeModeItem : public SfxUInt16Item { public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); @@ -300,14 +300,14 @@ public: }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront -class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { +class SVXCORE_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); Svx3DCloseFrontItem* Clone(SfxItemPool * = nullptr) const override; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack -class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { +class SVXCORE_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); Svx3DCloseBackItem* Clone(SfxItemPool * = nullptr) const override; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 22b6139eb0bd..f0fdbac8ed60 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -318,7 +318,7 @@ public: virtual sal_uInt16 getInsertCount() const = 0; }; -class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory +class SVXCORE_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public EditAbstractDialogFactory { public: static SvxAbstractDialogFactory* Create(); diff --git a/include/svx/svxdllapi.h b/include/svx/svxdllapi.h index a5ee4ec859c2..3e3de30c4ae1 100644 --- a/include/svx/svxdllapi.h +++ b/include/svx/svxdllapi.h @@ -29,6 +29,12 @@ #endif #define SVX_DLLPRIVATE SAL_DLLPRIVATE +#if defined(SVXCORE_DLLIMPLEMENTATION) +#define SVXCORE_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define SVXCORE_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + #endif // INCLUDED_SVX_SVXDLLAPI_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index f15dc1a30ecc..5f946d2aa14f 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -30,7 +30,7 @@ enum class SdrCaptionEscDir { Horizontal, Vertical, BestFit }; // class SdrCaptionEscDirItem -class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> { +class SVXCORE_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem<SdrCaptionEscDir> { public: SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SdrCaptionEscDir::Horizontal): SfxEnumItem(SDRATTR_CAPTIONESCDIR, eDir) {} virtual SdrCaptionEscDirItem* Clone(SfxItemPool* pPool=nullptr) const override; @@ -46,7 +46,7 @@ public: // sal_True = line escape position is relative // sal_False = line escape position is absolute -class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} virtual ~SdrCaptionEscIsRelItem() override; @@ -65,7 +65,7 @@ public: // 10000 = 100.00% = right resp. down // only when SdrCaptionEscIsRelItem=TRUE -class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { +class SVXCORE_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} virtual ~SdrCaptionEscRelItem() override; diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 0ff0f48ca56e..00b4903bef25 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -28,7 +28,7 @@ * Only for Type3 and Type4 * Only relevant, if SdrCaptionFitLineLenItem = false */ -class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} virtual ~SdrCaptionLineLenItem() override; @@ -44,7 +44,7 @@ public: * The length of the first caption line is either automatically * calculated or the default setting is used (SdrCaptionLineLenItem) */ -class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} virtual ~SdrCaptionFitLineLenItem() override; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 8bd222fe6d58..6c2b728a2735 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -27,7 +27,7 @@ enum class SdrCaptionType { Type1, Type2, Type3, Type4 }; -class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> { +class SVXCORE_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem<SdrCaptionType> { public: SdrCaptionTypeItem(SdrCaptionType eStyle=SdrCaptionType::Type3): SfxEnumItem(SDRATTR_CAPTIONTYPE, eStyle) {} virtual SdrCaptionTypeItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 69d36dac1367..36a9b72d5083 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -28,7 +28,7 @@ enum class SdrEdgeKind OrthoLines, ThreeLines, OneLine, Bezier, Arc }; -class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> { +class SVXCORE_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem<SdrEdgeKind> { public: SdrEdgeKindItem(SdrEdgeKind eStyle=SdrEdgeKind::OrthoLines): SfxEnumItem(SDRATTR_EDGEKIND, eStyle) {} virtual SdrEdgeKindItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index 2dfba6016673..c34dfed30887 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -23,7 +23,7 @@ #include <svx/sdmetitm.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -31,7 +31,7 @@ public: virtual SdrEdgeNode1HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -39,7 +39,7 @@ public: virtual SdrEdgeNode1VertDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; @@ -47,7 +47,7 @@ public: virtual SdrEdgeNode2HorzDistItem* Clone(SfxItemPool* pPool=nullptr) const override; }; -class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { +class SVXCORE_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index 0177bc438972..c26d2b25f217 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -29,7 +29,7 @@ // TextUpsideDown, but easily operated) // can also be dragged by dragging the measure line item // (SdrMeasureLineDistItem) over the reference edge -class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} virtual ~SdrMeasureBelowRefEdgeItem() override; diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index 2ca591b0aefd..4701c037f518 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -53,7 +53,7 @@ public: }; // The decimal places used for the measure value -class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { +class SVXCORE_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} virtual ~SdrMeasureDecimalPlacesItem() override; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 8b198301b76c..3a751b419749 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> #include <com/sun/star/drawing/MeasureTextVertPos.hpp> -class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem<css::drawing::MeasureTextHorzPos> { +class SVXCORE_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem<css::drawing::MeasureTextHorzPos> { public: SdrMeasureTextHPosItem(css::drawing::MeasureTextHorzPos ePos = css::drawing::MeasureTextHorzPos::MeasureTextHorzPos_AUTO) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS, ePos) @@ -41,7 +41,7 @@ public: virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, OUString& rText, const IntlWrapper&) const override; }; -class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem<css::drawing::MeasureTextVertPos> { +class SVXCORE_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem<css::drawing::MeasureTextVertPos> { public: SdrMeasureTextVPosItem(css::drawing::MeasureTextVertPos ePos = css::drawing::MeasureTextVertPos_AUTO) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS, ePos) diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index 9c4fedfe7af7..e208d2790d29 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -23,7 +23,7 @@ #include <svx/sdynitm.hxx> // text across the dimension line (90deg counter-clockwise rotation) -class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { +class SVXCORE_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} virtual ~SdrMeasureTextRota90Item() override; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 07fc71e9615c..e350e9677774 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -26,7 +26,7 @@ // specification of the unit if measurement. The numerical quantity value is converted in this unity. // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. -class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { +class SVXCORE_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem<FieldUnit> { public: SdrMeasureUnitItem(FieldUnit eUnit=FieldUnit::NONE): SfxEnumItem(SDRATTR_MEASUREUNIT, eUnit) {} virtual SdrMeasureUnitItem* Clone(SfxItemPool* pPool=nullptr) const override; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 670ab7107c93..4e4f477469ee 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -153,7 +153,7 @@ namespace svx class ToolboxButtonColorUpdaterBase; } -class SVX_DLLPUBLIC SvxStyleToolBoxControl final : public SfxToolBoxControl +class SVXCORE_DLLPUBLIC SvxStyleToolBoxControl final : public SfxToolBoxControl { struct Impl; std::unique_ptr<Impl> pImpl; @@ -201,7 +201,7 @@ friend class SfxStyleControllerItem_Impl; typedef std::function<void(const OUString&, const NamedColor&)> ColorSelectFunction; -class SVX_DLLPUBLIC SvxColorToolBoxControl final : public cppu::ImplInheritanceHelper< svt::PopupWindowController, +class SVXCORE_DLLPUBLIC SvxColorToolBoxControl final : public cppu::ImplInheritanceHelper< svt::PopupWindowController, css::frame::XSubToolbarController > { std::unique_ptr<svx::ToolboxButtonColorUpdaterBase> m_xBtnUpdater; @@ -245,7 +245,7 @@ public: void EnsurePaletteManager(); }; -class SVX_DLLPUBLIC SvxSimpleUndoRedoController final : public SfxToolBoxControl +class SVXCORE_DLLPUBLIC SvxSimpleUndoRedoController final : public SfxToolBoxControl { private: OUString aDefaultText; @@ -259,7 +259,7 @@ public: const SfxPoolItem* pState) override; }; -class SVX_DLLPUBLIC SvxCurrencyToolBoxControl final : public svt::PopupWindowController +class SVXCORE_DLLPUBLIC SvxCurrencyToolBoxControl final : public svt::PopupWindowController { private: OUString m_aFormatString; diff --git a/include/svx/uiobject.hxx b/include/svx/uiobject.hxx index ef03a3b21494..ea40c2a6b9e7 100644 --- a/include/svx/uiobject.hxx +++ b/include/svx/uiobject.hxx @@ -16,7 +16,7 @@ class SdrObject; -class SVX_DLLPUBLIC SdrUIObject : public UIObject +class SVXCORE_DLLPUBLIC SdrUIObject : public UIObject { public: diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index fc26f3f96784..f48382c6ddf1 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -40,37 +40,37 @@ enum class SdrInventor : sal_uInt32; * * @throws css::uno::RuntimeException */ -SVX_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer); +SVXCORE_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer); /** Returns a StarOffice API wrapper for the given SdrObject */ -SVX_DLLPUBLIC css::uno::Reference< css::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw (); +SVXCORE_DLLPUBLIC css::uno::Reference< css::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw (); /** Returns the SdrObject from the given StarOffice API wrapper */ -SVX_DLLPUBLIC SdrObject* GetSdrObjectFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape ) throw() ; +SVXCORE_DLLPUBLIC SdrObject* GetSdrObjectFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape ) throw() ; /** Returns a StarOffice API wrapper for the given SdrPage */ -SVX_DLLPUBLIC css::uno::Reference< css::drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw (); +SVXCORE_DLLPUBLIC css::uno::Reference< css::drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw (); /** Returns the SdrPage from the given StarOffice API wrapper */ -SVX_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ) throw() ; +SVXCORE_DLLPUBLIC SdrPage* GetSdrPageFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage ) throw() ; /** * Maps the vcl MapUnit enum to an API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const MapUnit nVcl, short& eApi ) throw(); +SVXCORE_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const MapUnit nVcl, short& eApi ) throw(); /** * Maps the API constant MeasureUnit to a vcl MapUnit enum. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& nVcl ) throw(); +SVXCORE_DLLPUBLIC bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& nVcl ) throw(); /** * Maps the vcl MapUnit enum to an API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi ) throw(); +SVXCORE_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi ) throw(); /** * If the given name is a predefined name for the current language it is replaced by @@ -78,7 +78,7 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi * * @throws std::exception */ -[[nodiscard]] SVX_DLLPUBLIC OUString +[[nodiscard]] SVXCORE_DLLPUBLIC OUString SvxUnogetApiNameForItem(const sal_uInt16 nWhich, const OUString& rInternalName); /** @@ -87,7 +87,7 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi * * @throws std::exception */ -[[nodiscard]] SVX_DLLPUBLIC OUString +[[nodiscard]] SVXCORE_DLLPUBLIC OUString SvxUnogetInternalNameForItem(const sal_uInt16 nWhich, const OUString& rApiName); #endif // INCLUDED_SVX_UNOAPI_HXX diff --git a/include/svx/unobrushitemhelper.hxx b/include/svx/unobrushitemhelper.hxx index b3f7261f7708..da0104747d74 100644 --- a/include/svx/unobrushitemhelper.hxx +++ b/include/svx/unobrushitemhelper.hxx @@ -35,7 +35,7 @@ // Set the equivalent in the range [XATTR_FILL_FIRST .. XATTR_FILL_LAST] in the given // SfxItemSet to create the same FillStyle as is expressed by the given SvxBrushItem. // This method will reset all items in the XATTR_FILL_* range first. -SVX_DLLPUBLIC void setSvxBrushItemAsFillAttributesToTargetSet( +SVXCORE_DLLPUBLIC void setSvxBrushItemAsFillAttributesToTargetSet( const SvxBrushItem& rBrush, SfxItemSet& rToSet); @@ -43,7 +43,7 @@ SVX_DLLPUBLIC void setSvxBrushItemAsFillAttributesToTargetSet( // items in the range [XATTR_FILL_FIRST .. XATTR_FILL_LAST]. Since this is not 100% // representable this may lead to reduced data. With nBackgroundID a Which-ID for the // to-be-created SvxBrushItem has to be given (default should be 99 as in RES_BACKGROUND). -SVX_DLLPUBLIC std::shared_ptr<SvxBrushItem> getSvxBrushItemFromSourceSet( +SVXCORE_DLLPUBLIC std::shared_ptr<SvxBrushItem> getSvxBrushItemFromSourceSet( const SfxItemSet& rSourceSet, sal_uInt16 nBackgroundID, bool bSearchInParents = true, diff --git a/include/svx/unofill.hxx b/include/svx/unofill.hxx index 63d854e7b355..a59f9c8fbb00 100644 --- a/include/svx/unofill.hxx +++ b/include/svx/unofill.hxx @@ -25,12 +25,12 @@ class SdrModel; -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoHatchTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoBitmapTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoMarkerTable_createInstance( SdrModel* pModel ); -SVX_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoDashTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoGradientTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoHatchTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoBitmapTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoTransGradientTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoMarkerTable_createInstance( SdrModel* pModel ); +SVXCORE_DLLPUBLIC css::uno::Reference< css::uno::XInterface > SvxUnoDashTable_createInstance( SdrModel* pModel ); #endif // INCLUDED_SVX_UNOFILL_HXX diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index d616a78650a6..35730594c1aa 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -28,9 +28,9 @@ class SdrHint; class SdrModel; -SVX_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* pModel); +SVXCORE_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(SdrModel* pModel); -class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFactory +class SVXCORE_DLLPUBLIC SvxUnoDrawMSFactory : public css::lang::XMultiServiceFactory { protected: /** abstract SdrModel provider */ diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index ca81554fb31f..efbc5d7ba4e6 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -32,7 +32,7 @@ class SdrModel; -class SVX_DLLPUBLIC SvxUnoDrawingModel +class SVXCORE_DLLPUBLIC SvxUnoDrawingModel : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other public SvxFmMSFactory, public css::drawing::XDrawPagesSupplier, @@ -95,12 +95,12 @@ public: virtual css::uno::Reference< css::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) override; }; -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut ); +SVXCORE_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut ); extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pExportService ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream ); +SVXCORE_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const css::uno::Reference<css::io::XOutputStream>& xOut, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pExportService ); +SVXCORE_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream ); extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent ); -SVX_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pImportService ); +SVXCORE_DLLPUBLIC extern bool SvxDrawingLayerImport( SdrModel* pModel, const css::uno::Reference<css::io::XInputStream>& xInputStream, const css::uno::Reference< css::lang::XComponent >& xComponent, const char* pImportService ); #endif diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index 6814f859904a..911be0c2a66e 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -51,7 +51,7 @@ enum class SdrInventor : sal_uInt32; #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) -class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper7< css::drawing::XDrawPage, +class SVXCORE_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper7< css::drawing::XDrawPage, css::drawing::XShapeGrouper, css::drawing::XShapes2, css::drawing::XShapes3, diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index 90e830ee3ed5..b85685d128ec 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -80,7 +80,7 @@ public: * SvxUnoPropertyMapProvider */ -class SVX_DLLPUBLIC SvxUnoPropertyMapProvider +class SVXCORE_DLLPUBLIC SvxUnoPropertyMapProvider { SfxItemPropertyMapEntry const * aMapArr[SVXMAP_END]; std::unique_ptr<SvxItemPropertySet> aSetArr[SVXMAP_END]; @@ -113,7 +113,7 @@ namespace comphelper { class PropertySetInfo; } class SvxPropertySetInfoPool { public: - SVX_DLLPUBLIC static rtl::Reference<comphelper::PropertySetInfo> const & getOrCreate( sal_Int32 nServiceId ) throw(); + SVXCORE_DLLPUBLIC static rtl::Reference<comphelper::PropertySetInfo> const & getOrCreate( sal_Int32 nServiceId ) throw(); private: static rtl::Reference<comphelper::PropertySetInfo> mxInfos[SVXUNO_SERVICEID_LASTID+1]; diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 0b48d1e433d6..eb0333468046 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -83,10 +83,10 @@ class SvxShapeMaster; class SvxItemPropertySet; class SfxItemSet; -void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, +void SVXCORE_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const css::uno::Any& rVal, SfxItemSet& rSet ); -css::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); +css::uno::Any SVXCORE_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); // WARNING: if you update the supported interfaces, @@ -105,7 +105,7 @@ typedef ::cppu::WeakAggImplHelper12< css::document::XActionLockable, css::beans::XMultiPropertyStates> SvxShape_UnoImplHelper; -class SVX_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, +class SVXCORE_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper, public SfxListener, public SvxShapeMutex { @@ -350,7 +350,7 @@ private: SVX_DLLPRIVATE void impl_construct(); }; -class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase +class SVXCORE_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase { protected: /** called from the XActionLockable interface methods on initial locking */ @@ -511,7 +511,7 @@ public: /*********************************************************************** * * ***********************************************************************/ -class SVX_DLLPUBLIC SvxShapeControl final : public css::drawing::XControlShape, public SvxShapeText +class SVXCORE_DLLPUBLIC SvxShapeControl final : public css::drawing::XControlShape, public SvxShapeText { protected: using SvxUnoTextRangeBase::setPropertyValue; @@ -579,7 +579,7 @@ public: ***********************************************************************/ // #i118485# changed parent to SvxShapeText to allow Text handling over UNO API -class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText +class SVXCORE_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // override these for special property handling in subcasses. Return true if property is handled @@ -787,7 +787,7 @@ typedef ::cppu::WeakAggImplHelper1< css::drawing::XEnhancedCustomShapeDefaulter > SvxShape_UnoImplHelper1; -class SVX_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public SvxShape_UnoImplHelper1 +class SVXCORE_DLLPUBLIC SvxCustomShape final : public SvxShapeText, public SvxShape_UnoImplHelper1 { protected: using SvxUnoTextRangeBase::setPropertyValue; diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index 732166bcda56..e259b5386950 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -41,7 +41,7 @@ class OutputDevice; class SvxTextEditSourceImpl; class SdrText; -class SVX_DLLPUBLIC SvxTextEditSource final : public SvxEditSource, public SvxViewForwarder +class SVXCORE_DLLPUBLIC SvxTextEditSource final : public SvxEditSource, public SvxViewForwarder { public: SvxTextEditSource( SdrObject* pObj, SdrText* pText ); diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index cf0b70b96630..359b3aa31f55 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -38,7 +38,7 @@ class Impl3DMirrorConstructOverlay; * Derived class of SdrView to edit 3D objects. */ -class SVX_DLLPUBLIC E3dView : public SdrView +class SVXCORE_DLLPUBLIC E3dView : public SdrView { E3dDefaultAttributes a3DDefaultAttr; MouseEvent aMouseEvent; // The parameters of the last Events (Mouse, Keyboard) diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 6ca043ea2db7..5d7856bd9ab0 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -44,7 +44,7 @@ enum class ProjectionType { Parallel, Perspective }; |* \************************************************************************/ -class SVX_DLLPUBLIC Viewport3D +class SVXCORE_DLLPUBLIC Viewport3D { protected: basegfx::B3DHomMatrix aViewTf; // the real transformations matrix diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index 92c71fa9ae1e..0fff0a5cecb9 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -25,7 +25,7 @@ #include <vcl/GraphicObject.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XOBitmap +class SVXCORE_DLLPUBLIC XOBitmap { private: std::unique_ptr<GraphicObject> xGraphicObject; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 1778722be5c8..bfc67952ce97 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -28,7 +28,7 @@ class SdrModel; -class SVX_DLLPUBLIC XFillBitmapItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XFillBitmapItem : public NameOrIndex { private: GraphicObject maGraphicObject; diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index be515f607546..12788d6fa901 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -29,7 +29,7 @@ class XColorList; -class SVX_DLLPUBLIC XColorItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex { Color aColor; diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx index 8cc68be065f7..e1fca6b67f14 100644 --- a/include/svx/xdash.hxx +++ b/include/svx/xdash.hxx @@ -28,7 +28,7 @@ #include <vector> -class SVX_DLLPUBLIC XDash final +class SVXCORE_DLLPUBLIC XDash final { css::drawing::DashStyle eDash; sal_uInt32 nDotLen; diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 585eb0f87ff5..9f7cf907924e 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -28,7 +28,7 @@ -class SVX_DLLPUBLIC XFillStyleItem final : public SfxEnumItem<css::drawing::FillStyle> +class SVXCORE_DLLPUBLIC XFillStyleItem final : public SfxEnumItem<css::drawing::FillStyle> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index aee5cb7f13ac..59a5c7e3d9bf 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> // SetItem with all ItemSets of fill-attributes -class SVX_DLLPUBLIC XFillAttrSetItem final : public SfxSetItem +class SVXCORE_DLLPUBLIC XFillAttrSetItem final : public SfxSetItem { public: XFillAttrSetItem(std::unique_ptr<SfxItemSet>&& pItemSet ); diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index 6dc89e3d1fff..4033e6796913 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFillBackgroundItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFillBackgroundItem final : public SfxBoolItem { public: XFillBackgroundItem( bool bFill = false ); diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index ea5f94b344f6..ca7c739a77fd 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -24,7 +24,7 @@ #include <svx/rectenum.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpPosItem final : public SfxEnumItem<RectPoint> +class SVXCORE_DLLPUBLIC XFillBmpPosItem final : public SfxEnumItem<RectPoint> { public: XFillBmpPosItem( RectPoint eRP = RectPoint::MM ); diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 7516eef0e988..9fb283bab5ff 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpSizeLogItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFillBmpSizeLogItem final : public SfxBoolItem { public: XFillBmpSizeLogItem( bool bLog = true ); diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 1321969723fa..d5c9769a3901 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -23,7 +23,7 @@ #include <svl/metitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFillBmpSizeXItem final : public SfxMetricItem { public: XFillBmpSizeXItem( long nSizeX = 0 ); @@ -39,7 +39,7 @@ public: SVX_DLLPRIVATE virtual bool HasMetrics() const override; }; -class SVX_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFillBmpSizeYItem final : public SfxMetricItem { public: XFillBmpSizeYItem( long nSizeY = 0 ); diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index 52998ea69394..ab92eca975a5 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpTileItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFillBmpTileItem final : public SfxBoolItem { public: XFillBmpTileItem( bool bTile = true ); diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index b8a3bb3b874c..54d354b52268 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -23,7 +23,7 @@ #include <svl/intitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpPosOffsetXItem final : public SfxUInt16Item { public: XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); @@ -36,7 +36,7 @@ public: OUString &rText, const IntlWrapper& ) const override; }; -class SVX_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpPosOffsetYItem final : public SfxUInt16Item { public: XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index a45ac6d67b9b..3d3f3b28e4d1 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -23,7 +23,7 @@ #include <svl/eitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpStretchItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFillBmpStretchItem final : public SfxBoolItem { public: XFillBmpStretchItem( bool bStretch = true ); diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 7a01f0eeee83..b561ab775300 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -23,7 +23,7 @@ #include <svl/intitem.hxx> #include <svx/svxdllapi.h> -class SVX_DLLPUBLIC XFillBmpTileOffsetXItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpTileOffsetXItem final : public SfxUInt16Item { public: XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); @@ -36,7 +36,7 @@ public: OUString &rText, const IntlWrapper& ) const override; }; -class SVX_DLLPUBLIC XFillBmpTileOffsetYItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillBmpTileOffsetYItem final : public SfxUInt16Item { public: XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 7fd1f9782e65..0efa4b4b1dbb 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -29,7 +29,7 @@ -class SVX_DLLPUBLIC XFillColorItem final : public XColorItem +class SVXCORE_DLLPUBLIC XFillColorItem final : public XColorItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 3865bd5df0a1..e33b57e0f4ee 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -27,7 +27,7 @@ -class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem +class SVXCORE_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem { private: diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index d0fa9600bea6..01268edd04f8 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -29,7 +29,7 @@ class SdrModel; -class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XFillGradientItem : public NameOrIndex { XGradient aGradient; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index a0d88fffeb3e..b3dcb2b04df3 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -29,7 +29,7 @@ class SdrModel; -class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XFillHatchItem : public NameOrIndex { XHatch aHatch; diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index c29ad9173982..55128b4957ed 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XFillTransparenceItem final : public SfxUInt16Item { public: XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index 7aa4328aac09..27773a49db75 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextAdjustItem final : public SfxEnumItem<XFormTextAdjust> +class SVXCORE_DLLPUBLIC XFormTextAdjustItem final : public SfxEnumItem<XFormTextAdjust> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 6e292935edc9..516d219a009a 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextDistanceItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFormTextDistanceItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 8d3fb68ca058..3cac10212843 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextMirrorItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFormTextMirrorItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index fe58b4160172..2225e3552e62 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextOutlineItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFormTextOutlineItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 9155449a6826..d0adcbf22fc0 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextShadowColorItem final : public XColorItem +class SVXCORE_DLLPUBLIC XFormTextShadowColorItem final : public XColorItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 377d247f018e..e951a69081c3 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextShadowItem final : public SfxEnumItem<XFormTextShadow> +class SVXCORE_DLLPUBLIC XFormTextShadowItem final : public SfxEnumItem<XFormTextShadow> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 478cb26c5759..1a3d7c19b7d6 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextShadowXValItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFormTextShadowXValItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); @@ -44,7 +44,7 @@ public: |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextShadowYValItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFormTextShadowYValItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index 4d2e0d2c9ef0..51e03e7905f6 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextStartItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XFormTextStartItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx index 8fae7d896c75..f8ef9dbe9f98 100644 --- a/include/svx/xgrad.hxx +++ b/include/svx/xgrad.hxx @@ -27,7 +27,7 @@ class Gradient; -class SAL_WARN_UNUSED SVX_DLLPUBLIC XGradient final +class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC XGradient final { css::awt::GradientStyle eStyle; Color aStartColor; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 0e61f07249d7..92e0c099b034 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XGradientStepCountItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XGradientStepCountItem final : public SfxUInt16Item { public: XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx index 95c02d0b34e8..79b5f624e338 100644 --- a/include/svx/xhatch.hxx +++ b/include/svx/xhatch.hxx @@ -27,7 +27,7 @@ -class SVX_DLLPUBLIC XHatch final +class SVXCORE_DLLPUBLIC XHatch final { css::drawing::HatchStyle eStyle; Color aColor; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index f82f6a40343f..90c19c2f0854 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -33,7 +33,7 @@ typedef bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p -class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem +class SVXCORE_DLLPUBLIC NameOrIndex : public SfxStringItem { sal_Int32 nPalIndex; diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index 16f6880cf48f..ab8e26561e75 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -26,7 +26,7 @@ #include <svx/svxdllapi.h> #include <com/sun/star/drawing/LineStyle.hpp> -class SVX_DLLPUBLIC XLineStyleItem final : public SfxEnumItem<css::drawing::LineStyle> +class SVXCORE_DLLPUBLIC XLineStyleItem final : public SfxEnumItem<css::drawing::LineStyle> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 1f0bbd37d232..b495ecf2554f 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -27,7 +27,7 @@ -class SVX_DLLPUBLIC XLineJointItem final : public SfxEnumItem<css::drawing::LineJoint> +class SVXCORE_DLLPUBLIC XLineJointItem final : public SfxEnumItem<css::drawing::LineJoint> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 4e395610d5df..206250f5411a 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> // SetItem with all ItemSets of line-attributes -class SVX_DLLPUBLIC XLineAttrSetItem final : public SfxSetItem +class SVXCORE_DLLPUBLIC XLineAttrSetItem final : public SfxSetItem { public: XLineAttrSetItem(std::unique_ptr<SfxItemSet>&& pItemSet ); diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 7b62e2c514db..7311d0d06150 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -27,7 +27,7 @@ -class SVX_DLLPUBLIC XLineCapItem final : public SfxEnumItem<css::drawing::LineCap> +class SVXCORE_DLLPUBLIC XLineCapItem final : public SfxEnumItem<css::drawing::LineCap> { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 459b85af670f..7de9bc8b688a 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -25,7 +25,7 @@ -class SVX_DLLPUBLIC XLineColorItem final : public XColorItem +class SVXCORE_DLLPUBLIC XLineColorItem final : public XColorItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 33b5229ed054..4998b1f03fc1 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -30,7 +30,7 @@ class SdrModel; -class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex +class SVXCORE_DLLPUBLIC XLineDashItem : public NameOrIndex { XDash aDash; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 2498237b9dbd..6cb8cf402efc 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -25,7 +25,7 @@ -class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem +class SVXCORE_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: XLineEndCenterItem(bool bEndCenter = false); diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index f6b3b87494a6..9a43e14f3506 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -28,7 +28,7 @@ class SdrModel; -class SVX_DLLPUBLIC XLineEndItem final : public NameOrIndex +class SVXCORE_DLLPUBLIC XLineEndItem final : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index 4c0f54d27f6b..1e9ef4a2e333 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -28,7 +28,7 @@ -class SVX_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XLineEndWidthItem final : public SfxMetricItem { public: XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index b2a4ab1d4cdc..bde8c597d8b0 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -25,7 +25,7 @@ -class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem +class SVXCORE_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: XLineStartCenterItem(bool bStartCenter = false); diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 7add1df8c80f..859fdcbe75f9 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -28,7 +28,7 @@ class SdrModel; -class SVX_DLLPUBLIC XLineStartItem final : public NameOrIndex +class SVXCORE_DLLPUBLIC XLineStartItem final : public NameOrIndex { basegfx::B2DPolyPolygon maPolyPolygon; diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index a2e894e96486..3094c3297695 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -27,7 +27,7 @@ -class SVX_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XLineStartWidthItem final : public SfxMetricItem { public: XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index bb23b8271bdb..c7eca5815d0c 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -29,7 +29,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XLineTransparenceItem final : public SfxUInt16Item +class SVXCORE_DLLPUBLIC XLineTransparenceItem final : public SfxUInt16Item { public: XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index fc9b2f3ad8d0..65cd9ee8ead3 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -25,7 +25,7 @@ -class SVX_DLLPUBLIC XLineWidthItem final : public SfxMetricItem +class SVXCORE_DLLPUBLIC XLineWidthItem final : public SfxMetricItem { public: static SfxPoolItem* CreateDefault(); diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 0b32271d6222..ed64bd71522b 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -43,7 +43,7 @@ class SvGlobalName; class OutputStorageWrapper_Impl; -class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper final : +class SVXCORE_DLLPUBLIC SvXMLEmbeddedObjectHelper final : public cppu::WeakComponentImplHelper< css::document::XEmbeddedObjectResolver, css::container::XNameAccess > { ::osl::Mutex maMutex; diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index ac4070fa3d11..41f726d22e23 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -42,7 +42,7 @@ namespace svx //= OXFormsDescriptor - struct SVX_DLLPUBLIC OXFormsDescriptor { + struct SVXCORE_DLLPUBLIC OXFormsDescriptor { OUString szName; OUString szServiceName; @@ -61,7 +61,7 @@ namespace svx //= OXFormsTransferable - class SVX_DLLPUBLIC OXFormsTransferable final : public TransferableHelper { + class SVXCORE_DLLPUBLIC OXFormsTransferable final : public TransferableHelper { // TransferableHelper overridables virtual void AddSupportedFormats() override; diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 6da78ee28547..3f80f0191ba4 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -44,7 +44,7 @@ struct SvxGraphicHelperStream_Impl css::uno::Reference < css::io::XStream > xStream; }; -class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHelper<css::document::XGraphicObjectResolver, +class SVXCORE_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHelper<css::document::XGraphicObjectResolver, css::document::XGraphicStorageHandler, css::document::XBinaryStreamResolver> { diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 8635ed86a30c..5b0d3f6e5f43 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -50,7 +50,7 @@ namespace tools { class Polygon; } -class SVX_DLLPUBLIC XOutBitmap +class SVXCORE_DLLPUBLIC XOutBitmap { public: diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index b985b3a728ac..e872b205da85 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -41,7 +41,7 @@ class OutputDevice; class ImpXPolygon; -class SVX_DLLPUBLIC XPolygon final +class SVXCORE_DLLPUBLIC XPolygon final { o3tl::cow_wrapper< ImpXPolygon > pImpXPolygon; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 479da4f16fae..f82f88d386cd 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -22,7 +22,7 @@ #include <svx/xcolit.hxx> -class SVX_DLLPUBLIC XSecondaryFillColorItem final : public XColorItem +class SVXCORE_DLLPUBLIC XSecondaryFillColorItem final : public XColorItem { public: XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index 6b96c88755aa..24fcddef171a 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -39,7 +39,7 @@ #include <limits> #include <memory> -class SVX_DLLPUBLIC XColorEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XColorEntry final : public XPropertyEntry { private: Color aColor; @@ -53,7 +53,7 @@ public: } }; -class SVX_DLLPUBLIC XLineEndEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XLineEndEntry final : public XPropertyEntry { private: basegfx::B2DPolyPolygon const aB2DPolyPolygon; @@ -68,7 +68,7 @@ public: } }; -class SVX_DLLPUBLIC XDashEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XDashEntry final : public XPropertyEntry { private: XDash const aDash; @@ -83,7 +83,7 @@ public: } }; -class SVX_DLLPUBLIC XHatchEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XHatchEntry final : public XPropertyEntry { private: XHatch const aHatch; @@ -98,7 +98,7 @@ public: } }; -class SVX_DLLPUBLIC XGradientEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XGradientEntry final : public XPropertyEntry { private: XGradient const aGradient; @@ -113,7 +113,7 @@ public: } }; -class SVX_DLLPUBLIC XBitmapEntry final : public XPropertyEntry +class SVXCORE_DLLPUBLIC XBitmapEntry final : public XPropertyEntry { private: GraphicObject const maGraphicObject; @@ -150,7 +150,7 @@ class XPatternList ; typedef rtl::Reference< class XPatternList > XPatternListRe class XLineEndList ; typedef rtl::Reference< class XLineEndList > XLineEndListRef; class XGradientList ; typedef rtl::Reference< class XGradientList > XGradientListRef; -class SVX_DLLPUBLIC XPropertyList : public cppu::OWeakObject +class SVXCORE_DLLPUBLIC XPropertyList : public cppu::OWeakObject { protected: XPropertyListType const meType; @@ -234,7 +234,7 @@ public: rtl::Reference<XPropertyList> const & plist); }; -class SVX_DLLPUBLIC XColorList : public XPropertyList +class SVXCORE_DLLPUBLIC XColorList : public XPropertyList { protected: virtual BitmapEx CreateBitmapForUI(long nIndex) override; @@ -253,7 +253,7 @@ public: static XColorListRef GetStdColorList(); // returns a singleton }; -class SVX_DLLPUBLIC XLineEndList : public XPropertyList +class SVXCORE_DLLPUBLIC XLineEndList : public XPropertyList { protected: virtual BitmapEx CreateBitmapForUI(long nIndex) override; @@ -268,7 +268,7 @@ public: virtual bool Create() override; }; -class SVX_DLLPUBLIC XDashList : public XPropertyList +class SVXCORE_DLLPUBLIC XDashList : public XPropertyList { private: BitmapEx maBitmapSolidLine; @@ -300,7 +300,7 @@ public: OUString const & GetStringForUiNoLine() const; }; -class SVX_DLLPUBLIC XHatchList : public XPropertyList +class SVXCORE_DLLPUBLIC XHatchList : public XPropertyList { private: BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; @@ -318,7 +318,7 @@ public: virtual bool Create() override; }; -class SVX_DLLPUBLIC XGradientList : public XPropertyList +class SVXCORE_DLLPUBLIC XGradientList : public XPropertyList { private: BitmapEx CreateBitmap(long nIndex, const Size& rSize) const; @@ -338,7 +338,7 @@ public: virtual bool Create() override; }; -class SVX_DLLPUBLIC XBitmapList : public XPropertyList +class SVXCORE_DLLPUBLIC XBitmapList : public XPropertyList { private: BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; @@ -357,7 +357,7 @@ public: virtual bool Create() override; }; -class SVX_DLLPUBLIC XPatternList : public XPropertyList +class SVXCORE_DLLPUBLIC XPatternList : public XPropertyList { private: BitmapEx CreateBitmap( long nIndex, const Size& rSize ) const; diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index b28f93898b9e..8d6db594d600 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextStyleItem final : public SfxEnumItem<XFormTextStyle> +class SVXCORE_DLLPUBLIC XFormTextStyleItem final : public SfxEnumItem<XFormTextStyle> { public: static SfxPoolItem* CreateDefault(); @@ -48,7 +48,7 @@ public: |* \************************************************************************/ -class SVX_DLLPUBLIC XFormTextHideFormItem final : public SfxBoolItem +class SVXCORE_DLLPUBLIC XFormTextHideFormItem final : public SfxBoolItem { public: static SfxPoolItem* CreateDefault(); diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index a48721c3f888..fea763848ab9 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -805,7 +805,7 @@ bool SdTransferable::SetTableRTF( SdDrawDocument* pModel ) if( pTableObj ) { SvMemoryStream aMemStm( 65535, 65535 ); - sdr::table::SdrTableObj::ExportAsRTF( aMemStm, *pTableObj ); + sdr::table::ExportAsRTF( aMemStm, *pTableObj ); return SetAny( Any( Sequence< sal_Int8 >( static_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.TellEnd() ) ) ); } } diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 6fb9be6973a3..3a72c05921dd 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -265,7 +265,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) pPage->NbcInsertObject( pObj ); - sdr::table::SdrTableObj::ImportAsRTF( rStream, *pObj ); + sdr::table::ImportAsRTF( rStream, *pObj ); } } diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index cd3abc58e624..5cb8a455738d 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Library_set_precompiled_header,svxcore,svx/inc/pch/precompiled_ #.ENDIF $(eval $(call gb_Library_add_defs,svxcore,\ - -DSVX_DLLIMPLEMENTATION \ + -DSVXCORE_DLLIMPLEMENTATION \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ )) diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 72f02a52407f..4c3b6c4900e4 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -33,7 +33,7 @@ class Splitter; namespace svx { namespace sidebar { -class SVX_DLLPUBLIC GalleryControl final : public PanelLayout +class SVXCORE_DLLPUBLIC GalleryControl final : public PanelLayout { public: GalleryControl( vcl::Window* pParentWindow ); diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index f9aa1ffa9558..9b4fd310f76f 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -40,7 +40,7 @@ enum GalSoundType SOUND_ANIMAL = 7 }; -class SVX_DLLPUBLIC SgaObject +class SVXCORE_DLLPUBLIC SgaObject { friend class GalleryTheme; diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx index 494b7090cc93..cda823242108 100644 --- a/svx/source/inc/cell.hxx +++ b/svx/source/inc/cell.hxx @@ -44,7 +44,7 @@ namespace sdr { namespace properties { namespace sdr { namespace table { -class SVX_DLLPUBLIC Cell : public SdrText, +class SVXCORE_DLLPUBLIC Cell : public SdrText, public SvxUnoTextBase, public css::table::XMergeableCell, public css::awt::XLayoutConstrains, diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 108c72d2c909..78bc126fea86 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -368,7 +368,7 @@ namespace svxform const SfxPoolItem* pState ) override; }; - class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow + class SVXCORE_DLLPUBLIC DataNavigatorManager : public SfxChildWindow { public: SVX_DLLPRIVATE DataNavigatorManager( vcl::Window* pParent, sal_uInt16 nId, diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 91f24a1fc890..72a40e908f94 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -44,7 +44,7 @@ namespace svxform //= OLocalExchange - class SVX_DLLPUBLIC OLocalExchange : public TransferableHelper + class SVXCORE_DLLPUBLIC OLocalExchange : public TransferableHelper { private: Link<OLocalExchange&,void> m_aClipboardListener; @@ -89,7 +89,7 @@ namespace svxform //= OLocalExchangeHelper /// a helper for navigator windows (SvTreeListBox'es) which allow DnD within themself - class SVX_DLLPUBLIC OLocalExchangeHelper + class SVXCORE_DLLPUBLIC OLocalExchangeHelper { protected: VclPtr<vcl::Window> m_pDragSource; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 23cf3f6c216b..bbeff968b63f 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -532,7 +532,7 @@ namespace svxform }; - class SVX_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow + class SVXCORE_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow { public: SVX_DLLPRIVATE NavigatorFrameManager( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index d64275dd42db..c8f87a5dc1f1 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -27,7 +27,7 @@ // FmFormObj -class SVX_DLLPUBLIC FmFormObj : public SdrUnoObj +class SVXCORE_DLLPUBLIC FmFormObj : public SdrUnoObj { FmFormObj( const FmFormObj& ) = delete; diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index d2f547bfa45c..9a55609bc7f8 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -112,7 +112,7 @@ public: /** returns an object mapping from control models to drawing shapes. */ - SVX_DLLPUBLIC css::uno::Reference< css::container::XMap > getControlToShapeMap(); + SVXCORE_DLLPUBLIC css::uno::Reference< css::container::XMap > getControlToShapeMap(); private: /** validates whether <member>xCurrentForm</member> is still valid and to be used diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 28443a6a8519..8c2947e538c4 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -80,7 +80,7 @@ namespace com { namespace sun { namespace star { namespace lang { namespace svxform { - SVX_DLLPUBLIC void ImplSmartRegisterUnoServices(); + SVXCORE_DLLPUBLIC void ImplSmartRegisterUnoServices(); css::uno::Reference<css::uno::XInterface> OAddConditionDialog_Create( diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 43b6a579b2f2..3ca7a3bf2e1d 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -144,7 +144,7 @@ struct SdrViewEvent; class FmFormShell; class FmFormView; class FmFormObj; -class SVX_DLLPUBLIC FmXFormShell final : public FmXFormShell_BASE +class SVXCORE_DLLPUBLIC FmXFormShell final : public FmXFormShell_BASE ,public FmXFormShell_CFGBASE ,public svx::IControllerFeatureInvalidation { diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index ac2cb7038cdc..514e9d8f8032 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -43,7 +43,7 @@ namespace svxform { //= OSQLParserClient - class SVX_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient + class SVXCORE_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient { protected: mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser; diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index 4a27e670a7f8..0b22906274dd 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -62,7 +62,7 @@ private: Reference< XTable > mxTable; }; -void SdrTableObj::ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ) +void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj ) { SdrTableRtfExporter aEx( rStrm, rObj ); aEx.Write(); diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 2bbef503ae94..9f8ed6c0aa97 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -498,7 +498,7 @@ void SdrTableRTFParser::ProcToken( RtfImportInfo* pInfo ) } } -void SdrTableObj::ImportAsRTF( SvStream& rStream, SdrTableObj& rObj ) +void ImportAsRTF( SvStream& rStream, SdrTableObj& rObj ) { SdrTableRTFParser aParser( rObj ); aParser.Read( rStream ); |