Kaydet (Commit) 76f30450 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Tomaž Vajngerl

[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/54322Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst 209f95d9
......@@ -61,10 +61,6 @@ published service GraphicObjectShape
*/
[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;
......@@ -120,6 +116,10 @@ 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;
......
......@@ -80,7 +80,7 @@ published service NumberingLevel
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic Graphic;
[optional, property] com::sun::star::graphic::XGraphic Graphic;
};
......
......@@ -53,12 +53,6 @@ published service PageProperties
*/
[property] string BackGraphicURL;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the filter name of the background graphic.
*/
[property] string BackGraphicFilter;
......@@ -190,12 +184,6 @@ published service PageProperties
*/
[property, maybevoid] string HeaderBackGraphicURL;
/** contains the graphic of the background of the header.
@since LibreOffice 6.1
*/
[property, maybevoid] com::sun::star::graphic::XGraphic HeaderBackGraphic;
/** contains the filter name of the background graphic of the header.
*/
[property, maybevoid] string HeaderBackGraphicFilter;
......@@ -309,12 +297,6 @@ published service PageProperties
*/
[property, maybevoid] string FooterBackGraphicURL;
/** contains the graphic of the background of the footer.
@since LibreOffice 6.1
*/
[property, maybevoid] com::sun::star::graphic::XGraphic FooterBackGraphic;
/** contains the filter name of the background graphic in the footer.
*/
[property, maybevoid] string FooterBackGraphicFilter;
......@@ -487,6 +469,24 @@ published service PageProperties
/** determines the distance of all borders of the header. */
[property, maybevoid] long HeaderBorderDistance;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the graphic of the background of the header.
@since LibreOffice 6.1
*/
[optional, property, maybevoid] com::sun::star::graphic::XGraphic HeaderBackGraphic;
/** contains the graphic of the background of the footer.
@since LibreOffice 6.1
*/
[optional, property, maybevoid] com::sun::star::graphic::XGraphic FooterBackGraphic;
};
}; }; }; };
......
......@@ -72,12 +72,6 @@ published service BaseFrameProperties
*/
[property] string BackGraphicURL;
/** contains the graphic for the background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the file filter for the background graphic.
*/
[property] string BackGraphicFilter;
......@@ -367,6 +361,12 @@ published service BaseFrameProperties
@since LibreOffice 4.3
*/
[optional, property] short RelativeWidthRelation;
/** contains the graphic for the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -89,12 +89,6 @@ published service BaseIndex
*/
[property] string BackGraphicURL;
/** contains the graphic object that is displayed as background graphic.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the filter of the graphic file that is
displayed as background graphic*/
[property] string BackGraphicFilter;
......@@ -124,6 +118,12 @@ published service BaseIndex
[property] com::sun::star::text::XTextSection ContentSection;
/** the text section containing the header of the index */
[property] com::sun::star::text::XTextSection HeaderSection;
/** contains the graphic object that is displayed as background graphic.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -68,12 +68,6 @@ published service CellProperties
*/
[property] string BackGraphicURL;
/** contains the graphic object that is displayed as background graphic.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the graphic filter of the background graphic.
*/
[property] string BackGraphicFilter;
......@@ -135,6 +129,11 @@ published service CellProperties
*/
[property] short VertOrient;
/** contains the graphic object that is displayed as background graphic.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -88,12 +88,6 @@ published service CellRange
*/
[property] string BackGraphicURL;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** determines if the background color is transparent.
*/
[property] boolean BackTransparent;
......@@ -115,6 +109,11 @@ published service CellRange
*/
[property] long NumberFormat;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -85,9 +85,6 @@ published service TextGraphicObject
*/
[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.
*/
......@@ -130,6 +127,11 @@ published service TextGraphicObject
/** contains the ColorMode as com::sun::star::drawing::ColorMode.
*/
[property] com::sun::star::drawing::ColorMode GraphicColorMode;
/** contains the background graphic of the object.
*/
[optional, property] com::sun::star::graphic::XGraphic Graphic;
};
......
......@@ -112,12 +112,6 @@ published service TextSection
*/
[property] string BackGraphicURL;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the file filter for the background graphic.
*/
[property] string BackGraphicFilter;
......@@ -197,6 +191,12 @@ published service TextSection
/** determines the left margin of the section
*/
[optional, property] long SectionRightMargin;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -202,12 +202,6 @@ published service TextTable
*/
[property] string BackGraphicURL;
/** contains the graphic for the background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the file filter for the background graphic.
*/
[property] string BackGraphicFilter;
......@@ -239,6 +233,11 @@ published service TextTable
*/
[optional, property] string TableTemplateName;
/** contains the graphic for the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -58,12 +58,6 @@ published service TextTableRow
*/
[property] string BackGraphicURL;
/** contains the graphic of a background.
@since LibreOffice 6.1
*/
[property] com::sun::star::graphic::XGraphic BackGraphic;
/** contains the name of the file filter of a background graphic.
*/
[property] string BackGraphicFilter;
......@@ -106,7 +100,11 @@ published service TextTableRow
*/
[optional, property] sequence<com::sun::star::beans::PropertyValue> RowInteropGrabBag;
/** contains the graphic of the background.
@since LibreOffice 6.1
*/
[optional, property] com::sun::star::graphic::XGraphic BackGraphic;
};
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment