diff options
Diffstat (limited to 'include/svx')
-rw-r--r-- | include/svx/charmap.hxx | 12 | ||||
-rw-r--r-- | include/svx/cube3d.hxx | 4 | ||||
-rw-r--r-- | include/svx/graphctl.hxx | 10 | ||||
-rw-r--r-- | include/svx/lathe3d.hxx | 4 | ||||
-rw-r--r-- | include/svx/sphere3d.hxx | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 1c440b6ee2c1..4035f82d4c3d 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -52,19 +52,19 @@ namespace svx class SvxShowCharSetAcc; } -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxShowCharSet : public weld::CustomWidgetController +class SAL_WARN_UNUSED SvxShowCharSet : public weld::CustomWidgetController { protected: VclPtr<VirtualDevice> mxVirDev; vcl::Font maFont; std::unique_ptr<weld::ScrolledWindow> mxScrollArea; public: - SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev); + SVX_DLLPUBLIC SvxShowCharSet(std::unique_ptr<weld::ScrolledWindow> pScrollArea, const VclPtr<VirtualDevice>& rVirDev); virtual ~SvxShowCharSet() override; virtual void RecalculateFont(vcl::RenderContext& rRenderContext); - void SelectCharacter( sal_UCS4 cNew ); + SVX_DLLPUBLIC void SelectCharacter( sal_UCS4 cNew ); virtual sal_UCS4 GetSelectCharacter() const; virtual sal_UCS4 GetCharFromIndex(int index) const; void createContextMenu(const Point& rPosition); @@ -76,9 +76,9 @@ public: void SetPreSelectHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aPreSelectHdl = rHdl; } void SetFavClickHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aFavClickHdl = rHdl; } static sal_uInt32& getSelectedChar(); - void SetFont( const vcl::Font& rFont ); + SVX_DLLPUBLIC void SetFont( const vcl::Font& rFont ); vcl::Font const & GetFont() const { return maFont; } - FontCharMapRef const & GetFontCharMap(); + SVX_DLLPUBLIC FontCharMapRef const & GetFontCharMap(); bool isFavChar(std::u16string_view sTitle, std::u16string_view rFont); void getFavCharacterList(); //gets both Fav char and Fav char font list void updateFavCharacterList(const OUString& rChar, const OUString& rFont); @@ -153,7 +153,7 @@ protected: void InitSettings(vcl::RenderContext& rRenderContext); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; - DECL_DLLPRIVATE_LINK(VscrollHdl, weld::ScrolledWindow&, void); + DECL_LINK(VscrollHdl, weld::ScrolledWindow&, void); void ContextMenuSelect(std::u16string_view rIdent); void init(); diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index b984a74c65d9..7fff9931f642 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -44,7 +44,7 @@ class E3dDefaultAttributes; |* \************************************************************************/ -class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC E3dCubeObj final : public E3dCompoundObject +class SAL_WARN_UNUSED E3dCubeObj final : public E3dCompoundObject { // Parameter basegfx::B3DPoint aCubePos; @@ -61,7 +61,7 @@ private: virtual ~E3dCubeObj() override; public: - E3dCubeObj(SdrModel& rSdrModel, + SVXCORE_DLLPUBLIC E3dCubeObj(SdrModel& rSdrModel, const E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& aPos, const basegfx::B3DVector& r3DSize); diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 10f5b26fecac..281fadbc18c3 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -43,7 +43,7 @@ public: class SvxGraphCtrlAccessibleContext; -class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController +class GraphCtrl : public weld::CustomWidgetController { friend class GraphCtrlView; friend class GraphCtrlUserCall; @@ -65,7 +65,7 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController bool mbInIdleUpdate; weld::Dialog* mpDialog; - DECL_DLLPRIVATE_LINK( UpdateHdl, Timer*, void ); + DECL_LINK( UpdateHdl, Timer*, void ); rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext; @@ -93,11 +93,11 @@ protected: public: - GraphCtrl(weld::Dialog* pDialog); + SVX_DLLPUBLIC GraphCtrl(weld::Dialog* pDialog); virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; - virtual ~GraphCtrl() override; + SVX_DLLPUBLIC virtual ~GraphCtrl() override; - void SetGraphic( const Graphic& rGraphic, bool bNewModel = true ); + SVX_DLLPUBLIC void SetGraphic( const Graphic& rGraphic, bool bNewModel = true ); const Graphic& GetGraphic() const { return aGraphic; } const Size& GetGraphicSize() const { return aGraphSize; } diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 9bd17307ceee..c21be66cdc5e 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -39,7 +39,7 @@ class E3dDefaultAttributes; |* \************************************************************************/ -class SVXCORE_DLLPUBLIC E3dLatheObj final : public E3dCompoundObject +class E3dLatheObj final : public E3dCompoundObject { basegfx::B2DPolyPolygon maPolyPoly2D; @@ -52,7 +52,7 @@ private: virtual ~E3dLatheObj() override; public: - E3dLatheObj( + SVXCORE_DLLPUBLIC E3dLatheObj( SdrModel& rSdrModel, const E3dDefaultAttributes& rDefault, basegfx::B2DPolyPolygon aPoly2D); diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx index 3e0ff95bba4e..1f15d685cfdf 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 SVXCORE_DLLPUBLIC E3dSphereObj final : public E3dCompoundObject +class E3dSphereObj final : public E3dCompoundObject { private: basegfx::B3DPoint aCenter; @@ -47,7 +47,7 @@ private: virtual ~E3dSphereObj() override; public: - E3dSphereObj( + SVXCORE_DLLPUBLIC E3dSphereObj( SdrModel& rSdrModel, const E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, |