diff options
author | Björgvin Ragnarsson <nifgraup@gmail.com> | 2013-12-04 14:30:43 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-03-12 14:38:13 -0500 |
commit | 0b772a163b2536fc55aa3b4de925119e33af7691 (patch) | |
tree | 75bdd1045a375328326357e269c4380a500f9a25 | |
parent | f000cc02ee6e75e0e610940f61c3207a105dc95c (diff) |
fdo#72481 drawingml import: don't set CharEscapementHeight unconditionally
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220
Superscript not imported from pptx., 2013-10-07) made it possible to set
CharEscapementHeight even if moBaseline is not set, but this causes
problems in the docx importer + not necessary, according to the bugdoc;
so just don't do that.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Commit and message cherry picked from:
commit 798a563db133ebed3876c245459d90ef54ee7c9a
Author: Miklos Vajna <vmiklos@collabora.co.uk>
Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e
Reviewed-on: https://gerrit.libreoffice.org/8414
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | oox/source/drawingml/textcharacterproperties.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index a5fe786d3542..13ccfb8c95b8 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -125,7 +125,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil rPropMap[ PROP_CharStrikeout ] <<= GetFontStrikeout( moStrikeout.get( XML_noStrike ) ); rPropMap[ PROP_CharCaseMap ] <<= GetCaseMap( moCaseMap.get( XML_none ) ); - if( !bUseOptional || moBaseline.has() ) { + if( moBaseline.has() ) { rPropMap[ PROP_CharEscapement ] <<= sal_Int16(moBaseline.get( 0 ) / 1000); rPropMap[ PROP_CharEscapementHeight ] <<= sal_Int8(DFLT_ESC_PROP); } |