chartmultiline: remove unsued concept 'UnusedData'

13 files changed, 23 insertions, 169 deletions

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 69e693911c22..d31f6e0b44ab 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -830,8 +830,6 @@ void DialogModel::applyInterpretedData(
 
         DialogModel::setCategories(rNewData.Categories);
     }
-
-    OSL_ASSERT( ! rNewData.UnusedData.hasElements());
 }
 
 sal_Int32 DialogModel::countSeries() const
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index c2f29e42c6ba..0e3ef93cb3fb 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -114,14 +114,12 @@ public:
         static ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XDataSource > getUsedData(
             const ::com::sun::star::uno::Reference<
-                ::com::sun::star::frame::XModel >& xChartModel,
-            bool bIncludeUnusedData = false );
+                ::com::sun::star::frame::XModel >& xChartModel );
 
         static ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XDataSource > getUsedData(
             const ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XChartDocument >& xChartDoc,
-            bool bIncludeUnusedData = false );
+                ::com::sun::star::chart2::XChartDocument >& xChartDoc );
 
         static bool detectRangeSegmentation(
             const ::com::sun::star::uno::Reference<
@@ -130,8 +128,7 @@ public:
             , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& rOutUseColumns
             , bool& rOutFirstCellAsLabel
-            , bool& rOutHasCategories
-            , bool bIncludeUnusedData = false );
+            , bool& rOutHasCategories );
 
         static void setRangeSegmentation(
             const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 69e58bad0128..1e784eda4635 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -139,11 +139,6 @@ protected:
     virtual void SAL_CALL setDefaultColorScheme(
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setUnusedData(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aUnusedData )
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getUnusedData()
-        throw (::com::sun::star::uno::RuntimeException);
 
 
     // ____ XCoordinateSystemContainer ____
@@ -240,11 +235,6 @@ private:
         ::com::sun::star::chart2::XColorScheme >
                         m_xColorScheme;
 
-    ::com::sun::star::uno::Sequence<
-            ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::data::XLabeledDataSequence > >
-                        m_aUnusedData;
-
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
 };
 
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 3e8c8ea9cd24..f66a93e3de58 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -373,18 +373,6 @@ void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorSch
     fireModifyEvent();
 }
 
-void SAL_CALL Diagram::setUnusedData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aUnusedData )
-    throw (uno::RuntimeException)
-{
-    m_aUnusedData = aUnusedData;
-}
-
-Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL Diagram::getUnusedData()
-    throw (uno::RuntimeException)
-{
-    return m_aUnusedData;
-}
-
 // ____ XTitled ____
 uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject()
     throw (uno::RuntimeException)
diff --git a/chart2/source/model/main/ImplChartModel.cxx b/chart2/source/model/main/ImplChartModel.cxx
index 87383dcf5817..5975f44bdce7 100644..100755
--- a/chart2/source/model/main/ImplChartModel.cxx
+++ b/chart2/source/model/main/ImplChartModel.cxx
@@ -283,27 +283,6 @@ Reference< chart2::data::XDataSource > SAL_CALL ImplChartModel::SetRangeRepresen
         ::rtl::OUString::createFromAscii("DataRowSource"), -1,
         uno::makeAny( ::com::sun::star::chart::ChartDataRowSource_COLUMNS ), beans::PropertyState_DIRECT_VALUE );
     return SetArguments( aArgs, bSetData );
