diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-06 11:22:47 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-06 11:25:35 +0100 |
| commit | 291c3ae79c45bc470f8a903a2541b10e9784fac5 (patch) | |
| tree | 56e0c5c1ea91c2219633660fe01906d575a89aef /oox | |
| parent | b09957e616f569ebf56e2b09b04e64fee9e0e298 (diff) | |
fix OOXML strict import
fix the problem introduced by 6536826f2f4c747582d60ed40b0418c6a67a9829
Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/diagram/diagram.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/shape.cxx | 4 | ||||
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index 4672a2818cc3..70d938ad1ea2 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -421,8 +421,8 @@ void loadDiagram( ShapePtr& pShape, pDiagram, xRefDataModel); - pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfType( rFilter, xRefDataModel->getFragmentPath(), - "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" ); + pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter, + xRefDataModel->getFragmentPath(), "image" ); // Pass the info to pShape diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 3a2ebae8ddb1..883d76f9227c 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1200,7 +1200,7 @@ void Shape::putPropertiesToGrabBag( const Sequence< PropertyValue >& aProperties } } -uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfType(core::XmlFilterBase& rFilter, OUString sFragment, OUString sType ) +uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfTypeFromOfficeDoc(core::XmlFilterBase& rFilter, OUString sFragment, OUString sType ) { uno::Sequence< uno::Sequence< uno::Any > > xRelListTemp; sal_Int32 counter = 0; @@ -1208,7 +1208,7 @@ uno::Sequence< uno::Sequence< uno::Any > > Shape::resolveRelationshipsOfType(co core::RelationsRef xRels = rFilter.importRelations( sFragment ); if ( xRels ) { - core::RelationsRef xImageRels = xRels->getRelationsFromType( sType ); + core::RelationsRef xImageRels = xRels->getRelationsFromTypeFromOfficeDoc( sType ); if ( xImageRels ) { xRelListTemp.realloc( xImageRels->size() ); diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index dc20747b0fd6..7e6a217bbcbd 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -433,8 +433,8 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) aValue.realloc(length+1); diagramDrawing[0] = uno::makeAny( mxFilterBase->importFragment( aFragmentPath ) ); - diagramDrawing[1] = uno::makeAny( pShapePtr->resolveRelationshipsOfType( *mxFilterBase, aFragmentPath, - "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" ) ); + diagramDrawing[1] = uno::makeAny( pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc( + *mxFilterBase, aFragmentPath, "image" ) ); beans::PropertyValue* pValue = aValue.getArray(); pValue[length].Name = "OOXDrawing"; |