diff options
author | Muthu Subramanian <sumuthu@suse.com> | 2013-08-15 17:41:26 +0530 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-08-22 01:14:48 -0700 |
commit | b6f35687e4d53c67fd5d104fd99f92c6d11bf815 (patch) | |
tree | 6ac6c46c2762f9d31170eb41326417fb3ab58adf | |
parent | 18ffd11876cc831a605fe4aa17af53434d5b14aa (diff) |
n#831457: Placeholders text size is not correct.
Placeholders (or shapes without text imported from
the files) have wrong font size. This is because the
size (and probably other text attributes) aren't applied from
the mastertextlist to the shape itself.
-rw-r--r-- | oox/source/drawingml/shape.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index dc2a7db1aa06..2e460d3c53d2 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -535,6 +535,9 @@ Reference< XShape > Shape::createAndInsert( { mpTextBody->getTextProperties().pushRotationAdjustments( mnRotation ); aShapeProps.assignUsed( mpTextBody->getTextProperties().maPropertyMap ); + // Push char properties as well - specifically useful when this is a placeholder + if( mpMasterTextListStyle && mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.has() ) + aShapeProps[ PROP_CharHeight ] <<= GetFontHeight( mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.get() ); } // applying properties |