diff options
| author | Regényi Balázs <regenyi.balazs+gerrit@gmail.com> | 2020-04-07 09:12:07 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-09 09:52:13 +0200 |
| commit | 3bf68bfa4a6376857ed65e768722607ee7287dfa (patch) | |
| tree | 39fb17ca419450b40f57575800486d954fec8fc9 /oox | |
| parent | 56221dcb7cb29340eafc869da5af117b885cc8c8 (diff) | |
tdf#131776 DOCX grouped shape import: fix regression for strikeouts
Because of previous commit we applied strikeout
on shape text if its attribute "val" was false.
Regression from commit 143e6641cea7a06faeec8b3b65aa09b153a6490f
(tdf#131776 DOCX DrawingML shape import: fix missing strikeout).
Co-Author: Szabolcs Toth
Change-Id: Iff2331cc183be59aee66a7f6f0ad65af89b13093
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91796
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textcharacterpropertiescontext.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index cd98b9564825..4533a96e1cca 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -211,10 +211,12 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl case W_TOKEN( bCs ): break; case W_TOKEN( strike ): - mrTextCharacterProperties.moStrikeout = XML_sngStrike; + if (rAttribs.getBool(W_TOKEN(val), true)) + mrTextCharacterProperties.moStrikeout = XML_sngStrike; break; case W_TOKEN( dstrike ): - mrTextCharacterProperties.moStrikeout = XML_dblStrike; + if (rAttribs.getBool(W_TOKEN(val), true)) + mrTextCharacterProperties.moStrikeout = XML_dblStrike; break; case W_TOKEN( color ): if (rAttribs.getInteger(W_TOKEN(val)).has()) |