incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1220836 [1/4] - in /incubator/ooo/trunk: ./ main/ main/basegfx/inc/basegfx/color/ main/basegfx/inc/basegfx/matrix/ main/basegfx/inc/basegfx/polygon/ main/basegfx/source/color/ main/basegfx/source/polygon/ main/cppcanvas/source/mtfrenderer/...
Date Mon, 19 Dec 2011 16:41:25 GMT
Author: alg
Date: Mon Dec 19 16:41:21 2011
New Revision: 1220836

URL: http://svn.apache.org/viewvc?rev=1220836&view=rev
Log:
Svg: Reintegrated Svg replacement from /branches/alg/svgreplavement to trunk, first version of Svg stable and done

Added:
    incubator/ooo/trunk/main/drawinglayer/drawinglayer.component
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/drawinglayer.component
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/cropprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/tools/
      - copied from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/tools/
    incubator/ooo/trunk/main/drawinglayer/source/drawinglayeruno/
      - copied from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/drawinglayeruno/
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/cropprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx
    incubator/ooo/trunk/main/drawinglayer/source/tools/
      - copied from r1220782, incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/tools/
    incubator/ooo/trunk/main/offapi/com/sun/star/graphic/Primitive2DTools.idl
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/offapi/com/sun/star/graphic/Primitive2DTools.idl
    incubator/ooo/trunk/main/offapi/com/sun/star/graphic/SvgTools.idl
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/offapi/com/sun/star/graphic/SvgTools.idl
    incubator/ooo/trunk/main/offapi/com/sun/star/graphic/XPrimitive2DRenderer.idl
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/offapi/com/sun/star/graphic/XPrimitive2DRenderer.idl
    incubator/ooo/trunk/main/offapi/com/sun/star/graphic/XSvgParser.idl
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/offapi/com/sun/star/graphic/XSvgParser.idl
    incubator/ooo/trunk/main/svgio/
      - copied from r1220782, incubator/ooo/branches/alg/svgreplacement/main/svgio/
    incubator/ooo/trunk/main/vcl/inc/vcl/svgdata.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/vcl/inc/vcl/svgdata.hxx
    incubator/ooo/trunk/main/vcl/source/gdi/svgdata.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/vcl/source/gdi/svgdata.cxx
    incubator/ooo/trunk/main/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
    incubator/ooo/trunk/main/xmloff/source/core/xmlmultiimagehelper.cxx
      - copied unchanged from r1220782, incubator/ooo/branches/alg/svgreplacement/main/xmloff/source/core/xmlmultiimagehelper.cxx
Removed:
    incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
    incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/rendergraphicprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/rendergraphicprimitive2d.cxx
    incubator/ooo/trunk/main/vcl/inc/vcl/rendergraphic.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/rendergraphicrasterizer.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/svgread.hxx
    incubator/ooo/trunk/main/vcl/source/gdi/rendergraphic.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/rendergraphicrasterizer.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/svgread.cxx
Modified:
    incubator/ooo/trunk/   (props changed)
    incubator/ooo/trunk/main/Module_ooo.mk
    incubator/ooo/trunk/main/Repository.mk
    incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx
    incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
    incubator/ooo/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
    incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
    incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
    incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
    incubator/ooo/trunk/main/basegfx/source/color/bcolormodifier.cxx
    incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygon.cxx
    incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygoncutter.cxx
    incubator/ooo/trunk/main/basegfx/source/polygon/b2dsvgpolypolygon.cxx
    incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
    incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/makefile.mk
    incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
    incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk
    incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/baseprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor3d/shadow3dextractor.cxx
    incubator/ooo/trunk/main/editeng/inc/editeng/unoprnms.hxx
    incubator/ooo/trunk/main/filter/source/flash/swfwriter1.cxx
    incubator/ooo/trunk/main/filter/source/graphicfilter/eos2met/eos2met.cxx
    incubator/ooo/trunk/main/filter/source/graphicfilter/epict/epict.cxx
    incubator/ooo/trunk/main/filter/source/graphicfilter/eps/eps.cxx
    incubator/ooo/trunk/main/filter/source/svg/svgwriter.cxx
    incubator/ooo/trunk/main/filter/source/svg/svgwriter.hxx
    incubator/ooo/trunk/main/offapi/com/sun/star/graphic/makefile.mk
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/postprocess/prj/build.lst
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/module_hidden_ooo.scp
    incubator/ooo/trunk/main/sd/source/ui/view/drviews2.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/drviews6.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/drviews7.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/drviewsc.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/drviewsj.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/sdview.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/sdview3.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx
    incubator/ooo/trunk/main/solenv/inc/libs.mk
    incubator/ooo/trunk/main/splitbuild/framework.lst
    incubator/ooo/trunk/main/svtools/inc/svtools/grfmgr.hxx
    incubator/ooo/trunk/main/svtools/source/filter/filter.cxx
    incubator/ooo/trunk/main/svtools/source/filter/wmf/emfwr.cxx
    incubator/ooo/trunk/main/svtools/source/filter/wmf/wmfwr.cxx
    incubator/ooo/trunk/main/svtools/source/graphic/descriptor.cxx
    incubator/ooo/trunk/main/svtools/source/graphic/grfcache.cxx
    incubator/ooo/trunk/main/svtools/source/graphic/grfmgr.cxx
    incubator/ooo/trunk/main/svtools/source/graphic/grfmgr2.cxx
    incubator/ooo/trunk/main/svtools/source/graphic/provider.cxx
    incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/objectcontacttools.hxx
    incubator/ooo/trunk/main/svx/inc/svx/svdograf.hxx
    incubator/ooo/trunk/main/svx/inc/svx/svdstr.hrc
    incubator/ooo/trunk/main/svx/inc/svx/svdxcgv.hxx
    incubator/ooo/trunk/main/svx/inc/svx/unoshprp.hxx
    incubator/ooo/trunk/main/svx/source/dialog/_bmpmask.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
    incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svddrgmt.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdedtv.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdedtv2.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdfmtf.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdfmtf.hxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdobj.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdorect.cxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdstr.src
    incubator/ooo/trunk/main/svx/source/svdraw/svdxcgv.cxx
    incubator/ooo/trunk/main/svx/source/tbxctrls/grafctrl.cxx
    incubator/ooo/trunk/main/svx/source/unodraw/unoshap2.cxx
    incubator/ooo/trunk/main/svx/source/xml/xmlgrhlp.cxx
    incubator/ooo/trunk/main/sw/inc/cmdid.h
    incubator/ooo/trunk/main/sw/inc/ndgrf.hxx
    incubator/ooo/trunk/main/sw/inc/unoprnms.hxx
    incubator/ooo/trunk/main/sw/source/core/doc/notxtfrm.cxx
    incubator/ooo/trunk/main/sw/source/core/graphic/ndgrf.cxx
    incubator/ooo/trunk/main/sw/source/core/unocore/unoframe.cxx
    incubator/ooo/trunk/main/sw/source/core/unocore/unomap.cxx
    incubator/ooo/trunk/main/sw/source/core/unocore/unoprnms.cxx
    incubator/ooo/trunk/main/sw/source/ui/shells/grfsh.cxx
    incubator/ooo/trunk/main/vcl/Library_vcl.mk
    incubator/ooo/trunk/main/vcl/Package_inc.mk
    incubator/ooo/trunk/main/vcl/inc/impgraph.hxx
    incubator/ooo/trunk/main/vcl/inc/sallayout.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/gdimtf.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/graph.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/metaact.hxx
    incubator/ooo/trunk/main/vcl/inc/vcl/outdev.hxx
    incubator/ooo/trunk/main/vcl/source/gdi/gdimtf.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/graph.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/impgraph.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/makefile.mk
    incubator/ooo/trunk/main/vcl/source/gdi/metaact.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/outdev6.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx
    incubator/ooo/trunk/main/vcl/source/gdi/print2.cxx
    incubator/ooo/trunk/main/vcl/util/makefile.mk
    incubator/ooo/trunk/main/xmloff/Library_xo.mk
    incubator/ooo/trunk/main/xmloff/Package_inc.mk
    incubator/ooo/trunk/main/xmloff/inc/xmloff/txtparae.hxx
    incubator/ooo/trunk/main/xmloff/source/draw/shapeexport2.cxx
    incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.cxx
    incubator/ooo/trunk/main/xmloff/source/draw/ximpshap.hxx
    incubator/ooo/trunk/main/xmloff/source/text/XMLTextFrameContext.cxx
    incubator/ooo/trunk/main/xmloff/source/text/XMLTextFrameContext.hxx
    incubator/ooo/trunk/main/xmloff/source/text/txtparae.cxx

