diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2018-04-26 19:28:35 +0900 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-03 13:06:33 +0200 |
commit | 2bf4d69e0bfa98d641939e62945a7f8915441297 (patch) | |
tree | 2c64c371f0261bdda2b2adc16abb1b24e5315cb8 /offapi/com/sun/star | |
parent | f1579d3d6c5f5f3a651825e035b93bee7a4f43c6 (diff) |
[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>
Diffstat (limited to 'offapi/com/sun/star')
-rw-r--r-- | offapi/com/sun/star/drawing/GraphicObjectShape.idl | 21 | ||||
-rw-r--r-- | offapi/com/sun/star/style/NumberingLevel.idl | 17 | ||||
-rw-r--r-- | offapi/com/sun/star/text/TextGraphicObject.idl | 15 |
3 files changed, 40 insertions, 13 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; - }; |