CWS-TOOLING: integrate CWS rtlchart02

3 files changed, 17 insertions, 72 deletions

diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index 867635284d46..704696efd4d3 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -33,9 +33,11 @@
 #include <com/sun/star/beans/PropertySet.idl>
 
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.idl>
+#include <com/sun/star/chart/ChartAxisPosition.idl>
+#include <com/sun/star/chart/ChartAxisLabelPosition.idl>
+#include <com/sun/star/chart/ChartAxisMarkPosition.idl>
 
 #include <com/sun/star/chart2/XAxis.idl>
-#include <com/sun/star/chart2/AxisPosition.idl>
 #include <com/sun/star/chart2/XTitled.idl>
 
 #include <com/sun/star/drawing/LineProperties.idl>
@@ -68,15 +70,22 @@ service Axis
      */
     [property]      boolean   Show;
 
-    /** Describes where to place the axis within a coordinate system -
-    wether it should be placed at the standard position for a main axis or at the standard position for a secondary axis or maybe something else in future.
+    /** Determines where the axis crosses the other axis.
      */
-    [property]      AxisPosition   AxisPosition;
+    [optional, property] com::sun::star::chart::ChartAxisPosition CrossoverPosition;
+
+    /** Determines the scale value on the other axis when CrossoverPosition is set to VALUE.
+     */
+    [optional, property] double CrossoverValue;
 
     /** Determines whether to display text at the axis or not.
      */
     [property]      boolean   DisplayLabels;
 
+    /** Determines where the axis labels are placed.
+     */
+    [optional, property] com::sun::star::chart::ChartAxisLabelPosition LabelPosition;
+
     /** Determines how to stagger the labels at the axis (side by side, even, odd, auto )
     */
     [property]      ::com::sun::star::chart::ChartAxisArrangeOrderType ArrangeOrder;
@@ -122,6 +131,10 @@ service Axis
         @see <type>TickmarkStyle</type>.
      */
     [property]      long      MinorTickmarks;
+
+    /** Determines where the interval marks are placed.
+     */
+    [optional, property] com::sun::star::chart::ChartAxisMarkPosition MarkPosition;
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/AxisPosition.idl b/offapi/com/sun/star/chart2/AxisPosition.idl
deleted file mode 100644
index fabcec048cd8..000000000000
--- a/offapi/com/sun/star/chart2/AxisPosition.idl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: AxisPosition.idl,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __com_sun_star_chart2_axisposition_idl__
-#define __com_sun_star_chart2_axisposition_idl__
-
-
-//=============================================================================
-
- module com {  module sun {  module star {  module chart2 {
-
-//=============================================================================
-
-/** These values specify where an axis is placed in respect to a coordinate system.
- */
-constants AxisPosition
-{
-    //-------------------------------------------------------------------------
-
-    /** the axis is located at the standard position of the coordinate system.
-    <p>It depends on the coordinate system, on the represented dimension and maybe on the language settings where the standard position is.
-    In a typical european cartesian coordinate system for example the main y axis is located at the left border.</p>
-     */
-    const long MAIN = 0;
-
-    //-------------------------------------------------------------------------
-
-    /** the axis is located at the standard position of the coordinate system.
-    <p>It depends on the coordinate system, on the represented dimension and maybe on the language settings where the standard position is.
-    In a typical european cartesian coordinate system for example the secondary y axis is located at the right border.</p>
-     */
-    const long SECONDARY = 1;
-
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
index adb8fc9b80a0..d82862c69268 100644
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ b/offapi/com/sun/star/chart2/makefile.mk
@@ -45,7 +45,6 @@ PRJNAME=offapi
 IDLFILES= \
     AxisType.idl \
     AxisOrientation.idl \
-    AxisPosition.idl \
     Break.idl \
     CoordinateSystemTypeID.idl \
     CurveStyle.idl \