From 798a563db133ebed3876c245459d90ef54ee7c9a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 4 Dec 2013 14:30:43 +0100 Subject: 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. Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e --- oox/source/drawingml/textcharacterproperties.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oox') 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); } -- cgit