summaryrefslogtreecommitdiff
path: root/oox/inc/oox/drawingml/fillproperties.hxx
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-04-27 01:31:35 +0200
committerThorsten Behrens <tbehrens@novell.com>2011-04-27 01:31:35 +0200
commit48c61f72dd9e205f3d44838ae21cde0419538f1c (patch)
tree22eb884e19dd4f7c5b7dfaa0ba10bb77e12e3f19 /oox/inc/oox/drawingml/fillproperties.hxx
parentf433a86839499662cfc1356882b0538f01d850b6 (diff)
parent275e5c6544ff2f90cf6bd57b6a8a6293fe10943c (diff)
Merge commit 'ooo/DEV300_m106' into integration/dev300_m106
Conflicts: binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu filter/source/graphicfilter/eos2met/eos2met.cxx filter/source/msfilter/msvbahelper.cxx filter/source/svg/makefile.mk filter/source/svg/svgexport.cxx filter/source/svg/svgfilter.cxx filter/source/svg/svgfilter.hxx filter/source/svg/svgfontexport.cxx filter/source/svg/svgfontexport.hxx filter/source/svg/svgwriter.cxx filter/source/svg/svgwriter.hxx oox/inc/oox/core/relations.hxx oox/inc/oox/core/relationshandler.hxx oox/inc/oox/dump/biffdumper.hxx oox/inc/oox/dump/dffdumper.hxx oox/inc/oox/dump/dumperbase.hxx oox/inc/oox/dump/oledumper.hxx oox/inc/oox/dump/pptxdumper.hxx oox/inc/oox/helper/containerhelper.hxx oox/inc/oox/helper/propertyset.hxx oox/inc/oox/xls/commentsbuffer.hxx oox/inc/oox/xls/sharedformulabuffer.hxx oox/source/drawingml/shape.cxx oox/source/dump/oledumper.cxx oox/source/helper/binaryinputstream.cxx oox/source/helper/binaryoutputstream.cxx oox/source/helper/binarystreambase.cxx oox/source/helper/propertyset.cxx oox/source/ole/vbacontrol.cxx oox/source/ole/vbaproject.cxx oox/source/token/namespaces.hxx.tail oox/source/vml/vmlshape.cxx oox/source/xls/commentsbuffer.cxx oox/source/xls/condformatbuffer.cxx oox/source/xls/drawingfragment.cxx oox/source/xls/formulaparser.cxx oox/source/xls/pivotcachebuffer.cxx oox/source/xls/richstring.cxx oox/source/xls/sharedformulabuffer.cxx oox/source/xls/sheetdatacontext.cxx oox/source/xls/worksheethelper.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx
Diffstat (limited to 'oox/inc/oox/drawingml/fillproperties.hxx')
-rw-r--r--oox/inc/oox/drawingml/fillproperties.hxx55
1 files changed, 2 insertions, 53 deletions
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx b/oox/inc/oox/drawingml/fillproperties.hxx
index 7fcfa38bddbd..9f7c1541172f 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -37,7 +37,6 @@
namespace oox {
class GraphicHelper;
- class ModelObjectHelper;
class PropertyMap;
class PropertySet;
}
@@ -45,38 +44,7 @@ namespace oox {
namespace oox {
namespace drawingml {
-// ============================================================================
-
-enum FillPropertyId
-{
- FillStyleId,
- FillColorId,
- FillTransparenceId,
- FillGradientId,
- FillBitmapUrlId,
- FillBitmapModeId,
- FillBitmapSizeXId,
- FillBitmapSizeYId,
- FillBitmapOffsetXId,
- FillBitmapOffsetYId,
- FillBitmapRectanglePointId,
- FillId_END
-};
-
-struct FillPropertyIds
-{
- const sal_Int32* mpnPropertyIds;
- bool mbNamedFillGradient;
- bool mbNamedFillBitmap;
-
- explicit FillPropertyIds(
- const sal_Int32* pnPropertyIds,
- bool bNamedFillGradient,
- bool bNamedFillBitmap );
-
- inline bool has( FillPropertyId ePropId ) const { return mpnPropertyIds[ ePropId ] >= 0; }
- inline sal_Int32 operator[]( FillPropertyId ePropId ) const { return mpnPropertyIds[ ePropId ]; }
-};
+class ShapePropertyMap;
// ============================================================================
@@ -148,8 +116,6 @@ struct FillProperties
PatternFillProperties maPatternProps; /// Properties for pattern fills.
BlipFillProperties maBlipProps; /// Properties for bitmap fills.
- static FillPropertyIds DEFAULT_IDS; /// Default fill property identifiers for shape fill.
-
/** Overwrites all members that are explicitly set in rSourceProps. */
void assignUsed( const FillProperties& rSourceProps );
@@ -159,19 +125,8 @@ struct FillProperties
/** Writes the properties to the passed property map. */
void pushToPropMap(
- PropertyMap& rPropMap,
- ModelObjectHelper& rModelObjHelper,
+ ShapePropertyMap& rPropMap,
const GraphicHelper& rGraphicHelper,
- const FillPropertyIds& rPropIds = DEFAULT_IDS,
- sal_Int32 nShapeRotation = 0,
- sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
- /** Writes the properties to the passed property set. */
- void pushToPropSet(
- PropertySet& rPropSet,
- ModelObjectHelper& rModelObjHelper,
- const GraphicHelper& rGraphicHelper,
- const FillPropertyIds& rPropIds = DEFAULT_IDS,
sal_Int32 nShapeRotation = 0,
sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
};
@@ -190,12 +145,6 @@ struct GraphicProperties
PropertyMap& rPropMap,
const GraphicHelper& rGraphicHelper,
sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
-
- /** Writes the properties to the passed property set. */
- void pushToPropSet(
- PropertySet& rPropSet,
- const GraphicHelper& rGraphicHelper,
- sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
};
// ============================================================================