diff options
| author | Daniel Rentz <dr@openoffice.org> | 2010-05-28 16:38:36 +0200 |
|---|---|---|
| committer | Daniel Rentz <dr@openoffice.org> | 2010-05-28 16:38:36 +0200 |
| commit | 1ab26b208e07f2348ccf55d12de9648b8c6594a2 (patch) | |
| tree | 540b0bd81beb402b42a2169e1a48327c80ad7d9c /oox/source/vml | |
| parent | 5adcd26c159f796c574ed09ae92afe770f45a655 (diff) | |
dr76: build error after rebase
Diffstat (limited to 'oox/source/vml')
| -rw-r--r-- | oox/source/vml/vmlformatting.cxx | 3 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 25b76e226713..3b832d9daf12 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -31,6 +31,7 @@ #include "oox/token/tokenmap.hxx" #include "oox/helper/graphichelper.hxx" #include "oox/helper/propertymap.hxx" +#include "oox/core/filterbase.hxx" #include "oox/drawingml/color.hxx" #include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/fillproperties.hxx" @@ -474,7 +475,7 @@ void FillModel::assignUsed( const FillModel& rSource ) moRotate.assignIfUsed( rSource.moRotate ); } -void FillModel::pushToPropMap( PropertyMap& rPropMap, +void FillModel::pushToPropMap( PropertyMap& rPropMap, ::oox::core::FilterBase& rFilter, ModelObjectHelper& rModelObjectHelper, const GraphicHelper& rGraphicHelper ) const { /* Convert VML fill formatting to DrawingML fill formatting and let the diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 3dc53e4ce909..9bca05d69b24 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -317,7 +317,7 @@ void ShapeBase::convertShapeProperties( const Reference< XShape >& rxShape ) con PropertyMap aPropMap; maTypeModel.maStrokeModel.pushToPropMap( aPropMap, rModelObjectHelper, rGraphicHelper ); - maTypeModel.maFillModel.pushToPropMap( aPropMap, rModelObjectHelper, rGraphicHelper ); + maTypeModel.maFillModel.pushToPropMap( aPropMap, mrDrawing.getFilter(), rModelObjectHelper, rGraphicHelper ); PropertySet aPropSet( rxShape ); aPropSet.setProperties( aPropMap ); |