diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2020-04-01 15:04:22 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-04-21 09:51:35 +0200 |
| commit | 9b7a2d33e9dcb5e4131e4901969d5853efdaf6e8 (patch) | |
| tree | f9704fa3d231f89a95e4ba89cfc497afea5ea1fb /oox | |
| parent | 249428202be04ab9a2271a9cd48922523fa03bc4 (diff) | |
tdf#131775 DOCX DrawingML shape import: fix missing spacing
Character spacing of grouped shapes wasn't imported.
Co-Author: Balazs Regenyi, Szabolcs Toth
Change-Id: I9c4f204a5ab7c7e55e26968a71b315d84e5d8515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91490
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
| -rwxr-xr-x[-rw-r--r--] | oox/source/drawingml/textcharacterpropertiescontext.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 7658d41031f0..5198b65b61ab 100644..100755 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -165,7 +165,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl case W_TOKEN( u ): { // If you add here, check if it is in drawingmltypes.cxx 113. - auto attrib = rAttribs.getString(W_TOKEN( val ), OUString()); + auto attrib = rAttribs.getString(W_TOKEN(val), OUString()); if (attrib == "single" || attrib == "words") // TODO: implement words properly. Now it is a single line. mrTextCharacterProperties.moUnderline = XML_sng; else if (attrib == "wavyHeavy") @@ -202,6 +202,12 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl mrTextCharacterProperties.moUnderline = XML_none; break; } + case W_TOKEN( spacing ): + { + auto attrib = rAttribs.getInteger(W_TOKEN( val ), 0); + mrTextCharacterProperties.moSpacing = attrib; + break; + } case W_TOKEN( b ): mrTextCharacterProperties.moBold = rAttribs.getBool(W_TOKEN( val ), true); break; |