From 315b8b63a481922670f1e01482777c359087128c Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 24 Feb 2015 02:37:26 +0100 Subject: fix all UNO IDL errors in new cond format API Change-Id: I004a3899363280c16a60a5cca03d8940baeeae5c --- offapi/UnoApi_offapi.mk | 16 ++++++++++++++++ offapi/com/sun/star/sheet/ConditionFormatEntry.idl | 9 ++++++--- offapi/com/sun/star/sheet/ConditionalFormat.idl | 2 +- offapi/com/sun/star/sheet/DataBar.idl | 6 +++++- offapi/com/sun/star/sheet/IconSet.idl | 5 ++++- offapi/com/sun/star/sheet/IconSetFormatEntry.idl | 2 +- offapi/com/sun/star/sheet/XColorScaleEntry.idl | 16 ++++++++++++---- offapi/com/sun/star/sheet/XDataBarEntry.idl | 12 +++++++++--- offapi/com/sun/star/sheet/XIconSetEntry.idl | 12 +++++++++--- 9 files changed, 63 insertions(+), 17 deletions(-) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 85ac1f2344f0..1411c5425a1f 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -1157,9 +1157,13 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ Cells \ CellsEnumeration \ ConsolidationDescriptor \ + ConditionalFormat \ + ConditionFormatEntry \ + ColorScale \ DDELink \ DDELinks \ DDELinksEnumeration \ + DataBar \ DataPilotDescriptor \ DataPilotField \ DataPilotFieldGroup \ @@ -1195,6 +1199,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sheet,\ FunctionDescriptionEnumeration \ FunctionDescriptions \ HeaderFooterContent \ + IconSet \ LabelRange \ LabelRanges \ LabelRangesEnumeration \ @@ -3325,9 +3330,14 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ CellDeleteMode \ CellFlags \ CellInsertMode \ + ColorScaleEntryType \ ComplexReference \ + ConditionEntryType \ + ConditionFormatOperator \ ConditionOperator \ ConditionOperator2 \ + DataBarAxis \ + DataBarEntryType \ DDEItemInfo \ DDELinkInfo \ DDELinkMode \ @@ -3373,6 +3383,8 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ FunctionCategory \ GeneralFunction \ GoalResult \ + IconSetFormatEntry \ + IconSetType \ LocalizedName \ MemberResult \ MemberResultFlags \ @@ -3417,12 +3429,15 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ XCellRangesAccess \ XCellRangesQuery \ XCellSeries \ + XColorScaleEntry \ XCompatibilityNames \ + XConditionEntry \ XConditionalFormat \ XConditionalFormats \ XConditionEntry \ XConsolidatable \ XConsolidationDescriptor \ + XDataBarEntry \ XDDELink \ XDDELinkResults \ XDDELinks \ @@ -3458,6 +3473,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sheet,\ XGoalSeek \ XHeaderFooterContent \ XHierarchiesSupplier \ + XIconSetEntry \ XLabelRange \ XLabelRanges \ XLevelsSupplier \ diff --git a/offapi/com/sun/star/sheet/ConditionFormatEntry.idl b/offapi/com/sun/star/sheet/ConditionFormatEntry.idl index bc7b2f5d08fa..53dfa1b5c37a 100644 --- a/offapi/com/sun/star/sheet/ConditionFormatEntry.idl +++ b/offapi/com/sun/star/sheet/ConditionFormatEntry.idl @@ -16,13 +16,16 @@ service ConditionFormatEntry { interface XConditionEntry; - [property] ConditionFormatOperator Operator; + /** + * See com.sun.star.sheet.ConditionFormatOperator for valid values + */ + [property] long Operator; [property] string StyleName; - [optional, property] Formula1; + [optional, property] string Formula1; - [optional, property] Formula2; + [optional, property] string Formula2; }; diff --git a/offapi/com/sun/star/sheet/ConditionalFormat.idl b/offapi/com/sun/star/sheet/ConditionalFormat.idl index d205e3ce2440..d168da36e2f6 100644 --- a/offapi/com/sun/star/sheet/ConditionalFormat.idl +++ b/offapi/com/sun/star/sheet/ConditionalFormat.idl @@ -30,7 +30,7 @@ module com { module sun { module star { module sheet { service ConditionalFormat { interface com::sun::star::beans::XPropertySet; - interface com::sun::star::uno::XConditionalFormat; + interface com::sun::star::sheet::XConditionalFormat; /** represents the range for the conditional format All ranges have to be in the same sheet. diff --git a/offapi/com/sun/star/sheet/DataBar.idl b/offapi/com/sun/star/sheet/DataBar.idl index 816d1a0c84d2..8276e17e20f5 100644 --- a/offapi/com/sun/star/sheet/DataBar.idl +++ b/offapi/com/sun/star/sheet/DataBar.idl @@ -13,6 +13,7 @@ #include #include #include +#include module com { module sun { module star { module sheet { @@ -22,7 +23,10 @@ service DataBar [property] boolean ShowValue; - [property] DataBarAxis AxisPosition; + /** + * See com.sun.star.sheet.DataBarAxis for possible values + */ + [property] long AxisPosition; [property] boolean Gradient; diff --git a/offapi/com/sun/star/sheet/IconSet.idl b/offapi/com/sun/star/sheet/IconSet.idl index feafef4fe9f2..9588ab4cb2a6 100644 --- a/offapi/com/sun/star/sheet/IconSet.idl +++ b/offapi/com/sun/star/sheet/IconSet.idl @@ -22,7 +22,10 @@ service IconSet [property] boolean Reverse; - [property] IconSetType Icons; + /** + * See com.sun.star.sheet.IconSetType for possible values. + */ + [property] long Icons; [property] sequence IconSetEntries; diff --git a/offapi/com/sun/star/sheet/IconSetFormatEntry.idl b/offapi/com/sun/star/sheet/IconSetFormatEntry.idl index fdfef6dcefb2..24715e36c58b 100644 --- a/offapi/com/sun/star/sheet/IconSetFormatEntry.idl +++ b/offapi/com/sun/star/sheet/IconSetFormatEntry.idl @@ -12,7 +12,7 @@ module com { module sun { module star { module sheet { -constants IconSetEntryType +constants IconSetFormatEntry { const long ICONSET_PERCENTILE = 0; diff --git a/offapi/com/sun/star/sheet/XColorScaleEntry.idl b/offapi/com/sun/star/sheet/XColorScaleEntry.idl index 79b096f12999..8d29e6365f44 100644 --- a/offapi/com/sun/star/sheet/XColorScaleEntry.idl +++ b/offapi/com/sun/star/sheet/XColorScaleEntry.idl @@ -10,21 +10,29 @@ #ifndef __com_sun_star_sheet_XColorScaleEntry_idl__ #define __com_sun_star_sheet_XColorScaleEntry_idl__ +#include + module com { module sun { module star { module sheet { interface XColorScaleEntry { com::sun::star::util::Color getColor(); - void setColor(com::sun::star::util::Color Color); + void setColor( [in] com::sun::star::util::Color Color); string getFormula(); - void setFormula(string Formula); + void setFormula( [in] string Formula); - ColorScaleEntryType getType(); + /** + * See com.sun.star.sheet.ColorScaleEntryType for possible values + */ + long getType(); - void setType(ColorScaleEntryType Type); + /** + * See com.sun.star.sheet.ColorScaleEntryType for possible values + */ + void setType( [in] long Type); }; diff --git a/offapi/com/sun/star/sheet/XDataBarEntry.idl b/offapi/com/sun/star/sheet/XDataBarEntry.idl index 59c1b660f3db..746de16c22b3 100644 --- a/offapi/com/sun/star/sheet/XDataBarEntry.idl +++ b/offapi/com/sun/star/sheet/XDataBarEntry.idl @@ -16,11 +16,17 @@ interface XDataBarEntry { string getFormula(); - void setFormula(string Formula); + void setFormula( [in] string Formula); - DataBarEntryType getType(); + /** + * See com.sun.star.sheet.DataBarEntryType for possible values + */ + long getType(); - void setType(DataBarEntryType Type); + /** + * See com.sun.star.sheet.DataBarEntryType for possible values + */ + void setType( [in] long Type); }; diff --git a/offapi/com/sun/star/sheet/XIconSetEntry.idl b/offapi/com/sun/star/sheet/XIconSetEntry.idl index 216d93d795c5..4382e4406cff 100644 --- a/offapi/com/sun/star/sheet/XIconSetEntry.idl +++ b/offapi/com/sun/star/sheet/XIconSetEntry.idl @@ -18,11 +18,17 @@ interface XIconSetEntry { string getFormula(); - void setFormula(string Formula); + void setFormula([in] string Formula); - IconSetEntryType getType(); + /** + * See com.sun.star.sheet.IconSetEntryType for possible values. + */ + long getType(); - void setType(IconSetEntryType Type); + /** + * See com.sun.star.sheet.IconSetEntryType for possible values. + */ + void setType([in] long Type); }; -- cgit