summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMuthu Subramanian <sumuthu@suse.com>2013-08-15 17:41:26 +0530
committerMuthu Subramanian <sumuthu@suse.com>2013-08-15 22:34:43 +0530
commit1a4cba3fc9c991cceb88028c562d99be22caf407 (patch)
tree2ff031f106d73beee63f7f7869a36dcfaabca396 /oox
parent6b205205175b8ce599d2924550040271fd7303e5 (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.
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 64a7ab5df0a1..2e65b27de54e 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