path: root/offapi/type_reference
diff options
authorStephan Bergmann <>2013-09-19 15:11:30 +0200
committerStephan Bergmann <>2013-09-19 15:50:04 +0200
commit6db34b6b33ba8e3b13683efd05df8441b87e9c92 (patch)
tree8a4084e9f1757276d6e99ea9ba6caf9db9271fc7 /offapi/type_reference
parent02ee39c1de1d9e5cd556a9e1aab5b6925e65ebec (diff)
Directly build UNOIDL .rdb files from .idl files
...via unoidl-write and the new source-format registry provicers, instead of using idlc to produce .urd files, regmerge to merge them into legacy .rdb files, and unoidl-write to translate those to new UNOIDL .rdb files. gb_UnoApi and gb_InternalUnoApi ctors take an additional argument now that is the path (below $(SRCDIR)) of the source-format registry from which to obtain UNOIDL entity definitions. It can either be an .idl file (in which case no *_add_idlfiles calls should be used and the resulting .rdb will contain all the entities from that one .idl file; used in some tests to conveniently define all test-specific entities in a single file) or a directory denoting the root of an .idl file tree (in which case *_add_idlfiles calls specify the entites to include in the resulting .idl file). (In the first case, the generated .rdb file needs to depend on that single .idl file, so the gb_UnoApiTarget ctor contains a dependency on that additional argument, which happens, as a side effect, to trigger rebuilds in the second, tree-based case when addition/removal of .idl files in the tree causes updates of directory time-stamps.) UnoApiPartTarget and all the dependency-tracking logic based on .urd files in solenv/gbuild/ is gone. Generation of an .rdb file now depends on its source registry (see previous paragraph) and all the .idl files specified with *_add_idlfiles (in the second, tree-based case above). A consequence of that is that gb_UnoApi_add_idlfile, -_nohdl, and -_noheader all do the same now. I left them in for now anyway, maybe they become relevant again when the use of cppumaker is changed to read directly from a source-format registry instead of going via a .rdb registry. The legacy tools idlc, regcompare, regmerge, and regview are still contained in the URE or SDK for now. cb344cd59e1ddb7c6db66dbd9263b4755969d4ba "Revert 'Looks like idlc resolved typedefs inside sequence<...>'" is re-reverted as now "the current offapi.rdb is generated via unoidl-write instead of idlc." Change-Id: I3d9d92f17326bc9f49dd934c85aab6a17951d06d
Diffstat (limited to 'offapi/type_reference')
1 files changed, 11 insertions, 11 deletions
diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl
index a1f36b8b0557..7647760f5c1e 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 {
- 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 {
- 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;