chart52: merge with DEV300_m98

4 files changed, 14 insertions, 18 deletions

diff --git a/offapi/com/sun/star/chart2/LegendExpansion.idl b/offapi/com/sun/star/chart/ChartLegendExpansion.idl
index 8a51a47bb3a1..3808c7ea9ad1 100644..100755
--- a/offapi/com/sun/star/chart2/LegendExpansion.idl
+++ b/offapi/com/sun/star/chart/ChartLegendExpansion.idl
@@ -24,8 +24,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef com_sun_star_chart_LegendExpansion_idl
-#define com_sun_star_chart_LegendExpansion_idl
+#ifndef com_sun_star_chart_ChartLegendExpansion_idl
+#define com_sun_star_chart_ChartLegendExpansion_idl
 
 module com
 {
@@ -33,41 +33,37 @@ module sun
 {
 module star
 {
-module chart2
+module chart
 {
 
-/**
+/** Specifies sizing aspects of the legend
  */
-enum LegendExpansion
+enum ChartLegendExpansion
 {
-    /** The legend is laid out such that it is wider that high.  The
-        aspect ratio is greater than 1.
+    /** The legend entries are arranged in a single row if possible. If not enough space is available further rows are added.
 
         <p>This is usually used for legends that are displayed at the
         top or bottom of the page.</p>
      */
     WIDE,
 
-    /** The legend is laid out such that it is higher that wide.  The
-        aspect ratio is less than 1.
+    /** The legend entries are stacked in a single column if possible. If not enough space is available further columns are added.
 
         <p>This is usually used for legends that are displayed on the
         left or right hand side of the page.</p>
      */
     HIGH,
 
-    /** The legend is laid out such that height and width are not
-        differing too much.  It is not guaranteed to have an aspect
-        ratio of 1.
+    /** The legend entries are arranged in a way that the aspect ratio of the resulting legend is as near to 1 as possible.
      */
     BALANCED,
 
-    /** The aspect ratio of the legend is given explicitly
+    /** The size of the legend is given explicitly
      */
     CUSTOM
 };
 
-} ; // chart2
+} ; // chart
 } ; // com
 } ; // sun
 } ; // star
diff --git a/offapi/com/sun/star/chart/makefile.mk b/offapi/com/sun/star/chart/makefile.mk
index fdbf07173c5e..2b7086a638c3 100644
--- a/offapi/com/sun/star/chart/makefile.mk
+++ b/offapi/com/sun/star/chart/makefile.mk
@@ -72,6 +72,7 @@ IDLFILES=\
     ChartGrid.idl\
     ChartLegend.idl\
     ChartLegendPosition.idl\
+    ChartLegendExpansion.idl \
     ChartLine.idl\
     ChartPieSegmentProperties.idl\
     ChartRegressionCurveType.idl\
diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index 0d51492ae4c2..32bd7aa7d85e 100644
--- a/offapi/com/sun/star/chart2/Legend.idl
+++ b/offapi/com/sun/star/chart2/Legend.idl
@@ -29,7 +29,7 @@
 
 #include <com/sun/star/chart2/XLegend.idl>
 #include <com/sun/star/chart2/LegendPosition.idl>
-#include <com/sun/star/chart2/LegendExpansion.idl>
+#include <com/sun/star/chart/ChartLegendExpansion.idl>
 
 #include <com/sun/star/beans/PropertySet.idl>
 #include <com/sun/star/drawing/LineProperties.idl>
@@ -63,12 +63,12 @@ service Legend
     /** Determines how the aspect ratio of the legend should roughly
         be.
 
-        <p>Set the Expansion to <member>LegendExpansion::HIGH</member>
+        <p>Set the Expansion to <member>::com::sun::star::chart::ChartLegendExpansion::HIGH</member>
         for a legend that is positioned on the right or left hand
         side.  Use <member>LegendExpansion::WIDE</member> for a legend
         that is positioned on top or the bottom.</p>
      */
-    [property] LegendExpansion Expansion;
+    [property] ::com::sun::star::chart::ChartLegendExpansion Expansion;
 
     /** Determines, whether the legend should be redered by the view.
      */
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
index dcce7e71d4d2..4523a018cf74 100644
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ b/offapi/com/sun/star/chart2/makefile.mk
@@ -52,7 +52,6 @@ IDLFILES= \
     FillBitmap.idl \
     IncrementData.idl \
     InterpretedData.idl \
-    LegendExpansion.idl \
     LegendPosition.idl \
     LegendSymbolStyle.idl \
     LightSource.idl \