-    /*
-    uno::Sequence< beans::PropertyValue > aArgs();
-
-    Reference< chart2::data::XDataProvider > xDataProvider( this->GetDataProvider() );
-    if( xDataProvider.is() )
-        aArgs = xDataProvider->detectArguments( DataSourceHelper::getUsedData( xChartModel ) ),
-
-    ::rtl::OUString aRangeString;
-    uno::Sequence< sal_Int32 > aSequenceMapping;
-    bool bUseColumns = true;
-    bool bFirstCellAsLabel = true;
-    bool bHasCategories = true;
-
-    DataSourceHelper::detectRangeSegmentation(
-        uno::Reference< frame::XModel >( m_xChartDoc, uno::UNO_QUERY ),
-        aRangeString, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories );
-
-    aArgs = createArguments( rRangeRepresentation, aSequenceMapping, bUseColumns, bFirstCellAsLabel, bHasCategories ) );
-
-    return SetArguments( aArgs, bSetData );
-    */
 }
 
 void ImplChartModel::SetChartTypeManager(
@@ -369,7 +348,7 @@ void ImplChartModel::CreateDefaultChart()
                 xLegendProperties->setPropertyValue( C2U( "LineColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xb3b3b3 ) ));  // gray30
                 xLegendProperties->setPropertyValue( C2U( "FillColor" ), uno::makeAny( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10
 
-                if( bIsRTL )

+                if( bIsRTL )
                     xLegendProperties->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny( chart2::LegendPosition_LINE_START ));
             }
             if(xDiagram.is())
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index a5ebb6b1ec2f..c10943c58e9f 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -81,8 +81,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
     Reference< data::XLabeledDataSequence > xCategories;
     bool bHasCategories = HasCategories( aArguments, aData );
 
-    Sequence< Reference< data::XLabeledDataSequence > > aUnusedData;
-
     bool bHasXValues = false;
     sal_Int32 nDataSeqCount = aData.getLength();
 
@@ -173,7 +171,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource(
 
     Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
     aSeries[0] = ContainerHelper::ContainerToSequence( aSeriesVec );
-    return InterpretedData( aSeries, xCategories, aUnusedData );
+    return InterpretedData( aSeries, xCategories );
 }
 
 chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
@@ -181,8 +179,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
     throw (uno::RuntimeException)
 {
     InterpretedData aResult( aInterpretedData );
-    vector< Reference< data::XLabeledDataSequence > > aUnused(
-        ContainerHelper::SequenceToVector( aInterpretedData.UnusedData ));
 
     sal_Int32 i=0;
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
@@ -269,17 +265,15 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries(
             Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences());
             if( aSeqs.getLength() != aNewSequences.getLength() )
             {
+#if OSL_DEBUG_LEVEL > 1
                 sal_Int32 j=0;
                 for( ; j<aSeqs.getLength(); ++j )
                 {
-                    if( aSeqs[j] != xValuesY &&
-                        aSeqs[j] != xValuesX &&
-                        aSeqs[j] != xValuesSize )
-                        aUnused.push_back( aSeqs[j] );
+                    OSL_ENSURE( aSeqs[j] == xValuesY || aSeqs[j] == xValuesX || aSeqs[j] == xValuesSize, "All sequences should be used" );
                 }
+#endif
                 Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW );
                 xSink->setData( aNewSequences );
-                aResult.UnusedData = ContainerHelper::ContainerToSequence( aUnused );
             }
         }
         catch( uno::Exception & ex )
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1996cc12830e..b735b8a90bc4 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -220,10 +220,8 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
         chart2::InterpretedData aData;
         aData.Series = aSeriesSeq;
         aData.Categories = DiagramHelper::getCategoriesFromDiagram( xDiagram );
-        aData.UnusedData = xDiagram->getUnusedData();
 
-        if( (aData.UnusedData.getLength() == 0) &&
-            xInterpreter->isDataCompatible( aData ))
+        if( xInterpreter->isDataCompatible( aData ) )
         {
             aData = xInterpreter->reinterpretDataSeries( aData );
         }
@@ -241,32 +239,9 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >
                 aParam[0] = beans::PropertyValue( C2U("HasCategories"), -1, uno::makeAny( true ),
                                                   beans::PropertyState_DIRECT_VALUE );
             }
-            else if( aData.UnusedData.getLength())
-            {
-                for( sal_Int32 i=0; i<aData.UnusedData.getLength(); ++i )
-                    try
-                    {
-                        Reference< beans::XPropertySet > xProp( aData.UnusedData[i]->getValues(), uno::UNO_QUERY_THROW );
-                        OUString aRole;
-                        if( (xProp->getPropertyValue(C2U("Role")) >>= aRole) &
-                            aRole.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("categories")) )
-                        {
-                            aData.Categories = aData.UnusedData[i];
-                            for( ++i; i<aData.UnusedData.getLength(); ++i  )
-                                aData.UnusedData[i-1] = aData.UnusedData[i];
-                            aData.UnusedData.realloc( aData.UnusedData.getLength() - 1 );
-                            break;
-                        }
-                    }
-                    catch( const uno::Exception & ex )
-                    {
-                        ASSERT_EXCEPTION( ex );
-                    }
-            }
             aData = xInterpreter->interpretDataSource( xSource, aParam, aFlatSeriesSeq );
         }
         aSeriesSeq = aData.Series;
-        xDiagram->setUnusedData( aData.UnusedData );
 
         sal_Int32 i, j, nIndex = 0;
         for( i=0; i<aSeriesSeq.getLength(); ++i )
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 8073b7af04ef..42cce33714be 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -152,7 +152,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
 
     Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
     aSeries[0] = ContainerToSequence( aSeriesVec );
-    return InterpretedData( aSeries, xCategories, Sequence< Reference< data::XLabeledDataSequence > >() );
+    return InterpretedData( aSeries, xCategories );
 }
 
 InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
