Merge commit 'ooo/DEV300_m103'

Conflicts:
	sc/source/filter/starcalc/scflt.cxx
	sc/source/ui/unoobj/chart2uno.cxx

1 files changed, 0 insertions, 64 deletions

diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 83e7de7a8d1f..705a7c328c6e 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -236,70 +236,6 @@ private:
 };
 
 
-// LabeledDataSequence =======================================================
-
-class ScChart2LabeledDataSequence : public
-                ::cppu::WeakImplHelper4<
-                    ::com::sun::star::chart2::data::XLabeledDataSequence,
-                    ::com::sun::star::util::XCloneable,
-                    ::com::sun::star::util::XModifyBroadcaster,
-                    ::com::sun::star::lang::XServiceInfo >,
-                SfxListener
-{
-public:
-
-    explicit ScChart2LabeledDataSequence( ScDocument* pDoc );
-    virtual ~ScChart2LabeledDataSequence();
-
-    // SfxListener -----------------------------------------------------------
-
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
-    // XLabeledDataSequence --------------------------------------------------
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setValues(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setLabel(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XCloneable ------------------------------------------------------------
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XModifyBroadcaster ----------------------------------------------------
-
-    virtual void SAL_CALL addModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeModifyListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XServiceInfo ----------------------------------------------------------
-
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(
-            ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString&
-            rServiceName) throw( ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString> SAL_CALL
-        getSupportedServiceNames() throw(
-                ::com::sun::star::uno::RuntimeException);
-
-private:
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence >   m_aData;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::data::XDataSequence >   m_aLabel;
-    ScDocument*                                               m_pDocument;
-};
-
 // DataSequence ==============================================================
 
 class ScChart2DataSequence : public