[Libreoffice-commits] core.git: offapi/type_reference
Stephan Bergmann
sbergman at redhat.com
Thu Sep 19 02:56:19 PDT 2013
offapi/type_reference/offapi.idl | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 4bcc515356e2a66417e36600bee9402efb2f9ec3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 19 11:55:55 2013 +0200
Looks like idlc resolved typedefs inside sequence<...>
...so manually fix that in the reference rdb that had been generated from legacy idlc output.
Change-Id: Iaa5545222be762f6573d1f4165604229fccad191
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index a1f36b8..7647760 100644
--- a/offapi/type_reference/offapi.idl
+++ b/offapi/type_reference/offapi.idl
@@ -2429,7 +2429,7 @@ module com {
[property, maybevoid] ::com::sun::star::util::Color InactiveSelectionBackgroundColor;
[property, maybevoid] ::com::sun::star::util::Color ActiveSelectionTextColor;
[property, maybevoid] ::com::sun::star::util::Color InactiveSelectionTextColor;
- [property, maybevoid] sequence< long > RowBackgroundColors;
+ [property, maybevoid] sequence< ::com::sun::star::util::Color > RowBackgroundColors;
[property] ::com::sun::star::style::VerticalAlignment VerticalAlign;
[property] ::com::sun::star::awt::FontDescriptor FontDescriptor;
[property, maybevoid] ::com::sun::star::util::Color TextColor;
@@ -2848,8 +2848,10 @@ module com {
CONTROL = 2,
SYMMETRIC = 3
};
- published typedef sequence< sequence< ::com::sun::star::drawing::PolygonFlags > > FlagSequenceSequence;
- published typedef sequence< sequence< ::com::sun::star::awt::Point > > PointSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
+ published typedef sequence< ::com::sun::star::drawing::FlagSequence > FlagSequenceSequence;
+ published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
+ published typedef sequence< ::com::sun::star::drawing::PointSequence > PointSequenceSequence;
published struct PolyPolygonBezierCoords {
::com::sun::star::drawing::PointSequenceSequence Coordinates;
::com::sun::star::drawing::FlagSequenceSequence Flags;
@@ -5219,7 +5221,7 @@ module com {
interface ::com::sun::star::drawing::XControlShape;
};
published typedef sequence< long > CoordinateSequence;
- published typedef sequence< sequence< long > > CoordinateSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::CoordinateSequence > CoordinateSequenceSequence;
published service DashTable {
interface ::com::sun::star::container::XNameContainer;
};
@@ -5281,7 +5283,7 @@ module com {
[property, optional] boolean ParagraphSummation;
};
published typedef sequence< double > DoubleSequence;
- published typedef sequence< sequence< double > > DoubleSequenceSequence;
+ published typedef sequence< ::com::sun::star::drawing::DoubleSequence > DoubleSequenceSequence;
published interface XShapes;
published interface XShapeBinder {
interface ::com::sun::star::uno::XInterface;
@@ -5533,7 +5535,6 @@ module com {
HORIZONTAL = 5,
VERTICAL = 6
};
- published typedef sequence< ::com::sun::star::drawing::PolygonFlags > FlagSequence;
/** @deprecated */ published struct GluePoint {
::com::sun::star::awt::Point Position;
short EscapeDirection;
@@ -5721,7 +5722,6 @@ module com {
[property] string PluginURL;
[property] sequence< ::com::sun::star::beans::PropertyValue > PluginCommands;
};
- published typedef sequence< ::com::sun::star::awt::Point > PointSequence;
published service PolyLineShape {
service ::com::sun::star::drawing::Shape;
service ::com::sun::star::drawing::LineProperties;
@@ -14164,7 +14164,7 @@ module com {
published interface XDefaultNumberingProvider {
interface ::com::sun::star::uno::XInterface;
sequence< ::com::sun::star::container::XIndexAccess > getDefaultOutlineNumberings([in] ::com::sun::star::lang::Locale aLocale);
- sequence< sequence< ::com::sun::star::beans::PropertyValue > > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
+ sequence< ::com::sun::star::beans::PropertyValues > getDefaultContinuousNumberingLevels([in] ::com::sun::star::lang::Locale aLocale);
};
published service DefaultNumberingProvider: ::com::sun::star::text::XDefaultNumberingProvider;
published service Defaults {
@@ -15347,8 +15347,8 @@ module com {
};
published interface XRubySelection {
interface ::com::sun::star::uno::XInterface;
- sequence< sequence< ::com::sun::star::beans::PropertyValue > > getRubyList([in] boolean Automatic);
- void setRubyList([in] sequence< sequence< ::com::sun::star::beans::PropertyValue > > RubyList, [in] boolean Automatic);
+ sequence< ::com::sun::star::beans::PropertyValues > getRubyList([in] boolean Automatic);
+ void setRubyList([in] sequence< ::com::sun::star::beans::PropertyValues > RubyList, [in] boolean Automatic);
};
published interface XTextCopy {
interface ::com::sun::star::uno::XInterface;
@@ -15371,7 +15371,7 @@ module com {
[property] boolean IsSortByPosition;
[property] string BracketBefore;
[property] string BracketAfter;
- [property] sequence< sequence< ::com::sun::star::beans::PropertyValue > > SortKeys;
+ [property] sequence< ::com::sun::star::beans::PropertyValues > SortKeys;
[property] ::com::sun::star::lang::Locale Locale;
[property] string SortAlgorithm;
};
More information about the Libreoffice-commits
mailing list