@@ -160,8 +160,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
     throw (uno::RuntimeException)
 {
     InterpretedData aResult( aInterpretedData );
-    vector< Reference< data::XLabeledDataSequence > > aUnused(
-        SequenceToVector( aInterpretedData.UnusedData ));
 
     sal_Int32 i=0;
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
@@ -193,14 +191,14 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
             Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences());
             if( aSeqs.getLength() != aNewSequences.getLength() )
             {
+#if OSL_DEBUG_LEVEL > 1
                 sal_Int32 j=0;
                 for( ; j<aSeqs.getLength(); ++j )
                 {
-                    if( aSeqs[j] != xValuesY )
-                        aUnused.push_back( aSeqs[j] );
+                    OSL_ENSURE( aSeqs[j] == xValuesY, "All sequences should be used" );
                 }
+#endif
                 Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW );
-
                 xSink->setData( aNewSequences );
             }
         }
@@ -210,8 +208,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries(
         }
     }
 
-    aResult.UnusedData = ContainerToSequence( aUnused );
-
     return aResult;
 }
 
@@ -297,34 +293,13 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
     throw (uno::RuntimeException)
 {
     vector< Reference< data::XLabeledDataSequence > > aResultVec;
-    vector< Reference< data::XLabeledDataSequence > > aUnusedDataVec;
     aResultVec.reserve( aInterpretedData.Series.getLength() +
-                        aInterpretedData.UnusedData.getLength() +
                         1 // categories
         );
 
     if( aInterpretedData.Categories.is())
         aResultVec.push_back( aInterpretedData.Categories );
 
-    // add unused data that has the Role categories at front
-    if( aInterpretedData.UnusedData.getLength())
-    {
-        sal_Int32 nSize = aInterpretedData.UnusedData.getLength();
-        for( sal_Int32 i=0; i<nSize; ++i )
-        {
-            Reference< data::XLabeledDataSequence > xPotentialCategories( aInterpretedData.UnusedData[i]  );
-            if( xPotentialCategories.is() )
-            {
-                if( GetRole( xPotentialCategories->getValues()).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("categories")))
-                    aResultVec.push_back( xPotentialCategories );
-                else
-                    aUnusedDataVec.push_back( xPotentialCategories );
-            }
-        }
-    }
-    else
-        aUnusedDataVec = SequenceToVector( aInterpretedData.UnusedData );
-
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
     for( sal_Int32 nSeriesIdx=0; nSeriesIdx<aSeries.getLength(); ++nSeriesIdx )
     {
@@ -352,9 +327,6 @@ Reference< data::XDataSource > SAL_CALL DataInterpreter::mergeInterpretedData(
         }
     }
 
-    // add unused data at end
-    copy( aUnusedDataVec.begin(), aUnusedDataVec.end(), back_inserter( aResultVec ));
-
     return Reference< data::XDataSource >( DataSourceHelper::createDataSource( ContainerToSequence( aResultVec ) ) );
 }
 
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index b3e1ea78768e..80fc55eb27f9 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -271,8 +271,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource(
         }
     }
 
-    const Sequence< Reference< data::XLabeledDataSequence > > aUnusedData;//@todo remove the unused data concept completely
-    return InterpretedData( aResultSeries, xCategories, aUnusedData );
+    return InterpretedData( aResultSeries, xCategories );
 }
 
 // criterion: there must be two groups for stock-charts with volume and all
@@ -305,7 +304,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible(
         if( ! DataInterpreter::isDataCompatible(
                 InterpretedData( Sequence< Sequence< Reference< XDataSeries > > >(
                                      aInterpretedData.Series.getConstArray(), 1 ),
-                                 aInterpretedData.Categories, aInterpretedData.UnusedData )))
+                                 aInterpretedData.Categories )))
             return sal_False;
     }
 
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 74d8da6b13bd..7ce92d4e6af2 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -82,8 +82,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
     bool bHasCategories = HasCategories( aArguments, aData );
 
     // parse data
-    Sequence< Reference< data::XLabeledDataSequence > > aUnusedData;
-
     bool bCategoriesUsed = false;
     for( sal_Int32 nDataIdx= 0; nDataIdx < aData.getLength(); ++nDataIdx )
     {
@@ -160,7 +158,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource(
 
     Sequence< Sequence< Reference< XDataSeries > > > aSeries(1);
     aSeries[0] = ContainerHelper::ContainerToSequence( aSeriesVec );
-    return InterpretedData( aSeries, xCategories, aUnusedData );
+    return InterpretedData( aSeries, xCategories );
 }
 
 chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
@@ -168,8 +166,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
     throw (uno::RuntimeException)
 {
     InterpretedData aResult( aInterpretedData );
-    vector< Reference< data::XLabeledDataSequence > > aUnused(
-        ContainerHelper::SequenceToVector( aInterpretedData.UnusedData ));
 
     sal_Int32 i=0;
     Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series ));
