diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2013-08-16 17:46:44 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2013-08-16 17:48:16 +0530 |
| commit | 29c43f6900b74180dcaeb586909da2652eef0f85 (patch) | |
| tree | 3ea08f3a559d2280bc1eaefd9361b1f3a12f0cce /oox | |
| parent | b118c88a83da383a3f7fb1a1de2a3cb9a89d4452 (diff) | |
n#831457: Recommiting the patch.
Fixed the test cases - false negatives.
Diffstat (limited to 'oox')
| -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 f4a795e525b3..f065d1b89c74 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -545,6 +545,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 |