Modified: openoffice/trunk/main/basegfx/inc/basegfx/range/b3irange.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/range/b3irange.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/range/b3irange.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/range/b3irange.hxx Sun Aug 7 19:24:03 2016 @@ -29,10 +29,11 @@ #include <basegfx/tuple/b3ituple.hxx> #include <basegfx/tuple/b3i64tuple.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { - class B3IRange + class BASEGFX_DLLPUBLIC B3IRange { typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange;
Modified: openoffice/trunk/main/basegfx/inc/basegfx/range/basicbox.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/range/basicbox.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/range/basicbox.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/range/basicbox.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_RANGE_BASICBOX_HXX #include <basegfx/range/basicrange.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -36,7 +37,7 @@ namespace basegfx <em>outside</em> of the range, in contrast to BasicRange, which considers them inside. */ - class BasicBox : public BasicRange< sal_Int32, Int32Traits > + class BASEGFX_DLLPUBLIC BasicBox : public BasicRange< sal_Int32, Int32Traits > { typedef BasicRange< sal_Int32, Int32Traits > Base; public: Modified: openoffice/trunk/main/basegfx/inc/basegfx/raster/bpixelraster.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/raster/bpixelraster.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/raster/bpixelraster.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/raster/bpixelraster.hxx Sun Aug 7 19:24:03 2016 @@ -28,6 +28,7 @@ #include <sal/types.h> #include <basegfx/pixel/bpixel.hxx> #include <rtl/memory.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -36,7 +37,7 @@ namespace basegfx { - class BPixelRaster + class BASEGFX_DLLPUBLIC BPixelRaster { private: // do not allow copy constructor and assignment operator Modified: openoffice/trunk/main/basegfx/inc/basegfx/raster/bzpixelraster.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/raster/bzpixelraster.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/raster/bzpixelraster.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/raster/bzpixelraster.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/raster/bpixelraster.hxx> #include <rtl/memory.h> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -34,7 +35,7 @@ namespace basegfx { - class BZPixelRaster : public BPixelRaster + class BASEGFX_DLLPUBLIC BZPixelRaster : public BPixelRaster { protected: // additionally, host a ZBuffer Modified: openoffice/trunk/main/basegfx/inc/basegfx/raster/rasterconvert3d.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/raster/rasterconvert3d.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/raster/rasterconvert3d.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/raster/rasterconvert3d.hxx Sun Aug 7 19:24:03 2016 @@ -30,6 +30,7 @@ #include <basegfx/vector/b3dvector.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2dvector.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -45,7 +46,7 @@ namespace basegfx namespace basegfx { - class ip_single + class BASEGFX_DLLPUBLIC ip_single { private: double mfVal; @@ -71,7 +72,7 @@ namespace basegfx namespace basegfx { - class ip_double + class BASEGFX_DLLPUBLIC ip_double { private: ip_single maX; @@ -97,7 +98,7 @@ namespace basegfx namespace basegfx { - class ip_triple + class BASEGFX_DLLPUBLIC ip_triple { private: ip_single maX; @@ -133,7 +134,7 @@ namespace basegfx { #define SCANLINE_EMPTY_INDEX (0xffffffff) - class InterpolatorProvider3D + class BASEGFX_DLLPUBLIC InterpolatorProvider3D { private: ::std::vector< ip_triple > maColorInterpolators; @@ -315,7 +316,7 @@ namespace basegfx namespace basegfx { - class RasterConversionLineEntry3D + class BASEGFX_DLLPUBLIC RasterConversionLineEntry3D { private: ip_single maX; @@ -413,7 +414,7 @@ namespace basegfx namespace basegfx { - class RasterConverter3D : public InterpolatorProvider3D + class BASEGFX_DLLPUBLIC RasterConverter3D : public InterpolatorProvider3D { private: // the line entries for an area conversion run Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/b2dclipstate.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <sal/types.h> #include <o3tl/cow_wrapper.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -50,7 +51,7 @@ namespace basegfx a clip representation is requested, and using faster code paths for common special cases (like all-rectangle clips) */ - class B2DClipState + class BASEGFX_DLLPUBLIC B2DClipState { public: typedef o3tl::cow_wrapper< ImplB2DClipState > ImplType; Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/canvastools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/canvastools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/canvastools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/canvastools.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <basegfx/basegfxdllapi.h> namespace com { namespace sun { namespace star { namespace geometry @@ -75,118 +76,118 @@ namespace basegfx // Polygon conversions // =================================================================== - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, const ::basegfx::B2DPolygon& rPoly ); - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > xPolyPolygonFromB2DPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::com::sun::star::uno::Sequence< + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > > bezierSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::com::sun::star::uno::Sequence< + BASEGFX_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > > pointSequenceSequenceFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly ); - ::basegfx::B2DPolygon polygonFromPoint2DSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromPoint2DSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D >& rPoints ); - ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromPoint2DSequenceSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints ); - ::basegfx::B2DPolygon polygonFromBezier2DSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolygon polygonFromBezier2DSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D >& rPoints ); - ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon polyPolygonFromBezier2DSequenceSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints ); - ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( + BASEGFX_DLLPUBLIC ::basegfx::B2DPolyPolygon b2DPolyPolygonFromXPolyPolygon2D( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& rPoly ); // Matrix conversions // =================================================================== - ::com::sun::star::geometry::AffineMatrix2D& + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& affineMatrixFromHomMatrix( ::com::sun::star::geometry::AffineMatrix2D& matrix, const ::basegfx::B2DHomMatrix& transform); - ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D( + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix3D& affineMatrixFromHomMatrix3D( ::com::sun::star::geometry::AffineMatrix3D& matrix, const ::basegfx::B3DHomMatrix& transform); - ::basegfx::B2DHomMatrix& + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix& homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); + BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); - ::com::sun::star::geometry::Matrix2D& + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& matrixFromHomMatrix( ::com::sun::star::geometry::Matrix2D& matrix, const ::basegfx::B2DHomMatrix& transform); - ::basegfx::B2DHomMatrix& + BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix& homMatrixFromMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::Matrix2D& matrix ); // Geometry conversions // =================================================================== - ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); - ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); - ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); - ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); - - ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); - ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); - ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); - ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); - - ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); - ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); - ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); - - ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); - ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealSize2D size2DFromB2DSize( const ::basegfx::B2DVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealPoint2D point2DFromB2DPoint( const ::basegfx::B2DPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); + + BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); + + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); + + BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); - ::com::sun::star::awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& ); - ::com::sun::star::awt::Point awtPointFromB2IPoint( const ::basegfx::B2IPoint& ); - ::com::sun::star::awt::Rectangle awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& ); - - ::basegfx::B2IVector b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& ); - ::basegfx::B2IPoint b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& ); - ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Size awtSizeFromB2ISize( const ::basegfx::B2IVector& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Point awtPointFromB2IPoint( const ::basegfx::B2IPoint& ); + BASEGFX_DLLPUBLIC ::com::sun::star::awt::Rectangle awtRectangleFromB2IRectangle( const ::basegfx::B2IRange& ); + + BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromAwtSize( const ::com::sun::star::awt::Size& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromAwtPoint( const ::com::sun::star::awt::Point& ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2IRectangleFromAwtRectangle( const ::com::sun::star::awt::Rectangle& ); // Geometry comparisons // =================================================================== - bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ); - bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ); - bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ); - bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ); - bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ); - - bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ); - bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ); - bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ); - - bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ); - bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB ); - bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB ); + BASEGFX_DLLPUBLIC bool RealSize2DAreEqual( const ::com::sun::star::geometry::RealSize2D& rA, const ::com::sun::star::geometry::RealSize2D& rB ); + BASEGFX_DLLPUBLIC bool RealPoint2DAreEqual( const ::com::sun::star::geometry::RealPoint2D& rA, const ::com::sun::star::geometry::RealPoint2D& rB ); + BASEGFX_DLLPUBLIC bool RealRectangle2DAreEqual( const ::com::sun::star::geometry::RealRectangle2D& rA, const ::com::sun::star::geometry::RealRectangle2D& rB ); + BASEGFX_DLLPUBLIC bool RealRectangle3DAreEqual( const ::com::sun::star::geometry::RealRectangle3D& rA, const ::com::sun::star::geometry::RealRectangle3D& rB ); + BASEGFX_DLLPUBLIC bool AffineMatrix2DAreEqual( const ::com::sun::star::geometry::AffineMatrix2D& rA, const ::com::sun::star::geometry::AffineMatrix2D& rB ); + + BASEGFX_DLLPUBLIC bool IntegerSize2DAreEqual( const ::com::sun::star::geometry::IntegerSize2D& rA, const ::com::sun::star::geometry::IntegerSize2D& rB ); + BASEGFX_DLLPUBLIC bool IntegerPoint2DAreEqual( const ::com::sun::star::geometry::IntegerPoint2D& rA, const ::com::sun::star::geometry::IntegerPoint2D& rB ); + BASEGFX_DLLPUBLIC bool IntegerRectangle2DAreEqual( const ::com::sun::star::geometry::IntegerRectangle2D& rA, const ::com::sun::star::geometry::IntegerRectangle2D& rB ); + + BASEGFX_DLLPUBLIC bool awtSizeAreEqual( const ::com::sun::star::awt::Size& rA, const ::com::sun::star::awt::Size& rB ); + BASEGFX_DLLPUBLIC bool awtPointAreEqual( const ::com::sun::star::awt::Point& rA, const ::com::sun::star::awt::Point& rB ); + BASEGFX_DLLPUBLIC bool awtRectangleAreEqual( const ::com::sun::star::awt::Rectangle& rA, const ::com::sun::star::awt::Rectangle& rB ); /** Return smalltest integer range, which completely contains given floating point range. @@ -198,7 +199,7 @@ namespace basegfx @return the closest integer range, which completely contains rRange. */ - ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); + BASEGFX_DLLPUBLIC ::basegfx::B2IRange b2ISurroundingRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); /** Return smalltest B2DRange with integer values, which completely contains given floating point range. @@ -209,7 +210,7 @@ namespace basegfx @return the closest B2DRange with integer coordinates, which completely contains rRange. */ - ::basegfx::B2DRange b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); + BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DSurroundingIntegerRangeFromB2DRange( const ::basegfx::B2DRange& rRange ); } } Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/debugplotter.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/debugplotter.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/debugplotter.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/debugplotter.hxx Sun Aug 7 19:24:03 2016 @@ -34,6 +34,7 @@ #include <vector> #include <utility> #include <iostream> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -50,7 +51,7 @@ namespace basegfx To be able to generate one coherent block of output, this class delays actual writing to its destructor */ - class DebugPlotter : private ::boost::noncopyable + class BASEGFX_DLLPUBLIC DebugPlotter : private ::boost::noncopyable { public: /** Create new debug output object Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/gradienttools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/gradienttools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/gradienttools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/gradienttools.hxx Sun Aug 7 19:24:03 2016 @@ -29,6 +29,7 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/basegfxdllapi.h> #include <vector> #include <algorithm> @@ -41,7 +42,7 @@ namespace basegfx 1.2-compatible gradients. Use the createXXXODFGradientInfo() methods below for initializing from ODF attributes. */ - class ODFGradientInfo + class BASEGFX_DLLPUBLIC ODFGradientInfo { private: /** transformation mapping from [0,1]^2 texture coordinate @@ -146,7 +147,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createLinearODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createLinearODFGradientInfo( const B2DRange& rTargetArea, sal_uInt32 nSteps, double fBorder, @@ -165,7 +166,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getLinearGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getLinearGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); /** Create matrix for ODF's axial gradient definition @@ -194,7 +195,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createAxialODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createAxialODFGradientInfo( const B2DRange& rTargetArea, sal_uInt32 nSteps, double fBorder, @@ -213,7 +214,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getAxialGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getAxialGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); /** Create matrix for ODF's radial gradient definition @@ -237,7 +238,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createRadialODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createRadialODFGradientInfo( const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -256,7 +257,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getRadialGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getRadialGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); /** Create matrix for ODF's elliptical gradient definition @@ -280,7 +281,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createEllipticalODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createEllipticalODFGradientInfo( const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -300,7 +301,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getEllipticalGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getEllipticalGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); /** Create matrix for ODF's square gradient definition @@ -324,7 +325,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createSquareODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createSquareODFGradientInfo( const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -344,7 +345,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getSquareGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getSquareGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); /** Create matrix for ODF's rectangular gradient definition @@ -368,7 +369,7 @@ namespace basegfx @param fAngle Gradient angle (from ODF) */ - ODFGradientInfo createRectangularODFGradientInfo( + BASEGFX_DLLPUBLIC ODFGradientInfo createRectangularODFGradientInfo( const B2DRange& rTargetArea, const B2DVector& rOffset, sal_uInt32 nSteps, @@ -388,7 +389,7 @@ namespace basegfx @param rGradInfo Gradient info, for transformation and number of steps */ - double getRectangularGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); + BASEGFX_DLLPUBLIC double getRectangularGradientAlpha(const B2DPoint& rUV, const ODFGradientInfo& rGradInfo); } } Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/keystoplerp.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/keystoplerp.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/keystoplerp.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/keystoplerp.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/numeric/ftools.hxx> #include <vector> +#include <basegfx/basegfxdllapi.h> namespace com{ namespace sun{ namespace star{ namespace uno { template<typename T> class Sequence; @@ -46,7 +47,7 @@ namespace basegfx then calculate the relative alpha between the two buckets found. */ - class KeyStopLerp + class BASEGFX_DLLPUBLIC KeyStopLerp { public: typedef std::pair<std::ptrdiff_t,double> ResultType; Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/tools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/tools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/tools.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/tools.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_TOOLS_TOOLS_HXX #include <sal/types.h> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -53,7 +54,7 @@ namespace basegfx @return true, when at least part of the line is visible after the clip, false otherwise */ - bool liangBarskyClip2D( ::basegfx::B2DPoint& io_rStart, + BASEGFX_DLLPUBLIC bool liangBarskyClip2D( ::basegfx::B2DPoint& io_rStart, ::basegfx::B2DPoint& io_rEnd, const ::basegfx::B2DRange& rClipRect ); @@ -115,7 +116,7 @@ namespace basegfx @param rFitTarget The rectangle to fit the parallelogram into. */ - void infiniteLineFromParallelogram( ::basegfx::B2DPoint& io_rLeftTop, + BASEGFX_DLLPUBLIC void infiniteLineFromParallelogram( ::basegfx::B2DPoint& io_rLeftTop, ::basegfx::B2DPoint& io_rLeftBottom, ::basegfx::B2DPoint& io_rRightTop, ::basegfx::B2DPoint& io_rRightBottom, Modified: openoffice/trunk/main/basegfx/inc/basegfx/tools/unopolypolygon.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tools/unopolypolygon.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tools/unopolypolygon.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tools/unopolypolygon.hxx Sun Aug 7 19:24:03 2016 @@ -31,6 +31,7 @@ #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp> #include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -42,7 +43,7 @@ namespace unotools ::com::sun::star::rendering::XBezierPolyPolygon2D, ::com::sun::star::lang::XServiceInfo > UnoPolyPolygonBase; - class UnoPolyPolygon : private cppu::BaseMutex, + class BASEGFX_DLLPUBLIC UnoPolyPolygon : private cppu::BaseMutex, public UnoPolyPolygonBase { public: Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx Sun Aug 7 19:24:03 2016 @@ -89,7 +89,7 @@ namespace basegfx @param rTup The 2D Tuple which will be copied. */ - explicit B2DTuple(const B2ITuple& rTup); + BASEGFX_DLLPUBLIC explicit B2DTuple(const B2ITuple& rTup); ~B2DTuple() {} @@ -235,9 +235,9 @@ namespace basegfx return *this; } - void correctValues(const double fCompareValue = 0.0); + BASEGFX_DLLPUBLIC void correctValues(const double fCompareValue = 0.0); - static const B2DTuple& getEmptyTuple(); + BASEGFX_DLLPUBLIC static const B2DTuple& getEmptyTuple(); }; // external operators @@ -362,7 +362,7 @@ namespace basegfx @return the nearest integer for this tuple */ - B2ITuple fround(const B2DTuple& rTup); + BASEGFX_DLLPUBLIC B2ITuple fround(const B2DTuple& rTup); } // end of namespace basegfx #endif /* _BGFX_TUPLE_B2DTUPLE_HXX */ Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2i64tuple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2i64tuple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2i64tuple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2i64tuple.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <sal/types.h> #include <basegfx/tuple/b2dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -38,7 +39,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on two sal_Int64 values */ - class B2I64Tuple + class BASEGFX_DLLPUBLIC B2I64Tuple { protected: sal_Int64 mnX; Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2ituple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2ituple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2ituple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b2ituple.hxx Sun Aug 7 19:24:03 2016 @@ -40,7 +40,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on two sal_Int32 values */ - class B2ITuple + class BASEGFX_DLLPUBLIC B2ITuple { protected: sal_Int32 mnX; Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3dtuple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3dtuple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3dtuple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3dtuple.hxx Sun Aug 7 19:24:03 2016 @@ -43,7 +43,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three double values */ - class B3DTuple + class BASEGFX_DLLPUBLIC B3DTuple { protected: double mfX; @@ -436,7 +436,7 @@ namespace basegfx @return the nearest integer for this tuple */ - B3ITuple fround(const B3DTuple& rTup); + BASEGFX_DLLPUBLIC B3ITuple fround(const B3DTuple& rTup); } // end of namespace basegfx #endif /* _BGFX_TUPLE_B3DTUPLE_HXX */ Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3i64tuple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3i64tuple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3i64tuple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3i64tuple.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <sal/types.h> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx @@ -38,7 +39,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three sal_Int64 values */ - class B3I64Tuple + class BASEGFX_DLLPUBLIC B3I64Tuple { protected: sal_Int64 mnX; Modified: openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3ituple.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3ituple.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3ituple.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/tuple/b3ituple.hxx Sun Aug 7 19:24:03 2016 @@ -26,7 +26,7 @@ #include <sal/types.h> #include <basegfx/tuple/b3dtuple.hxx> - +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -38,7 +38,7 @@ namespace basegfx @derive Use this class to implement Points or Vectors which are based on three sal_Int32 values */ - class B3ITuple + class BASEGFX_DLLPUBLIC B3ITuple { protected: sal_Int32 mnX; Modified: openoffice/trunk/main/basegfx/inc/basegfx/vector/b2dvector.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/vector/b2dvector.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/vector/b2dvector.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/vector/b2dvector.hxx Sun Aug 7 19:24:03 2016 @@ -27,6 +27,7 @@ #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -41,7 +42,7 @@ namespace basegfx @see B2DTuple */ - class B2DVector : public ::basegfx::B2DTuple + class BASEGFX_DLLPUBLIC B2DVector : public ::basegfx::B2DTuple { public: /** Create a 2D Vector @@ -205,7 +206,7 @@ namespace basegfx @return The mathematical Orientation of the two involved 2D Vectors */ - B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB ); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB ); /** Calculate a perpendicular 2D Vector to the given one @@ -217,7 +218,7 @@ namespace basegfx @return A 2D Vector perpendicular to the one given in parameter rVec */ - B2DVector getPerpendicular( const B2DVector& rNormalizedVec ); + BASEGFX_DLLPUBLIC B2DVector getPerpendicular( const B2DVector& rNormalizedVec ); /** Calculate a perpendicular 2D Vector to the given one, normalize the given one as preparation @@ -228,7 +229,7 @@ namespace basegfx @return A normalized 2D Vector perpendicular to the one given in parameter rVec */ - B2DVector getNormalizedPerpendicular( const B2DVector& rVec ); + BASEGFX_DLLPUBLIC B2DVector getNormalizedPerpendicular( const B2DVector& rVec ); /** Test two vectors which need not to be normalized for parallelism @@ -242,21 +243,21 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec ); + BASEGFX_DLLPUBLIC B2DVector operator*( const B2DHomMatrix& rMat, const B2DVector& rVec ); /** Test continuity between given vectors. The two given vectors are assumed to describe control points on a common point. Calculate if there is a continuity between them. */ - B2VectorContinuity getContinuity( const B2DVector& rBackVector, const B2DVector& rForwardVector ); + BASEGFX_DLLPUBLIC B2VectorContinuity getContinuity( const B2DVector& rBackVector, const B2DVector& rForwardVector ); } // end of namespace basegfx Modified: openoffice/trunk/main/basegfx/inc/basegfx/vector/b2ivector.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/vector/b2ivector.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/vector/b2ivector.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/vector/b2ivector.hxx Sun Aug 7 19:24:03 2016 @@ -26,6 +26,7 @@ #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -40,7 +41,7 @@ namespace basegfx @see B2ITuple */ - class B2IVector : public ::basegfx::B2ITuple + class BASEGFX_DLLPUBLIC B2IVector : public ::basegfx::B2ITuple { public: /** Create a 2D Vector @@ -181,7 +182,7 @@ namespace basegfx @return The mathematical Orientation of the two involved 2D Vectors */ - B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB ); + BASEGFX_DLLPUBLIC B2VectorOrientation getOrientation( const B2IVector& rVecA, const B2IVector& rVecB ); /** Calculate a perpendicular 2D Vector to the given one @@ -191,7 +192,7 @@ namespace basegfx @return A 2D Vector perpendicular to the one given in parameter rVec */ - B2IVector getPerpendicular( const B2IVector& rVec ); + BASEGFX_DLLPUBLIC B2IVector getPerpendicular( const B2IVector& rVec ); /** Test two vectors which need not to be normalized for parallelism @@ -205,21 +206,21 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B2IVector& rVecA, const B2IVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec ); + BASEGFX_DLLPUBLIC B2IVector operator*( const B2DHomMatrix& rMat, const B2IVector& rVec ); /** Test continuity between given vectors. The two given vectors are assumed to describe control points on a common point. Calculate if there is a continuity between them. */ - B2VectorContinuity getContinuity( const B2IVector& rBackVector, const B2IVector& rForwardVector ); + BASEGFX_DLLPUBLIC B2VectorContinuity getContinuity( const B2IVector& rBackVector, const B2IVector& rForwardVector ); } // end of namespace basegfx Modified: openoffice/trunk/main/basegfx/inc/basegfx/vector/b3dvector.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/vector/b3dvector.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/vector/b3dvector.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/vector/b3dvector.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_VECTOR_B3DVECTOR_HXX #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/basegfxdllapi.h> ////////////////////////////////////////////////////////////////////////////// @@ -41,7 +42,7 @@ namespace basegfx @see B3DTuple */ - class B3DVector : public ::basegfx::B3DTuple + class BASEGFX_DLLPUBLIC B3DVector : public ::basegfx::B3DTuple { public: /** Create a 3D Vector @@ -301,14 +302,14 @@ namespace basegfx bool if the two values are parallel. Also true if one of the vectors is empty. */ - bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB ); + BASEGFX_DLLPUBLIC bool areParallel( const B3DVector& rVecA, const B3DVector& rVecB ); /** Transform vector by given transformation matrix. Since this is a vector, translational components of the matrix are disregarded. */ - B3DVector operator*( const B3DHomMatrix& rMat, const B3DVector& rVec ); + BASEGFX_DLLPUBLIC B3DVector operator*( const B3DHomMatrix& rMat, const B3DVector& rVec ); /** Calculate the Cross Product of two 3D Vectors Modified: openoffice/trunk/main/basegfx/inc/basegfx/vector/b3ivector.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/inc/basegfx/vector/b3ivector.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/inc/basegfx/vector/b3ivector.hxx (original) +++ openoffice/trunk/main/basegfx/inc/basegfx/vector/b3ivector.hxx Sun Aug 7 19:24:03 2016 @@ -25,6 +25,7 @@ #define _BGFX_VECTOR_B3IVECTOR_HXX #include <basegfx/tuple/b3ituple.hxx> +#include <basegfx/basegfxdllapi.h> namespace basegfx { @@ -39,7 +40,7 @@ namespace basegfx @see B3ITuple */ - class B3IVector : public ::basegfx::B3ITuple + class BASEGFX_DLLPUBLIC B3IVector : public ::basegfx::B3ITuple { public: /** Create a 3D Vector @@ -229,7 +230,7 @@ namespace basegfx Since this is a vector, translational components of the matrix are disregarded. */ - B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec ); + BASEGFX_DLLPUBLIC B3IVector operator*( const B3DHomMatrix& rMat, const B3IVector& rVec ); /** Calculate the Cross Product of two 3D Vectors Modified: openoffice/trunk/main/basegfx/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/prj/build.lst (original) +++ openoffice/trunk/main/basegfx/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,18 +1,2 @@ -fx basegfx : o3tl sal offuh cppuhelper cppu NULL -fx basegfx usr1 - all fx_mkout NULL -fx basegfx\inc nmake - all fx_inc NULL -fx basegfx\prj get - all fx_prj NULL -fx basegfx\source\curve nmake - all fx_curve fx_inc NULL -fx basegfx\source\matrix nmake - all fx_matrix fx_inc NULL -fx basegfx\source\numeric nmake - all fx_numeric fx_inc NULL -fx basegfx\source\point nmake - all fx_point fx_inc NULL -fx basegfx\source\polygon nmake - all fx_polygon fx_inc NULL -fx basegfx\source\range nmake - all fx_range fx_inc NULL -fx basegfx\source\tuple nmake - all fx_tuple fx_inc NULL -fx basegfx\source\tools nmake - all fx_tools fx_inc NULL -fx basegfx\source\vector nmake - all fx_vector fx_inc NULL -fx basegfx\source\color nmake - all fx_color fx_inc NULL -fx basegfx\source\pixel nmake - all fx_pixel fx_inc NULL -fx basegfx\source\raster nmake - all fx_raster fx_inc NULL -fx basegfx\util nmake - all fx_util fx_curve fx_matrix fx_numeric fx_point fx_polygon fx_range fx_tuple fx_tools fx_vector fx_color fx_pixel fx_raster NULL -fx basegfx\test nmake - all fx_tests fx_util NULL +fx basegfx : o3tl sal offapi cppuhelper cppu NULL +fx basegfx\prj nmake - all fx_prj NULL Modified: openoffice/trunk/main/basegfx/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/prj/d.lst (original) +++ openoffice/trunk/main/basegfx/prj/d.lst Sun Aug 7 19:24:03 2016 @@ -1,114 +0,0 @@ -..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib%_EXT%\ibasegfx.lib -..\%__SRC%\lib\basegfx.lib %_DEST%\lib%_EXT%\basegfx.lib -..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib%_EXT%\basegfx_s.lib - -..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin%_EXT%\basegfx?????.dll -..\%__SRC%\bin\bgfx*.dll %_DEST%\bin%_EXT%\bgfx*.dll - -..\%__SRC%\lib\libbasegfx*.* %_DEST%\lib%_EXT%\libbasegfx*.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a - -mkdir: %_DEST%\inc%_EXT%\basegfx - -mkdir: %_DEST%\inc%_EXT%\basegfx\matrix -..\inc\basegfx\matrix\b2dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrix.hxx -..\inc\basegfx\matrix\b2dhommatrixtools.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b2dhommatrixtools.hxx -..\inc\basegfx\matrix\b3dhommatrix.hxx %_DEST%\inc%_EXT%\basegfx\matrix\b3dhommatrix.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\point -..\inc\basegfx\point\b2dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dpoint.hxx -..\inc\basegfx\point\b3dpoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dpoint.hxx -..\inc\basegfx\point\b2ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2ipoint.hxx -..\inc\basegfx\point\b3ipoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3ipoint.hxx -..\inc\basegfx\point\b2dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b2dhompoint.hxx -..\inc\basegfx\point\b3dhompoint.hxx %_DEST%\inc%_EXT%\basegfx\point\b3dhompoint.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\range -..\inc\basegfx\range\rangeexpander.hxx %_DEST%\inc%_EXT%\basegfx\range\rangeexpander.hxx -..\inc\basegfx\range\basicrange.hxx %_DEST%\inc%_EXT%\basegfx\range\basicrange.hxx -..\inc\basegfx\range\basicbox.hxx %_DEST%\inc%_EXT%\basegfx\range\basicbox.hxx -..\inc\basegfx\range\b1drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1drange.hxx -..\inc\basegfx\range\b2dpolyrange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dpolyrange.hxx -..\inc\basegfx\range\b2drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drange.hxx -..\inc\basegfx\range\b2drectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2drectangle.hxx -..\inc\basegfx\range\b2dconnectedranges.hxx %_DEST%\inc%_EXT%\basegfx\range\b2dconnectedranges.hxx -..\inc\basegfx\range\b3drange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3drange.hxx -..\inc\basegfx\range\b3dvolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3dvolume.hxx -..\inc\basegfx\range\b1irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b1irange.hxx -..\inc\basegfx\range\b2irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irange.hxx -..\inc\basegfx\range\b2irectangle.hxx %_DEST%\inc%_EXT%\basegfx\range\b2irectangle.hxx -..\inc\basegfx\range\b3irange.hxx %_DEST%\inc%_EXT%\basegfx\range\b3irange.hxx -..\inc\basegfx\range\b3ivolume.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ivolume.hxx -..\inc\basegfx\range\b1ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b1ibox.hxx -..\inc\basegfx\range\b2ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b2ibox.hxx -..\inc\basegfx\range\b3ibox.hxx %_DEST%\inc%_EXT%\basegfx\range\b3ibox.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\vector -..\inc\basegfx\vector\b2dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dvector.hxx -..\inc\basegfx\vector\b2enums.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2enums.hxx -..\inc\basegfx\vector\b2dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2dsize.hxx -..\inc\basegfx\vector\b3dvector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dvector.hxx -..\inc\basegfx\vector\b3dsize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3dsize.hxx -..\inc\basegfx\vector\b2ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2ivector.hxx -..\inc\basegfx\vector\b2isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b2isize.hxx -..\inc\basegfx\vector\b3ivector.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3ivector.hxx -..\inc\basegfx\vector\b3isize.hxx %_DEST%\inc%_EXT%\basegfx\vector\b3isize.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\curve -..\inc\basegfx\curve\b2dcubicbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dcubicbezier.hxx -..\inc\basegfx\curve\b2dquadraticbezier.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dquadraticbezier.hxx -..\inc\basegfx\curve\b2dbeziertools.hxx %_DEST%\inc%_EXT%\basegfx\curve\b2dbeziertools.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\numeric -..\inc\basegfx\numeric\ftools.hxx %_DEST%\inc%_EXT%\basegfx\numeric\ftools.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\polygon -..\inc\basegfx\polygon\b2dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygon.hxx -..\inc\basegfx\polygon\b2dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygon.hxx -..\inc\basegfx\polygon\b2dpolypolygonfillrule.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonfillrule.hxx -..\inc\basegfx\polygon\b2dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontools.hxx -..\inc\basegfx\polygon\b2dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygontools.hxx -..\inc\basegfx\polygon\b2dpolypolygonrasterconverter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygonrasterconverter.hxx -..\inc\basegfx\polygon\b2dlinegeometry.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dlinegeometry.hxx -..\inc\basegfx\polygon\b2dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygonclipper.hxx -..\inc\basegfx\polygon\b2dpolygontriangulator.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygontriangulator.hxx -..\inc\basegfx\polygon\b2dpolygoncutandtouch.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolygoncutandtouch.hxx -..\inc\basegfx\polygon\b2dpolypolygoncutter.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dpolypolygoncutter.hxx -..\inc\basegfx\polygon\b2dtrapezoid.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b2dtrapezoid.hxx -..\inc\basegfx\polygon\b3dpolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygon.hxx -..\inc\basegfx\polygon\b3dpolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygon.hxx -..\inc\basegfx\polygon\b3dpolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygontools.hxx -..\inc\basegfx\polygon\b3dpolypolygontools.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolypolygontools.hxx -..\inc\basegfx\polygon\b3dpolygonclipper.hxx %_DEST%\inc%_EXT%\basegfx\polygon\b3dpolygonclipper.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\tuple -..\inc\basegfx\tuple\b2dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2dtuple.hxx -..\inc\basegfx\tuple\b3dtuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3dtuple.hxx -..\inc\basegfx\tuple\b2ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2ituple.hxx -..\inc\basegfx\tuple\b3ituple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3ituple.hxx -..\inc\basegfx\tuple\b2i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b2i64tuple.hxx -..\inc\basegfx\tuple\b3i64tuple.hxx %_DEST%\inc%_EXT%\basegfx\tuple\b3i64tuple.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\tools -..\inc\basegfx\tools\canvastools.hxx %_DEST%\inc%_EXT%\basegfx\tools\canvastools.hxx -..\inc\basegfx\tools\keystoplerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\keystoplerp.hxx -..\inc\basegfx\tools\lerp.hxx %_DEST%\inc%_EXT%\basegfx\tools\lerp.hxx -..\inc\basegfx\tools\unopolypolygon.hxx %_DEST%\inc%_EXT%\basegfx\tools\unopolypolygon.hxx -..\inc\basegfx\tools\b2dclipstate.hxx %_DEST%\inc%_EXT%\basegfx\tools\b2dclipstate.hxx -..\inc\basegfx\tools\rectcliptools.hxx %_DEST%\inc%_EXT%\basegfx\tools\rectcliptools.hxx -..\inc\basegfx\tools\tools.hxx %_DEST%\inc%_EXT%\basegfx\tools\tools.hxx -..\inc\basegfx\tools\gradienttools.hxx %_DEST%\inc%_EXT%\basegfx\tools\gradienttools.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\color -..\inc\basegfx\color\bcolor.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolor.hxx -..\inc\basegfx\color\bcolortools.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolortools.hxx -..\inc\basegfx\color\bcolormodifier.hxx %_DEST%\inc%_EXT%\basegfx\color\bcolormodifier.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\pixel -..\inc\basegfx\pixel\bpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bpixel.hxx -..\inc\basegfx\pixel\bzpixel.hxx %_DEST%\inc%_EXT%\basegfx\pixel\bzpixel.hxx - -mkdir: %_DEST%\inc%_EXT%\basegfx\raster -..\inc\basegfx\raster\bpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bpixelraster.hxx -..\inc\basegfx\raster\bzpixelraster.hxx %_DEST%\inc%_EXT%\basegfx\raster\bzpixelraster.hxx -..\inc\basegfx\raster\rasterconvert3d.hxx %_DEST%\inc%_EXT%\basegfx\raster\rasterconvert3d.hxx Modified: openoffice/trunk/main/basic/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basic/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/basic/prj/build.lst (original) +++ openoffice/trunk/main/basic/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,4 +1,4 @@ -sb basic : L10N:l10n offuh oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL +sb basic : L10N:l10n offapi oovbaapi svtools xmlscript framework salhelper LIBXSLT:libxslt NULL sb basic usr1 - all sb_mkout NULL sb basic\inc nmake - all sb_inc NULL sb basic\source\basmgr nmake - all sb_mgr sb_inc NULL Modified: openoffice/trunk/main/binaryurp/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/binaryurp/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/binaryurp/prj/build.lst (original) +++ openoffice/trunk/main/binaryurp/prj/build.lst Sun Aug 7 19:24:03 2016 @@ -1,3 +1,3 @@ -bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offuh sal salhelper stlport NULL +bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal salhelper stlport NULL bu binaryurp\source nmake - all bu_source NULL bu binaryurp\qa nmake - all bu_qa bu_source NULL Modified: openoffice/trunk/main/bootstrap.1 URL: http://svn.apache.org/viewvc/openoffice/trunk/main/bootstrap.1?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/bootstrap.1 (original) +++ openoffice/trunk/main/bootstrap.1 Sun Aug 7 19:24:03 2016 @@ -19,6 +19,23 @@ # # ************************************************************* +if test -z "${SOLARENV}"; then + if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi +fi +if test -z "${SOLARENV}"; then + echo "bootstrap: No environment set!" + exit 1 +fi + +# remove aliases set by *Env.Set.sh +unalias mkout +unalias deliver +unalias build +unalias build_client +unalias zipdep +unalias nmake +unalias gunzip + # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x # Use spawn instead of fork when building dmake on cygwin. if test "$GUI" = "WNT"; then Modified: openoffice/trunk/main/canvas/inc/canvas/base/cachedprimitivebase.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/base/cachedprimitivebase.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/base/cachedprimitivebase.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/base/cachedprimitivebase.hxx Sun Aug 7 19:24:03 2016 @@ -32,6 +32,7 @@ #include <cppuhelper/compbase2.hxx> #include <comphelper/broadcasthelper.hxx> +#include <canvas/canvastoolsdllapi.h> /* Definition of CachedPrimitiveBase class */ @@ -43,7 +44,7 @@ namespace canvas /** Base class, providing common functionality for implementers of the XCachedPrimitive interface. */ - class CachedPrimitiveBase : public CachedPrimitiveBase_Base, + class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public CachedPrimitiveBase_Base, public ::comphelper::OBaseMutex { public: Modified: openoffice/trunk/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx Sun Aug 7 19:24:03 2016 @@ -31,7 +31,7 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <canvas/base/spritesurface.hxx> - +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -40,7 +40,7 @@ namespace canvas /** Base class for an XSprite helper implementation - to be used in concert with CanvasCustomSpriteBase */ - class CanvasCustomSpriteHelper + class CANVASTOOLS_DLLPUBLIC CanvasCustomSpriteHelper { public: CanvasCustomSpriteHelper(); Modified: openoffice/trunk/main/canvas/inc/canvas/canvastools.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/canvastools.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/canvastools.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/canvastools.hxx Sun Aug 7 19:24:03 2016 @@ -38,6 +38,7 @@ #include <limits> #include <algorithm> +#include <canvas/canvastoolsdllapi.h> namespace basegfx { @@ -149,56 +150,56 @@ namespace canvas /** Create a RealSize2D with both coordinate values set to +infinity */ - ::com::sun::star::geometry::RealSize2D createInfiniteSize2D(); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::RealSize2D createInfiniteSize2D(); // View- and RenderState utilities // =================================================================== - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& initRenderState( ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& initViewState( ::com::sun::star::rendering::ViewState& viewState ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& setViewStateTransform( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& appendToViewState( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& prependToViewState( ::com::sun::star::rendering::ViewState& viewState, const ::basegfx::B2DHomMatrix& transform ); - ::com::sun::star::rendering::RenderState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - ::basegfx::B2DHomMatrix& + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); - ::com::sun::star::rendering::ViewState& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& mergeViewAndRenderState( ::com::sun::star::rendering::ViewState& resultViewState, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, @@ -209,10 +210,10 @@ namespace canvas // Matrix utilities // =================================================================== - ::com::sun::star::geometry::AffineMatrix2D& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D& setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D& matrix ); - ::com::sun::star::geometry::Matrix2D& + CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D& matrix ); @@ -238,7 +239,7 @@ namespace canvas @return a reference to the resulting rectangle */ - ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange& o_Rect, const ::basegfx::B2DRange& i_Rect, const ::basegfx::B2DHomMatrix& i_Transformation ); @@ -278,7 +279,7 @@ namespace canvas @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix& o_transform, const ::basegfx::B2DRange& i_destRect, const ::basegfx::B2DRange& i_srcRect, const ::basegfx::B2DHomMatrix& i_transformation ); @@ -310,7 +311,7 @@ namespace canvas @see calcRectToRectTransform() @see calcTransformedRectBounds() */ - ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix& o_transform, const ::basegfx::B2DRange& i_srcRect, const ::basegfx::B2DHomMatrix& i_transformation ); @@ -334,7 +335,7 @@ namespace canvas @param rTransformation This transformation is applied to rTransformRect */ - bool isInside( const ::basegfx::B2DRange& rContainedRect, + CANVASTOOLS_DLLPUBLIC bool isInside( const ::basegfx::B2DRange& rContainedRect, const ::basegfx::B2DRange& rTransformRect, const ::basegfx::B2DHomMatrix& rTransformation ); @@ -361,7 +362,7 @@ namespace canvas @return false, if the resulting scroll area is empty */ - bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea, + CANVASTOOLS_DLLPUBLIC bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea, ::basegfx::B2IPoint& io_rDestPoint, ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas, const ::basegfx::B2IRange& rBounds ); @@ -389,7 +390,7 @@ namespace canvas @return false, if the resulting blit is empty, i.e. fully clipped away. */ - bool clipBlit( ::basegfx::B2IRange& io_rSourceArea, + CANVASTOOLS_DLLPUBLIC bool clipBlit( ::basegfx::B2IRange& io_rSourceArea, ::basegfx::B2IPoint& io_rDestPoint, const ::basegfx::B2IRange& rSourceBounds, const ::basegfx::B2IRange& rDestBounds ); @@ -409,7 +410,7 @@ namespace canvas @return the integer range, which is covered by the sprite given by rRange. */ - ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange ); /** Retrieve various internal properties of the actual canvas implementation. @@ -429,7 +430,7 @@ namespace canvas @return A reference to the resulting sequence of parameters */ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams ); @@ -438,21 +439,21 @@ namespace canvas Use this method for dead-simple bitmap implementations, that map all their formats to 8888 RGBA color. */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace(); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace(); /** Return a memory layout for a default RGBA integer format Use this method for dead-simple bitmap implementations, that map all their formats to 8888 RGBA color. */ - ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout( const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize ); /// Convert standard 8888 RGBA color to vcl color - ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor ); + CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor ); /// Convert standard 8888 RGBA color to vcl color - ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor ); + CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor ); // Modelled closely after boost::numeric_cast, only that we // issue some trace output here and throw a RuntimeException @@ -485,13 +486,13 @@ namespace canvas return static_cast<Target>(arg); } - ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( + CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect( const ::com::sun::star::awt::Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin ); /** Retrieve for small bound marks around each corner of the given rectangle */ - ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange ); + CANVASTOOLS_DLLPUBLIC ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange ); /** Calculate number of gradient "strips" to generate (takes into account device resolution) @@ -500,7 +501,7 @@ namespace canvas Maximal integer difference between all color stops, needed for smooth gradient color differences */ - int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, + CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix& rTotalTransform, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::rendering::Texture& texture, Modified: openoffice/trunk/main/canvas/inc/canvas/elapsedtime.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/elapsedtime.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/elapsedtime.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/elapsedtime.hxx Sun Aug 7 19:24:03 2016 @@ -27,6 +27,7 @@ #include <sal/types.h> #include "boost/shared_ptr.hpp" +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -38,7 +39,7 @@ namespace canvas -management functions. In its simplest use-case, it measures the time from its creation. */ - class ElapsedTime + class CANVASTOOLS_DLLPUBLIC ElapsedTime { public: /** Create a new ElapsedTime object Modified: openoffice/trunk/main/canvas/inc/canvas/parametricpolypolygon.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/parametricpolypolygon.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/parametricpolypolygon.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/parametricpolypolygon.hxx Sun Aug 7 19:24:03 2016 @@ -32,6 +32,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <boost/utility.hpp> +#include <canvas/canvastoolsdllapi.h> namespace basegfx { @@ -47,7 +48,7 @@ namespace canvas typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D, ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base; - class ParametricPolyPolygon : public ::comphelper::OBaseMutex, + class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex, public ParametricPolyPolygon_Base, private ::boost::noncopyable { Modified: openoffice/trunk/main/canvas/inc/canvas/prioritybooster.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/prioritybooster.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/prioritybooster.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/prioritybooster.hxx Sun Aug 7 19:24:03 2016 @@ -27,6 +27,7 @@ #include <sal/types.h> #include <memory> +#include <canvas/canvastoolsdllapi.h> namespace canvas @@ -47,8 +48,8 @@ namespace canvas Difference in execution priority. Positive values increase prio, negative values decrease prio. */ - explicit PriorityBooster( sal_Int32 nDelta ); - ~PriorityBooster(); + CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta ); + CANVASTOOLS_DLLPUBLIC ~PriorityBooster(); private: // also disables copy constructor and assignment operator Modified: openoffice/trunk/main/canvas/inc/canvas/propertysethelper.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/propertysethelper.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/propertysethelper.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/propertysethelper.hxx Sun Aug 7 19:24:03 2016 @@ -32,6 +32,7 @@ #include <vector> #include <memory> +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -50,7 +51,7 @@ namespace canvas The core responsibility of this this class is the name/value mapping for property sets. */ - class PropertySetHelper + class CANVASTOOLS_DLLPUBLIC PropertySetHelper { public: typedef boost::function0< ::com::sun::star::uno::Any > GetterType; Modified: openoffice/trunk/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx Sun Aug 7 19:24:03 2016 @@ -29,6 +29,7 @@ #include <boost/shared_ptr.hpp> +#include <canvas/canvastoolsdllapi.h> namespace canvas { @@ -69,7 +70,7 @@ namespace canvas /** Create a surface proxy for the given render module. */ - ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ); + CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule ); } #endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */ Modified: openoffice/trunk/main/canvas/inc/canvas/spriteredrawmanager.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/spriteredrawmanager.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/spriteredrawmanager.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/spriteredrawmanager.hxx Sun Aug 7 19:24:03 2016 @@ -39,6 +39,7 @@ #include <boost/utility.hpp> #include <boost/bind.hpp> +#include <canvas/canvastoolsdllapi.h> /* Definition of SpriteRedrawManager class */ @@ -62,7 +63,7 @@ namespace canvas there) will reside in a common sprite area and handled together in the forEachSpriteArea functor call. */ - class SpriteRedrawManager : private ::boost::noncopyable + class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager : private ::boost::noncopyable { public: /** Data container for the connected components list Modified: openoffice/trunk/main/canvas/inc/canvas/verifyinput.hxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/canvas/inc/canvas/verifyinput.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/canvas/inc/canvas/verifyinput.hxx (original) +++ openoffice/trunk/main/canvas/inc/canvas/verifyinput.hxx Sun Aug 7 19:24:03 2016 @@ -34,6 +34,7 @@ #include <boost/bind.hpp> #include <boost/current_function.hpp> +#include <canvas/canvastoolsdllapi.h> namespace com { namespace sun { namespace star { namespace geometry { @@ -91,7 +92,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -114,7 +115,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -137,7 +138,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -160,7 +161,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -183,7 +184,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D& rSegment, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -206,7 +207,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D& rPoint, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -229,7 +230,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealRectangle2D& rRect, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -251,7 +252,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::ViewState& viewState, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -277,7 +278,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::RenderState& renderState, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -300,7 +301,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -322,7 +323,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::Texture& texture, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::Texture& texture, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -344,7 +345,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -366,7 +367,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -388,7 +389,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontInfo& fontInfo, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -410,7 +411,7 @@ namespace canvas @throws an lang::IllegalArgumentException, if anything is wrong */ - void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, + CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf, @@ -673,7 +674,7 @@ namespace canvas @param size Given rectangle must be within ((0,0), (size.Width, size.Height)) */ - void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, + CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect, const ::com::sun::star::geometry::IntegerSize2D& size ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when @@ -685,7 +686,7 @@ namespace canvas @param size Given position must be within ((0,0), (size.Width, size.Height)) */ - void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos, + CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos, const ::com::sun::star::geometry::IntegerSize2D& size ); /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when @@ -694,7 +695,7 @@ namespace canvas @param size Size to verify */ - void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, + CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf ); @@ -705,7 +706,7 @@ namespace canvas @param size Size to verify */ - void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, + CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size, const char* pStr, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIf );