mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS aw048 (1.11.2); FILE MERGED

Browse Source 
2007/04/18 15:30:18 aw 1.11.2.1: #i76339#
This commit is contained in:
Kurt Zenker
2007-05-09 12:36:12 +00:00
parent b08b9eb36b
commit 9f8925de57
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppcanvas/source/mtfrenderer/polypolyaction.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: polypolyaction.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -112,8 +112,7 @@ namespace cppcanvas
bool bFill, bool bFill,
bool bStroke ) : bool bStroke ) :
CachedPrimitiveBase( rCanvas, false ), CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), /*#i76339#*/ ::PolyPolygon(rPolyPoly) ) ),
rPolyPoly ) ),
maBounds( ::basegfx::tools::getRange(rPolyPoly) ), maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
mpCanvas( rCanvas ), mpCanvas( rCanvas ),
maState(), maState(),
@@ -135,8 +134,7 @@ namespace cppcanvas
bool bStroke, bool bStroke,
int nTransparency ) : int nTransparency ) :
CachedPrimitiveBase( rCanvas, false ), CachedPrimitiveBase( rCanvas, false ),
mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), mxPolyPoly( ::vcl::unotools::xPolyPolygonFromPolyPolygon( rCanvas->getUNOCanvas()->getDevice(), /*#i76339#*/ ::PolyPolygon(rPolyPoly) ) ),
rPolyPoly ) ),
maBounds( ::basegfx::tools::getRange(rPolyPoly) ), maBounds( ::basegfx::tools::getRange(rPolyPoly) ),
mpCanvas( rCanvas ), mpCanvas( rCanvas ),
maState(), maState(),
@@ -508,7 +506,7 @@ namespace cppcanvas
const OutDevState& rState, const OutDevState& rState,
const rendering::Texture& rTexture ) 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, ActionSharedPtr PolyPolyActionFactory::createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,
@@ -530,7 +528,7 @@ namespace cppcanvas
{ {
OSL_ENSURE( rState.isLineColorSet, OSL_ENSURE( rState.isLineColorSet,
"PolyPolyActionFactory::createPolyPolyAction() for strokes called with empty line color" ); "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, ActionSharedPtr PolyPolyActionFactory::createPolyPolyAction( const ::basegfx::B2DPolyPolygon& rPoly,