summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-05-09 12:36:12 +0000
committerKurt Zenker <kz@openoffice.org>2007-05-09 12:36:12 +0000
commit9f8925de577a200980bea813da96f01d0de673bf (patch)
tree0c2a3b3cd12251a965549f23b1b55e70b28c4e16 /cppcanvas
parentb08b9eb36bb1a169dee361aadf2e81215d0d45be (diff)
INTEGRATION: CWS aw048 (1.11.2); FILE MERGED
2007/04/18 15:30:18 aw 1.11.2.1: #i76339#
Diffstat (limited to 'cppcanvas')
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 9a48ed524110..007ce1d48374 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: polypolyaction.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: obo $ $Date: 2007-01-22 11:51:27 $
+ * last change: $Author: kz $ $Date: 2007-05-09 13:36:12 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -112,8 +112,7 @@ namespace cppcanvas
bool bFill,
bool bStroke ) :
CachedPrimitiveBase( rCanvas, false ),
- mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(),
- rPolyPoly ) ),
+ mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), /*#i76339#*/ ::PolyPolygon(rPolyPoly) ) ),
maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
@@ -135,8 +134,7 @@ namespace cppcanvas
bool bStroke,
int nTransparency ) :
CachedPrimitiveBase( rCanvas, false ),
- mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(),
- rPolyPoly ) ),
+ mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), /*#i76339#*/ ::PolyPolygon(rPolyPoly) ) ),
maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
mpCanvas( rCanvas ),
maState(),
@@ -508,7 +506,7 @@ namespace cppcanvas
const OutDevState& rState,
const rendering::Texture& rTexture )
{
- return ActionSharedPtr( new TexturedPolyPolyAction( rPoly, rCanvas, rState, rTexture ) );
+ return ActionSharedPtr( new TexturedPolyPolyAction( /*#i76339#*/ ::PolyPolygon(rPoly), rCanvas, rState, rTexture ) );
}
ActionSharedPtr PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
@@ -530,7 +528,7 @@ namespace cppcanvas
{
OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createPolyPolyAction() for strokes called with empty line color" );
- return ActionSharedPtr( new StrokedPolyPolyAction( rPoly, rCanvas, rState, rStrokeAttributes ) );
+ return ActionSharedPtr( new StrokedPolyPolyAction( /*#i76339#*/ ::PolyPolygon(rPoly), rCanvas, rState, rStrokeAttributes ) );
}
ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,