Propchange: incubator/ooo/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/ooo/branches/alg/svgreplacement:1205420-1220782

Modified: incubator/ooo/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/Module_ooo.mk?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/Module_ooo.mk (original)
+++ incubator/ooo/trunk/main/Module_ooo.mk Mon Dec 19 16:41:21 2011
@@ -30,7 +30,8 @@ $(eval $(call gb_Module_Module,ooo))
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 	comphelper \
 	drawinglayer \
-        editeng \
+	svgio \
+    editeng \
 	framework \
 	padmin \
 	sfx2 \

Modified: incubator/ooo/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/Repository.mk?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/Repository.mk (original)
+++ incubator/ooo/trunk/main/Repository.mk Mon Dec 19 16:41:21 2011
@@ -52,6 +52,7 @@ $(eval $(call gb_Helper_register_librari
 	cui \
     desktop_detector \
 	drawinglayer \
+	svgio \
 	editeng \
 	fwe \
 	fwi \

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolor.hxx Mon Dec 19 16:41:21 2011
@@ -151,9 +151,9 @@ namespace basegfx
 		// luminance
 		double luminance() const
 		{
-			const double fRedWeight(77.0 / 256.0);
-			const double fGreenWeight(151.0 / 256.0);
-			const double fBlueWeight(28.0 / 256.0);
+			const double fRedWeight(77.0 / 256.0);      // 0.30
+			const double fGreenWeight(151.0 / 256.0);   // 0.59
+			const double fBlueWeight(28.0 / 256.0);     // 0.11
 
 			return (mfX * fRedWeight + mfY * fGreenWeight + mfZ * fBlueWeight);
 		}

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/color/bcolormodifier.hxx Mon Dec 19 16:41:21 2011
@@ -35,10 +35,12 @@ namespace basegfx
 	*/
 	enum BColorModifyMode
 	{
-		BCOLORMODIFYMODE_REPLACE,		// replace all color with local color
-		BCOLORMODIFYMODE_INTERPOLATE,	// interpolate color between given and local with local value
-		BCOLORMODIFYMODE_GRAY,			// convert color to gray
-		BCOLORMODIFYMODE_BLACKANDWHITE	// convert color to B&W, local value is treshhold
+		BCOLORMODIFYMODE_REPLACE,		        // replace all color with local color
+		BCOLORMODIFYMODE_INTERPOLATE,	        // interpolate color between given and local with local value
+		BCOLORMODIFYMODE_GRAY,			        // convert color to gray
+		BCOLORMODIFYMODE_BLACKANDWHITE,	        // convert color to B&W, local value is treshhold
+        BCOLORMODIFYMODE_INVERT,                // invert color
+        BCOLORMODIFYMODE_LUMINANCE_TO_ALPHA     // convert color to alpha value (used for Svg Mask)
 	};
 
 	/**	Class to hold a color, value and mode for a color modification. Color modification is

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx Mon Dec 19 16:41:21 2011
@@ -149,7 +149,7 @@ namespace basegfx
 			double                 mfShearX;
 
 		public:
-			B2DHomMatrixBufferedDecompose(const B2DHomMatrix& rB2DHomMatrix)
+			B2DHomMatrixBufferedDecompose(const B2DHomMatrix& rB2DHomMatrix = B2DHomMatrix())
 			:   maScale(),
 				maTranslate(),
 				mfRotate(0.0),
@@ -201,7 +201,7 @@ namespace basegfx
 			}
 
 		public:
-			B2DHomMatrixBufferedOnDemandDecompose(const B2DHomMatrix& rB2DHomMatrix)
+			B2DHomMatrixBufferedOnDemandDecompose(const B2DHomMatrix& rB2DHomMatrix = B2DHomMatrix())
 			:   maB2DHomMatrix(rB2DHomMatrix),
 				maScale(),
 				maTranslate(),

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx Mon Dec 19 16:41:21 2011
@@ -263,6 +263,10 @@ namespace basegfx
         B2DPoint* begin();
         B2DPoint* end();
 	};
+
+    // typedef for a vector of B2DPolygons
+    typedef ::std::vector< B2DPolygon > B2DPolygonVector;
+
 } // end of namespace basegfx
 
 //////////////////////////////////////////////////////////////////////////////

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx Mon Dec 19 16:41:21 2011
@@ -128,6 +128,10 @@ namespace basegfx
         B2DPolygon* begin();
         B2DPolygon* end();
 	};
+
+    // typedef for a vector of B2DPolyPolygons
+    typedef ::std::vector< B2DPolyPolygon > B2DPolyPolygonVector;
+
 } // end of namespace basegfx
 
 #endif /* _BGFX_POLYGON_B2DPOLYPOLYGON_HXX */

Modified: incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx (original)
+++ incubator/ooo/trunk/main/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx Mon Dec 19 16:41:21 2011
@@ -65,6 +65,13 @@ namespace basegfx
 		// can be combined for logical polygon operations or polygon clipping.
 		B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero = false);
 
+        // geometrically convert PolyPolygons which are proposed to use nonzero fill rule
+        // to a representation where evenodd paint will give the same result. To do this
+        // all intersections and self-intersections get solved (the polygons will be rearranged
+        // if needed). Then all polygons which are inside another one with the same orientation
+        // get deleted
+        B2DPolyPolygon createNonzeroConform(const B2DPolyPolygon& rCandidate);
+
         // For convenience: The four basic operations OR, XOR, AND and DIFF for
         // two PolyPolygons. These are combinations of the above methods. To not be forced
         // to do evtl. already done preparations twice, You have to do the operations Yourself.
@@ -104,7 +111,7 @@ namespace basegfx
 
 			@return A single PolyPolygon containing the Or-merged result
 		*/
-		B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput);
+		B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput);
 
 	} // end of namespace tools
 } // end of namespace basegfx

Modified: incubator/ooo/trunk/main/basegfx/source/color/bcolormodifier.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/source/color/bcolormodifier.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/source/color/bcolormodifier.cxx (original)
+++ incubator/ooo/trunk/main/basegfx/source/color/bcolormodifier.cxx Mon Dec 19 16:41:21 2011
@@ -56,6 +56,15 @@ namespace basegfx
 					return ::basegfx::BColor(1.0, 1.0, 1.0);
 				}
 			}
