From a4814ec65788fef70840fa56d326615d79990f46 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 21 Nov 2011 15:25:43 +0100 Subject: offapi: fix build errors in chart2 services --- offapi/com/sun/star/chart2/Axis.idl | 1 + offapi/com/sun/star/chart2/ChartDocument.idl | 3 --- offapi/com/sun/star/chart2/CoordinateSystem.idl | 4 +--- offapi/com/sun/star/chart2/DataPoint.idl | 3 +++ offapi/com/sun/star/chart2/DataPointProperties.idl | 10 ++++++---- offapi/com/sun/star/chart2/DataSeries.idl | 8 ++++---- offapi/com/sun/star/chart2/Diagram.idl | 4 ++-- offapi/com/sun/star/chart2/ErrorBar.idl | 7 +++++-- offapi/com/sun/star/chart2/ExponentialScaling.idl | 2 +- offapi/com/sun/star/chart2/FormattedString.idl | 7 +++---- offapi/com/sun/star/chart2/GridProperties.idl | 2 -- offapi/com/sun/star/chart2/Legend.idl | 1 + offapi/com/sun/star/chart2/LinearScaling.idl | 2 +- offapi/com/sun/star/chart2/LogarithmicScaling.idl | 2 +- offapi/com/sun/star/chart2/PowerScaling.idl | 2 +- offapi/com/sun/star/chart2/RegressionCurveEquation.idl | 3 ++- offapi/com/sun/star/chart2/Title.idl | 5 +++-- offapi/com/sun/star/chart2/data/RangeHighlighter.idl | 2 +- offapi/com/sun/star/frame/XToolbarControllerListener.idl | 2 ++ 19 files changed, 38 insertions(+), 32 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl index d5daba1232b8..c2c982a3e1e6 100644 --- a/offapi/com/sun/star/chart2/Axis.idl +++ b/offapi/com/sun/star/chart2/Axis.idl @@ -28,6 +28,7 @@ #define com_sun_star_chart_Axis_idl #include +#include #include #include #include diff --git a/offapi/com/sun/star/chart2/ChartDocument.idl b/offapi/com/sun/star/chart2/ChartDocument.idl index 56a04ed33522..b8bc0d8e495b 100644 --- a/offapi/com/sun/star/chart2/ChartDocument.idl +++ b/offapi/com/sun/star/chart2/ChartDocument.idl @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -78,8 +77,6 @@ service ChartDocument */ [optional] interface ::com::sun::star::lang::XInitialization; - - [optional] interface XUndoSupplier; }; } ; // chart2 diff --git a/offapi/com/sun/star/chart2/CoordinateSystem.idl b/offapi/com/sun/star/chart2/CoordinateSystem.idl index b74aace0e7d9..407b1a46b4ab 100644 --- a/offapi/com/sun/star/chart2/CoordinateSystem.idl +++ b/offapi/com/sun/star/chart2/CoordinateSystem.idl @@ -1,10 +1,8 @@ #ifndef com_sun_star_chart2_CoordinateSystem_idl #define com_sun_star_chart2_CoordinateSystem_idl -#include -#include #include -#include +#include module com { diff --git a/offapi/com/sun/star/chart2/DataPoint.idl b/offapi/com/sun/star/chart2/DataPoint.idl index 5f070bd0b857..285635b74aa9 100644 --- a/offapi/com/sun/star/chart2/DataPoint.idl +++ b/offapi/com/sun/star/chart2/DataPoint.idl @@ -28,7 +28,10 @@ #define com_sun_star_chart2_DataPoint_idl #include +#include +#include #include +#include module com { diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl index 4893449a2ce8..51dfbbd3250f 100644 --- a/offapi/com/sun/star/chart2/DataPointProperties.idl +++ b/offapi/com/sun/star/chart2/DataPointProperties.idl @@ -29,12 +29,14 @@ #include #include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include module com diff --git a/offapi/com/sun/star/chart2/DataSeries.idl b/offapi/com/sun/star/chart2/DataSeries.idl index 61b0d795babb..2016d192bb9e 100644 --- a/offapi/com/sun/star/chart2/DataSeries.idl +++ b/offapi/com/sun/star/chart2/DataSeries.idl @@ -30,12 +30,12 @@ #include #include #include -#include -#include +#include +#include +#include +#include #include #include -#include -#include module com { diff --git a/offapi/com/sun/star/chart2/Diagram.idl b/offapi/com/sun/star/chart2/Diagram.idl index e13d609523f0..a2e605938f85 100644 --- a/offapi/com/sun/star/chart2/Diagram.idl +++ b/offapi/com/sun/star/chart2/Diagram.idl @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include module com @@ -72,7 +72,7 @@ service Diagram /** The size of the diagram as relative size of the page size. */ - [property] ::com::sun::star::layout::RelativeSize RelativeSize; + [property] ::com::sun::star::chart2::RelativeSize RelativeSize; /** The attributes RelativePosition and RelativeSize should be used for the inner coordinate region without axis labels and without data labels. */ diff --git a/offapi/com/sun/star/chart2/ErrorBar.idl b/offapi/com/sun/star/chart2/ErrorBar.idl index c9f87c92e4f7..28058189c7a1 100644 --- a/offapi/com/sun/star/chart2/ErrorBar.idl +++ b/offapi/com/sun/star/chart2/ErrorBar.idl @@ -29,6 +29,8 @@ #include #include +#include +#include module com { @@ -50,15 +52,16 @@ service ErrorBar /** allows attaching data sequences to the error bars. @see data::DataSequenceRole */ - optional interface data::XDataSink; + [optional] interface data::XDataSink; /** allows querying data sequences that were set at error bars. @see data::DataSequenceRole */ [optional] interface data::XDataSource; /** + @see ::com::sun::star::chart::ErrorBarStyle */ - [property] ::com::sun::star::chart::ErrorBarStyle ErrorBarStyle; + [property] long ErrorBarStyle; /** */ diff --git a/offapi/com/sun/star/chart2/ExponentialScaling.idl b/offapi/com/sun/star/chart2/ExponentialScaling.idl index eacf3e1e48ce..148129f7dde4 100644 --- a/offapi/com/sun/star/chart2/ExponentialScaling.idl +++ b/offapi/com/sun/star/chart2/ExponentialScaling.idl @@ -27,7 +27,7 @@ #ifndef com_sun_star_chart2_ExponentialScaling_idl #define com_sun_star_chart2_ExponentialScaling_idl -#include +#include //============================================================================= diff --git a/offapi/com/sun/star/chart2/FormattedString.idl b/offapi/com/sun/star/chart2/FormattedString.idl index 1916425e58b3..79d232af1db9 100644 --- a/offapi/com/sun/star/chart2/FormattedString.idl +++ b/offapi/com/sun/star/chart2/FormattedString.idl @@ -1,7 +1,6 @@ -#ifndef com_sun_star_chart_XFormattedString_idl -#define com_sun_star_chart_XFormattedString_idl +#ifndef com_sun_star_chart_FormattedString_idl +#define com_sun_star_chart_FormattedString_idl -#include #include #include #include @@ -29,7 +28,7 @@ service FormattedString /** */ - interface XFormattedString; + interface ::com::sun::star::chart2::XFormattedString; }; } ; // chart2 diff --git a/offapi/com/sun/star/chart2/GridProperties.idl b/offapi/com/sun/star/chart2/GridProperties.idl index dfa769b54761..02772b56c761 100644 --- a/offapi/com/sun/star/chart2/GridProperties.idl +++ b/offapi/com/sun/star/chart2/GridProperties.idl @@ -27,8 +27,6 @@ #ifndef com_sun_star_chart_GridProperties_idl #define com_sun_star_chart_GridProperties_idl -#include -#include #include module com diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl index 6a7317448410..eada3b913beb 100644 --- a/offapi/com/sun/star/chart2/Legend.idl +++ b/offapi/com/sun/star/chart2/Legend.idl @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/offapi/com/sun/star/chart2/LinearScaling.idl b/offapi/com/sun/star/chart2/LinearScaling.idl index a933192a558d..97cf3c738e82 100644 --- a/offapi/com/sun/star/chart2/LinearScaling.idl +++ b/offapi/com/sun/star/chart2/LinearScaling.idl @@ -27,7 +27,7 @@ #ifndef com_sun_star_chart2_LinearScaling_idl #define com_sun_star_chart2_LinearScaling_idl -#include +#include //============================================================================= diff --git a/offapi/com/sun/star/chart2/LogarithmicScaling.idl b/offapi/com/sun/star/chart2/LogarithmicScaling.idl index 231ed2865d86..dbce87e4cd50 100644 --- a/offapi/com/sun/star/chart2/LogarithmicScaling.idl +++ b/offapi/com/sun/star/chart2/LogarithmicScaling.idl @@ -27,7 +27,7 @@ #ifndef com_sun_star_chart2_LogarithmicScaling_idl #define com_sun_star_chart2_LogarithmicScaling_idl -#include +#include //============================================================================= diff --git a/offapi/com/sun/star/chart2/PowerScaling.idl b/offapi/com/sun/star/chart2/PowerScaling.idl index f141bb8c972a..ed3df916523e 100644 --- a/offapi/com/sun/star/chart2/PowerScaling.idl +++ b/offapi/com/sun/star/chart2/PowerScaling.idl @@ -27,7 +27,7 @@ #ifndef com_sun_star_chart2_PowerScaling_idl #define com_sun_star_chart2_PowerScaling_idl -#include +#include //============================================================================= diff --git a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl index 99204903f192..2cfafd27c1c5 100644 --- a/offapi/com/sun/star/chart2/RegressionCurveEquation.idl +++ b/offapi/com/sun/star/chart2/RegressionCurveEquation.idl @@ -31,6 +31,7 @@ #include #include #include +#include module com { @@ -62,4 +63,4 @@ service RegressionCurveEquation } ; // sun } ; // star -#endif \ No newline at end of file +#endif diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl index 8afc10a1af57..c71c8a87bdd2 100644 --- a/offapi/com/sun/star/chart2/Title.idl +++ b/offapi/com/sun/star/chart2/Title.idl @@ -28,11 +28,12 @@ #define com_sun_star_chart_Title_idl #include -#include #include +#include #include #include #include +//FIXME does not exist module com { @@ -51,7 +52,7 @@ service Title service ::com::sun::star::drawing::FillProperties; service ::com::sun::star::drawing::LineProperties; service ::com::sun::star::beans::PropertySet; - [optional] service ::com::sun::star::layout::LayoutElement; +//FIXME [optional] service ::com::sun::star::layout::LayoutElement; /** */ diff --git a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl index cdf3dc637bbb..d92a06a6bf2b 100644 --- a/offapi/com/sun/star/chart2/data/RangeHighlighter.idl +++ b/offapi/com/sun/star/chart2/data/RangeHighlighter.idl @@ -27,7 +27,7 @@ #ifndef com_sun_star_chart2_data_RangeHighlighter_idl #define com_sun_star_chart2_data_RangeHighlighter_idl -#include +#include module com { diff --git a/offapi/com/sun/star/frame/XToolbarControllerListener.idl b/offapi/com/sun/star/frame/XToolbarControllerListener.idl index 63b7b6ae4cca..c317a614e3a7 100644 --- a/offapi/com/sun/star/frame/XToolbarControllerListener.idl +++ b/offapi/com/sun/star/frame/XToolbarControllerListener.idl @@ -27,6 +27,8 @@ #ifndef __com_sun_star_frame_XToolbarControllerListener_idl__ #define __com_sun_star_frame_XToolbarControllerListener_idl__ +#include + //============================================================================= module com { module sun { module star { module frame { -- cgit