@@ -233,16 +229,15 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries(
             Sequence< Reference< data::XLabeledDataSequence > > aSeqs( xSeriesSource->getDataSequences());
             if( aSeqs.getLength() != aNewSequences.getLength() )
             {
+#if OSL_DEBUG_LEVEL > 1
                 sal_Int32 j=0;
                 for( ; j<aSeqs.getLength(); ++j )
                 {
-                    if( aSeqs[j] != xValuesY &&
-                        aSeqs[j] != xValuesX )
-                        aUnused.push_back( aSeqs[j] );
+                    OSL_ENSURE( aSeqs[j] == xValuesY || aSeqs[j] == xValuesX, "All sequences should be used" );
                 }
+#endif
                 Reference< data::XDataSink > xSink( xSeriesSource, uno::UNO_QUERY_THROW );
                 xSink->setData( aNewSequences );
-                aResult.UnusedData = ContainerHelper::ContainerToSequence( aUnused );
             }
         }
         catch( uno::Exception & ex )
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 37c3a609ac9f..13765f60ed20 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -301,18 +301,13 @@ uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( const uno:
 }
 
 uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
-    const uno::Reference< chart2::XChartDocument >& xChartDoc,
-    bool bIncludeUnusedData /* = false */ )
+    const uno::Reference< chart2::XChartDocument >& xChartDoc )
 {
-    if( bIncludeUnusedData )
-        return getUsedData( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ), bIncludeUnusedData );
-    else
-         return pressUsedDataIntoRectangularFormat( xChartDoc );
+    return pressUsedDataIntoRectangularFormat( xChartDoc );
 }
 
 uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
-    const uno::Reference< frame::XModel >& xChartModel,
-    bool bIncludeUnusedData /* = false */ )
+    const uno::Reference< frame::XModel >& xChartModel )
 {
     ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
 
@@ -333,14 +328,6 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
                      ::std::back_inserter( aResult ));
     }
 
-    if( bIncludeUnusedData && xDiagram.is())
-    {
-        uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aUnusedData( xDiagram->getUnusedData());
-        ::std::copy( aUnusedData.getConstArray(),
-                     aUnusedData.getConstArray() + aUnusedData.getLength(),
-                     ::std::back_inserter( aResult ));
-    }
-
     return uno::Reference< chart2::data::XDataSource >(
         new DataSource( ContainerHelper::ContainerToSequence( aResult )));
 }
@@ -352,8 +339,7 @@ bool DataSourceHelper::detectRangeSegmentation(
     , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
     , bool& rOutUseColumns
     , bool& rOutFirstCellAsLabel
-    , bool& rOutHasCategories
-    , bool bIncludeUnusedData /* = false */)
+    , bool& rOutHasCategories )
 {
     bool bSomethingDetected = false;
 
@@ -364,9 +350,6 @@ bool DataSourceHelper::detectRangeSegmentation(
     if( !xDataProvider.is() )
         return bSomethingDetected;
 
-    OSL_ASSERT( !bIncludeUnusedData ); //bIncludeUnusedData is not supported currently
-    (void)(bIncludeUnusedData); // avoid warning in non-debug build
-
     try
     {
         DataSourceHelper::readArguments(
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index fbc8042af27b..448145351790 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1004,17 +1004,6 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategories(
                 aRet = DataSequenceToStringSequence(xCategories->getValues());
             if( !aRet.getLength() )
             {
-                /*
-                //unused ranges are very problematic as they bear the risk to damage the rectangular structure completly
-                if( bUseUnusedDataAlso )
-                {
-                    Sequence< Reference< chart2::data::XLabeledDataSequence > > aUnusedSequences( xDia->getUnusedData() );
-                    ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aUnusedCategoryVector(
-                        DataSeriesHelper::getAllDataSequencesByRole( aUnusedSequences, C2U("categories") ) );
-                    if( aUnusedCategoryVector.size() && aUnusedCategoryVector[0].is() )
-                        aRet = DataSequenceToStringSequence(aUnusedCategoryVector[0]->getValues());
-                }
-                */
                 if( !aRet.getLength() )
                 {
                     Reference< XCoordinateSystemContainer > xCooSysCnt( xDia, uno::UNO_QUERY );
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 4d8f7be112ff..0e62b67d66b0 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -833,11 +833,6 @@ InternalDataProvider::InternalDataProvider(
             ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc ));
             ::std::for_each( aSeriesVector.begin(), aSeriesVector.end(),
                              lcl_internalizeSeries( rData, *this ));
-
-            // unused data
-            Sequence< Reference< chart2::data::XLabeledDataSequence > > aUnusedData( xDiagram->getUnusedData());
-            aUnusedData = lcl_internalizeData( aUnusedData, rData, *this );
-            xDiagram->setUnusedData( aUnusedData );
         }
     }
     catch( const uno::Exception & ex )