diff options
| author | Björgvin Ragnarsson <nifgraup@gmail.com> | 2013-12-04 14:30:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-10 05:43:56 -0500 |
| commit | 8ad2aec13205d308341da8519e15a3187b633b91 (patch) | |
| tree | 1f16882573eef49ad3b444631771e1bc9c9b577e | |
| parent | c3813789af24ae53153e0014ce5e4fff880197a2 (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/8415
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.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 a8a880600976..febb28ce86c9 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -116,7 +116,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); } |