From 2cacaf6ab0acf3188f43df02ef3fc87082e351b2 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 18 Jan 2013 15:22:36 +0100 Subject: oox::vml::ShadowModel: differentiate between not having it and having it off Having it explicitly disabled was already handled, but apparently 01d059c13e39f4fba75e2152b4db6b0b746bca71 turned on shadows by default. Fix this. Change-Id: I1401a28b36a9b5aea302f9a19a6d02a29e6b358d --- oox/source/vml/vmlformatting.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'oox/source/vml/vmlformatting.cxx') diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 3113d57b4dd5..1af17a3886f7 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -714,9 +714,14 @@ void FillModel::pushToPropMap( ShapePropertyMap& rPropMap, const GraphicHelper& // ============================================================================ +ShadowModel::ShadowModel() + : mbHasShadow(false) +{ +} + void ShadowModel::pushToPropMap(ShapePropertyMap& rPropMap, const GraphicHelper& rGraphicHelper) const { - if (moHasShadow.has() && !moHasShadow.get()) + if (!mbHasShadow || (moShadowOn.has() && !moShadowOn.get())) return; drawingml::Color aColor = ConversionHelper::decodeColor(rGraphicHelper, moColor, moOpacity, API_RGB_GRAY); -- cgit