diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-26 22:35:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-27 21:23:10 +0000 |
| commit | a33a394bf3b44f56641ee8fd3bc5e29f1776c777 (patch) | |
| tree | 3a933c765c153769d1b517f1db59ca753a5769d6 /xmloff | |
| parent | e76f0727393c0a4316767307dc89b24e86d4a848 (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
(cherry picked from commit af57a81d0c28944b424649f024c28f444a1ab2d9)
Reviewed-on: https://gerrit.libreoffice.org/22723
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/XMLShapeStyleContext.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 2a80b436737a..60ca797daf4b 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( |