From 45f20a893a457a40604207382611afd2f8e4b635 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 23 Apr 2018 12:43:54 +0900 Subject: [API CHANGE] deprecate XGraphicObjectResolver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XGraphicObjectResolver was used to get the GraphicObject URL from an storage (package) URL. This isn't possible anymore in LO 6.1 since creating GraphicObject from uniqueID was removed for its lifecycle issues. XGraphicObjectResolver is now deprecated and when the "resolveGraphicObjectURL" is called, it throws a RuntimeExeption. In places where XGraphicObjectResolver was used, we now use the XGraphicStorageHandler as the alternative. Both share a common implementation so previously we could cast one to the other at any time. Now only XGraphicStorageHandler is used. GraphicObjectResolver was removed and replaced by the alternative GraphicStorageHandler for instance creation - where needed. Change-Id: I5d3f759c6f95b7dbe2d93688d99c8aa4899ffa84 Reviewed-on: https://gerrit.libreoffice.org/53279 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl --- sd/source/ui/unoidl/unomodel.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sd/source/ui') diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 9186385f182c..677687e703d0 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -75,7 +75,7 @@ #include #include -// Support creation of GraphicObjectResolver and EmbeddedObjectResolver +// Support creation of GraphicStorageHandler and EmbeddedObjectResolver #include #include #include @@ -940,13 +940,13 @@ css::uno::Reference SdXImpressDocument::create( return svx::NamespaceMap_createInstance( aWhichIds, &mpDoc->GetItemPool() ); } - // Support creation of GraphicObjectResolver and EmbeddedObjectResolver - if( aServiceSpecifier == "com.sun.star.document.ExportGraphicObjectResolver" ) + // Support creation of GraphicStorageHandler and EmbeddedObjectResolver + if (aServiceSpecifier == "com.sun.star.document.ExportGraphicStorageHandler") { return static_cast(new SvXMLGraphicHelper( SvXMLGraphicHelperMode::Write )); } - if( aServiceSpecifier == "com.sun.star.document.ImportGraphicObjectResolver" ) + if (aServiceSpecifier == "com.sun.star.document.ImportGraphicStorageHandler") { return static_cast(new SvXMLGraphicHelper( SvXMLGraphicHelperMode::Read )); } @@ -1135,9 +1135,9 @@ uno::Sequence< OUString > SAL_CALL SdXImpressDocument::getAvailableServiceNames( aSNS[i++] = sUNO_Service_ImageMapPolygonObject; aSNS[i++] = "com.sun.star.xml.NamespaceMap"; - // Support creation of GraphicObjectResolver and EmbeddedObjectResolver - aSNS[i++] = "com.sun.star.document.ExportGraphicObjectResolver"; - aSNS[i++] = "com.sun.star.document.ImportGraphicObjectResolver"; + // Support creation of GraphicStorageHandler and EmbeddedObjectResolver + aSNS[i++] = "com.sun.star.document.ExportGraphicStorageHandler"; + aSNS[i++] = "com.sun.star.document.ImportGraphicStorageHandler"; aSNS[i++] = "com.sun.star.document.ExportEmbeddedObjectResolver"; aSNS[i++] = "com.sun.star.document.ImportEmbeddedObjectResolver"; aSNS[i++] = "com.sun.star.drawing.TableShape"; -- cgit