diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-26 22:35:26 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-02 11:00:02 +0100 |
| commit | 91063e3e6b53e3eff65df5106dc5dfc8f4b45568 (patch) | |
| tree | f2e23a7cf5532357ccd37760631e4ecb7498e794 /xmloff | |
| parent | a771a48307da4dd93096b7630e826c62c4852911 (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)
(cherry picked from commit af57a81d0c28944b424649f024c28f444a1ab2d9)
Change-Id: I13f7998e0986b26c34929afd40b1b4f0fc9efdff
Reviewed-on: https://gerrit.libreoffice.org/22724
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 13ed8b7035a3a3128e246ad2f5b3be059c411c57)
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 fe1b6b9bd1db..d8e7387ffd73 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -242,7 +242,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( |