+            case BCOLORMODIFYMODE_INVERT :
+            {
+                return ::basegfx::BColor(1.0 - aSourceColor.getRed(), 1.0 - aSourceColor.getGreen(), 1.0 - aSourceColor.getBlue());
+            }
+            case BCOLORMODIFYMODE_LUMINANCE_TO_ALPHA:
+            {
+                const double fAlpha(1.0 - ((aSourceColor.getRed() * 0.2125) + (aSourceColor.getGreen() * 0.7154) + (aSourceColor.getBlue() * 0.0721)));
+                return ::basegfx::BColor(fAlpha, fAlpha, fAlpha);
+            }
 			default : // BCOLORMODIFYMODE_REPLACE
 			{
 				return maBColor;

Modified: incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygon.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygon.cxx (original)
+++ incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygon.cxx Mon Dec 19 16:41:21 2011
@@ -38,9 +38,7 @@
 
 class ImplB2DPolyPolygon
 {
-	typedef ::std::vector< basegfx::B2DPolygon >	PolygonVector;
-
-	PolygonVector									maPolygons;
+	basegfx::B2DPolygonVector                   maPolygons;
 
 public:
 	ImplB2DPolyPolygon() : maPolygons()
@@ -80,7 +78,7 @@ public:
 		if(nCount)
 		{
 			// add nCount copies of rPolygon
-			PolygonVector::iterator aIndex(maPolygons.begin());
+			basegfx::B2DPolygonVector::iterator aIndex(maPolygons.begin());
 			aIndex += nIndex;
 			maPolygons.insert(aIndex, nCount, rPolygon);
 		}
@@ -94,7 +92,7 @@ public:
 		{
 			// add nCount polygons from rPolyPolygon
 			maPolygons.reserve(maPolygons.size() + nCount);
-			PolygonVector::iterator aIndex(maPolygons.begin());
+			basegfx::B2DPolygonVector::iterator aIndex(maPolygons.begin());
 			aIndex += nIndex;
 
 			for(sal_uInt32 a(0L); a < nCount; a++)
@@ -110,9 +108,9 @@ public:
 		if(nCount)
 		{
 			// remove polygon data
-			PolygonVector::iterator aStart(maPolygons.begin());
+			basegfx::B2DPolygonVector::iterator aStart(maPolygons.begin());
 			aStart += nIndex;
-			const PolygonVector::iterator aEnd(aStart + nCount);
+			const basegfx::B2DPolygonVector::iterator aEnd(aStart + nCount);
 
 			maPolygons.erase(aStart, aEnd);
 		}

Modified: incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygoncutter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygoncutter.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygoncutter.cxx (original)
+++ incubator/ooo/trunk/main/basegfx/source/polygon/b2dpolypolygoncutter.cxx Mon Dec 19 16:41:21 2011
@@ -701,6 +701,94 @@ namespace basegfx
 
 		//////////////////////////////////////////////////////////////////////////////
 
+        B2DPolyPolygon createNonzeroConform(const B2DPolyPolygon& rCandidate)
+        {
+            B2DPolyPolygon aCandidate;
+
+            // remove all self-intersections and intersections
+            if(rCandidate.count() == 1)
+            {
+                aCandidate = basegfx::tools::solveCrossovers(rCandidate.getB2DPolygon(0));
+            }
+            else
+            {
+                aCandidate = basegfx::tools::solveCrossovers(rCandidate);
+            }
+
+            // cleanup evtl. neutral polygons
+            aCandidate = basegfx::tools::stripNeutralPolygons(aCandidate);
+
+            // remove all polygons which have the same orientation as the polygon they are directly contained in
+            const sal_uInt32 nCount(aCandidate.count());
+            
+            if(nCount > 1)
+            {
+                sal_uInt32 a, b;
+                ::std::vector< StripHelper > aHelpers;
+                aHelpers.resize(nCount);
+
+                for(a = 0; a < nCount; a++)
+                {
+                    const B2DPolygon aCand(aCandidate.getB2DPolygon(a));
+                    StripHelper* pNewHelper = &(aHelpers[a]);
+                    pNewHelper->maRange = tools::getRange(aCand);
+                    pNewHelper->meOrinetation = tools::getOrientation(aCand);
+
+                    // initialize with own orientation
+                    pNewHelper->mnDepth = (ORIENTATION_NEGATIVE == pNewHelper->meOrinetation ? -1 : 1);
+                }
+
+                for(a = 0; a < nCount - 1; a++)
+                {
+                    const B2DPolygon aCandA(aCandidate.getB2DPolygon(a));
+                    StripHelper& rHelperA = aHelpers[a];
+                    
+                    for(b = a + 1; b < nCount; b++)
+                    {
+                        const B2DPolygon aCandB(aCandidate.getB2DPolygon(b));
+                        StripHelper& rHelperB = aHelpers[b];
+                        const bool bAInB(rHelperB.maRange.isInside(rHelperA.maRange) && tools::isInside(aCandB, aCandA, true));
+
+                        if(bAInB)
+                        {
+                            // A is inside B, add orientation of B to A
+                            rHelperA.mnDepth += (ORIENTATION_NEGATIVE == rHelperB.meOrinetation ? -1 : 1);
+                        }
+
+                        const bool bBInA(rHelperA.maRange.isInside(rHelperB.maRange) && tools::isInside(aCandA, aCandB, true));
+
+                        if(bBInA)
+                        {
+                            // B is inside A, add orientation of A to B
+                            rHelperB.mnDepth += (ORIENTATION_NEGATIVE == rHelperA.meOrinetation ? -1 : 1);
+                        }
+                    }
+                }
+
+                const B2DPolyPolygon aSource(aCandidate);
+                aCandidate.clear();
+
+                for(a = 0L; a < nCount; a++)
+                {
+                    const StripHelper& rHelper = aHelpers[a];
+                    // for contained unequal oriented polygons sum will be 0
+                    // for contained equal it will be >=2 or <=-2
+                    // for free polygons (not contained) it will be 1 or -1
+                    // -> accept all which are >=-1 && <= 1
+                    bool bAcceptEntry(rHelper.mnDepth >= -1 && rHelper.mnDepth <= 1);
+
+                    if(bAcceptEntry)
+                    {
+                        aCandidate.append(aSource.getB2DPolygon(a));
+                    }
+                }
+            }
+
+            return aCandidate;
+        }
+
+        //////////////////////////////////////////////////////////////////////////////
+
 		B2DPolyPolygon stripDispensablePolygons(const B2DPolyPolygon& rCandidate, bool bKeepAboveZero)
 		{
 			const sal_uInt32 nCount(rCandidate.count());
@@ -922,15 +1010,15 @@ namespace basegfx
             }
         }
 
-		B2DPolyPolygon mergeToSinglePolyPolygon(const std::vector< basegfx::B2DPolyPolygon >& rInput)
+		B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& rInput)
 		{
-			std::vector< basegfx::B2DPolyPolygon > aInput(rInput);
+			B2DPolyPolygonVector aInput(rInput);
 			
 			// first step: prepareForPolygonOperation and simple merge of non-overlapping
 			// PolyPolygons for speedup; this is possible for the wanted OR-operation
 			if(aInput.size())
 			{
-				std::vector< basegfx::B2DPolyPolygon > aResult;
+				B2DPolyPolygonVector aResult;
 				aResult.reserve(aInput.size());
 
 				for(sal_uInt32 a(0); a < aInput.size(); a++)
@@ -972,7 +1060,7 @@ namespace basegfx
 			// second step: melt pairwise to a single PolyPolygon
 			while(aInput.size() > 1)
 			{
-				std::vector< basegfx::B2DPolyPolygon > aResult;
+				B2DPolyPolygonVector aResult;
 				aResult.reserve((aInput.size() / 2) + 1);
 
 				for(sal_uInt32 a(0); a < aInput.size(); a += 2)

Modified: incubator/ooo/trunk/main/basegfx/source/polygon/b2dsvgpolypolygon.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/source/polygon/b2dsvgpolypolygon.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/source/polygon/b2dsvgpolypolygon.cxx (original)
+++ incubator/ooo/trunk/main/basegfx/source/polygon/b2dsvgpolypolygon.cxx Mon Dec 19 16:41:21 2011
@@ -782,9 +782,16 @@ namespace basegfx
                                 // (since
                                 // createPolygonFromEllipseSegment()
                                 // normalizes to e.g. cw arc)
-                                const bool bFlipSegment( (bLargeArcFlag!=0) == 
-                                    (fmod(fTheta2+2*M_PI-fTheta1,
-                                          2*M_PI)<M_PI) );
+                                
+                                // ALG: In my opinion flipping the segment only
+                                // depends on the sweep flag. At least, this gives
+                                // correct results forthe SVG example (see SVG doc 8.3.8 ff)
+                                //
+                                //const bool bFlipSegment( (bLargeArcFlag!=0) == 
+                                //    (fmod(fTheta2+2*M_PI-fTheta1,
+                                //          2*M_PI)<M_PI) );
+                                const bool bFlipSegment(!bSweepFlag);
+
                                 if( bFlipSegment )
                                     std::swap(fTheta1,fTheta2);
 

Modified: incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx (original)
+++ incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/implrenderer.cxx Mon Dec 19 16:41:21 2011
@@ -79,7 +79,6 @@
 #include <lineaction.hxx>
 #include <pointaction.hxx>
 #include <polypolyaction.hxx>
-#include <rendergraphicaction.hxx>
 #include <textaction.hxx>
 #include <transparencygroupaction.hxx>
 #include <vector>
@@ -2650,32 +2649,6 @@ namespace cppcanvas
                     }
                     break;
 
-                    case META_RENDERGRAPHIC_ACTION:
-                    {
-                        MetaRenderGraphicAction* pAct = static_cast<MetaRenderGraphicAction*>(pCurrAct);
-
-                        ActionSharedPtr pRenderGraphicAction(
-                                internal::RenderGraphicActionFactory::createRenderGraphicAction(
-                                    pAct->GetRenderGraphic(),
-                                    getState( rStates ).mapModeTransform *
-                                    ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
-                                    getState( rStates ).mapModeTransform *
-                                    ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
-                                    rCanvas,
-                                    getState( rStates ) ) );
-
-                        if( pRenderGraphicAction )
-                        {
-                            maActions.push_back(
-                                MtfAction(
-                                    pRenderGraphicAction,
-                                    io_rCurrActionIndex ) );
-
-                            io_rCurrActionIndex += pRenderGraphicAction->getActionCount()-1;
-                        }
-                    }
-                    break;
-
                     default:
                         OSL_ENSURE( false,
                                     "Unknown meta action type encountered" );

Modified: incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/makefile.mk?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/makefile.mk (original)
+++ incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/makefile.mk Mon Dec 19 16:41:21 2011
@@ -48,7 +48,6 @@ SLOFILES =	$(SLO)$/cachedprimitivebase.o
 			$(SLO)$/lineaction.obj \
 			$(SLO)$/pointaction.obj \
 			$(SLO)$/polypolyaction.obj \
-			$(SLO)$/rendergraphicaction.obj \
 			$(SLO)$/textaction.obj \
 			$(SLO)$/transparencygroupaction.obj \
 			$(SLO)$/mtftools.obj

Modified: incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx (original)
+++ incubator/ooo/trunk/main/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx Mon Dec 19 16:41:21 2011
@@ -387,7 +387,6 @@ namespace cppcanvas
                                 case META_TEXTLINE_ACTION:
                                 case META_TEXTRECT_ACTION:
                                 case META_STRETCHTEXT_ACTION:
-                                case META_RENDERGRAPHIC_ACTION:
                                     // output-generating action - only
                                     // copy, if we're within the
                                     // requested subset

Modified: incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk (original)
+++ incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk Mon Dec 19 16:41:21 2011
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,drawinglayer))
 
+$(eval $(call gb_Library_set_componentfile,drawinglayer,drawinglayer/drawinglayer))
+
 $(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc))
 
 $(eval $(call gb_Library_add_precompiled_header,drawinglayer,$(SRCDIR)/drawinglayer/inc/pch/precompiled_drawinglayer))
