[API CHANGE] revert and deprecate GraphicURL, modify Graphic prop.

Revert the state of GraphicURL property so it supports setting a
external URL, but getting throws and exception.

Modify the Graphic property, so it reflects what was used with
GraphicURL before.

Change-Id: Ia05b8ea37997b5ed8c75215557cce9979630c898
Reviewed-on: https://gerrit.libreoffice.org/53509
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

4 files changed, 43 insertions, 15 deletions

diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 522d0019bd48..7ca7706b3f2c 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -50,15 +50,28 @@ published service GraphicObjectShape
     service com::sun::star::drawing::RotationDescriptor;
 
     /** This is an url to the source bitmap for this graphic shape.
+
+        @deprecated as of LibreOffice 6.1 - use Graphic instead
+
+        Note the new behaviour since it was deprecated:
+        This property can only be set and only external URLs are
+        supported (no more vnd.sun.star.GraphicObject scheme). When a
+        URL is set, then it will load the image and set the Graphic
+        property.
     */
     [property] string GraphicURL;
 
+    /** This is the graphic that represents this graphic shape
+    */
+    [property] com::sun::star::graphic::XGraphic Graphic;
+
     /** This is an url to the stream ("in document" or linked graphic) for this graphic shape.
     */
     [property] string GraphicStreamURL;
 
-    /** Deprecated. Use graphic property instead!
-        This is the bitmap that represents this graphic shape.
+    /** This is the bitmap that represents this graphic shape.
+
+         @deprecated Use graphic property instead!
     */
     [optional, property] com::sun::star::awt::XBitmap GraphicObjectFillBitmap;
 
@@ -107,10 +120,6 @@ published service GraphicObjectShape
     */
     [optional, property] com::sun::star::container::XIndexContainer ImageMap;
 
-    /** This is the graphic that represents this graphic shape
-    */
-    [optional, property] com::sun::star::graphic::XGraphic Graphic;
-
     /// Whether this shape is actually a signature line.
     [optional, property] boolean IsSignatureLine;
 
diff --git a/offapi/com/sun/star/style/NumberingLevel.idl b/offapi/com/sun/star/style/NumberingLevel.idl
index fac43e5e82b3..f006e66c4360 100644
--- a/offapi/com/sun/star/style/NumberingLevel.idl
+++ b/offapi/com/sun/star/style/NumberingLevel.idl
@@ -19,14 +19,12 @@
 #ifndef __com_sun_star_style_NumberingLevel_idl__
 #define __com_sun_star_style_NumberingLevel_idl__
 
-
+#include <com/sun/star/graphic/XGraphic.idl>
 
  module com {  module sun {  module star {  module style {
 
 /** These properties describe the numbering of a paragraph.
 
-
-
     <p>NumberType determines the type of the numbering symbol.
     Depending on this setting, some of the following values will be
     ignored.</p>
@@ -63,6 +61,14 @@ published service NumberingLevel
     [property] string BulletFontName;
 
     /** This is the URL of a graphic file to use as a symbol.
+
+        @deprecated as of LibreOffice 6.1, use Graphic instead
+
+        Note the new behaviour since it this was deprecated:
+        This property can only be set and only external URLs are
+        supported (no more vnd.sun.star.GraphicObject scheme). When an
+        URL is set, then it will load the graphic and set the Graphic
+        property.
      */
     [property] string GraphicURL;
 
@@ -70,6 +76,11 @@ published service NumberingLevel
      */
     [property] short StartWith;
 
+    /** This is the graphic file to use as a symbol.
+
+        @since LibreOffice 6.1
+     */
+    [property] com::sun::star::graphic::XGraphic Graphic;
 };
 
 
diff --git a/offapi/com/sun/star/text/TextGraphicObject.idl b/offapi/com/sun/star/text/TextGraphicObject.idl
index 32c7dde0db03..071e15048a79 100644
--- a/offapi/com/sun/star/text/TextGraphicObject.idl
+++ b/offapi/com/sun/star/text/TextGraphicObject.idl
@@ -74,9 +74,20 @@ published service TextGraphicObject
     [property] boolean VertMirrored;
 
     /** contains the URL of the background graphic of the object
+
+        @deprecated as of LibreOffice 6.1 - use Graphic instead
+
+        Note the new behaviour since it was deprecated:
+        This property can only be set and only external URLs are
+        supported (no more vnd.sun.star.GraphicObject scheme). When a
+        URL is set, then it will load the image and set the Graphic
+        property.
      */
     [property] string GraphicURL;
 
+    /** contains the background graphic of the object.
+     */
+    [property] com::sun::star::graphic::XGraphic Graphic;
 
     /** contains the name of the filter of the background graphic of the object.
      */
@@ -119,10 +130,6 @@ published service TextGraphicObject
     /** contains the ColorMode as com::sun::star::drawing::ColorMode.
      */
     [property] com::sun::star::drawing::ColorMode  GraphicColorMode;
-    /** contains the graphic.
-     */
-    [optional, property] com::sun::star::graphic::XGraphic    Graphic;
-
 };
 
 
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index 99ad946e8f05..1c534cb024d9 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -5604,6 +5604,7 @@ module com {
      service ::com::sun::star::drawing::ShadowProperties;
      service ::com::sun::star::drawing::RotationDescriptor;
      [property] string GraphicURL;
+     [property] ::com::sun::star::graphic::XGraphic Graphic;
      [property] string GraphicStreamURL;
      [property, optional] ::com::sun::star::awt::XBitmap GraphicObjectFillBitmap;
      [property] short AdjustLuminance;
@@ -5615,7 +5616,6 @@ module com {
      [property] short Transparency;
      [property] ::com::sun::star::drawing::ColorMode GraphicColorMode;
      [property, optional] ::com::sun::star::container::XIndexContainer ImageMap;
-     [property, optional] ::com::sun::star::graphic::XGraphic Graphic;
     };
     /** @deprecated */ published interface XShapeGroup {
      interface ::com::sun::star::drawing::XShape;
@@ -13394,6 +13394,7 @@ module com {
      [property] string BulletFontName;
      [property] string GraphicURL;
      [property] short StartWith;
+     [property] ::com::sun::star::graphic::XGraphic Graphic;
     };
     published service NumberingRule {
      service ::com::sun::star::style::NumberingAlignment;
@@ -14959,6 +14960,7 @@ module com {
      [property] boolean HoriMirroredOnOddPages;
      [property] boolean VertMirrored;
      [property] string GraphicURL;
+     [property] ::com::sun::star::graphic::XGraphic Graphic;
      [property] string GraphicFilter;
      [property] ::com::sun::star::awt::Size ActualSize;
      [property] short AdjustLuminance;
@@ -14970,7 +14972,6 @@ module com {
      [property] boolean GraphicIsInverted;
      [property] short Transparency;
      [property] ::com::sun::star::drawing::ColorMode GraphicColorMode;
-     [property, optional] ::com::sun::star::graphic::XGraphic Graphic;
     };
     published service TextGraphicObjects {
      interface ::com::sun::star::container::XNameAccess;