summaryrefslogtreecommitdiffstats
path: root/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-12-23 09:36:18 +0200
committerNoel Grandin <noel@peralex.com>2015-12-23 09:38:46 +0200
commit85e9b0f3ea017612d44a7abd7e2f854e16b6a676 (patch)
tree8ef04e309c8bb05d9a45e7d30ad408b646079e03 /drawinglayer
parentloplugin:unusedfields in chart2 (diff)
downloadcore-85e9b0f3ea017612d44a7abd7e2f854e16b6a676.tar.gz
core-85e9b0f3ea017612d44a7abd7e2f854e16b6a676.zip
tdf#96541 - dialog "About LibreOfficeDev" has lost its logo
regression from 58d8d8a "tdf#69977: uno::Sequence is expensive" Change-Id: I792b5971a7a3a9532cccb36add5b558c68e397ef
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index f4adb26da181..202a9bc6aff4 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/supportsservice.hxx>
+#include <comphelper/sequence.hxx>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <comphelper/processfactory.hxx>
@@ -112,7 +113,7 @@ namespace drawinglayer
}
uno::Reference< rendering::XBitmap > XPrimitive2DRenderer::rasterize(
- const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& Primitive2DSequence,
+ const uno::Sequence< uno::Reference< graphic::XPrimitive2D > >& aPrimitive2DSequence,
const uno::Sequence< beans::PropertyValue >& aViewInformationSequence,
::sal_uInt32 DPI_X,
::sal_uInt32 DPI_Y,
@@ -121,7 +122,7 @@ namespace drawinglayer
{
uno::Reference< rendering::XBitmap > XBitmap;
- if(Primitive2DSequence.hasElements())
+ if(aPrimitive2DSequence.hasElements())
{
const basegfx::B2DRange aRange(Range.X1, Range.Y1, Range.X2, Range.Y2);
const double fWidth(aRange.getWidth());
@@ -161,7 +162,7 @@ namespace drawinglayer
const primitive2d::Primitive2DReference xEmbedRef(
new primitive2d::TransformPrimitive2D(
aEmbedding,
- primitive2d::Primitive2DContainer()));
+ comphelper::sequenceToContainer<primitive2d::Primitive2DContainer>(aPrimitive2DSequence)));
const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef };
BitmapEx aBitmapEx(