diff options
Diffstat (limited to 'include/oox')
| -rw-r--r-- | include/oox/drawingml/shapepropertymap.hxx | 7 | ||||
| -rw-r--r-- | include/oox/helper/modelobjecthelper.hxx | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index 973a5ff2baa9..bace1978d78a 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -71,7 +71,7 @@ enum class ShapeProperty FillBitmapOffsetX, FillBitmapOffsetY, FillBitmapRectanglePoint, - FillHatch, + FillHatch, /// Explicit fill hatch or name of a fill hatch stored in a global container. ShadowXDistance, FillBitmapName, FillBackground, @@ -87,12 +87,13 @@ struct OOX_DLLPUBLIC ShapePropertyInfo bool const mbNamedLineDash; /// True = use named line dash instead of explicit line dash. bool const mbNamedFillGradient; /// True = use named fill gradient instead of explicit fill gradient. bool const mbNamedFillBitmap; /// True = use named fill bitmap instead of explicit fill bitmap. + bool const mbNamedFillHatch; /// True = use named fill hatch instead of explicit fill hatch. static ShapePropertyInfo DEFAULT; /// Default property info (used as default parameter of other methods). explicit ShapePropertyInfo(const ShapePropertyIds& rnPropertyIds, bool bNamedLineMarker, bool bNamedLineDash, - bool bNamedFillGradient, bool bNamedFillBitmap); + bool bNamedFillGradient, bool bNamedFillBitmap, bool bNamedFillHatch); bool has(ShapeProperty ePropId) const { @@ -147,6 +148,8 @@ private: bool setFillBitmap( sal_Int32 nPropId, const css::uno::Any& rValue ); /** Sets an explicit fill bitmap and pushes the name to FillBitmapName */ bool setFillBitmapName( const css::uno::Any& rValue ); + /** Sets an explicit fill hatch, or creates a named fill hatch. */ + bool setFillHatch( sal_Int32 nPropId, const css::uno::Any& rValue ); // not implemented, to prevent implicit conversion from enum to int css::uno::Any& operator[]( ShapeProperty ePropId ) = delete; diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index d618e4ab78ba..a946a5c6aa78 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -32,6 +32,7 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } namespace container { class XNameContainer; } namespace drawing { struct LineDash; } + namespace drawing { struct Hatch; } namespace drawing { struct PolyPolygonBezierCoords; } namespace lang { class XMultiServiceFactory; } } } } @@ -105,6 +106,8 @@ public: OUString insertTransGrandient( const css::awt::Gradient& rGradient ); + OUString insertFillHatch( const css::drawing::Hatch& rHatch ); + /** Inserts a new named fill graphic, returns the bitmap name, based on an internal constant name with a new unused index appended. */ OUString insertFillBitmapXGraphic(css::uno::Reference<css::graphic::XGraphic> const & rxGraphic); @@ -117,6 +120,7 @@ private: ObjectContainer maGradientContainer; ///< Contains all named fill gradients. ObjectContainer maTransGradContainer; ///< Contains all named transparency Gradients. ObjectContainer maBitmapUrlContainer; ///< Contains all named fill bitmap URLs. + ObjectContainer maHatchContainer; ///< Contains all named fill hatches. }; |