@@ -94,6 +96,7 @@ $(eval $(call gb_Library_add_exception_o
 	drawinglayer/source/primitive2d/borderlineprimitive2d \
 	drawinglayer/source/primitive2d/chartprimitive2d \
 	drawinglayer/source/primitive2d/controlprimitive2d \
+	drawinglayer/source/primitive2d/cropprimitive2d \
 	drawinglayer/source/primitive2d/discretebitmapprimitive2d \
 	drawinglayer/source/primitive2d/discreteshadowprimitive2d \
 	drawinglayer/source/primitive2d/embedded3dprimitive2d \
@@ -114,14 +117,16 @@ $(eval $(call gb_Library_add_exception_o
 	drawinglayer/source/primitive2d/metafileprimitive2d \
 	drawinglayer/source/primitive2d/modifiedcolorprimitive2d \
 	drawinglayer/source/primitive2d/pagepreviewprimitive2d \
+	drawinglayer/source/primitive2d/patternfillprimitive2d \
 	drawinglayer/source/primitive2d/polypolygonprimitive2d \
 	drawinglayer/source/primitive2d/polygonprimitive2d \
 	drawinglayer/source/primitive2d/primitivetools2d \
-	drawinglayer/source/primitive2d/rendergraphicprimitive2d \
 	drawinglayer/source/primitive2d/sceneprimitive2d \
 	drawinglayer/source/primitive2d/sdrdecompositiontools2d \
 	drawinglayer/source/primitive2d/shadowprimitive2d \
 	drawinglayer/source/primitive2d/structuretagprimitive2d \
+	drawinglayer/source/primitive2d/svggradientprimitive2d \
+	drawinglayer/source/primitive2d/textbreakuphelper \
 	drawinglayer/source/primitive2d/texteffectprimitive2d \
 	drawinglayer/source/primitive2d/textenumsprimitive2d \
 	drawinglayer/source/primitive2d/textlayoutdevice \
@@ -176,6 +181,9 @@ $(eval $(call gb_Library_add_exception_o
 	drawinglayer/source/processor3d/zbufferprocessor3d \
 	drawinglayer/source/texture/texture \
 	drawinglayer/source/texture/texture3d \
+	drawinglayer/source/tools/converters \
+	drawinglayer/source/drawinglayeruno/drawinglayeruno \
+	drawinglayer/source/drawinglayeruno/xprimitive2drenderer \
 ))
 
 # vim: set noet sw=4 ts=4:

Modified: incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/Package_inc.mk?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/Package_inc.mk (original)
+++ incubator/ooo/trunk/main/drawinglayer/Package_inc.mk Mon Dec 19 16:41:21 2011
@@ -36,6 +36,7 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx,drawinglayer/primitive2d/borderlineprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/chartprimitive2d.hxx,drawinglayer/primitive2d/chartprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/controlprimitive2d.hxx,drawinglayer/primitive2d/controlprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/cropprimitive2d.hxx,drawinglayer/primitive2d/cropprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx,drawinglayer/primitive2d/discretebitmapprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx,drawinglayer/primitive2d/discreteshadowprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx,drawinglayer/primitive2d/embedded3dprimitive2d.hxx))
@@ -54,6 +55,7 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx,drawinglayer/primitive2d/patternfillprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polygonprimitive2d.hxx,drawinglayer/primitive2d/polygonprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx,drawinglayer/primitive2d/polypolygonprimitive2d.hxx))
@@ -62,10 +64,14 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sceneprimitive2d.hxx,drawinglayer/primitive2d/sceneprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/shadowprimitive2d.hxx,drawinglayer/primitive2d/shadowprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx,drawinglayer/primitive2d/structuretagprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx,drawinglayer/primitive2d/svggradientprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textbreakuphelper.hxx,drawinglayer/primitive2d/textbreakuphelper.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx,drawinglayer/primitive2d/textenumsprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx,drawinglayer/primitive2d/texteffectprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlayoutdevice.hxx,drawinglayer/primitive2d/textlayoutdevice.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlineprimitive2d.hxx,drawinglayer/primitive2d/textlineprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textprimitive2d.hxx,drawinglayer/primitive2d/textprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx,drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx,drawinglayer/primitive2d/textdecoratedprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx,drawinglayer/primitive2d/texthierarchyprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transformprimitive2d.hxx,drawinglayer/primitive2d/transformprimitive2d.hxx))
@@ -76,6 +82,7 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/baseprimitive3d.hxx,drawinglayer/primitive3d/baseprimitive3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/groupprimitive3d.hxx,drawinglayer/primitive3d/groupprimitive3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx,drawinglayer/primitive3d/hatchtextureprimitive3d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx,drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx,drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygonprimitive3d.hxx,drawinglayer/primitive3d/polygonprimitive3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx,drawinglayer/primitive3d/polygontubeprimitive3d.hxx))
@@ -110,6 +117,8 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/defaultprocessor3d.hxx,drawinglayer/processor3d/defaultprocessor3d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/zbufferprocessor3d.hxx,drawinglayer/processor3d/zbufferprocessor3d.hxx))
 
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillgradientattribute.hxx,drawinglayer/attribute/fillgradientattribute.hxx))
@@ -132,3 +141,5 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/linestartendattribute.hxx,drawinglayer/attribute/linestartendattribute.hxx))
 
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture.hxx,drawinglayer/texture/texture.hxx))
+
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/tools/converters.hxx,drawinglayer/tools/converters.hxx))

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx Mon Dec 19 16:41:21 2011
@@ -265,7 +265,11 @@ namespace drawinglayer
 {
 	namespace primitive2d
 	{
-		/// get B2DRange from a given Primitive2DReference
+        /// support to handle a sequence of primitives as stl vector and convert it during creation
+	    typedef ::std::vector< BasePrimitive2D* > Primitive2DVector;
+        Primitive2DSequence DRAWINGLAYER_DLLPUBLIC Primitive2DVectorToPrimitive2DSequence(const Primitive2DVector& rSource, bool bInvert = false);
+
+        /// get B2DRange from a given Primitive2DReference
 		basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation);
 
 		/// get B2DRange from a given Primitive2DSequence

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx Mon Dec 19 16:41:21 2011
@@ -99,7 +99,12 @@
 #define PRIMITIVE2D_ID_EPSPRIMITIVE2D						(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60)
 #define PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D			(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 61)
 #define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D            (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 62)
-#define PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D				(PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63)
+#define PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D         (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63)
+#define PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D         (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 64)
+#define PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D             (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 65)
+#define PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D             (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 66)
+#define PRIMITIVE2D_ID_CROPPRIMITIVE2D                      (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 67)
+#define PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D               (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68)
 
 //////////////////////////////////////////////////////////////////////////////
 

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx Mon Dec 19 16:41:21 2011
@@ -30,6 +30,7 @@
 #include <basegfx/range/b2drange.hxx>
 #include <vector>
 #include <com/sun/star/lang/Locale.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
@@ -43,11 +44,6 @@ namespace drawinglayer { namespace attri
 	class FontAttribute;
 }}
 
