From e87ea03a0d595ed478f281a723a6889228babeb2 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sat, 21 Apr 2018 14:13:32 +0900 Subject: [API CHANGE] Remove uniqueID from XGraphicObject and GraphicObject MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Creating a GraphicObject with the uniqueID isn't supported anymore, so exposing the uniqueID doesn't make much sense. Both are removed from the API with this commit. Code paths that used it were refactored to use the alternative (property which transports XGraphic or XBitmap). XGraphicObject can now only be created empty and the XGraphic can be set to it with setGraphic property. Change-Id: I4df5ce0aef8814d482482effdbb4521a84252360 Reviewed-on: https://gerrit.libreoffice.org/53242 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- offapi/com/sun/star/graphic/GraphicObject.idl | 11 ----------- offapi/com/sun/star/graphic/XGraphicObject.idl | 14 +------------- 2 files changed, 1 insertion(+), 24 deletions(-) (limited to 'offapi/com/sun/star/graphic') diff --git a/offapi/com/sun/star/graphic/GraphicObject.idl b/offapi/com/sun/star/graphic/GraphicObject.idl index b6339348bcc6..ef971c2924fd 100644 --- a/offapi/com/sun/star/graphic/GraphicObject.idl +++ b/offapi/com/sun/star/graphic/GraphicObject.idl @@ -26,11 +26,6 @@ module com { module sun { module star { module graphic { /** The GraphicObject service can be used to create XGraphicObject instances. -

XGraphicObject objects are accessible using GraphicObject scheme URLs like - vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD. - As long as at least one instance of XGraphicObject with a particular UniqueID exists, - the associated image/graphic is available.

- @see GraphicObject @see GraphicProvider @see MediaProperties @@ -42,12 +37,6 @@ service GraphicObject : XGraphicObject */ create(); - /** Creates an GraphicObject with uniqueId - @param uniqueId - If another XGraphicObject with uniqueId exists, this GraphicObject - is populated with the other GraphicObject's data. - */ - createWithId( [in] string uniqueId ); }; } ; } ; } ; } ; diff --git a/offapi/com/sun/star/graphic/XGraphicObject.idl b/offapi/com/sun/star/graphic/XGraphicObject.idl index 155b0a53b60d..895ef39dbe7e 100644 --- a/offapi/com/sun/star/graphic/XGraphicObject.idl +++ b/offapi/com/sun/star/graphic/XGraphicObject.idl @@ -28,14 +28,6 @@ interface XGraphic; /** XGraphicObject objects represent in-memory image and graphic objects. -

Such objects are accessible using GraphicObject scheme URLs like -

    -
  • vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD
  • -
- The numeric portion of the url is formed from #UniqueID. - As long as at least one instance of XGraphicObject with a particular UniqueID exists, - the associated image/graphic is available.

- @see XGraphicObject @see GraphicProvider @see MediaProperties @@ -45,11 +37,7 @@ interface XGraphicObject : ::com::sun::star::uno::XInterface { /** is the associated image/graphic for this object. */ - [attribute ] XGraphic Graphic; - - /** is the id that can be used to form the vnd.sun.star.GraphicObject url to address this object. - */ - [attribute, readonly ] string UniqueID; + [attribute] XGraphic Graphic; }; } ; } ; } ; } ; -- cgit