chart52: #28670# make the legend within charts resizeable - part 2

3 files changed, 3 insertions, 75 deletions

diff --git a/offapi/com/sun/star/chart2/Legend.idl b/offapi/com/sun/star/chart2/Legend.idl
index e48b6d3c0..2b1565480 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/LegendExpansion.idl b/offapi/com/sun/star/chart2/LegendExpansion.idl
deleted file mode 100644
index 1273dbd52..000000000
--- a/offapi/com/sun/star/chart2/LegendExpansion.idl
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * 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_chart_LegendExpansion_idl
-#define com_sun_star_chart_LegendExpansion_idl
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/**
- */
-enum LegendExpansion
-{
-    /** 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 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 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
-     */
-    CUSTOM
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
index dcce7e71d..4523a018c 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 \