-namespace basegfx {
-    class B2DPolyPolygon;
-    typedef ::std::vector< B2DPolyPolygon > B2DPolyPolygonVector;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive
 

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx Mon Dec 19 16:41:21 2011
@@ -33,15 +33,11 @@
 #include <vector>
 #include <com/sun/star/lang/Locale.hpp>
 #include <drawinglayer/attribute/fontattribute.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines
 
-namespace basegfx {
-    class B2DPolyPolygon;
-    typedef ::std::vector< B2DPolyPolygon > B2DPolyPolygonVector;
-}
-
 class OutputDevice;
 
 //////////////////////////////////////////////////////////////////////////////

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx Mon Dec 19 16:41:21 2011
@@ -53,7 +53,6 @@ namespace drawinglayer { namespace primi
     class MetafilePrimitive2D;
     class TextSimplePortionPrimitive2D;
     class BitmapPrimitive2D;
-    class RenderGraphicPrimitive2D;
     class TransparencePrimitive2D;
     class PolygonStrokePrimitive2D;
     class FillBitmapPrimitive2D;
@@ -106,7 +105,6 @@ namespace drawinglayer
             void impRenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rMetaCandidate);
             void impRenderTextSimplePortionPrimitive2D(const primitive2d::TextSimplePortionPrimitive2D& rTextCandidate);
             void impRenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate);
-            void impRenderRenderGraphicPrimitive2D(const primitive2d::RenderGraphicPrimitive2D& rRenderGraphicCandidate);
             void impRenderTransparencePrimitive2D(const primitive2d::TransparencePrimitive2D& rTransparenceCandidate);
             void impRenderPolygonStrokePrimitive2D(const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive);
             void impRenderFillBitmapPrimitive2D(const primitive2d::FillBitmapPrimitive2D& rFillBitmapPrimitive2D);

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx Mon Dec 19 16:41:21 2011
@@ -44,7 +44,7 @@ namespace drawinglayer
 		{
 		private:
             /// the extracted contour
-            std::vector< basegfx::B2DPolyPolygon >  maExtractedContour;
+            basegfx::B2DPolyPolygonVector       maExtractedContour;
 
 			/// tooling methods
 			void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
@@ -53,7 +53,7 @@ namespace drawinglayer
 			ContourExtractor2D(const geometry::ViewInformation2D& rViewInformation);
 			virtual ~ContourExtractor2D();
 			
-			const std::vector< basegfx::B2DPolyPolygon >& getExtractedContour() const { return maExtractedContour; }
+			const basegfx::B2DPolyPolygonVector& getExtractedContour() const { return maExtractedContour; }
 		};
 	} // end of namespace processor2d
 } // end of namespace drawinglayer

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx Mon Dec 19 16:41:21 2011
@@ -27,6 +27,7 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -42,8 +43,8 @@ namespace drawinglayer
 		class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D : public BaseProcessor2D
 		{
 		private:
-			std::vector< basegfx::B2DPolygon >		maExtractedHairlines;
-			std::vector< basegfx::B2DPolyPolygon >	maExtractedLineFills;
+			basegfx::B2DPolygonVector               maExtractedHairlines;
+			basegfx::B2DPolyPolygonVector           maExtractedLineFills;
 
             /// bitfield
             unsigned                                mbInLineGeometry : 1;
@@ -55,8 +56,8 @@ namespace drawinglayer
 			LineGeometryExtractor2D(const geometry::ViewInformation2D& rViewInformation);
 			virtual ~LineGeometryExtractor2D();
 			
-			const std::vector< basegfx::B2DPolygon >& getExtractedHairlines() const { return maExtractedHairlines; }
-			const std::vector< basegfx::B2DPolyPolygon >& getExtractedLineFills() const { return maExtractedLineFills; }
+			const basegfx::B2DPolygonVector& getExtractedHairlines() const { return maExtractedHairlines; }
+			const basegfx::B2DPolyPolygonVector& getExtractedLineFills() const { return maExtractedLineFills; }
 		};
 	} // end of namespace processor2d
 } // end of namespace drawinglayer

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx Mon Dec 19 16:41:21 2011
@@ -38,7 +38,6 @@ namespace drawinglayer { namespace primi
 	class TextSimplePortionPrimitive2D;
 	class PolygonHairlinePrimitive2D;
 	class BitmapPrimitive2D;
-	class RenderGraphicPrimitive2D;
 	class FillBitmapPrimitive2D;
 	class PolyPolygonGradientPrimitive2D;
 	class PolyPolygonBitmapPrimitive2D;
@@ -95,7 +94,6 @@ namespace drawinglayer
             void RenderTextSimpleOrDecoratedPortionPrimitive2D(const primitive2d::TextSimplePortionPrimitive2D& rTextCandidate);
 			void RenderPolygonHairlinePrimitive2D(const primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate, bool bPixelBased);
 			void RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate);
