diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-03 12:07:30 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-03 12:39:26 +0100 |
| commit | 92518d513fe021be58a0bbeb04fd9306eb23ebda (patch) | |
| tree | 17b9fdcb9aedde2b59167c916918d51b4d65dd33 /oox/source/shape | |
| parent | 51145fa54451a7a068df30af0f7319b25104d1e6 (diff) | |
drawingML import: fix default character height of WPG rectangles
The problem was that due to setting it to 18 in oox, the rectangle
didn't inherit the default 11 from the document.
Change-Id: I05c3b9c1d64eec58695e2039651a5f015df1f9e4
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/WpgContext.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index 39bb4709b6a6..d66b51864eb8 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -46,7 +46,10 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken break; case XML_wsp: { - oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape")); + // Don't set default character height, Writer has its own way to set + // the default, and if we don't set it here, editeng properly inherits + // it. + oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false)); return new oox::drawingml::ShapeContext(*this, mpShape, pShape); } break; |