From fa94b21f2e24da0d19e11b73ed3a78fc9ec87536 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 3 Apr 2011 21:39:14 +0200 Subject: the interface classes/functions must be dllpublic --- drawinglayer/Library_drawinglayer.mk | 5 +++ drawinglayer/Package_inc.mk | 1 + .../inc/drawinglayer/animation/animationtiming.hxx | 12 +++--- .../drawinglayer/attribute/fillbitmapattribute.hxx | 4 +- .../attribute/fillgradientattribute.hxx | 4 +- .../drawinglayer/attribute/fillhatchattribute.hxx | 4 +- .../inc/drawinglayer/attribute/fontattribute.hxx | 4 +- .../inc/drawinglayer/attribute/lineattribute.hxx | 4 +- .../attribute/linestartendattribute.hxx | 4 +- .../drawinglayer/attribute/materialattribute3d.hxx | 4 +- .../drawinglayer/attribute/sdrallattribute3d.hxx | 4 +- .../drawinglayer/attribute/sdrfillattribute.hxx | 4 +- .../attribute/sdrfillbitmapattribute.hxx | 4 +- .../drawinglayer/attribute/sdrlightattribute3d.hxx | 4 +- .../attribute/sdrlightingattribute3d.hxx | 4 +- .../drawinglayer/attribute/sdrlineattribute.hxx | 4 +- .../attribute/sdrlinestartendattribute.hxx | 4 +- .../attribute/sdrobjectattribute3d.hxx | 4 +- .../drawinglayer/attribute/sdrsceneattribute3d.hxx | 4 +- .../drawinglayer/attribute/sdrshadowattribute.hxx | 4 +- .../inc/drawinglayer/attribute/strokeattribute.hxx | 4 +- drawinglayer/inc/drawinglayer/drawinglayerdllapi.h | 45 ++++++++++++++++++++++ .../drawinglayer/geometry/viewinformation2d.hxx | 4 +- .../drawinglayer/geometry/viewinformation3d.hxx | 4 +- .../primitive2d/animatedprimitive2d.hxx | 8 ++-- .../primitive2d/backgroundcolorprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/baseprimitive2d.hxx | 18 +++++---- .../drawinglayer/primitive2d/bitmapprimitive2d.hxx | 4 +- .../primitive2d/borderlineprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/chartprimitive2d.hxx | 4 +- .../primitive2d/clippedborderlineprimitive2d.hxx | 4 +- .../primitive2d/controlprimitive2d.hxx | 4 +- .../primitive2d/discretebitmapprimitive2d.hxx | 4 +- .../primitive2d/discreteshadowprimitive2d.hxx | 6 ++- .../primitive2d/embedded3dprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/epsprimitive2d.hxx | 4 +- .../primitive2d/fillbitmapprimitive2d.hxx | 4 +- .../primitive2d/fillgradientprimitive2d.hxx | 4 +- .../primitive2d/fillhatchprimitive2d.hxx | 4 +- .../primitive2d/graphicprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/gridprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/groupprimitive2d.hxx | 4 +- .../primitive2d/helplineprimitive2d.hxx | 4 +- .../primitive2d/hiddengeometryprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/invertprimitive2d.hxx | 4 +- .../primitive2d/markerarrayprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/maskprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/mediaprimitive2d.hxx | 4 +- .../primitive2d/metafileprimitive2d.hxx | 4 +- .../primitive2d/modifiedcolorprimitive2d.hxx | 4 +- .../primitive2d/pagepreviewprimitive2d.hxx | 4 +- .../primitive2d/pointarrayprimitive2d.hxx | 4 +- .../primitive2d/polygonprimitive2d.hxx | 12 +++--- .../primitive2d/polypolygonprimitive2d.hxx | 18 +++++---- .../drawinglayer/primitive2d/primitivetools2d.hxx | 10 +++-- .../drawinglayer/primitive2d/sceneprimitive2d.hxx | 4 +- .../primitive2d/sdrdecompositiontools2d.hxx | 12 +++--- .../drawinglayer/primitive2d/shadowprimitive2d.hxx | 4 +- .../primitive2d/structuretagprimitive2d.hxx | 4 +- .../primitive2d/textdecoratedprimitive2d.hxx | 4 +- .../primitive2d/texteffectprimitive2d.hxx | 4 +- .../primitive2d/textenumsprimitive2d.hxx | 10 +++-- .../primitive2d/texthierarchyprimitive2d.hxx | 14 ++++--- .../drawinglayer/primitive2d/textlayoutdevice.hxx | 8 ++-- .../primitive2d/textlineprimitive2d.hxx | 4 +- .../drawinglayer/primitive2d/textprimitive2d.hxx | 6 ++- .../primitive2d/textstrikeoutprimitive2d.hxx | 8 ++-- .../primitive2d/transformprimitive2d.hxx | 4 +- .../primitive2d/transparenceprimitive2d.hxx | 4 +- .../primitive2d/unifiedtransparenceprimitive2d.hxx | 4 +- .../primitive2d/wallpaperprimitive2d.hxx | 4 +- .../primitive2d/wrongspellprimitive2d.hxx | 4 +- .../drawinglayer/primitive3d/baseprimitive3d.hxx | 18 +++++---- .../drawinglayer/primitive3d/groupprimitive3d.hxx | 4 +- .../primitive3d/hatchtextureprimitive3d.hxx | 4 +- .../primitive3d/hiddengeometryprimitive3d.hxx | 4 +- .../primitive3d/modifiedcolorprimitive3d.hxx | 4 +- .../primitive3d/polygonprimitive3d.hxx | 6 ++- .../primitive3d/polygontubeprimitive3d.hxx | 4 +- .../primitive3d/polypolygonprimitive3d.hxx | 4 +- .../primitive3d/sdrcubeprimitive3d.hxx | 4 +- .../primitive3d/sdrdecompositiontools3d.hxx | 20 +++++----- .../primitive3d/sdrextrudelathetools3d.hxx | 16 ++++---- .../primitive3d/sdrextrudeprimitive3d.hxx | 4 +- .../primitive3d/sdrlatheprimitive3d.hxx | 4 +- .../primitive3d/sdrpolypolygonprimitive3d.hxx | 4 +- .../drawinglayer/primitive3d/sdrprimitive3d.hxx | 4 +- .../primitive3d/sdrsphereprimitive3d.hxx | 4 +- .../drawinglayer/primitive3d/shadowprimitive3d.hxx | 4 +- .../primitive3d/textureprimitive3d.hxx | 12 +++--- .../primitive3d/transformprimitive3d.hxx | 4 +- .../drawinglayer/processor2d/baseprocessor2d.hxx | 6 ++- .../drawinglayer/processor2d/canvasprocessor.hxx | 4 +- .../processor2d/contourextractor2d.hxx | 4 +- .../processor2d/hittestprocessor2d.hxx | 4 +- .../processor2d/linegeometryextractor2d.hxx | 4 +- .../processor2d/textaspolygonextractor2d.hxx | 4 +- .../processor2d/vclmetafileprocessor2d.hxx | 4 +- .../processor2d/vclpixelprocessor2d.hxx | 4 +- .../drawinglayer/processor2d/vclprocessor2d.hxx | 4 +- .../drawinglayer/processor3d/baseprocessor3d.hxx | 6 ++- .../processor3d/cutfindprocessor3d.hxx | 4 +- .../processor3d/defaultprocessor3d.hxx | 4 +- .../processor3d/geometry2dextractor.hxx | 4 +- .../drawinglayer/processor3d/shadow3dextractor.hxx | 4 +- .../processor3d/zbufferprocessor3d.hxx | 4 +- drawinglayer/inc/drawinglayer/texture/texture.hxx | 22 ++++++----- .../inc/drawinglayer/texture/texture3d.hxx | 10 +++-- 108 files changed, 451 insertions(+), 190 deletions(-) create mode 100644 drawinglayer/inc/drawinglayer/drawinglayerdllapi.h diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 0f0c0b9d321c..fa9cef081166 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -38,6 +38,11 @@ $(eval $(call gb_Library_set_include,drawinglayer,\ -I$(OUTDIR)/inc/offuh \ )) +$(eval $(call gb_Library_set_defs,drawinglayer,\ + $$(DEFS) \ + -DDRAWINGLAYER_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_add_linked_libs,drawinglayer,\ avmedia \ basegfx \ diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk index 73c5601f73db..d4c81dcd30aa 100644 --- a/drawinglayer/Package_inc.mk +++ b/drawinglayer/Package_inc.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sd $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrsceneattribute3d.hxx,drawinglayer/attribute/sdrsceneattribute3d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrshadowattribute.hxx,drawinglayer/attribute/sdrshadowattribute.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/strokeattribute.hxx,drawinglayer/attribute/strokeattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/drawinglayerdllapi.h,drawinglayer/drawinglayerdllapi.h)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation2d.hxx,drawinglayer/geometry/viewinformation2d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation3d.hxx,drawinglayer/geometry/viewinformation3d.hxx)) $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/animatedprimitive2d.hxx,drawinglayer/primitive2d/animatedprimitive2d.hxx)) diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx index 106424b0a73a..ff10eb5672ff 100644 --- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx +++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX #define INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX +#include + #include #include @@ -40,7 +42,7 @@ namespace drawinglayer { ////////////////////////////////////////////////////////////////////////////// - class AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntry { private: AnimationEntry(const AnimationEntry&); @@ -59,7 +61,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryFixed : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: double mfDuration; @@ -78,7 +80,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLinear : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: double mfDuration; @@ -99,7 +101,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryList : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: double mfDuration; @@ -122,7 +124,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLoop : public AnimationEntryList + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { protected: sal_uInt32 mnRepeat; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx index 41ca480bfab0..96b181dbf18c 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class FillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute { private: ImpFillBitmapAttribute* mpFillBitmapAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx index 4d02d2569089..1d0b1ce30cab 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -69,7 +71,7 @@ namespace drawinglayer { namespace attribute { - class FillGradientAttribute + class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute { private: ImpFillGradientAttribute* mpFillGradientAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx index 0bb0988f5889..3828927ac8bc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -66,7 +68,7 @@ namespace drawinglayer { namespace attribute { - class FillHatchAttribute + class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute { private: ImpFillHatchAttribute* mpFillHatchAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx index 1382c506669a..2e3ebd5dad06 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer This attribute class is able to hold all parameters needed/used to completely define the parametrisation of a text portion. */ - class FontAttribute + class DRAWINGLAYER_DLLPUBLIC FontAttribute { private: ImpFontAttribute* mpFontAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx index b4e006d7b750..f9d7142e5c3d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineAttribute + class DRAWINGLAYER_DLLPUBLIC LineAttribute { private: ImpLineAttribute* mpLineAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx index c8745778eb21..ba6a45aaab6f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute { private: ImpLineStartEndAttribute* mpLineStartEndAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx index 2b4ea4b90743..886d87e0d063 100644 --- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class MaterialAttribute3D + class DRAWINGLAYER_DLLPUBLIC MaterialAttribute3D { private: ImpMaterialAttribute3D* mpMaterialAttribute3D; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx index c3857e617d69..1831b787f288 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX +#include + #include #include #include @@ -45,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineFillShadowAttribute3D + class DRAWINGLAYER_DLLPUBLIC SdrLineFillShadowAttribute3D { private: const SdrLineAttribute maLine; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx index db4e570cb23d..d9bb829fa698 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -53,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillAttribute { private: ImpSdrFillAttribute* mpSdrFillAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx index 9e5721620e06..ab7f003fee4d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillBitmapAttribute { private: ImpSdrFillBitmapAttribute* mpSdrFillBitmapAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx index edeae3cb9fee..03a731c607ba 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DLightAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DLightAttribute { private: ImpSdr3DLightAttribute* mpSdr3DLightAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx index dbe1c1f7e0cd..8de7688b5199 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX +#include + #include #include @@ -53,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrLightingAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLightingAttribute { private: ImpSdrLightingAttribute* mpSdrLightingAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx index c5f18db6f7a4..6e39600e3dfa 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX +#include + #include #include #include @@ -52,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineAttribute { private: ImpSdrLineAttribute* mpSdrLineAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx index b832c9ca51b5..02582b56a290 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -50,7 +52,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineStartEndAttribute { private: ImpSdrLineStartEndAttribute* mpSdrLineStartEndAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx index 06d9360f6d11..f92caa1c8ff1 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX +#include + #include #include #include @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DObjectAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DObjectAttribute { private: ImpSdr3DObjectAttribute* mpSdr3DObjectAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx index 44e964a53f42..594b4c45de5f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX +#include + #include #include #include @@ -48,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class SdrSceneAttribute + class DRAWINGLAYER_DLLPUBLIC SdrSceneAttribute { private: ImpSdrSceneAttribute* mpSdrSceneAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx index 12f41297a337..9c4b2ececdd9 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class SdrShadowAttribute + class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute { private: ImpSdrShadowAttribute* mpSdrShadowAttribute; diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx index b9e4d15cd6e2..99e35ceec080 100644 --- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class StrokeAttribute + class DRAWINGLAYER_DLLPUBLIC StrokeAttribute { private: ImpStrokeAttribute* mpStrokeAttribute; diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h new file mode 100644 index 000000000000..8badcbe1fe82 --- /dev/null +++ b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * David Tardon, Red Hat Inc. + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Major Contributor(s): + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H +#define INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H + +#include + +#if defined(DRAWINGLAYER_DLLIMPLEMENTATION) +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define DRAWINGLAYER_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index e397eeb94395..0a6b21e66f58 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX +#include + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -63,7 +65,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive2D for C++ implementations working with those */ - class ViewInformation2D + class DRAWINGLAYER_DLLPUBLIC ViewInformation2D { private: /// pointer to private implementation class diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx index e8b6299769cb..8364577ee99d 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX +#include + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -61,7 +63,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive3D for C++ implementations working with those */ - class ViewInformation3D + class DRAWINGLAYER_DLLPUBLIC ViewInformation3D { private: /// pointer to private implementation class diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx index 50b3e5e6ecd9..a43f12f17584 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX +#include + #include #include #include @@ -58,7 +60,7 @@ namespace drawinglayer for values of [0.0 .. 0.5] the first, else the last entry will be used. This mechanism is not limited to two entries, though. */ - class AnimatedSwitchPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedSwitchPrimitive2D : public GroupPrimitive2D { private: /** @@ -115,7 +117,7 @@ namespace drawinglayer decomposition is specialized in delivering the children in the range [0.0.. 0.5] and an empty sequence else */ - class AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D { protected: public: @@ -147,7 +149,7 @@ namespace drawinglayer will be linearly combined from the decomposed values and the animation value to allow a smooth animation. */ - class AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D { private: /// the transformations diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 05b7fae6ecf8..441abf49f01c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX +#include + #include #include @@ -50,7 +52,7 @@ namespace drawinglayer It will try to buffer it's last decomposition using maLastViewport to detect changes in the get2DDecomposition call. */ - class BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the fill color to use diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index b6afe2994e08..12585e9202ce 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX +#include + #include #include #include @@ -142,7 +144,7 @@ namespace drawinglayer for view-independent primitives which are defined by not using ViewInformation2D in their get2DDecomposition/getB2DRange implementations. */ - class BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive2DImplBase @@ -227,7 +229,7 @@ namespace drawinglayer to identify if a new decomposition is needed at the next call (f) return maBuffered2DDecomposition */ - class BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive2D : public BasePrimitive2D { private: @@ -270,24 +272,24 @@ namespace drawinglayer namespace primitive2d { /// get B2DRange from a given Primitive2DReference - basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); /// get B2DRange from a given Primitive2DSequence - basegfx::B2DRange getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); /// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally - bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); /// concatenate sequence - void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); /// concatenate single Primitive2D - void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx index e93456151959..c3650b3fd23a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer This may change in the future to any other, maybe more general base class providing 24bit RGBA. */ - class BitmapPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BitmapPrimitive2D : public BasePrimitive2D { private: /// the RGBA Bitmap-data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 6080881cbb42..0bd537de41b3 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX +#include + #include #include #include @@ -48,7 +50,7 @@ namespace drawinglayer The LineStart/End overlap is defined by the Extend(Inner|Outer)(Start|End) definitions. */ - class BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx index 752b6e6985dd..b32c94291e26 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX +#include + #include #include #include @@ -45,7 +47,7 @@ namespace drawinglayer visualisation. It is used to allow specific renderers to do something direct for visualising the chart. */ - class ChartPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ChartPrimitive2D : public GroupPrimitive2D { private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx index bae79087a7a8..9c1495b0d582 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX +#include + #include #include #include @@ -41,7 +43,7 @@ namespace drawinglayer /** BorderLinePrimitive2D clipped by the intersection with a provided polygon. */ - class ClippedBorderLinePrimitive2D : public BorderLinePrimitive2D + class DRAWINGLAYER_DLLPUBLIC ClippedBorderLinePrimitive2D : public BorderLinePrimitive2D { private: const basegfx::B2DPolygon maIntersection; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index 41ee01581090..c4999883823e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer representation is limited to a quadratic pixel maximum defined in the applicatin settings. */ - class ControlPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// object's base data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 27e77f20aa44..8e33c1530f8d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX +#include + #include #include @@ -46,7 +48,7 @@ namespace drawinglayer painted in 1:1 pixel resolution. It will never be sheared, rotated or scaled with the view. */ - class DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D { private: /// the RGBA Bitmap-data diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index c30bff545ddb..795f4d97b130 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -28,6 +28,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#include + #include #include #include @@ -42,7 +44,7 @@ namespace drawinglayer /** DiscreteShadow data class */ - class DiscreteShadow + class DRAWINGLAYER_DLLPUBLIC DiscreteShadow { private: /// the original shadow BitmapEx in a special form @@ -85,7 +87,7 @@ namespace drawinglayer /** DiscreteShadowPrimitive2D class */ - class DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D { private: // the object transformation of the rectangular object diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index cbc1393dd849..245a6d1bb8dc 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX +#include + #include #include #include @@ -51,7 +53,7 @@ namespace drawinglayer This primitive will not be visualized and decomposes to a yellow 2D rectangle to visualize that this should never be visualized */ - class Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the sequence of 3d primitives diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx index a3310c00bf24..a1533a6d5633 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX +#include + #include #include #include @@ -41,7 +43,7 @@ namespace drawinglayer namespace primitive2d { /** EpsPrimitive2D class */ - class EpsPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC EpsPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 2552472b3388..503ab31d4ff5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX +#include + #include #include #include @@ -53,7 +55,7 @@ namespace drawinglayer decomposition, but on pixel oututs the areas where the tiled pieces are aligned tend to show up (one overlapping or empty pixel) */ - class FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index f4f780404059..2fe971b871ef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX +#include + #include #include @@ -58,7 +60,7 @@ namespace drawinglayer version is used in the MetafilePrimitive2D decomposition when the old XOR paint was recorded. */ - class FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index d27b1957f657..f7a37b2f5e3f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX +#include + #include #include #include @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will deliver the hatch lines. */ - class FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx index 2f4c52ff1532..381d69b41fb6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX +#include + #include #include #include @@ -54,7 +56,7 @@ namespace drawinglayer The primitive geometry area is defined by Transform. */ - class GraphicPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GraphicPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx index edb7f43417c3..fda8dd3e9fda 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX +#include + #include #include #include @@ -50,7 +52,7 @@ namespace drawinglayer makes this primitive highly view-dependent and it dynamically buffers the last decomposition dependent from the Viewport used. */ - class GridPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GridPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// The geometry definition for the grid area diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index db582069df57..b2bec3c7c818 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -70,7 +72,7 @@ namespace drawinglayer - ModifiedColorPrimitive2D (for a stack of color modifications) - TransformPrimitive2D (for a transformation stack) */ - class GroupPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive2D : public BasePrimitive2D { private: /// the children. Declared private since this shall never be changed at all after construction diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx index 2e70d31a1949..26587634eaf1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX +#include + #include #include #include @@ -61,7 +63,7 @@ namespace drawinglayer The visualisation uses the two given colors to create a dashed line with the given dash length. */ - class HelplinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HelplinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// Helpline geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index b17d0600c8b2..341effddfc00 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer // filled nor lines' creation criteria. The whole primitive decomposes to nothing, // so no one not knowing it will be influenced. Only helper processors for hit test // (and maybe BoundRect extractors) will use it and it's children subcontent. - class HiddenGeometryPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D : public GroupPrimitive2D { public: HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx index ea20a1099614..2ef4a4184c92 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer systems. XOR painting needs read access to the target, so modern graphic systems tend to not support it anymore. */ - class InvertPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC InvertPrimitive2D : public GroupPrimitive2D { public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index eedee6013950..90d2ef9d3c5c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX +#include + #include #include #include @@ -53,7 +55,7 @@ namespace drawinglayer It decomposes to the needed number of BitmapPrimitive2D's, so it would be efficient to handle it directly in a renderer. */ - class MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the positions for the marker diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx index a46f7d44e835..6f2dced65eef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX +#include + #include #include @@ -52,7 +54,7 @@ namespace drawinglayer The geometrc range of this primitive is completely defined by the Mask PolyPolygon since by definition nothing outside of the mask is visible. */ - class MaskPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D { private: /// the mask PolyPolygon diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx index 9d64e204c936..bc9dcb9a495e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX +#include + #include #include #include @@ -48,7 +50,7 @@ namespace drawinglayer background and the decomposition will try to create a graphic representation if te content (defined by the URL), e.g. a still frome for animated stuff. */ - class MediaPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MediaPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx index e4763a818648..77fb8a8cf9d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX +#include + #include #include #include @@ -60,7 +62,7 @@ namespace drawinglayer have many advantages; Metafile would no longer have to be rendered by sub-systems and a standard way for converting Metafiles would exist. */ - class MetafilePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MetafilePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index c96782e60fe0..770ed83fe160 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX +#include + #include #include @@ -55,7 +57,7 @@ namespace drawinglayer If a renderer does not handle this primitive, the content will be visualized unchanged. */ - class ModifiedColorPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive2D : public GroupPrimitive2D { private: /// The ColorModifier to use diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 7fc5e13a6e62..e6d969651a68 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer those primitives to be visualized correctly, Your renderer needs to locally correct it's ViewInformation2D to reference the new XDrawPage. */ - class PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the XDrawPage visualized by this primitive. When we go forward with primitives diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index fb275d66544f..d6a60fc95b7b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX +#include + #include #include @@ -49,7 +51,7 @@ namespace drawinglayer should proccess it (Currently it is only used for grid visualisation, but this may change). */ - class PointArrayPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D : public BasePrimitive2D { private: /// the array of positions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx index 2bfeabf4305a..48acedc4613a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX +#include + #include #include #include @@ -52,7 +54,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive2D : public BasePrimitive2D { private: /// the hairline geometry @@ -99,7 +101,7 @@ namespace drawinglayer It will be decomposed to the needed PolygonHairlinePrimitive2D if not handled directly by a renderer. */ - class PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -161,7 +163,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled PolyPolygons for fat lines. */ - class PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -218,7 +220,7 @@ namespace drawinglayer This primitive defines a waveline based on a PolygonStrokePrimitive2D where the wave is defined by wave width and wave length. */ - class PolygonWavePrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D : public PolygonStrokePrimitive2D { private: /// wave definition @@ -274,7 +276,7 @@ namespace drawinglayer eventually by start and end definitions which are normally used for arrows. */ - class PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D { private: /// geometric definitions for line start and end diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 2ae5edbb1ea0..a8f046ddab6c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX +#include + #include #include #include @@ -52,7 +54,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonHairlinePrimitive2Ds. */ - class PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the hairline geometry @@ -98,7 +100,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonMarkerPrimitive2Ds. */ - class PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -154,7 +156,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokePrimitive2Ds. */ - class PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -212,7 +214,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokeArrowPrimitive2Ds. */ - class PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D { private: /// geometric definitions for line start and end @@ -268,7 +270,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolyPolygonColorPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D { private: /// the PolyPolygon geometry @@ -312,7 +314,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ - class PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -357,7 +359,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ - class PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -407,7 +409,7 @@ namespace drawinglayer (including transparence). The decomosition will create a MaskPrimitive2D containing a FillBitmapPrimitive2D. */ - class PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx index 3548b8971fd3..d8d1423da26c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date DiscreteUnit accessible using getDiscreteUnit() */ - class DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used fDiscreteUnit definitions for decomposition. Since this @@ -84,7 +86,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date Viewport accessible using getViewport() */ - class ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used Viewport definition for decomposition. Since this @@ -123,7 +125,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() */ - class ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation definition for decomposition. Since this @@ -163,7 +165,7 @@ namespace drawinglayer implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() and an object transformation via getObjectTransformation() */ - class ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation and the last ObjectTransformation diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx index 7d55725cc15f..2b67fd957ca9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX +#include + #include #include #include @@ -60,7 +62,7 @@ namespace drawinglayer This is the class a renderer may process directly when he wants to implement an own (e.g. system-specific) 3D renderer. */ - class ScenePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ScenePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the 3D geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index a74777d7a7e2..0779cbb3a4b2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -48,24 +50,24 @@ namespace drawinglayer namespace primitive2d { // helpers to create HitTestPrimitives Line - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon, const basegfx::B2DHomMatrix& rMatrix); diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx index 0ae428a6fc22..8f5b479d8b7a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX +#include + #include #include #include @@ -53,7 +55,7 @@ namespace drawinglayer are needed for the shadow itself; all the local decompositions of the original geometry can be reused from the renderer for shadow visualisation. */ - class ShadowPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive2D : public GroupPrimitive2D { private: /// the shadow transformation, normally just an offset diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 58da9a51fa63..23970f580baa 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX +#include + #include #include @@ -50,7 +52,7 @@ namespace drawinglayer If a renderer ignores this, it just decomposes to it's child content. */ - class StructureTagPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC StructureTagPrimitive2D : public GroupPrimitive2D { private: /// the PDF structure element this grouping represents diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 33d20ca4361c..57c6c748f21b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX +#include + #include #include @@ -56,7 +58,7 @@ namespace drawinglayer a TextSimplePortionPrimitive2D and all the contained decorations (if used) as geometry. */ - class TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D { private: /// decoration definitions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 7f00c04ed34d..6770ecb96b5d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX +#include + #include #include @@ -54,7 +56,7 @@ namespace drawinglayer also be used for any other primitives) which have some TextEffect applied and create the needed geometry and embedding on decomposition. */ - class TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the text (or other) content diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx index ce4616e7b0d4..8d3100bf7ff1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX +#include + #include #include @@ -65,8 +67,8 @@ namespace drawinglayer }; /** helper to convert LineStyle */ - TextLine mapFontUnderlineToTextLine(FontUnderline eLineStyle); - FontUnderline mapTextLineToFontUnderline(TextLine eLineStyle); + TextLine DRAWINGLAYER_DLLPUBLIC mapFontUnderlineToTextLine(FontUnderline eLineStyle); + FontUnderline DRAWINGLAYER_DLLPUBLIC mapTextLineToFontUnderline(TextLine eLineStyle); /** FontStrikeout definition */ enum TextStrikeout @@ -80,8 +82,8 @@ namespace drawinglayer }; /** helper to convert FontStrikeout */ - TextStrikeout mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); - ::FontStrikeout mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); + TextStrikeout DRAWINGLAYER_DLLPUBLIC mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); + ::FontStrikeout DRAWINGLAYER_DLLPUBLIC mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); /** TextEmphasisMark definition */ enum TextEmphasisMark diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index d5370b85fbd2..bf9ed2c5e41f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX +#include + #include #include @@ -47,7 +49,7 @@ namespace drawinglayer This primitive encapsulates text lines. */ - class TextHierarchyLinePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyLinePrimitive2D : public GroupPrimitive2D { private: public: @@ -70,7 +72,7 @@ namespace drawinglayer This primitive encapsulates text bullets. */ - class TextHierarchyBulletPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBulletPrimitive2D : public GroupPrimitive2D { private: public: @@ -93,7 +95,7 @@ namespace drawinglayer This primitive encapsulates text paragraphs. */ - class TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D { private: public: @@ -116,7 +118,7 @@ namespace drawinglayer This primitive encapsulates text blocks. */ - class TextHierarchyBlockPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBlockPrimitive2D : public GroupPrimitive2D { private: public: @@ -157,7 +159,7 @@ namespace drawinglayer type. Also added is a String which is type-dependent. E.g. for URL fields, it contains the URL. */ - class TextHierarchyFieldPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyFieldPrimitive2D : public GroupPrimitive2D { private: FieldType meType; @@ -199,7 +201,7 @@ namespace drawinglayer content. To suppress, this primitive needs to be parsed by the renderer without taking any action. */ - class TextHierarchyEditPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyEditPrimitive2D : public GroupPrimitive2D { private: public: diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx index 64629d8bd2d1..1a3fa97bae73 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX #define INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX +#include + #include #include #include @@ -67,7 +69,7 @@ namespace drawinglayer When in the future FontHandling may move to an own library independent from VCL, primitives will be prepared. */ - class TextLayouterDevice + class DRAWINGLAYER_DLLPUBLIC TextLayouterDevice { /// internally used VirtualDevice VirtualDevice& mrDevice; @@ -139,7 +141,7 @@ namespace drawinglayer both defines FontStretching, where no stretching happens at fFontScaleY == fFontScaleX */ - Font getVclFontFromFontAttribute( + Font DRAWINGLAYER_DLLPUBLIC getVclFontFromFontAttribute( const attribute::FontAttribute& rFontAttribute, double fFontScaleX, double fFontScaleY, @@ -151,7 +153,7 @@ namespace drawinglayer above) will be set in return parameter o_rSize to allow further processing */ - attribute::FontAttribute getFontAttributeFromVclFont( + attribute::FontAttribute DRAWINGLAYER_DLLPUBLIC getFontAttributeFromVclFont( basegfx::B2DVector& o_rSize, const Font& rFont, bool bRTL, diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx index 64249c83f164..08b184e7208c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX +#include + #include #include #include @@ -40,7 +42,7 @@ namespace drawinglayer { namespace primitive2d { - class TextLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx index bc80b888f2c2..c48f18b32c31 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX +#include + #include #include #include @@ -101,7 +103,7 @@ namespace drawinglayer @param rFontColor The font color to use */ - class TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// text transformation (FontCoordinateSystem) @@ -180,7 +182,7 @@ namespace drawinglayer }; /// small helper to have a compare operator for Locale - bool LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); + bool DRAWINGLAYER_DLLPUBLIC LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); } // end of namespace primitive2d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 674545ca5554..401b00176c0c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX +#include + #include #include #include @@ -42,7 +44,7 @@ namespace drawinglayer { namespace primitive2d { - class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions @@ -76,7 +78,7 @@ namespace drawinglayer { namespace primitive2d { - class TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: sal_Unicode maStrikeoutChar; @@ -117,7 +119,7 @@ namespace drawinglayer { namespace primitive2d { - class TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: double mfHeight; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx index 508d81cdbf28..8f2a7daafc4e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX +#include + #include #include @@ -57,7 +59,7 @@ namespace drawinglayer different, transformed states without the need to create those thousand primitive contents. */ - class TransformPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive2D : public GroupPrimitive2D { private: // the transformation to apply to the child geometry diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 7d96f336177c..f6141884dc9b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +58,7 @@ namespace drawinglayer rendering, not the transparent one. The transparent one should/will be clipped accordingly. */ - class TransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransparencePrimitive2D : public GroupPrimitive2D { private: /// The transparence-Mask who's RGB-Values are interpreted as Luminance diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 616aa48b82e2..94a95785638e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +50,7 @@ namespace drawinglayer regions of combined transparency, but be all rendered with the defined, single transparency. */ - class UnifiedTransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparencePrimitive2D : public GroupPrimitive2D { private: /// the unified transparence diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index b3cbbaa69235..aa0fb20e8e03 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX +#include + #include #include #include @@ -52,7 +54,7 @@ namespace drawinglayer layouting which is dependent from WallpaperStyle; thus it does not need to be handled anywhere else in the future. */ - class WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D { private: basegfx::B2DRange maObjectRange; diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index be5c6b3cad67..31ac1a7d7b80 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX +#include + #include #include #include @@ -54,7 +56,7 @@ namespace drawinglayer The geometric definition defines a line on the X-Axis (no Y-coordinates) which will when transformed by Transformation, create the coordinate data. */ - class WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometry definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index b80bd9d0a8ed..02c7eb598329 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX +#include + #include #include #include @@ -83,7 +85,7 @@ namespace drawinglayer That's all for 3D! */ - class BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase @@ -148,7 +150,7 @@ namespace drawinglayer The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information */ - class BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive3D : public BasePrimitive3D { private: @@ -191,24 +193,24 @@ namespace drawinglayer namespace primitive3d { /// get B3DRange from a given Primitive3DReference - basegfx::B3DRange getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); /// get range3D from a given Primitive3DSequence - basegfx::B3DRange getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); /// compare two Primitive3DReferences for equality, uses arePrimitive3DReferencesEqual internally - bool arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); /// concatenate sequence - void appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); /// concatenate single Primitive3D - void appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); } // end of namespace primitive3d } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index 6b2a3ba9c773..0c93b4295071 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +58,7 @@ namespace drawinglayer - HatchTexturePrimitive3D (for 3D hatch fill) - TransformPrimitive3D (for a transformation stack) */ - class GroupPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive3D : public BasePrimitive3D { private: /// the children. Declared private since this shall never be changed at all after construction diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index f2f88b56bda0..586a590d3d74 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer primitive has no default buffering, it is necessary here to add a local buffering mechanism for the decomposition */ - class HatchTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC HatchTexturePrimitive3D : public TexturePrimitive3D { private: /// the hatch definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index 8aec150e32b4..bb9ab4f1352d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -31,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +51,7 @@ namespace drawinglayer // decomposes to nothing, so no one not knowing it will be influenced. Only // helper processors for hit test (and maybe BoundRect extractors) will // use it and it's children subcontent. - class HiddenGeometryPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive3D : public GroupPrimitive3D { public: HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index b28dca4c445b..61e5123baf61 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer visualisation. Please see the ModifiedColorPrimitive2D description for more info. */ - class ModifiedColorPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive3D : public GroupPrimitive3D { private: /// The ColorModifier to use diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 1b92bced8258..bae55721ebdb 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX +#include + #include #include #include @@ -49,7 +51,7 @@ namespace drawinglayer This is one of the non-decomposable 3D primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive3D : public BasePrimitive3D { private: /// the hairline geometry @@ -92,7 +94,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled Tubes for fat lines. */ - class PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D { private: /// the line geometry diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 7d5620305134..4666f3d61b1d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +54,7 @@ namespace drawinglayer 3D objects needed for the line tubes and the edge roundings in full 3D. */ - class PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D { private: /// hold the last decompositon since it's expensive diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 77050889b487..c9d6a650e9f3 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer It is assumed here that the PolyPolgon is a single plane in 3D. */ - class PolyPolygonMaterialPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMaterialPrimitive3D : public BasePrimitive3D { private: /// the PolyPolygon geometry diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index bef18f7042c4..a63322b5e29a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -43,7 +45,7 @@ namespace drawinglayer The cube is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrCubePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrCubePrimitive3D : public SdrPrimitive3D { protected: /// local decomposition. diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 61a67dad1c44..512f1c5b6a91 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX +#include + #include #include #include @@ -58,25 +60,25 @@ namespace drawinglayer namespace primitive3d { // #i98295# - basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); - void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); // #i98314# - void applyTextureTo3DGeometry( + void DRAWINGLAYER_DLLPUBLIC applyTextureTo3DGeometry( ::com::sun::star::drawing::TextureProjectionMode eModeX, ::com::sun::star::drawing::TextureProjectionMode eModeY, ::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange, const basegfx::B2DVector& rTextureSize); - Primitive3DSequence create3DPolyPolygonLinePrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonLinePrimitives( const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine); - Primitive3DSequence create3DPolyPolygonFillPrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonFillPrimitives( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, @@ -84,12 +86,12 @@ namespace drawinglayer const attribute::SdrFillAttribute& rFill, const attribute::FillGradientAttribute& rFillGradient); - Primitive3DSequence createShadowPrimitive3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createShadowPrimitive3D( const Primitive3DSequence& rSource, const attribute::SdrShadowAttribute& rShadow, bool bShadow3D); - Primitive3DSequence createHiddenGeometryPrimitives3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives3D( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 7dfb986d0a0d..bf72befcd0bc 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX +#include + #include #include #include @@ -55,7 +57,7 @@ namespace drawinglayer }; /// class to hold one Slice3D - class Slice3D + class DRAWINGLAYER_DLLPUBLIC Slice3D { protected: basegfx::B3DPolyPolygon maPolyPolygon; @@ -89,7 +91,7 @@ namespace drawinglayer typedef ::std::vector< Slice3D > Slice3DVector; /// helpers for creation - void createLatheSlices( + void DRAWINGLAYER_DLLPUBLIC createLatheSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -100,7 +102,7 @@ namespace drawinglayer bool bCloseFront, bool bCloseBack); - void createExtrudeSlices( + void DRAWINGLAYER_DLLPUBLIC createExtrudeSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -111,10 +113,10 @@ namespace drawinglayer bool bCloseBack); /// helpers for geometry extraction - basegfx::B3DPolyPolygon extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); - basegfx::B3DPolyPolygon extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); - void extractPlanesFromSlice( + void DRAWINGLAYER_DLLPUBLIC extractPlanesFromSlice( ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, bool bCreateNormals, @@ -127,7 +129,7 @@ namespace drawinglayer bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform); - void createReducedOutlines( + void DRAWINGLAYER_DLLPUBLIC createReducedOutlines( const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B3DPolygon& rLoopA, diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 06f881a7f260..22ab9b358416 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX +#include + #include #include @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrExtrudePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrExtrudePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index b4e4f18c10aa..aa21580d364f 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX +#include + #include #include @@ -49,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrLathePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrLathePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 71f868b468aa..450b6a7ec61a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +49,7 @@ namespace drawinglayer The decomposition will include all needed 3D data for visualisation, including FatLines and fill styles. */ - class SdrPolyPolygonPrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPolyPolygonPrimitive3D : public SdrPrimitive3D { private: /// the planar polyPolygon evtl with normals and texture coordinates diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index 26d5efda687b..0f3b66fb6308 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX +#include + #include #include #include @@ -48,7 +50,7 @@ namespace drawinglayer */ namespace primitive3d { - class SdrPrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPrimitive3D : public BufferedDecompositionPrimitive3D { private: /// object surface attributes diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index a2ec5e5f7c46..919cbefd5a33 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -43,7 +45,7 @@ namespace drawinglayer The sphere is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrSpherePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrSpherePrimitive3D : public SdrPrimitive3D { private: /// additional geometry definitions diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index 26ac8dcd6739..d72e83493267 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX +#include + #include #include #include @@ -49,7 +51,7 @@ namespace drawinglayer combined with the scene and camera definition to create the correct projected shadow 2D-Polygons. */ - class ShadowPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive3D : public GroupPrimitive3D { protected: /// 2D shadow definition diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 0eb6a6a3844e..8c816733d36c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer 3d geometry by embedding it. It is used as bae class for extended texture definitions */ - class TexturePrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TexturePrimitive3D : public GroupPrimitive3D { private: /// texture geometry definition @@ -91,7 +93,7 @@ namespace drawinglayer transparence texture definition. All 3D primitives embedded here will be shown with the given transparency. */ - class UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D { private: /// transparency definition @@ -133,7 +135,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined gradient. */ - class GradientTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GradientTexturePrimitive3D : public TexturePrimitive3D { private: /// the gradient definition @@ -172,7 +174,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined bitmap (maybe tiled if defined). */ - class BitmapTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BitmapTexturePrimitive3D : public TexturePrimitive3D { private: /// bitmap fill attribute @@ -212,7 +214,7 @@ namespace drawinglayer that gradient will be interpreted as luminance Transparence-Values. All 3D primitives embedded here will be shown with the defined transparence. */ - class TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D { public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index 544fb0b2690e..d559fab5048c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX +#include + #include #include @@ -47,7 +49,7 @@ namespace drawinglayer Please see the description for TransformPrimitive2D since these primitives are pretty similar. */ - class TransformPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive3D : public GroupPrimitive3D { private: // the 3D transformation to apply diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx index 8721e0262914..cafe6e91a8c8 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX +#include + #include #include @@ -160,7 +162,7 @@ namespace drawinglayer be helpful to add many for the purpose not interesting higher level primitives to not force their decomposition to be created and/or parsed. */ - class BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor2D { private: /// The ViewInformation2D itself. It's private to isolate accesses to it @@ -209,7 +211,7 @@ namespace drawinglayer hand around as instance over various methods where every called method can add graphic content to it. */ - class CollectingProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC CollectingProcessor2D : public BaseProcessor2D { private: primitive2d::Primitive2DSequence maPrimitive2DSequence; diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index ca300484f017..2fbcda99f5cb 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx @@ -29,6 +29,8 @@ #ifndef _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX #define _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#include + #include #include #include @@ -74,7 +76,7 @@ namespace drawinglayer A basic implementation of a renderer for com::sun::star::rendering::XCanvas as a target */ - class canvasProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D { private: // The Pixel renderer resets the original MapMode from the OutputDevice. diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx index cff47b664ad3..e0b95eb6c450 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX +#include + #include #include #include @@ -44,7 +46,7 @@ namespace drawinglayer A processor who extracts the contour of the primtives feeded to it in the single local PolyPolygon */ - class ContourExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC ContourExtractor2D : public BaseProcessor2D { private: /// the extracted contour diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx index 7056392860ff..96da21a9b6d3 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -49,7 +51,7 @@ namespace drawinglayer This processor implements a HitTest with the feeded primitives, given tolerance and extras */ - class HitTestProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC HitTestProcessor2D : public BaseProcessor2D { private: /// discrete HitTest position diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx index d750531e905a..66c0a52021ce 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX +#include + #include #include @@ -43,7 +45,7 @@ namespace drawinglayer This processor can extract the line geometry from feeded primpitives. The hairlines and the fille geometry from fat lines are separated. */ - class LineGeometryExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D : public BaseProcessor2D { private: std::vector< basegfx::B2DPolygon > maExtractedHairlines; diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 522f3ec1136d..3dbb9d17a0a5 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX +#include + #include #include #include @@ -73,7 +75,7 @@ namespace drawinglayer This processor extracts text in the feeded primitives to filled polygons */ - class TextAsPolygonExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC TextAsPolygonExtractor2D : public BaseProcessor2D { private: // extraction target diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx index bb7d9537da9b..b28b1da17519 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX +#include + #include #include #include @@ -76,7 +78,7 @@ namespace drawinglayer and the extra-data added to it (which can be seen mostly as 'extensions' or simply as 'hacks'). */ - class VclMetafileProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclMetafileProcessor2D : public VclProcessor2D { private: /// local helper(s) diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx index 273a3b82d392..8ee535ac652d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX +#include + #include #include @@ -44,7 +46,7 @@ namespace drawinglayer all feeded primitives to a VCL Window. It is the currently used renderer for all VCL editing output from the DrawingLayer. */ - class VclPixelProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D { private: /* The Pixel renderer resets the original MapMode from the OutputDevice. diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx index e25ba9f55b14..7efe90048025 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX +#include + #include #include #include @@ -71,7 +73,7 @@ namespace drawinglayer This processor is the base class for VCL-Based processors. It has no processBasePrimitive2D implementation and thus is not usable directly. */ - class VclProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclProcessor2D : public BaseProcessor2D { protected: // the destination OutDev diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx index 4cd1242ddb29..d021236f391d 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer Please have a look at baseprocessor2d.hxx for more comments. */ - class BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor3D { private: geometry::ViewInformation3D maViewInformation3D; @@ -88,7 +90,7 @@ namespace drawinglayer hand around as instance over various methods where every called method can add graphic content to it. */ - class CollectingProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CollectingProcessor3D : public BaseProcessor3D { private: primitive3d::Primitive3DSequence maPrimitive3DSequence; diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx index f8f62fab74ce..ad66dcbb9bd3 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX +#include + #include ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +44,7 @@ namespace drawinglayer This processor extracts all cuts of 3D plane geometries in the feeded primitives with the given cut vector, based on the ViewInformation3D given. */ - class CutFindProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CutFindProcessor : public BaseProcessor3D { private: /// the start and stop point for the cut vector diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx index 178e9f02a82b..be3278f0e167 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX +#include + #include #include #include @@ -78,7 +80,7 @@ namespace drawinglayer rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to e.g. base a Z-Buffer supported renderer on the 3D primitive processing. */ - class DefaultProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC DefaultProcessor3D : public BaseProcessor3D { protected: /// read-only scene infos (normal handling, etc...) diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx index 3712a57a1bca..91131a92a0a7 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX +#include + #include #include #include @@ -47,7 +49,7 @@ namespace drawinglayer It is e.g. used as sub-processor for contour extraction where 3D geometry is only useful as 2D projected geometry. */ - class Geometry2DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Geometry2DExtractingProcessor : public BaseProcessor3D { private: /// result holding vector (2D) diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx index 98f18b8d78ac..f245d93caeab 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX +#include + #include #include #include @@ -52,7 +54,7 @@ namespace drawinglayer some data to do so since we do not only offer flat projected 2D shadow, but also projections dependent on the light source */ - class Shadow3DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Shadow3DExtractingProcessor : public BaseProcessor3D { private: /// typedef for data handling diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx index 6d2a806ce630..d070e9d643d8 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX +#include + #include #include @@ -65,7 +67,7 @@ namespace drawinglayer raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. */ - class ZBufferProcessor3D : public DefaultProcessor3D + class DRAWINGLAYER_DLLPUBLIC ZBufferProcessor3D : public DefaultProcessor3D { private: /// the raster target, a Z-Buffer diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx index 92040af2f65a..27117ded3412 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX +#include + #include #include #include @@ -40,7 +42,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvx { public: GeoTexSvx(); @@ -64,7 +66,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradient : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx { protected: basegfx::ODFGradientInfo maGradientInfo; @@ -100,7 +102,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientLinear : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient { public: GeoTexSvxGradientLinear(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -119,7 +121,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientAxial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient { public: GeoTexSvxGradientAxial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -138,7 +140,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRadial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRadial : public GeoTexSvxGradient { public: GeoTexSvxGradientRadial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY); @@ -157,7 +159,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientElliptical : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientElliptical : public GeoTexSvxGradient { public: GeoTexSvxGradientElliptical(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -176,7 +178,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientSquare : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientSquare : public GeoTexSvxGradient { public: GeoTexSvxGradientSquare(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -195,7 +197,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRect : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRect : public GeoTexSvxGradient { public: GeoTexSvxGradientRect(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -214,7 +216,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx { protected: basegfx::B2DHomMatrix maTextureTransform; @@ -242,7 +244,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxTiled : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled : public GeoTexSvx { protected: basegfx::B2DPoint maTopLeft; diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx index cd3cd09286a8..258653c97191 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx @@ -29,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX +#include + #include #include @@ -45,7 +47,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMono : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono : public GeoTexSvx { protected: basegfx::BColor maSingleColor; @@ -68,7 +70,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmap : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmap : public GeoTexSvx { protected: Bitmap maBitmap; @@ -96,7 +98,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmapTiled : public GeoTexSvxBitmap + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapTiled : public GeoTexSvxBitmap { protected: // helpers @@ -132,7 +134,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMultiHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch : public GeoTexSvx { protected: basegfx::BColor maColor; -- cgit v1.2.3