diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-18 11:57:31 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-18 12:09:15 +0200 |
| commit | d379d18666aa42031359ca8eb34b0021960347ae (patch) | |
| tree | d0324e2297be256e8c291cd6e17676f68f9f072d /oox | |
| parent | 8e67a7796f598de2f11b694542bccb48343f0d9a (diff) | |
oox: import WPS shape with text as shape with textbox
This allows having real shapes (like having rounded corners) and complex
content (like containing a table) at the same time.
WPS shapes are wrappers around drawingML markup in DOCX files, so this
only affects the DOCX import.
Change-Id: Iad1c1c61233be1c17efa1821e680927aa9587215
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 3 | ||||
| -rw-r--r-- | oox/source/shape/WpsContext.cxx | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 9d16c3979c2c..85b8b4d11d1c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -816,8 +816,7 @@ Reference< XShape > Shape::createAndInsert( } else if (mbTextBox) { - //No such property yet - //aShapeProps.setProperty(PROP_TextBox, uno::makeAny(true)); + aShapeProps.setProperty(PROP_TextBox, uno::makeAny(true)); } if (aServiceName != "com.sun.star.text.TextFrame" && isLinkedTxbx()) diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index d7696f3e72dc..ec352952196e 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -131,7 +131,6 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken case XML_txbx: { mpShape->getCustomShapeProperties()->setShapeTypeOverride(true); - mpShape->setServiceName("com.sun.star.text.TextFrame"); mpShape->setTextBox(true); //in case if the textbox is linked, save the attributes //for further processing. @@ -153,7 +152,6 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken //in case if the textbox is linked, save the attributes //for further processing. mpShape->getCustomShapeProperties()->setShapeTypeOverride(true); - mpShape->setServiceName("com.sun.star.text.TextFrame"); mpShape->setTextBox(true); OptValue<OUString> id = rAttribs.getString(XML_id); OptValue<OUString> seq = rAttribs.getString(XML_seq); |