offapi: fix build errors in chart2 services

offapi/com/sun/star/chart2/Axis.idl

@@ -28,6 +28,7 @@
 #define com_sun_star_chart_Axis_idl
 
 #include <com/sun/star/beans/PropertySet.idl>
+#include <com/sun/star/awt/Size.idl>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
 #include <com/sun/star/chart/ChartAxisPosition.idl>
 #include <com/sun/star/chart/ChartAxisLabelPosition.idl>

offapi/com/sun/star/chart2/ChartDocument.idl

@@ -30,7 +30,6 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.idl>
 #include <com/sun/star/util/XNumberFormatsSupplier.idl>
 #include <com/sun/star/chart2/XChartDocument.idl>
-#include <com/sun/star/chart2/XUndoSupplier.idl>
 #include <com/sun/star/chart2/data/XDataReceiver.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/lang/XInitialization.idl>
@@ -78,8 +77,6 @@ service ChartDocument
         </ol>
      */
     [optional] interface  ::com::sun::star::lang::XInitialization;
-
-    [optional] interface XUndoSupplier;
 };
 
 } ; // chart2

offapi/com/sun/star/chart2/CoordinateSystem.idl

 #ifndef com_sun_star_chart2_CoordinateSystem_idl
 #define com_sun_star_chart2_CoordinateSystem_idl
 
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/chart2/XScale.idl>
 #include <com/sun/star/util/XCloneable.idl>
-#include <com/sun/star/lang/IndexOutOfBoundsException.idl>
+#include <com/sun/star/chart2/XChartTypeContainer.idl>
 
 module com
 {

offapi/com/sun/star/chart2/DataPoint.idl

@@ -28,7 +28,10 @@
 #define com_sun_star_chart2_DataPoint_idl
 
 #include <com/sun/star/style/CharacterProperties.idl>
+#include <com/sun/star/style/CharacterPropertiesAsian.idl>
+#include <com/sun/star/style/CharacterPropertiesComplex.idl>
 #include <com/sun/star/style/XStyle.idl>
+#include <com/sun/star/chart2/DataPointProperties.idl>
 
 module com
 {

offapi/com/sun/star/chart2/DataPointProperties.idl

@@ -29,12 +29,14 @@
 
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/awt/Gradient.idl>
+#include <com/sun/star/style/XStyle.idl>
 #include <com/sun/star/drawing/Hatch.idl>
 #include <com/sun/star/drawing/LineDash.idl>
-#include <com/sun/star/style/XStyle.idl>
-#include <com/sun/star/chart2/BitmapProperty.idl>
-#include <com/sun/star/chart2/TransparencyStyle.idl>
-#include <com/sun/star/chart2/DataCaptionStyle.idl>
+#include <com/sun/star/drawing/BitmapMode.idl>
+#include <com/sun/star/drawing/FillStyle.idl>
+#include <com/sun/star/drawing/LineStyle.idl>
+#include <com/sun/star/drawing/RectanglePoint.idl>
+#include <com/sun/star/chart2/DataPointLabel.idl>
 #include <com/sun/star/chart2/Symbol.idl>
 
 module com

offapi/com/sun/star/chart2/DataSeries.idl

@@ -30,12 +30,12 @@
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/container/XIndexContainer.idl>
 #include <com/sun/star/container/XContainer.idl>
-#include <com/sun/star/style/XStyle.idl>
-#include <com/sun/star/chart2/CoordinateSystemSupplier.idl>
+#include <com/sun/star/chart2/DataPointProperties.idl>
+#include <com/sun/star/chart2/StackingDirection.idl>
+#include <com/sun/star/chart2/XDataSeries.idl>
+#include <com/sun/star/chart2/XRegressionCurveContainer.idl>
 #include <com/sun/star/chart2/data/XDataSink.idl>
 #include <com/sun/star/chart2/data/XDataSource.idl>
-#include <com/sun/star/chart2/data/XDataSeries.idl>
-#include <com/sun/star/chart2/XRegressionCurveContainer.idl>
 
 module com
 {

offapi/com/sun/star/chart2/Diagram.idl

@@ -31,7 +31,7 @@
 #include <com/sun/star/chart2/XCoordinateSystemContainer.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 #include <com/sun/star/chart2/RelativePosition.idl>
-#include <com/sun/star/layout/RelativeSize.idl>
+#include <com/sun/star/chart2/RelativeSize.idl>
 #include <com/sun/star/chart/X3DDefaultSetter.idl>
 
 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.
      */

offapi/com/sun/star/chart2/ErrorBar.idl

@@ -29,6 +29,8 @@
 
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/chart/ErrorBarStyle.idl>
+#include <com/sun/star/chart2/data/XDataSink.idl>
+#include <com/sun/star/chart2/data/XDataSource.idl>
 
 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;
 
     /**
      */

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 <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 

offapi/com/sun/star/chart2/FormattedString.idl

-#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 <com/sun/star/uno/XInterface.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
 #include <com/sun/star/style/CharacterPropertiesAsian.idl>
@@ -29,7 +28,7 @@ service FormattedString
 
     /**
      */
-    interface XFormattedString;
+    interface ::com::sun::star::chart2::XFormattedString;
 };
 
 } ; // chart2

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 <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/chart2/XGrid.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 
 module com

offapi/com/sun/star/chart2/Legend.idl

@@ -29,6 +29,7 @@
 
 #include <com/sun/star/chart2/XLegend.idl>
 #include <com/sun/star/chart2/LegendPosition.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 #include <com/sun/star/chart/ChartLegendExpansion.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>

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 <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 

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 <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 

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 <com/sun/star/chart2/XScaling.idl>
+#include <com/sun/star/chart2/Scaling.idl>
 
 //=============================================================================
 

offapi/com/sun/star/chart2/RegressionCurveEquation.idl

@@ -31,6 +31,7 @@
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
 #include <com/sun/star/style/CharacterProperties.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 
 module com
 {
@@ -62,4 +63,4 @@ service RegressionCurveEquation
 } ; // sun
 } ; // star
 
-#endif
+#endif
\ No newline at end of file

offapi/com/sun/star/chart2/Title.idl

@@ -28,11 +28,12 @@
 #define com_sun_star_chart_Title_idl
 
 #include <com/sun/star/style/ParagraphProperties.idl>
-#include <com/sun/star/layout/LayoutElement.idl>
 #include <com/sun/star/chart2/XTitle.idl>
+#include <com/sun/star/chart2/RelativePosition.idl>
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
 #include <com/sun/star/drawing/FillProperties.idl>
+//FIXME does not exist <com/sun/star/layout/LayoutElement.idl>
 
 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;
 
     /**
      */

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 <com/sun/star/chart2/XRangeHighlighter.idl>
+#include <com/sun/star/chart2/data/XRangeHighlighter.idl>
 
 module com
 {

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 <com/sun/star/uno/XInterface.idl>
+
 //=============================================================================
 
  module com {  module sun {  module star {  module frame {