summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2018-08-22 20:57:19 +0300
committerAndras Timar <andras.timar@collabora.com>2018-09-12 10:13:00 +0200
commit6636362374fc0f0a3dee7f33e5042d840277391e (patch)
tree197e4ad612be5ff9542d50c4919ccb56c96df9bc
parent40fb5d6c34f88b4a43aedb6d3d7da0d7a5d5409b (diff)
tdf#115670 vml shadow: shadow is off unless explicitly set on
The absence of "on=" is treated in Word (tested 2003) as off. Change-Id: Ibc6b0e5ca0f25a9c3ca1b9505fa24c4d821bfd0 Reviewed-on: https://gerrit.libreoffice.org/59457 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b914c4c98bfca32168ff05fec7cc687c95754d36)
-rw-r--r--oox/source/vml/vmlshapecontext.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport9.cxx4
2 files changed, 5 insertions, 1 deletions
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 9f43ac3e4c8f..dcaad56ceec4 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -385,7 +385,7 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const A
case VML_TOKEN( shadow ):
{
mrTypeModel.maShadowModel.mbHasShadow = true;
- mrTypeModel.maShadowModel.moShadowOn.assignIfUsed(lclDecodeBool(rAttribs, XML_on));
+ mrTypeModel.maShadowModel.moShadowOn = lclDecodeBool(rAttribs, XML_on).get(false);
mrTypeModel.maShadowModel.moColor.assignIfUsed(rAttribs.getString(XML_color));
mrTypeModel.maShadowModel.moOffset.assignIfUsed(rAttribs.getString(XML_offset));
mrTypeModel.maShadowModel.moOpacity = lclDecodePercent(rAttribs, XML_opacity, 1.0);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 1888d3525e18..dc62f11523ae 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -560,6 +560,10 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
sal_Int32 nDistB = getXPath(pXmlDoc, "//wp:anchor", "distB").toInt32();
// This was -260350, which is not a valid value for an unsigned type.
CPPUNIT_ASSERT(nDistB >= 0);
+
+ // tdf#115670 the shadow should not be enabled (no on="t")
+ uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY);
+ CPPUNIT_ASSERT(!getProperty<bool>(xPropertySet, "Shadow"));
}
DECLARE_OOXMLEXPORT_TEST(testTdf104115, "tdf104115.docx")