INTEGRATION: CWS aquabmpfix01 (1.6.8); FILE MERGED

2008/05/14 13:41:01 hdu 1.6.8.1: #100000# fix cairocanvas compilation
This commit is contained in:
Oliver Bolte
2008-05-30 08:57:00 +00:00
parent 0d778878c3
commit d8e04a9106

View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: cairo_canvashelper.hxx,v $ * $RCSfile: cairo_canvashelper.hxx,v $
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -36,6 +36,7 @@
#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2isize.hxx>
#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dsize.hxx>
#include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
@@ -326,7 +327,8 @@ namespace cairocanvas
Operation aOperation, Operation aOperation,
::cairo::Cairo* pCairo, ::cairo::Cairo* pCairo,
const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >* pTextures=NULL,
SpriteCanvas* pDevice=NULL ); SpriteCanvas* pDevice=NULL,
::com::sun::star::rendering::FillRule eFillrule=::com::sun::star::rendering::FillRule_EVEN_ODD );
void doOperation( Operation aOperation, void doOperation( Operation aOperation,
::cairo::Cairo* pCairo, ::cairo::Cairo* pCairo,
sal_uInt32 nPolygonIndex=0, sal_uInt32 nPolygonIndex=0,