fix OOXML strict import

fix the problem introduced by 6536826f

Change-Id: I6c499f8490d92badda0f086d48c2347fa112bb4e

include/oox/drawingml/shape.hxx

@@ -178,7 +178,7 @@ public:
     const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> &
                         getDiagramDoms() { return maDiagramDoms; }
     void                setDiagramDoms(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rDiagramDoms) { maDiagramDoms = rDiagramDoms; }
-    com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfType(
+    com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::uno::Any > >resolveRelationshipsOfTypeFromOfficeDoc(
                                                                           core::XmlFilterBase& rFilter, OUString sFragment, OUString sType );
 protected:
 

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

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() );

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";