Revert "oox: initial smartart text is imported into Writer"
This causes a test failure with sw's n747461.docx , since one
shape is apparently not loaded. In this patch, it seems the
"if (Element == DGM_TOKEN(relIds))" part is the problem.
Reverting the whole change until this is fixed.
This reverts commit 8c6fb76c2cc24c336a28702b5f7f31cb5964129a.
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 5ceb101..3234238 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,7 +30,6 @@
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
#include "oox/drawingml/diagram/diagram.hxx"
namespace oox { namespace shape {
@@ -121,19 +120,6 @@ ShapeContextHandler::getDrawingShapeContext()
}
uno::Reference<xml::sax::XFastContextHandler>
ShapeContextHandler::getDiagramShapeContext()
{
if (!mxDiagramShapeContext.is())
{
FragmentHandlerRef rFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
mpShape.reset(new Shape());
mxDiagramShapeContext.set(new DiagramGraphicDataContext(*rFragmentHandler, mpShape));
}
return mxDiagramShapeContext;
}
uno::Reference<xml::sax::XFastContextHandler>
ShapeContextHandler::getContextHandler()
{
uno::Reference<xml::sax::XFastContextHandler> xResult;
@@ -144,9 +130,6 @@ ShapeContextHandler::getContextHandler()
case NMSP_vml:
xResult.set(getDrawingShapeContext());
break;
case NMSP_dmlDiagram:
xResult.set(getDiagramShapeContext());
break;
default:
xResult.set(getGraphicShapeContext(mnStartToken));
break;
@@ -171,9 +154,6 @@ void SAL_CALL ShapeContextHandler::startFastElement
mpThemePtr.reset(new Theme());
if (Element == DGM_TOKEN(relIds))
createFastChildContext(Element, Attribs);
uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
if (xContextHandler.is())
@@ -267,12 +247,6 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
if( const ::oox::vml::ShapeBase* pShape = mpDrawing->getShapes().takeLastShape() )
xResult = pShape->convertAndInsert( xShapes );
}
else if (getContextHandler() == getDiagramShapeContext())
{
basegfx::B2DHomMatrix aMatrix;
mpShape->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix );
xResult = mpShape->getXShape();
}
else if (mpShape.get() != NULL)
{
basegfx::B2DHomMatrix aTransformation;
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 95aee66..df9c398 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -159,7 +159,6 @@ private:
GraphicShapeContextPtr;
css::uno::Reference<XFastContextHandler> mxDrawingFragmentHandler;
css::uno::Reference<XFastContextHandler> mxGraphicShapeContext;
css::uno::Reference<XFastContextHandler> mxDiagramShapeContext;
core::XmlFilterRef mxFilterBase;
drawingml::ThemePtr mpThemePtr;
@@ -169,7 +168,6 @@ private:
css::uno::Reference<XFastContextHandler> getGraphicShapeContext(::sal_Int32 Element);
css::uno::Reference<XFastContextHandler> getDrawingShapeContext();
css::uno::Reference<XFastContextHandler> getDiagramShapeContext();
css::uno::Reference<XFastContextHandler> getContextHandler();
};
