mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drawingml import: handle wps:bodyPr inside a groupshape

Browse Source 
Change-Id: I1f059ae653ab13a7c867f77b2b1b4265e9e71b4e
This commit is contained in:
Miklos Vajna
2013-12-09 13:35:39 +01:00
parent 66338e11a4
commit f5b3a728ce
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
oox/source/drawingml/shapecontext.cxx
View File

@@ -31,6 +31,7 @@
#include "oox/drawingml/drawingmltypes.hxx" #include "oox/drawingml/drawingmltypes.hxx"
#include "oox/drawingml/customshapegeometry.hxx" #include "oox/drawingml/customshapegeometry.hxx"
#include "oox/drawingml/textbodycontext.hxx" #include "oox/drawingml/textbodycontext.hxx"
#include "oox/drawingml/textbodypropertiescontext.hxx"
#include "hyperlinkcontext.hxx" #include "hyperlinkcontext.hxx"
using namespace oox::core; using namespace oox::core;
@@ -95,15 +96,27 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
case XML_txBody: case XML_txBody:
case XML_txbxContent: case XML_txbxContent:
{ {
TextBodyPtr xTextBody( new TextBody ); if (!mpShapePtr->getTextBody())
mpShapePtr->setTextBody( xTextBody ); mpShapePtr->setTextBody( TextBodyPtr(new TextBody) );
return new TextBodyContext( *this, *xTextBody ); return new TextBodyContext( *this, *mpShapePtr->getTextBody() );
} }
case XML_txXfrm: case XML_txXfrm:
{ {
mpShapePtr->getTextBody()->getTextProperties().moRotation = rAttribs.getInteger( XML_rot ); mpShapePtr->getTextBody()->getTextProperties().moRotation = rAttribs.getInteger( XML_rot );
break; break;
} }
case XML_cNvSpPr:
break;
case XML_spLocks:
break;
case XML_bodyPr:
if (!mpShapePtr->getTextBody())
mpShapePtr->setTextBody( TextBodyPtr(new TextBody) );
return new TextBodyPropertiesContext( *this, rAttribs, mpShapePtr->getTextBody()->getTextProperties() );
break;
default:
SAL_WARN("oox", "ShapeContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken));
break;
} }
return this; return this;

1
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -1614,6 +1614,7 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx")
uno::Reference<text::XTextRange> xParagraph = getParagraphOfText(1, xText, "[Year]"); uno::Reference<text::XTextRange> xParagraph = getParagraphOfText(1, xText, "[Year]");
CPPUNIT_ASSERT_EQUAL(48.f, getProperty<float>(getRun(xParagraph, 1), "CharHeight")); CPPUNIT_ASSERT_EQUAL(48.f, getProperty<float>(getRun(xParagraph, 1), "CharHeight"));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), getProperty<sal_Int32>(getRun(xParagraph, 1), "CharColor")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), getProperty<sal_Int32>(getRun(xParagraph, 1), "CharColor"));
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xGroup->getByIndex(1), "TextVerticalAdjust"));
} }
DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")