[API CHANGE] deprecate XGraphicObjectResolver

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 <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>

4 files changed, 41 insertions, 43 deletions

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index da34ba0a74f7..2f544b327a6e 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -128,7 +128,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/document,\
 	DocumentRevisionListPersistence \
 	IndexedPropertyValues \
 	FilterConfigRefresh \
-	GraphicObjectResolver \
+	GraphicStorageHandler \
 	NamedPropertyValues \
 	OleEmbeddedServerRegistration \
 	OOXMLDocumentPropertiesImporter \
diff --git a/offapi/com/sun/star/document/GraphicObjectResolver.idl b/offapi/com/sun/star/document/GraphicObjectResolver.idl
deleted file mode 100644
index f10ea2951416..000000000000
--- a/offapi/com/sun/star/document/GraphicObjectResolver.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_document_GraphicObjectResolver_idl__
-#define __com_sun_star_document_GraphicObjectResolver_idl__
-
-#include <com/sun/star/document/XGraphicObjectResolver.idl>
-#include <com/sun/star/embed/XStorage.idl>
-
-
-module com {  module sun {  module star {  module document {
-
-
-/**
-    @since LibreOffice 4.1
- */
-service GraphicObjectResolver : XGraphicObjectResolver
-{
-    createWithStorage([in] com::sun::star::embed::XStorage Storage);
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/GraphicStorageHandler.idl b/offapi/com/sun/star/document/GraphicStorageHandler.idl
new file mode 100644
index 000000000000..a29f181f32bf
--- /dev/null
+++ b/offapi/com/sun/star/document/GraphicStorageHandler.idl
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef __com_sun_star_document_GraphicStorageHandler_idl__
+#define __com_sun_star_document_GraphicStorageHandler_idl__
+
+#include <com/sun/star/document/GraphicStorageHandler.idl>
+#include <com/sun/star/embed/XStorage.idl>
+
+module com {  module sun {  module star {  module document {
+
+/**
+    Default implementation of XGraphicStorageHandler
+
+    @since LibreOffice 6.1
+ */
+service GraphicStorageHandler : XGraphicStorageHandler
+{
+    createWithStorage([in] com::sun::star::embed::XStorage Storage);
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/document/XGraphicObjectResolver.idl b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
index d0678456301b..ea8f5ea270b7 100644
--- a/offapi/com/sun/star/document/XGraphicObjectResolver.idl
+++ b/offapi/com/sun/star/document/XGraphicObjectResolver.idl
@@ -26,11 +26,17 @@ module com {  module sun {  module star {  module document {
 
 
 /** this interface converts graphic object URLs from one URL space to another.
+
+    @deprecated since LibreOffice 6.1
+    Use GraphicStorageHandler or GraphicProvider to load an XGraphic instead
+    as converting to internal GraphicObject URL is not possible anymore.
  */
 published interface XGraphicObjectResolver: com::sun::star::uno::XInterface
 {
     /** converts the given URL from the source URL namespace to the destination
         URL space of this instance.
+
+        @deprecated since LibreOffice 6.1 - throws an RuntimeException if called
     */
     string resolveGraphicObjectURL( [in] string aURL );
 };