summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-02-26 22:35:26 +0100
committerMichael Stahl <mstahl@redhat.com>2016-02-27 00:04:54 +0100
commitaf57a81d0c28944b424649f024c28f444a1ab2d9 (patch)
treec05b7b5d0c889af25ef72cf3f7d10ff2407f32de /xmloff
parent1724081f6363fb2b97523a2c5edb1424d7959f8b (diff)
xmloff: tdf#97808: allow empty draw:marker-start/marker-end/stroke-dash
Apparently these are allowed to be empty, which means "nothing". (regression from db1d278dcc308c73eb5edebc20481c96e7f479d8) Change-Id: I13f7998e0986b26c34929afd40b1b4f0fc9efdff
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/XMLShapeStyleContext.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index c54b682be09e..b362ea8045e4 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -241,7 +241,11 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
// of type styleName = NCName which is non-empty.
// tdf#89802: for Writer frames there would be no exception here but
// it will fail later on attach() and take out the entire frame
- if (sStyleName.isEmpty())
+ if (sStyleName.isEmpty() &&
+ ( CTF_FILLGRADIENTNAME == aContextIDs[i].nContextID
+ || CTF_FILLTRANSNAME == aContextIDs[i].nContextID
+ || CTF_FILLHATCHNAME == aContextIDs[i].nContextID
+ || CTF_FILLBITMAPNAME == aContextIDs[i].nContextID))
{
Sequence<OUString> const seq{ sStyleName };
GetImport().SetError(