summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-03-10 14:56:26 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-03-10 14:57:06 +0100
commit5b12e2bb76d8e9af30672cc34b884c54b5e639f5 (patch)
treebea87a4b11ea2daa05e6f7eb3dc0bb28e7542b51 /oox
parent37b437dcd686de72e6c78703f351a56e23aef073 (diff)
fix OOXML strict chart import
Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/graphicshapecontext.cxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 3f45f4bab30f..ebd2028f6ad6 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -122,17 +122,21 @@ ContextHandlerRef GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
case XML_graphicData : // CT_GraphicalObjectData
{
OUString sUri( rAttribs.getString( XML_uri ).get() );
- if ( sUri == "http://schemas.openxmlformats.org/presentationml/2006/ole" )
+ if ( sUri == "http://schemas.openxmlformats.org/presentationml/2006/ole" ||
+ sUri == "http://purl.oclc.org/ooxml/presentationml/ole" )
return new OleObjectGraphicDataContext( *this, mpShapePtr );
- else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/diagram" )
+ else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/diagram" ||
+ sUri == "http://purl.oclc.org/ooxml/drawingml/diagram" )
return new DiagramGraphicDataContext( *this, mpShapePtr );
- else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/chart" )
+ else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/chart" ||
+ sUri == "http://purl.oclc.org/ooxml/drawingml/chart" )
return new ChartGraphicDataContext( *this, mpShapePtr, mbEmbedShapesInChart );
- else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) )
+ else if ( sUri == "http://schemas.openxmlformats.org/drawingml/2006/table" ||
+ sUri == "http://purl.oclc.org/ooxml/drawingml/table" )
return new table::TableContext( *this, mpShapePtr );
else
{
- OSL_TRACE( "OOX: Ignore graphicsData of %s", OUSTRING_TO_CSTR( sUri ) );
+ SAL_WARN("oox", "OOX: Ignore graphicsData of :" << sUri );
return 0;
}
}