-			void RenderRenderGraphicPrimitive2D(const primitive2d::RenderGraphicPrimitive2D& rRenderGraphicCandidate);
 			void RenderFillBitmapPrimitive2D(const primitive2d::FillBitmapPrimitive2D& rFillBitmapCandidate);
 			void RenderPolyPolygonGradientPrimitive2D(const primitive2d::PolyPolygonGradientPrimitive2D& rPolygonCandidate);
 			void RenderPolyPolygonBitmapPrimitive2D(const primitive2d::PolyPolygonBitmapPrimitive2D& rPolygonCandidate);

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx Mon Dec 19 16:41:21 2011
@@ -51,12 +51,9 @@ namespace drawinglayer
 		class DRAWINGLAYER_DLLPUBLIC Shadow3DExtractingProcessor : public BaseProcessor3D
 		{
 		private:
-            /// typedef for data handling
-            typedef std::vector< primitive2d::BasePrimitive2D* > BasePrimitive2DVector;
-
             /// result holding vector (2D) and target vector for stacking (inited to &maPrimitive2DSequence)
-            BasePrimitive2DVector                           maPrimitive2DSequence;
-            BasePrimitive2DVector*                          mpPrimitive2DSequence;
+            primitive2d::Primitive2DVector                  maPrimitive2DSequence;
+            primitive2d::Primitive2DVector*                 mpPrimitive2DSequence;
 
 			/// object transformation for scene for 2d definition
 			basegfx::B2DHomMatrix							maObjectTransformation;
@@ -93,10 +90,6 @@ namespace drawinglayer
              */
 			virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate);
 
-            /// helper to convert from BasePrimitive2DVector to primitive2d::Primitive2DSequence
-            const primitive2d::Primitive2DSequence getPrimitive2DSequenceFromBasePrimitive2DVector(
-                const BasePrimitive2DVector& rVector) const;
-
         public:
 			Shadow3DExtractingProcessor(
 				const geometry::ViewInformation3D& rViewInformation,

Modified: incubator/ooo/trunk/main/drawinglayer/source/primitive2d/baseprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/primitive2d/baseprimitive2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/primitive2d/baseprimitive2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/primitive2d/baseprimitive2d.cxx Mon Dec 19 16:41:21 2011
@@ -115,6 +115,27 @@ namespace drawinglayer
 {
 	namespace primitive2d
 	{
+        // convert helper stl vector of primitives to Primitive2DSequence
+        Primitive2DSequence Primitive2DVectorToPrimitive2DSequence(const Primitive2DVector& rSource, bool bInvert)
+        {
+            const sal_uInt32 nSize(rSource.size());
+            Primitive2DSequence aRetval;
+        
+            aRetval.realloc(nSize);
+
+            for(sal_uInt32 a(0); a < nSize; a++)
+            {
+                aRetval[bInvert ? nSize - 1 - a : a] = rSource[a];
+            }
+
+            // all entries taken over to Uno References as owners. To avoid
+            // errors with users of this mechanism to delete pointers to BasePrimitive2D
+            // itself, clear given vector
+            const_cast< Primitive2DVector& >(rSource).clear();
+
+            return aRetval;
+        }
+
 		// get B2DRange from a given Primitive2DReference
 		basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation)
 		{

Modified: incubator/ooo/trunk/main/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/primitive2d/graphicprimitive2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/primitive2d/graphicprimitive2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/primitive2d/graphicprimitive2d.cxx Mon Dec 19 16:41:21 2011
@@ -27,14 +27,14 @@
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
 #include <drawinglayer/animation/animationtiming.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/rendergraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/animatedprimitive2d.hxx>
 #include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
+#include <drawinglayer/primitive2d/cropprimitive2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // helper class for animated graphics
@@ -258,9 +258,9 @@ namespace drawinglayer
 		        aSuppressGraphicAttr.SetCrop(0, 0, 0, 0);
 		        aSuppressGraphicAttr.SetRotation(0);
 		        aSuppressGraphicAttr.SetMirrorFlags(0);
-		        
-                const GraphicObject&    rGraphicObject = getGraphicObject();
-                const Graphic           aTransformedGraphic(rGraphicObject.GetTransformedGraphic(&aSuppressGraphicAttr));
+
+                const GraphicObject& rGraphicObject = getGraphicObject();
+                const Graphic aTransformedGraphic(rGraphicObject.GetTransformedGraphic(&aSuppressGraphicAttr));
 
                 switch(aTransformedGraphic.GetType())
 				{
@@ -293,6 +293,32 @@ namespace drawinglayer
 								xPrimitive = Primitive2DReference(new AnimatedSwitchPrimitive2D(aAnimationList, aBitmapPrimitives, false));
 							}
 						}
+                        else if(aTransformedGraphic.getSvgData().get())
+                        {
+                            // embedded Svg fill, create embed transform
+                            const basegfx::B2DRange& rSvgRange(aTransformedGraphic.getSvgData()->getRange());
+
+                            if(basegfx::fTools::more(rSvgRange.getWidth(), 0.0) && basegfx::fTools::more(rSvgRange.getHeight(), 0.0))
+                            {
+                                // translate back to origin, scale to unit coordinates
+                                basegfx::B2DHomMatrix aEmbedSvg(
+                                    basegfx::tools::createTranslateB2DHomMatrix(
+                                        -rSvgRange.getMinX(),
+                                        -rSvgRange.getMinY()));
+
+                                aEmbedSvg.scale(
+                                    1.0 / rSvgRange.getWidth(),
+                                    1.0 / rSvgRange.getHeight());
+
+                                // apply created object transformation
+                                aEmbedSvg = aTransform * aEmbedSvg;
+
+                                // add Svg primitives embedded
+                                xPrimitive = new TransformPrimitive2D(
+                                    aEmbedSvg,
+                                    aTransformedGraphic.getSvgData()->getPrimitive2DSequence());
+                            }
+                        }
 						else
 						{
 							xPrimitive = Primitive2DReference(new BitmapPrimitive2D(aTransformedGraphic.GetBitmapEx(), aTransform));
@@ -742,44 +768,34 @@ namespace drawinglayer
                         else
                         {
 #endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
-	                        // create MetafilePrimitive2D
+                            // create MetafilePrimitive2D
                             const GDIMetaFile& rMetafile = aTransformedGraphic.GetGDIMetaFile();
+      
+                            xPrimitive = Primitive2DReference(
+                                new MetafilePrimitive2D(
+                                    aTransform,
+                                    rMetafile));
+
+                            // #i100357# find out if clipping is needed for this primitive. Unfortunately,
+                            // there exist Metafiles who's content is bigger than the proposed PrefSize set
+                            // at them. This is an error, but we need to work around this
+                            const Size aMetaFilePrefSize(rMetafile.GetPrefSize());
+                            const Size aMetaFileRealSize(
+                                const_cast< GDIMetaFile& >(rMetafile).GetBoundRect(
+                                    *Application::GetDefaultDevice()).GetSize());
+
+                            if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth()
+                                || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight())
+                            {
+                                // clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon
+                                const primitive2d::Primitive2DSequence aChildContent(&xPrimitive, 1);
+                                basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon());
+                                aMaskPolygon.transform(aTransform);
 
-                            if( aTransformedGraphic.IsRenderGraphic() )
-                            {
-                                xPrimitive = Primitive2DReference(
-                                    new RenderGraphicPrimitive2D(                                        
-                                        static_cast< MetaRenderGraphicAction* >(rMetafile.GetAction(0))->GetRenderGraphic(),
-                                        aTransform));
-                            }
-                            else
-                            {
                                 xPrimitive = Primitive2DReference(
-                                    new MetafilePrimitive2D(
-                                        aTransform,
-                                        rMetafile));
-
-                                // #i100357# find out if clipping is needed for this primitive. Unfortunately,
-                                // there exist Metafiles who's content is bigger than the proposed PrefSize set
-                                // at them. This is an error, but we need to work around this
-                                const Size aMetaFilePrefSize(rMetafile.GetPrefSize());
-                                const Size aMetaFileRealSize(
-                                    const_cast< GDIMetaFile& >(rMetafile).GetBoundRect(
-                                        *Application::GetDefaultDevice()).GetSize());
-
-                                if(aMetaFileRealSize.getWidth() > aMetaFilePrefSize.getWidth()
-                                    || aMetaFileRealSize.getHeight() > aMetaFilePrefSize.getHeight())
-                                {
-                                    // clipping needed. Embed to MaskPrimitive2D. Create childs and mask polygon
-                                    const primitive2d::Primitive2DSequence aChildContent(&xPrimitive, 1);
-                                    basegfx::B2DPolygon aMaskPolygon(basegfx::tools::createUnitPolygon());
-                                    aMaskPolygon.transform(aTransform);
-
-                                    xPrimitive = Primitive2DReference(
-                                        new MaskPrimitive2D(
-                                            basegfx::B2DPolyPolygon(aMaskPolygon),
-                                            aChildContent));
-                                }
+                                    new MaskPrimitive2D(
+                                        basegfx::B2DPolyPolygon(aMaskPolygon),
+                                        aChildContent));
                             }
 #ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE
                         }
@@ -795,105 +811,58 @@ namespace drawinglayer
 					}
 				}
 
