[API-CHANGE] revert reordering of Graphic properties

This reverts the reordering of properties and adds new properties
to the end and marks them as optional so we break API as little as
possible.

Change-Id: I422d882d1d1c721dd3ff7ad289329a9df58beb42
Reviewed-on: https://gerrit.libreoffice.org/54322
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>

1 files changed, 2 insertions, 13 deletions

diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index dad8fdc4d586..eb20847723b9 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -5604,7 +5604,6 @@ 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;
@@ -5616,6 +5615,7 @@ 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;
@@ -13134,7 +13134,6 @@ module com {
     published service PageProperties {
      [property] ::com::sun::star::util::Color BackColor;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] boolean BackTransparent;
@@ -13164,7 +13163,6 @@ module com {
      [property] ::com::sun::star::container::XNameContainer UserDefinedAttributes;
      [property, maybevoid] ::com::sun::star::util::Color HeaderBackColor;
      [property, maybevoid] string HeaderBackGraphicURL;
-     [property, maybevoid] ::com::sun::star::graphic::XGraphic HeaderBackGraphic;
      [property, maybevoid] string HeaderBackGraphicFilter;
      [property, maybevoid] ::com::sun::star::style::GraphicLocation HeaderBackGraphicLocation;
      [property, maybevoid] long HeaderLeftMargin;
@@ -13190,7 +13188,6 @@ module com {
      [property, maybevoid, optional] ::com::sun::star::text::XText HeaderTextRight;
      [property, maybevoid] ::com::sun::star::util::Color FooterBackColor;
      [property, maybevoid] string FooterBackGraphicURL;
-     [property, maybevoid] ::com::sun::star::graphic::XGraphic FooterBackGraphic;
      [property, maybevoid] string FooterBackGraphicFilter;
      [property, maybevoid] ::com::sun::star::style::GraphicLocation FooterBackGraphicLocation;
      [property, maybevoid] long FooterLeftMargin;
@@ -13395,7 +13392,6 @@ 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;
@@ -13840,7 +13836,6 @@ module com {
      [property] ::com::sun::star::text::XTextFrame AnchorFrame;
      [property] ::com::sun::star::util::Color BackColor;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] ::com::sun::star::table::BorderLine LeftBorder;
@@ -13929,7 +13924,6 @@ module com {
      [property, optional] string ParaStyleSeparator;
      [property] ::com::sun::star::text::XTextColumns TextColumns;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] ::com::sun::star::util::Color BackColor;
@@ -14020,7 +14014,6 @@ module com {
      [property] string CellName;
      [property] ::com::sun::star::util::Color BackColor;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] long NumberFormat;
@@ -14051,7 +14044,6 @@ module com {
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] boolean BackTransparent;
      [property] boolean ChartColumnAsLabel;
      [property] boolean ChartRowAsLabel;
@@ -14638,7 +14630,6 @@ module com {
      [property] short TableColumnRelativeSum;
      [property] ::com::sun::star::util::Color BackColor;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property, optional] boolean CollapsingBorders;
@@ -14966,7 +14957,6 @@ 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;
@@ -14978,6 +14968,7 @@ 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;
@@ -15050,7 +15041,6 @@ module com {
      [property] string DDECommandFile;
      [property] string DDECommandElement;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] boolean FootnoteIsCollectAtTextEnd;
@@ -15125,7 +15115,6 @@ module com {
      [property] ::com::sun::star::util::Color BackColor;
      [property] boolean BackTransparent;
      [property] string BackGraphicURL;
-     [property] ::com::sun::star::graphic::XGraphic BackGraphic;
      [property] string BackGraphicFilter;
      [property] ::com::sun::star::style::GraphicLocation BackGraphicLocation;
      [property] sequence< ::com::sun::star::text::TableColumnSeparator > TableColumnSeparators;