Commit Graph

3 Commits

Author SHA1 Message Date
37aa7d81aa Resolves: #i121194# Better support for graphic fill styles...
which are not bitmaps (svg, metafiles, ..)

(cherry picked from commit 7a652a2b2ab5e0d37e32185c8c5fac3af482bb76)

Conflicts:
	drawinglayer/Library_drawinglayer.mk
	drawinglayer/Package_inc.mk
	drawinglayer/inc/drawinglayer/attribute/fillgraphicattribute.hxx
	drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
	drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx
	drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
	drawinglayer/inc/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
	drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
	drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
	drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
	drawinglayer/inc/drawinglayer/texture/texture.hxx
	drawinglayer/inc/drawinglayer/texture/texture3d.hxx
	drawinglayer/source/attribute/fillbitmapattribute.cxx
	drawinglayer/source/attribute/sdrfillattribute.cxx
	drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
	drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
	drawinglayer/source/primitive2d/graphicprimitive2d.cxx
	drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
	drawinglayer/source/processor2d/canvasprocessor.cxx
	svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
	svx/source/sdr/contact/objectcontacttools.cxx
	vcl/inc/vcl/graph.hxx

unused file _vclmetafileprocessor2d.cxx deleted, was added by error

(cherry picked from commit ed0d53f8283cd3ce579a90b599118884d0db6119)

Conflicts:
	drawinglayer/source/processor2d/_vclmetafileprocessor2d.cxx

Corrected canvasProcessor usage

(cherry picked from commit 7903c33f31c457eb6ff506958c4233f2a5d39bcf)

Conflicts:
	svx/source/sdr/contact/objectcontacttools.cxx

Change-Id: I80008050b98dafc92fde043524843c13a75fe22c
d2fa667d7c127b4d735334e56093d1d4553b0a5b
e20c60c7d6472da1295a162d9a629be998861f62
2013-06-11 20:00:34 +01:00
00b33bf3ef drawinglayer: Fix typo Primitrive -> Primitive.
Change-Id: Iec1f5192fb052e884c4878ffb017dfd2f5f99350
2013-05-20 13:10:22 +02:00
b9337e22ce execute move of global headers
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details

Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00