9 files changed, 3 insertions, 396 deletions
diff --git a/offapi/com/sun/star/chart2/CustomLegendEntry.idl b/offapi/com/sun/star/chart2/CustomLegendEntry.idl
deleted file mode 100644
index 9668eaf90de4..000000000000
--- a/offapi/com/sun/star/chart2/CustomLegendEntry.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef com_sun_star_chart_CustomLegendEntry_idl
-#define com_sun_star_chart_CustomLegendEntry_idl
-
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/chart2/XLegendSymbolProvider.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/** A legend entry that does not depend on data series or other chart
-    objects.  It may contain any text a user specifies.
- */
-service CustomLegendEntry
-{
-    /** Is used to identify an object as one that may be shown in a
-        legend.
-     */
-    interface XLegendEntry;
-
-    /** Is used to display a legend text
-     */
-    interface XTitled;
-
-    /** If the legend entry should contain a user-defined symbol, you
-        have to implement this interface.
-     */
-    [optional] interface XLegendSymbolProvider;
-
-    /** must be supported, if properties are implemented
-     */
-    [optional] service ::com::sun::star::beans::XPropertySet;
-
-    /** determines what kind of symbol is displayed next to the entry
-        in the legend.
-     */
-    [optional, property] LegendSymbolStyle  SymbolStyle;
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
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/LegendExpansion.idl b/offapi/com/sun/star/chart2/LegendExpansion.idl
deleted file mode 100644
index 8a51a47bb3a1..000000000000
--- a/offapi/com/sun/star/chart2/LegendExpansion.idl
+++ /dev/null
@@ -1,75 +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 is laid out such that it is wider that high.  The
-        aspect ratio is greater than 1.
-
-        <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.
-
-        <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.
-     */
-    BALANCED,
-
-    /** The aspect ratio of the legend is given explicitly
-     */
-    CUSTOM
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
diff --git a/offapi/com/sun/star/chart2/LegendSymbolStyle.idl b/offapi/com/sun/star/chart2/LegendSymbolStyle.idl
deleted file mode 100644
index 13d47ee3a7c9..000000000000
--- a/offapi/com/sun/star/chart2/LegendSymbolStyle.idl
+++ /dev/null
@@ -1,107 +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_LegendSymbolStyle_idl
-#define com_sun_star_chart_LegendSymbolStyle_idl
-
-#include <com/sun/star/uno/XInterface.idl>
-
-#include <com/sun/star/chart2/XTitle.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/**
- */
-enum LegendSymbolStyle
-{
-    /** A square box with border.
-     */
-    BOX,
-
-    /** A rectangle that is wider than high with border.
-     */
-    BAR,
-
-    /** A square box with border, that may change its aspect ratio if
-        the layout of the legend requires this.
-     */
-    RECTANGLE,
-
-    /** A filled rectangle with no border that uses all the space
-        available for the legend entry's symbol, leaving no padding
-        space.  This is especially useful for legends representing a
-        color-scale.
-     */
-    STRETCHED_RECTANGLE,
-
-    /** A line extending from the left edge to the right edge
-     */
-    HORIZONTAL_LINE,
-
-    /** A line extending from the top edge to the bottom edge
-     */
-    VERTICAL_LINE,
-
-    /** A line spanning the diagonal of the box you would get with
-        <member>BOX</member>.
-     */
-    DIAGONAL_LINE,
-
-    /** A line like with <member>LINE</member>, but with a small
-        bordered square box in the middle.
-     */
-    LINE_WITH_BOX,
-
-    /** A line like with <member>LINE</member>, but with the symbol
-        that is returned by <member>XLegendEntry::getSymbol</member>
-        (see also <member>USER_DEFINED</member>).
-     */
-    LINE_WITH_SYMBOL,
-
-    /** A bordered circle which has the same bounding-box as the
-        <member>BOX</member>.
-     */
-    CIRCLE,
-
-    /** Use the symbol that is returned by
-        <member>XLegendEntry::getSymbol</member>.
-    */
-    USER_DEFINED
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
diff --git a/offapi/com/sun/star/chart2/ViewLegendEntry.idl b/offapi/com/sun/star/chart2/ViewLegendEntry.idl
deleted file mode 100644
index 0e5ea231628c..000000000000
--- a/offapi/com/sun/star/chart2/ViewLegendEntry.idl
+++ /dev/null
@@ -1,58 +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_chart2_ViewLegendEntry_idl
-#define com_sun_star_chart2_ViewLegendEntry_idl
-
-#include <com/sun/star/drawing/XShape.idl>
-#include <com/sun/star/chart2/XFormattedString.idl>
-
-//=============================================================================
-
-module com {  module sun {  module star {  module chart2 {
-
-//=============================================================================
-
-/**
- */
-struct ViewLegendEntry
-{
-    /** The legend symbol that represents a data series or other
-        information contained in the legend
-     */
-    ::com::sun::star::drawing::XShape    aSymbol;
-
-    /** The descriptive text for a legend entry.
-     */
-    sequence< XFormattedString >         aLabel;
-};
-
-//=============================================================================
-
-}; }; }; };
-
-#endif
-
diff --git a/offapi/com/sun/star/chart2/XLegend.idl b/offapi/com/sun/star/chart2/XLegend.idl
index 309aa148dd2a..1cc8666ef20d 100644
--- a/offapi/com/sun/star/chart2/XLegend.idl
+++ b/offapi/com/sun/star/chart2/XLegend.idl
@@ -3,15 +3,6 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
-#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
-
-#include <com/sun/star/chart2/XLegendEntry.idl>
-
 module com
 {
 module sun
@@ -25,30 +16,6 @@ module chart2
  */
 interface XLegend : ::com::sun::star::uno::XInterface
 {
-    /** The entry added is appended to the list, such that it appears
-        at the end of the legend.
-
-        @param xEntry
-
-            If it supports <type>CustomLegendEntry</type>,
-            the <type>XTitle</type> is used for displaying a text, and
-            the symbol is displayed according to the
-            <member>CustomLegendEntry::SymbolStyle</member> property.
-     */
-    void registerEntry( [in] XLegendEntry xEntry )
-        raises( com::sun::star::lang::IllegalArgumentException );
-
-    /** Removes an entry that was registered before
-
-        <p>(see <member>registerEntry</member>)</p>
-     */
-    void revokeEntry( [in] XLegendEntry xEntry )
-        raises( com::sun::star::container::NoSuchElementException );
-
-    /** Returns a list of all legend entries in the order in which
-        they were registered.
-     */
-    sequence< XLegendEntry > getEntries();
 };
 
 } ; // chart2
diff --git a/offapi/com/sun/star/chart2/XLegendEntry.idl b/offapi/com/sun/star/chart2/XLegendEntry.idl
deleted file mode 100644
index 579c453dbd6a..000000000000
--- a/offapi/com/sun/star/chart2/XLegendEntry.idl
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef com_sun_star_chart_XLegendEntry_idl
-#define com_sun_star_chart_XLegendEntry_idl
-
-#include <com/sun/star/uno/XInterface.idl>
-
-#include "com/sun/star/chart2/XTitle.idl"
-#include "com/sun/star/chart2/LegendSymbolStyle.idl"
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/** Object type for Legend.
-  */
-interface XLegendEntry : ::com::sun::star::uno::XInterface
-{
-    // no methods, currently only used for type safety
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
diff --git a/offapi/com/sun/star/chart2/XLegendSymbolProvider.idl b/offapi/com/sun/star/chart2/XLegendSymbolProvider.idl
deleted file mode 100644
index 56b2b082d317..000000000000
--- a/offapi/com/sun/star/chart2/XLegendSymbolProvider.idl
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef com_sun_star_chart_XLegendSymbolProvider_idl
-#define com_sun_star_chart_XLegendSymbolProvider_idl
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/drawing/XShape.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module chart2
-{
-
-/**
- */
-interface XLegendSymbolProvider : ::com::sun::star::uno::XInterface
-{
-    /** The returned shape is used for display in the legend.  It may
-        also be used for display at a data points.
-
-        <p>The shape returned here, will be resized using
-        <member scope="com::sun::star::drawing">XShape::setSize</member>
-        to fit the available space in the legend.</p>
-     */
-    com::sun::star::drawing::XShape getSymbol();
-};
-
-} ; // chart2
-} ; // com
-} ; // sun
-} ; // star
-
-#endif
diff --git a/offapi/com/sun/star/chart2/makefile.mk b/offapi/com/sun/star/chart2/makefile.mk
index 60cc8393e193..873bb985d566 100644
--- a/offapi/com/sun/star/chart2/makefile.mk
+++ b/offapi/com/sun/star/chart2/makefile.mk
@@ -48,9 +48,7 @@ IDLFILES= \
     FillBitmap.idl \
     IncrementData.idl \
     InterpretedData.idl \
-    LegendExpansion.idl \
     LegendPosition.idl \
-    LegendSymbolStyle.idl \
     LightSource.idl \
     PieChartOffsetMode.idl \
     RelativePosition.idl \
@@ -62,7 +60,6 @@ IDLFILES= \
     SymbolStyle.idl \
     TickmarkStyle.idl \
     TransparencyStyle.idl \
-    ViewLegendEntry.idl \
     XAnyDescriptionAccess.idl\
     XAxis.idl \
     XCoordinateSystem.idl \
@@ -86,8 +83,6 @@ IDLFILES= \
     XInternalDataProvider.idl \
     XLabeled.idl \
     XLegend.idl \
-    XLegendEntry.idl \
-    XLegendSymbolProvider.idl \
     XRegressionCurve.idl \
     XRegressionCurveCalculator.idl \
     XRegressionCurveContainer.idl \