diff options
author | Eike Rathke <erack@apache.org> | 2011-09-10 21:46:16 +0000 |
---|---|---|
committer | Eike Rathke <erack@apache.org> | 2011-09-10 21:46:16 +0000 |
commit | 8fc0f05239bd45a54040073167a61412e787a97b (patch) | |
tree | ee5fdd1b6d0970587a68e5cfbd20df8d8d2339d5 /drawinglayer/inc | |
parent | 7eef7dce2366dc2dc9616eaf8916972095bea19c (diff) |
impress212: drawinglayer gbuild environment changes
# User sj <sj@openoffice.org>
Diffstat (limited to 'drawinglayer/inc')
105 files changed, 290 insertions, 241 deletions
diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx index 6368f60fe3e9..e8a35d64305a 100644 --- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx +++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx @@ -28,7 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX #define INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <vector> ////////////////////////////////////////////////////////////////////////////// @@ -39,7 +39,7 @@ namespace drawinglayer { ////////////////////////////////////////////////////////////////////////////// - class AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntry { private: AnimationEntry(const AnimationEntry&); @@ -58,7 +58,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryFixed : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: double mfDuration; @@ -77,7 +77,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLinear : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: double mfDuration; @@ -98,7 +98,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryList : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: double mfDuration; @@ -121,7 +121,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 1bb8a864fa81..fb71066537d3 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx @@ -28,8 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -50,7 +49,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 f7bddbfe0f89..35719beb1ffc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -74,7 +73,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 9f147b36ef34..5a2a13f22ee4 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -71,7 +70,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 da7aedc6f983..a59ed674cc62 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx @@ -28,8 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -50,7 +49,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 4e29cf05e27f..0745b99e1ce9 100644 --- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <basegfx/vector/b2enums.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +48,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 9f681afc7d51..f561b5987260 100644 --- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx @@ -28,8 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -47,7 +46,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 2bb2256ee559..b801645909a4 100644 --- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx @@ -28,8 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -47,7 +46,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 583a01915662..445e2070486f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx @@ -28,7 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> @@ -44,7 +44,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 6ae2084d1d30..663c87a30981 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -58,7 +57,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 10408b477317..80cc3e74bf93 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx @@ -28,8 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -51,7 +50,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 aad8c6ff62ec..490488a53c04 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -56,7 +55,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 b4c84d7cc1b0..677a8ef4584f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -36,7 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <vector> ////////////////////////////////////////////////////////////////////////////// @@ -58,7 +58,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 5df511995e9f..78dbbdcff6ee 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx @@ -36,7 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <basegfx/vector/b2enums.hxx> #include <vector> @@ -57,7 +57,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 76bd836ac770..de1550c4099a 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -55,7 +54,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 d5ee84e8cfec..48bfd76ca165 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -36,7 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <com/sun/star/drawing/TextureKind2.hpp> @@ -56,7 +56,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 7b25b6c48666..9ed66914e715 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -36,7 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> @@ -53,7 +53,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 72bdcd2af2c2..dd6ab8038425 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx @@ -36,8 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX -#include <sal/types.h> - +#include <drawinglayer/drawinglayerdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predefines @@ -56,7 +55,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 0a8213c9bcf2..75f24003aabb 100644 --- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx @@ -28,7 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <vector> ////////////////////////////////////////////////////////////////////////////// @@ -44,7 +44,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 100755 index 000000000000..b004d1dbdf7a --- /dev/null +++ b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h @@ -0,0 +1,13 @@ +#ifndef INCLUDED_DRAWINGLAYERDLLAPI_H +#define INCLUDED_DRAWINGLAYERDLLAPI_H + +#include "sal/types.h" + +#if defined(DRAWINGLAYER_DLLIMPLEMENTATION) +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define DRAWINGLAYER_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_DRAWINGLAYERDLLAPI_H */ diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index dd3bce88f25f..76e8d889da4d 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx @@ -31,6 +31,7 @@ // 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). +#include <drawinglayer/drawinglayerdllapi.h> #include <sal/config.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -62,7 +63,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 5b37c5a2fe50..e3b7b99529d7 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx @@ -31,6 +31,7 @@ // 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). +#include <drawinglayer/drawinglayerdllapi.h> #include <sal/config.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> @@ -60,7 +61,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 cc59afbe9534..21db0dc91ea3 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -57,7 +58,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: /** @@ -114,7 +115,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: @@ -146,7 +147,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 3e405ef33804..3aee55d1eab1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +50,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 8ef63d012780..cdcaae7f8504 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> @@ -141,7 +142,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 @@ -226,7 +227,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: @@ -269,24 +270,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 e9cb7a87df80..8a4ca277f45a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +47,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 cbad5fc40afc..0938386b563e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +47,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 71c4cc6ffe1e..fb894c63333c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <com/sun/star/frame/XModel.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -44,7 +45,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/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index 8a8e6d503536..38ff8d6c35a6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/awt/XControlModel.hpp> @@ -46,7 +47,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 643a5905ede8..1ac82d90f0b4 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> @@ -45,7 +46,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..fd1b7c3b87f2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -42,7 +43,7 @@ namespace drawinglayer /** DiscreteShadow data class */ - class DiscreteShadow + class DRAWINGLAYER_DLLPUBLIC DiscreteShadow { private: /// the original shadow BitmapEx in a special form @@ -85,7 +86,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 d651af24047d..556b57751690 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -50,7 +51,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 0c286557e0da..a23c0a4cb4f4 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gfxlink.hxx> @@ -40,7 +41,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 8af9606bdea5..6305d6ece3fd 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> @@ -52,7 +53,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 868c5014cfde..dab1422fb73e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> @@ -57,7 +58,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 8b09540933ed..7c8a677e9f07 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +49,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 00b44b4515f0..630307a0de1b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/grfmgr.hxx> @@ -53,7 +54,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 f8deb0903deb..4cfd8b5542d7 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +50,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 0e95e7d15f2f..167c715c199b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -69,7 +70,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 e2323765b2e5..683484af587c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -60,7 +61,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 08ddd8237688..432b9b6a37ac 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -36,6 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +53,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 71b0353623c6..9fc3a891a3d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +47,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 b531d5a66f3d..e6b2bdf19b65 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> @@ -52,7 +53,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 b74a9212b64e..242c97378ce2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -51,7 +52,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 408268809c28..6e169c1fb1b7 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -47,7 +48,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 07ba73fd51f1..ea9f9a648878 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gdimtf.hxx> @@ -59,7 +60,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 fa24b5276959..e624fc6a8193 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -54,7 +55,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 99a0138699e9..c32c15ba2a36 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +47,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 47f8345832d7..b7278e18bcb8 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +49,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 ee5de781be86..f1fd9b7d085a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> @@ -51,7 +52,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 @@ -98,7 +99,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 @@ -160,7 +161,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 @@ -217,7 +218,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 @@ -273,7 +274,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 4a48ae0d3e59..b1665411adee 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -51,7 +52,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 @@ -97,7 +98,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 @@ -153,7 +154,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 @@ -211,7 +212,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 @@ -267,7 +268,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 @@ -311,7 +312,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 @@ -356,7 +357,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 @@ -406,7 +407,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 e74a051a794f..eb0827c3bfef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -44,7 +45,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 @@ -83,7 +84,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 @@ -122,7 +123,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 @@ -162,7 +163,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 278a1b0bfff2..0f5ce400be48 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -59,7 +60,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 e27a3b2b7725..be1b407b7213 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -36,6 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -53,24 +54,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 1f7c6aecab08..89cd81c96757 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -52,7 +53,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 247df9a7dd13..ac4cfbd74909 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <vcl/pdfwriter.hxx> @@ -49,7 +50,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 5c1093bc333a..5fde39b45137 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> @@ -55,7 +56,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 3adae8615db7..748738f2fcea 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -53,7 +54,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 5beed89a9ac6..a74eb11f006d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/vclenum.hxx> @@ -64,8 +65,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 @@ -79,8 +80,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 4ce00205f49f..9d1522e11479 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <tools/string.hxx> @@ -46,7 +47,7 @@ namespace drawinglayer This primitive encapsulates text lines. */ - class TextHierarchyLinePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyLinePrimitive2D : public GroupPrimitive2D { private: public: @@ -69,7 +70,7 @@ namespace drawinglayer This primitive encapsulates text bullets. */ - class TextHierarchyBulletPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBulletPrimitive2D : public GroupPrimitive2D { private: public: @@ -92,7 +93,7 @@ namespace drawinglayer This primitive encapsulates text paragraphs. */ - class TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D { private: public: @@ -115,7 +116,7 @@ namespace drawinglayer This primitive encapsulates text blocks. */ - class TextHierarchyBlockPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBlockPrimitive2D : public GroupPrimitive2D { private: public: @@ -156,7 +157,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; @@ -198,7 +199,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 3325e25dc913..a9a428e779ca 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -28,7 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX #define INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX -#include <sal/types.h> +#include <drawinglayer/drawinglayerdllapi.h> #include <tools/solar.h> #include <tools/poly.hxx> #include <basegfx/range/b2drange.hxx> @@ -66,7 +66,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; @@ -138,7 +138,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, @@ -150,7 +150,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 de364ccc128a..fc85e0c59215 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -39,7 +40,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 6c67bded2b17..c0eff0a449ff 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/string.hxx> @@ -100,7 +101,7 @@ namespace drawinglayer @param rFontColor The font color to use */ - class TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// text transformation (FontCoordinateSystem) diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 4ee3bc34c359..80b7494f224d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -41,7 +42,7 @@ namespace drawinglayer { namespace primitive2d { - class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions @@ -75,7 +76,7 @@ namespace drawinglayer { namespace primitive2d { - class TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: sal_Unicode maStrikeoutChar; @@ -116,7 +117,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 c488a883a9ce..d58e8eda6a8e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -56,7 +57,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 85032d0bd202..089c49d53751 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -36,6 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -61,7 +62,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 52f3747ddba2..bb3cd56d40a9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -36,6 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -53,7 +54,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 1914b3b33fe6..61c02a7fb80e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <vcl/wall.hxx> @@ -51,7 +52,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 daf134771f30..c563bf8425f0 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -53,7 +54,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 f3b5c418f12c..48c94ccf28f3 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive3D.hpp> @@ -82,7 +83,7 @@ namespace drawinglayer That's all for 3D! */ - class BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase @@ -147,7 +148,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: @@ -190,24 +191,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 a61c36b8bd8a..e2b16a0a7811 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -55,7 +56,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 b986c12adad3..d4025509d1b1 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/textureprimitive3d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> @@ -44,7 +45,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 287bfcc689e4..2672c9fea7c6 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -36,6 +36,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/groupprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -54,7 +55,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 12082a95bfc9..57e76b7fff0a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -44,7 +45,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 23b318c520d2..bfb3ecaea8e3 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/polygon/b3dpolygon.hxx> @@ -48,7 +49,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 @@ -91,7 +92,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 76fb7b99c909..1a6f3c0e8881 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +52,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 fae21dd4b198..29a7e86688b7 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <drawinglayer/attribute/materialattribute3d.hxx> @@ -46,7 +47,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 f1f680e11574..01b39b886867 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +43,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 4ccd863de69f..dca728abc798 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <vector> diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 257c0029b475..e3befaae0be0 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <vector> @@ -54,7 +55,7 @@ namespace drawinglayer }; /// class to hold one Slice3D - class Slice3D + class DRAWINGLAYER_DLLPUBLIC Slice3D { protected: basegfx::B3DPolyPolygon maPolyPolygon; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 254254a0055c..aae5723a3e4e 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -48,7 +49,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 28a483a5b5b2..1e79a6736a72 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -48,7 +49,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 5c2a4e6b2575..f68fbcdc3a2d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +47,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 fbef979d4b92..cedeca999bb4 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> @@ -47,7 +48,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 510c29b4de07..208fbea7cd13 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +43,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 b519dd1b2931..176e148343c8 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +49,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 a2e57da2cf1a..02fc6ef6c316 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +47,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 @@ -90,7 +91,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 @@ -132,7 +133,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 @@ -171,7 +172,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 @@ -211,7 +212,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 903a01881ed4..79a018b4d29f 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -46,7 +47,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 d93fb68c932c..438375cb5b34 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -159,7 +160,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 @@ -197,44 +198,6 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -namespace drawinglayer -{ - namespace processor2d - { - /** CollectingProcessor2D class - - A processor which just collects all primitives given to it in - process(..) calls to maPrimitive2DSequence. This can e.g. be used to - hand around as instance over various methods where every called - method can add graphic content to it. - */ - class CollectingProcessor2D : public BaseProcessor2D - { - private: - primitive2d::Primitive2DSequence maPrimitive2DSequence; - - public: - CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation); - virtual ~CollectingProcessor2D(); - - /// the central processing method - virtual void process(const primitive2d::Primitive2DSequence& rSource); - - /// helpers for adding to local sequence - void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource) - { - primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource); - } - - /// data access and reset - const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } - void reset() { maPrimitive2DSequence = primitive2d::Primitive2DSequence(); } - }; - } // end of namespace processor2d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX // eof diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index d218b7737c2b..207ba8a5f75f 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx @@ -28,6 +28,7 @@ #ifndef _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX #define _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -74,7 +75,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 9ec44d324187..6285ed92d4cd 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -43,7 +44,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 be0b40ff2139..2e67d147d9b8 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +49,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 9ea9313c8743..d7266d21d358 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -42,7 +43,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 2fa0bc47862c..eb51ac8ba687 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/color/bcolor.hxx> @@ -41,7 +42,7 @@ namespace drawinglayer namespace processor2d { /// helper data structure for returning the result - struct TextAsPolygonDataNode + struct DRAWINGLAYER_DLLPUBLIC TextAsPolygonDataNode { private: basegfx::B2DPolyPolygon maB2DPolyPolygon; @@ -72,7 +73,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 db5a70e9b4d7..1696f9699c5d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -75,7 +76,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 a237f5d289d7..8187d677780f 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <vcl/outdev.hxx> @@ -43,7 +44,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 9e9a827d2518..6b66e0867b1a 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -71,7 +72,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 6ed00c337ef3..6e412ac06282 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -44,7 +45,7 @@ namespace drawinglayer Please have a look at baseprocessor2d.hxx for more comments. */ - class BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor3D { private: geometry::ViewInformation3D maViewInformation3D; @@ -87,7 +88,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 918634af5e35..a62aafc33f28 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor3d/defaultprocessor3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -41,7 +42,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 af8de431f191..755c0ceb31e8 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> @@ -77,7 +78,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 f07eaa5c245c..39aaacbd9588 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +47,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 93ebfeab48e7..1944748701c4 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -51,7 +52,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 aefeddbb38a9..2ad5867ede23 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor3d/defaultprocessor3d.hxx> #include <vcl/bitmapex.hxx> @@ -64,7 +65,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 a14a80e5ab2c..6954c1270200 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolor.hxx> @@ -39,7 +40,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvx { public: GeoTexSvx(); @@ -63,7 +64,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradient : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx { protected: basegfx::ODFGradientInfo maGradientInfo; @@ -99,7 +100,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); @@ -118,7 +119,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); @@ -137,7 +138,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); @@ -156,7 +157,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); @@ -175,7 +176,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); @@ -194,7 +195,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); @@ -213,7 +214,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx { protected: basegfx::B2DHomMatrix maTextureTransform; @@ -241,7 +242,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 94b082096090..ae2e36ab4c40 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx @@ -28,6 +28,7 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/texture/texture.hxx> #include <vcl/bitmap.hxx> @@ -44,7 +45,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMono : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono : public GeoTexSvx { protected: basegfx::BColor maSingleColor; @@ -67,7 +68,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmap : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmap : public GeoTexSvx { protected: Bitmap maBitmap; @@ -95,7 +96,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmapTiled : public GeoTexSvxBitmap + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapTiled : public GeoTexSvxBitmap { protected: // helpers @@ -131,7 +132,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMultiHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch : public GeoTexSvx { protected: basegfx::BColor maColor; |