-				if(xPrimitive.is())
-				{
-					// check for cropping
-					if(getGraphicAttr().IsCropped())
-					{
-						// decompose to get current pos and size
-						basegfx::B2DVector aScale, aTranslate;
-						double fRotate, fShearX;
-						getTransform().decompose(aScale, aTranslate, fRotate, fShearX);
-
-						// create ranges. The current object range is just scale and translate
-						const basegfx::B2DRange aCurrent(
-							aTranslate.getX(), aTranslate.getY(), 
-							aTranslate.getX() + aScale.getX(), aTranslate.getY() + aScale.getY());
-
-						// calculate scalings between real image size and logic object size. This
-						// is necessary since the crop values are relative to original bitmap size
-						double fFactorX(1.0);
-						double fFactorY(1.0);
-
-						{
-							const MapMode aMapMode100thmm(MAP_100TH_MM);
-							Size aBitmapSize(rGraphicObject.GetPrefSize());
-							
-							// #i95968# better support PrefMapMode; special for MAP_PIXEL was missing
-							if(MAP_PIXEL == rGraphicObject.GetPrefMapMode().GetMapUnit())
-							{
-								aBitmapSize = Application::GetDefaultDevice()->PixelToLogic(aBitmapSize, aMapMode100thmm);
-							}
-							else
-							{
-								aBitmapSize = Application::GetDefaultDevice()->LogicToLogic(aBitmapSize, rGraphicObject.GetPrefMapMode(), aMapMode100thmm);
-							}
-
-							const double fDivX(aBitmapSize.Width() - getGraphicAttr().GetLeftCrop() - getGraphicAttr().GetRightCrop());
-							const double fDivY(aBitmapSize.Height() - getGraphicAttr().GetTopCrop() - getGraphicAttr().GetBottomCrop());
-
-							if(!basegfx::fTools::equalZero(fDivX))
-							{
-								fFactorX = aScale.getX() / fDivX;
-							}
-
-							if(!basegfx::fTools::equalZero(fDivY))
-							{
-								fFactorY = aScale.getY() / fDivY;
-							}
-						}
-
-						// Create cropped range, describes the bounds of the original graphic
-						basegfx::B2DRange aCropped;
-						aCropped.expand(aCurrent.getMinimum() - basegfx::B2DPoint(getGraphicAttr().GetLeftCrop() * fFactorX, getGraphicAttr().GetTopCrop() * fFactorY));
-						aCropped.expand(aCurrent.getMaximum() + basegfx::B2DPoint(getGraphicAttr().GetRightCrop() * fFactorX, getGraphicAttr().GetBottomCrop() * fFactorY));
-
-						if(aCropped.isEmpty())
-						{
-							// nothing to add since cropped bitmap is completely empty
-							// xPrimitive will not be used
-						}
-						else
-						{
-							// build new object transformation for transform primitive which contains xPrimitive
-							basegfx::B2DHomMatrix aNewObjectTransform(getTransform());
-							aNewObjectTransform.invert();
-							aNewObjectTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(
-								aCropped.getWidth(), aCropped.getHeight(),
-								aCropped.getMinX() - aCurrent.getMinX(), aCropped.getMinY() - aCurrent.getMinY())
-								* aNewObjectTransform;
-
-							// add shear, rotate and translate using combined matrix to speedup
-							const basegfx::B2DHomMatrix aCombinedMatrix(basegfx::tools::createShearXRotateTranslateB2DHomMatrix(
-								fShearX, fRotate, aTranslate.getX(), aTranslate.getY()));
-							aNewObjectTransform = aCombinedMatrix * aNewObjectTransform;
+                if(xPrimitive.is())
+                {
+                    // check for cropping
+                    if(getGraphicAttr().IsCropped())
+                    {
+                        // calculate scalings between real image size and logic object size. This
+                        // is necessary since the crop values are relative to original bitmap size
+                        double fFactorX(1.0);
+                        double fFactorY(1.0);
+                        
+                        {
+                            const MapMode aMapMode100thmm(MAP_100TH_MM);
+                            Size aBitmapSize(rGraphicObject.GetPrefSize());
+                            
+                            // #i95968# better support PrefMapMode; special for MAP_PIXEL was missing
+                            if(MAP_PIXEL == rGraphicObject.GetPrefMapMode().GetMapUnit())
+                            {
+                                aBitmapSize = Application::GetDefaultDevice()->PixelToLogic(aBitmapSize, aMapMode100thmm);
+                            }
+                            else
+                            {
+                                aBitmapSize = Application::GetDefaultDevice()->LogicToLogic(aBitmapSize, rGraphicObject.GetPrefMapMode(), aMapMode100thmm);
+                            }
+                            
+                            const double fDivX(aBitmapSize.Width() - getGraphicAttr().GetLeftCrop() - getGraphicAttr().GetRightCrop());
+                            const double fDivY(aBitmapSize.Height() - getGraphicAttr().GetTopCrop() - getGraphicAttr().GetBottomCrop());
+                            const basegfx::B2DVector aScale(aTransform * basegfx::B2DVector(1.0, 1.0));
+                            
+                            if(!basegfx::fTools::equalZero(fDivX))
+                            {
+                                fFactorX = fabs(aScale.getX()) / fDivX;
+                            }
+                            
+                            if(!basegfx::fTools::equalZero(fDivY))
+                            {
+                                fFactorY = fabs(aScale.getY()) / fDivY;
+                            }
+                        }
 
-							// prepare TransformPrimitive2D with xPrimitive
-							const Primitive2DReference xTransformPrimitive(new TransformPrimitive2D(aNewObjectTransform, Primitive2DSequence(&xPrimitive, 1L)));
+                        // embed content in cropPrimitive
+                        xPrimitive = new CropPrimitive2D(
+                            Primitive2DSequence(&xPrimitive, 1),
+                            aTransform,
+                            getGraphicAttr().GetLeftCrop() * fFactorX,
+                            getGraphicAttr().GetTopCrop() * fFactorY,
+                            getGraphicAttr().GetRightCrop() * fFactorX,
+                            getGraphicAttr().GetBottomCrop() * fFactorY);
+                    }
 
-							if(aCurrent.isInside(aCropped))
-							{
-								// cropped just got smaller, no need to really use a mask. Add to destination directly
-								appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xTransformPrimitive);
-							}
-							else
-							{
-								// cropped got bigger, mask it with original object's bounds
-								basegfx::B2DPolyPolygon aMaskPolyPolygon(basegfx::tools::createUnitPolygon());
-								aMaskPolyPolygon.transform(getTransform());
-
-								// create maskPrimitive with aMaskPolyPolygon and aMaskContentVector
-								const Primitive2DReference xRefB(new MaskPrimitive2D(aMaskPolyPolygon, Primitive2DSequence(&xTransformPrimitive, 1L)));
-								appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xRefB);
-							}
-						}
-					}
-					else
-					{
-						// add to decomposition
-						appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xPrimitive);
-					}
-				}
+                    // add to decomposition
+                    appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xPrimitive);
+                }
 			}
 
 			return aRetval;

