From 1351d5b97fd3e07c2bac1b7659726809bcb1c28d Mon Sep 17 00:00:00 2001 From: Balazs Varga Date: Wed, 31 Oct 2018 08:43:47 +0100 Subject: tdf#108104 OOXML Import: Fix Hatch fill in Charts Sets an explicit fill hatch, or creates a named fill hatch and stored in a global container. With this patch the SUPPORTED MS Office hatch styles by LibreOffice, or the custom LibreOffice hatches will be appeared correctly instead of the previous display as horizontal lines in LibreOffice. (The background color of the hatch styles are not imported correcty, but that is another BUG.) Change-Id: Ifda9dc805dd08f58db10b35f40d7f511a8614f77 Reviewed-on: https://gerrit.libreoffice.org/62681 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- include/oox/helper/modelobjecthelper.hxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/oox/helper') 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 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. }; -- cgit