summaryrefslogtreecommitdiff
path: root/oox/source/shape/ShapeContextHandler.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source/shape/ShapeContextHandler.cxx')
-rw-r--r--oox/source/shape/ShapeContextHandler.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 4d9b91ad69b2..34a84b42f93f 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -463,7 +463,10 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
mxLockedCanvasContext.clear();
}
}
- else if (mxChartShapeContext.is())
+ //NMSP_dmlChart == getNamespace( mnStartToken ) check is introduced to make sure that
+ //mnStartToken is set as NMSP_dmlChart in setStartToken.
+ //Only in case it is set then only the below block of code for ChartShapeContext should be executed.
+ else if (mxChartShapeContext.is() && (NMSP_dmlChart == getNamespace( mnStartToken )))
{
ChartGraphicDataContext* pChartGraphicDataContext = dynamic_cast<ChartGraphicDataContext*>(mxChartShapeContext.get());
if (pChartGraphicDataContext)