Modified: incubator/ooo/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/primitive2d/metafileprimitive2d.cxx Mon Dec 19 16:41:21 2011
@@ -59,7 +59,6 @@
 #include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
-#include <drawinglayer/primitive2d/rendergraphicprimitive2d.hxx>
 #include <numeric>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -3065,33 +3064,6 @@ namespace
 
                     break;
                 }
-                case META_RENDERGRAPHIC_ACTION :
-                {
-                    const MetaRenderGraphicAction* pA = (const MetaRenderGraphicAction*)pAction;
-					const Rectangle aRectangle(pA->GetPoint(), pA->GetSize());
-
-					if(!aRectangle.IsEmpty())
-                    {
-						// create object transform
-						basegfx::B2DHomMatrix aObjectTransform;
-
-						aObjectTransform.set(0, 0, aRectangle.GetWidth());
-						aObjectTransform.set(1, 1, aRectangle.GetHeight());
-						aObjectTransform.set(0, 2, aRectangle.Left());
-						aObjectTransform.set(1, 2, aRectangle.Top());
-
-						// add current transformation
-						aObjectTransform = rPropertyHolders.Current().getTransformation() * aObjectTransform;
-
-						// embed using EpsPrimitive
-						rTargetHolders.Current().append(
-							new drawinglayer::primitive2d::RenderGraphicPrimitive2D(
-								pA->GetRenderGraphic(),
-								aObjectTransform ) );
-					}
-
-					break;
-                }
                 case META_COMMENT_ACTION :
                 {
 					/** CHECKED, WORKS WELL */

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/hittestprocessor2d.cxx Mon Dec 19 16:41:21 2011
@@ -525,7 +525,6 @@ namespace drawinglayer
 				case PRIMITIVE2D_ID_FILLHATCHPRIMITIVE2D :
 				case PRIMITIVE2D_ID_PAGEPREVIEWPRIMITIVE2D :
                 case PRIMITIVE2D_ID_MEDIAPRIMITIVE2D:
-                case PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D:
                 {
                     if(!getHitTextOnly())
                     {

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/linegeometryextractor2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/linegeometryextractor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/linegeometryextractor2d.cxx Mon Dec 19 16:41:21 2011
@@ -119,7 +119,6 @@ namespace drawinglayer
 				case PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D :
 				case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D :
 				case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D :
-				case PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D :
 				case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
 				case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
                 {

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx Mon Dec 19 16:41:21 2011
@@ -210,7 +210,6 @@ namespace drawinglayer
 				case PRIMITIVE2D_ID_MARKERARRAYPRIMITIVE2D :
 				case PRIMITIVE2D_ID_POINTARRAYPRIMITIVE2D :
 				case PRIMITIVE2D_ID_BITMAPPRIMITIVE2D :
-				case PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D :
 				case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
 				case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
                 {

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx Mon Dec 19 16:41:21 2011
@@ -34,7 +34,6 @@
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/rendergraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
@@ -1284,12 +1283,6 @@ namespace drawinglayer
 					RenderBitmapPrimitive2D(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate));
 					break;
 				}
-				case PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D :
-				{
-                    // direct draw of transformed RenderGraphic primitive; use default processing
-					RenderRenderGraphicPrimitive2D(static_cast< const primitive2d::RenderGraphicPrimitive2D& >(rCandidate));
-					break;
-				}
 				case PRIMITIVE2D_ID_POLYPOLYGONBITMAPPRIMITIVE2D :
 				{
 					// need to handle PolyPolygonBitmapPrimitive2D here to support XPATHFILL_SEQ_BEGIN/XPATHFILL_SEQ_END
@@ -1657,7 +1650,8 @@ namespace drawinglayer
                                 // the ClipRegion is built from the Polygon. A AdaptiveSubdivide on the source polygon was missing there
                                 mpOutputDevice->Push(PUSH_CLIPREGION);
 								//mpOutputDevice->SetClipRegion(Region(PolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(maClipPolyPolygon))));
-								mpOutputDevice->SetClipRegion(Region(PolyPolygon(maClipPolyPolygon)));
+								//mpOutputDevice->SetClipRegion(Region(PolyPolygon(maClipPolyPolygon)));
+								mpOutputDevice->SetClipRegion(Region(maClipPolyPolygon));
                             }
 
 					        // recursively paint content

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx?rev=1220836&r1=1220835&r2=1220836&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx Mon Dec 19 16:41:21 2011
@@ -31,7 +31,6 @@
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/rendergraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillbitmapprimitive2d.hxx>
 #include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
@@ -190,12 +189,6 @@ namespace drawinglayer
 					RenderBitmapPrimitive2D(static_cast< const primitive2d::BitmapPrimitive2D& >(rCandidate));
 					break;
 				}
-				case PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D :
-				{
-					// direct draw of transformed BitmapEx primitive
-					RenderRenderGraphicPrimitive2D(static_cast< const primitive2d::RenderGraphicPrimitive2D& >(rCandidate));
-					break;
-				}
 				case PRIMITIVE2D_ID_FILLBITMAPPRIMITIVE2D :
 				{
 					// direct draw of fillBitmapPrimitive



Mime
View raw message