CWS-TOOLING: integrate CWS chart30

6 files changed, 57 insertions, 15 deletions

diff --git a/offapi/com/sun/star/chart/ChartLegend.idl b/offapi/com/sun/star/chart/ChartLegend.idl
index 9dfb63544b3a..ac1af809a729 100644
--- a/offapi/com/sun/star/chart/ChartLegend.idl
+++ b/offapi/com/sun/star/chart/ChartLegend.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartLegend.idl,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.94.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -64,8 +64,21 @@
 published service ChartLegend
 {
     service com::sun::star::drawing::Shape;
+
+    //-------------------------------------------------------------------------
+
+    /** If this property is <TRUE/> the position is calculated by the application automatically.
+        Setting this property to false will have no effect. Instead use the interface <type scope="com::sun::star::drawing">XShape</type>
+        to set a concrete position.
+     */
+    [optional, property] boolean AutomaticPosition;
+
+    //-------------------------------------------------------------------------
+
     service com::sun::star::style::CharacterProperties;
 
+    //-------------------------------------------------------------------------
+
     /** If a <type>ChartLegend</type> may be stored as XML file,
         this service should be supported in order to preserve unparsed
         XML attributes.
diff --git a/offapi/com/sun/star/chart/ChartTitle.idl b/offapi/com/sun/star/chart/ChartTitle.idl
index 7d10d2ed8381..d6d283cb1ce6 100644
--- a/offapi/com/sun/star/chart/ChartTitle.idl
+++ b/offapi/com/sun/star/chart/ChartTitle.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ChartTitle.idl,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.94.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,6 +53,16 @@ published service ChartTitle
 {
     service com::sun::star::drawing::Shape;
 
+    //-------------------------------------------------------------------------
+
+    /** If this property is <TRUE/> the position is calculated by the application automatically.
+        Setting this property to false will have no effect. Instead use the interface <type scope="com::sun::star::drawing">XShape</type>
+        to set a concrete position.
+     */
+    [optional, property] boolean AutomaticPosition;
+
+    //-------------------------------------------------------------------------
+
     /** If a <type>ChartTitle</type> may be stored as XML element,
         this service should be supported in order to preserve unparsed
         XML attributes.
diff --git a/offapi/com/sun/star/chart/Diagram.idl b/offapi/com/sun/star/chart/Diagram.idl
index d76eb360a50b..58b1921454c9 100644
--- a/offapi/com/sun/star/chart/Diagram.idl
+++ b/offapi/com/sun/star/chart/Diagram.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Diagram.idl,v $
- * $Revision: 1.15 $
+ * $Revision: 1.14.92.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,6 +65,30 @@
 published service Diagram
 {
 
+    interface com::sun::star::chart::XDiagram;
+
+    //-------------------------------------------------------------------------
+
+    /** If this property is <TRUE/> the position is calculated by the application automatically.
+        Setting this property to false will have no effect. Instead use the interface <type scope="com::sun::star::drawing">XShape</type>
+        to set a concrete position (note <type scope="com::sun::star::chart">XDiagram</type> is derived from <type scope="com::sun::star::drawing">XShape</type>).
+     */
+    [optional, property] boolean AutomaticPosition;
+
+    //-------------------------------------------------------------------------
+
+    /** If this property is <TRUE/> the size is calculated by the application automatically.
+        Setting this property to false will have no effect. Instead use the interface <type scope="com::sun::star::drawing">XShape</type>
+        to set a concrete size (note <type scope="com::sun::star::chart">XDiagram</type> is derived from <type scope="com::sun::star::drawing">XShape</type>).
+     */
+    [optional, property] boolean AutomaticSize;
+
+    //-------------------------------------------------------------------------
+
+    interface com::sun::star::beans::XPropertySet;
+
+    //-------------------------------------------------------------------------
+
     /** If a <type>Diagram</type> may be stored as XML file, this
         service should be supported in order to preserve unparsed XML
         attributes.
@@ -73,10 +97,6 @@ published service Diagram
      */
     [optional] service com::sun::star::xml::UserDefinedAttributeSupplier;
 
-    interface com::sun::star::chart::XDiagram;
-
-    interface com::sun::star::beans::XPropertySet;
-
     //-------------------------------------------------------------------------
 
     /** determines if the data for a data row is contained in the
diff --git a/offapi/com/sun/star/chart2/Axis.idl b/offapi/com/sun/star/chart2/Axis.idl
index 794e6ac1c331..867635284d46 100644
--- a/offapi/com/sun/star/chart2/Axis.idl
+++ b/offapi/com/sun/star/chart2/Axis.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Axis.idl,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.94.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -109,7 +109,7 @@ service Axis
      */
     [property, maybevoid]      long      NumberFormat;
 
-    [property]      ::com::sun::star::awt::Size  ReferenceDiagramSize;
+    [property]      ::com::sun::star::awt::Size  ReferencePageSize;
 
     /** determines what kind of tickmarks should be shown for major ticks.
 
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl b/offapi/com/sun/star/chart2/DataPointProperties.idl
index dbd8bb2f3205..3d4e93fe5457 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DataPointProperties.idl,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.92.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -283,14 +283,14 @@ service DataPointProperties
      */
     [optional, property] long LabelPlacement;
 
-    /** The size of the diagram at the moment when the font size for
+    /** The size of the page at the moment when the font size for
         data labels was set.
 
         <p>This size is used to resize text in the view when the size
-        of the diagram has changed since the font sizes were set
+        of the page has changed since the font sizes were set
         (automatic text scaling).</p>
      */
-    [maybevoid, property] com::sun::star::awt::Size   ReferenceDiagramSize;
+    [maybevoid, property] com::sun::star::awt::Size   ReferencePageSize;
 
     // statistics
 
diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl
index cf8422debe24..49d238c03212 100644
--- a/offapi/com/sun/star/chart2/Title.idl
+++ b/offapi/com/sun/star/chart2/Title.idl
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Title.idl,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.94.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,7 +33,6 @@
 #include <com/sun/star/style/ParagraphProperties.idl>
 #include <com/sun/star/layout/LayoutElement.idl>
 
-#include <com/sun/star/chart2/ReferenceSizeProperties.idl>
 #include <com/sun/star/chart2/XTitle.idl>
 
 #include <com/sun/star/beans/PropertySet.idl>