drawinglayer/inc/emfplushelper.hxx | 4 + drawinglayer/inc/wmfemfhelper.hxx | 3 + drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 - drawinglayer/source/tools/emfpbrush.hxx | 2 drawinglayer/source/tools/emfphelperdata.cxx | 2 drawinglayer/source/tools/emfphelperdata.hxx | 8 +++ drawinglayer/source/tools/emfpimage.hxx | 1 drawinglayer/source/tools/wmfemfhelper.cxx | 38 ++++++++-------- include/vcl/gdimetafiletools.hxx | 1 vcl/source/gdi/gdimetafiletools.cxx | 4 + 10 files changed, 47 insertions(+), 20 deletions(-)
New commits: commit 7071aaf63b8bd2c285727fda06c122222cc2fa80 Author: Armin Le Grand <[email protected]> Date: Thu Jun 22 16:40:00 2017 +0200 emfplus: linux build adaptions Change-Id: Ic3f0d8068e9e77b664a97f892205945c8e06b61a diff --git a/drawinglayer/inc/emfplushelper.hxx b/drawinglayer/inc/emfplushelper.hxx index 839a94d82e95..78e59dbf1abc 100644 --- a/drawinglayer/inc/emfplushelper.hxx +++ b/drawinglayer/inc/emfplushelper.hxx @@ -20,12 +20,16 @@ #ifndef INCLUDED_DRAWINGLAYER_INC_EMFPLUSHELPER_HXX #define INCLUDED_DRAWINGLAYER_INC_EMFPLUSHELPER_HXX +#include <sal/types.h> #include <sal/config.h> +#include <memory> /// predefines namespace emfplushelper { struct EmfPlusHelperData; } namespace wmfemfhelper { class TargetHolders; } namespace wmfemfhelper { class PropertyHolders; } +namespace drawinglayer { namespace geometry { class ViewInformation2D; }} +class SvMemoryStream; namespace emfplushelper { diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx index a11b6578e572..7ae8e64ad6e8 100644 --- a/drawinglayer/inc/wmfemfhelper.hxx +++ b/drawinglayer/inc/wmfemfhelper.hxx @@ -22,6 +22,9 @@ #include <sal/config.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <vcl/font.hxx> +#include <vcl/outdevstate.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> // predefines namespace drawinglayer { namespace geometry { class ViewInformation2D; }} diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 65ec52c894de..148eb9c5725b 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -21,7 +21,7 @@ #include <wmfemfhelper.hxx> //#include <basegfx/tools/canvastools.hxx> -//#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> +#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> //#include <basegfx/color/bcolor.hxx> //#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> //#include <vcl/lineinfo.hxx> @@ -29,7 +29,7 @@ //#include <drawinglayer/attribute/strokeattribute.hxx> //#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> //#include <vcl/metaact.hxx> -//#include <drawinglayer/primitive2d/transformprimitive2d.hxx> +#include <drawinglayer/primitive2d/transformprimitive2d.hxx> //#include <basegfx/matrix/b2dhommatrixtools.hxx> //#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> //#include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/drawinglayer/source/tools/emfpbrush.hxx b/drawinglayer/source/tools/emfpbrush.hxx index 852b2d469b4b..792b5f018790 100644 --- a/drawinglayer/source/tools/emfpbrush.hxx +++ b/drawinglayer/source/tools/emfpbrush.hxx @@ -21,6 +21,8 @@ #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPBRUSH_HXX #include <emfphelperdata.hxx> +#include <tools/color.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx index c9ed51e8b5ca..fdb0fb11c42f 100644 --- a/drawinglayer/source/tools/emfphelperdata.cxx +++ b/drawinglayer/source/tools/emfphelperdata.cxx @@ -28,6 +28,8 @@ #include <basegfx/curve/b2dcubicbezier.hxx> #include <wmfemfhelper.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <basegfx/polygon/b2dpolygontools.hxx> namespace emfplushelper { diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx index 290fd4a0ad8a..a700df8dac6c 100644 --- a/drawinglayer/source/tools/emfphelperdata.hxx +++ b/drawinglayer/source/tools/emfphelperdata.hxx @@ -21,9 +21,17 @@ #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPHELPERDATA_HXX #include <emfplushelper.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <tools/stream.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/vector/b2dsize.hxx> //#include <com/sun/star/rendering/XCanvasFont.hpp> //#include <com/sun/star/rendering/TextDirection.hpp> +// predefines +class SvStream; +namespace basegfx { class B2DPolyPolygon; } + namespace emfplushelper { // EMF+ commands diff --git a/drawinglayer/source/tools/emfpimage.hxx b/drawinglayer/source/tools/emfpimage.hxx index d5a06c5e56b9..455a88ea7757 100644 --- a/drawinglayer/source/tools/emfpimage.hxx +++ b/drawinglayer/source/tools/emfpimage.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DRAWINGLAYER_SOURCE_TOOLS_EMFPIMAGE_HXX #include <emfphelperdata.hxx> +#include <vcl/graph.hxx> namespace emfplushelper { diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index b272f4a51eb3..4c7a298b912f 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -22,39 +22,41 @@ //#include <basegfx/tools/canvastools.hxx> //#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> //#include <basegfx/color/bcolor.hxx> -//#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> -//#include <vcl/lineinfo.hxx> +#include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx> +#include <vcl/lineinfo.hxx> //#include <drawinglayer/attribute/lineattribute.hxx> //#include <drawinglayer/attribute/strokeattribute.hxx> -//#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> +#include <drawinglayer/primitive2d/polygonprimitive2d.hxx> //#include <vcl/metaact.hxx> -//#include <drawinglayer/primitive2d/transformprimitive2d.hxx> -//#include <basegfx/matrix/b2dhommatrixtools.hxx> -//#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> -//#include <basegfx/polygon/b2dpolygontools.hxx> +#include <drawinglayer/primitive2d/transformprimitive2d.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> +#include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/discretebitmapprimitive2d.hxx> -//#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> +#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <vcl/salbtype.hxx> -//#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -//#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx> +#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx> //#include <vcl/svapp.hxx> -//#include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> -//#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> -//#include <drawinglayer/primitive2d/maskprimitive2d.hxx> -//#include <basegfx/polygon/b2dpolygonclipper.hxx> +#include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> +#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx> +#include <drawinglayer/primitive2d/maskprimitive2d.hxx> +#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <drawinglayer/primitive2d/invertprimitive2d.hxx> -//#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> +#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx> //#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx> #include <drawinglayer/primitive2d/wallpaperprimitive2d.hxx> //#include <drawinglayer/primitive2d/textprimitive2d.hxx> -//#include <drawinglayer/primitive2d/textlayoutdevice.hxx> -//#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> +#include <drawinglayer/primitive2d/textlayoutdevice.hxx> +#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx> //#include <i18nlangtag/languagetag.hxx> #include <drawinglayer/primitive2d/textlineprimitive2d.hxx> #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx> -//#include <drawinglayer/primitive2d/epsprimitive2d.hxx> +#include <drawinglayer/primitive2d/epsprimitive2d.hxx> #include <tools/fract.hxx> //#include <numeric> +#include <vcl/gradient.hxx> +#include <vcl/hatch.hxx> #include <emfplushelper.hxx> namespace drawinglayer diff --git a/include/vcl/gdimetafiletools.hxx b/include/vcl/gdimetafiletools.hxx index ea47ced5032e..2296ab219e22 100644 --- a/include/vcl/gdimetafiletools.hxx +++ b/include/vcl/gdimetafiletools.hxx @@ -46,6 +46,7 @@ class VCL_DLLPUBLIC MetafileAccessor { public: virtual bool accessMetafile(GDIMetaFile& rTargetMetafile) const = 0; + virtual ~MetafileAccessor(); }; diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index 6cbdcdc0734f..b826b2fa8a0c 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -1083,4 +1083,8 @@ bool usesClipActions(const GDIMetaFile& rSource) return false; } +MetafileAccessor::~MetafileAccessor() +{ +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
