chartmultiline: #i82971# complex categories (part3 - complex categories for internal data + load/save + copy/paste) + cleanup

13 files changed, 492 insertions, 518 deletions

diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 6c2966d811df..1cabc1a2dc24 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -41,7 +41,6 @@ namespace com { namespace sun { namespace star {
     namespace chart {
         class XDiagram;
         class XChartDocument;
-        class XChartDataArray;
         struct ChartSeriesAddress;
     }
     namespace drawing {
diff --git a/xmloff/inc/xmloff/SchXMLExportHelper.hxx b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
index 63f37a584c90..b2914832d4a7 100644
--- a/xmloff/inc/xmloff/SchXMLExportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLExportHelper.hxx
@@ -47,7 +47,6 @@ namespace com { namespace sun { namespace star {
     namespace chart {
         class XDiagram;
         class XChartDocument;
-        class XChartDataArray;
         struct ChartSeriesAddress;
     }
     namespace chart2 {
@@ -183,8 +182,6 @@ private:
     SAL_DLLPRIVATE void addSize( com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xShape );
     /// fills the member msString with the appropriate String (i.e. "A3")
     SAL_DLLPRIVATE void getCellAddress( sal_Int32 nCol, sal_Int32 nRow );
-    /// interchanges rows and columns of the sequence given
-    SAL_DLLPRIVATE void swapDataArray( com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< double > >& rSequence );
     /// exports a string as a paragraph element
     SAL_DLLPRIVATE void exportText( const ::rtl::OUString& rText, bool bConvertTabsLFs = false );
     SAL_DLLPRIVATE void exportErrorBarRanges();
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index d62368739c8a..f47c946eb809 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -139,10 +139,6 @@ public:
 
     static sal_uInt16 GetChartFamilyID() { return XML_STYLE_FAMILY_SCH_CHART_ID; }
 
-    sal_Int32   GetNumberOfSeries();
-    sal_Int32   GetLengthOfSeries();
-    void        ResizeChartData( sal_Int32 nSeries, sal_Int32 nDataPoints = -1 );
-
     /** @param bPushLastChartType If </FALSE>, in case a new chart type has to
                be added (because it does not exist yet), it is appended at the
                end of the chart-type container.  When </TRUE>, a new chart type
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index 1f854469b4be..7b625679d383 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
@@ -877,6 +876,9 @@ void SchXMLChartContext::EndElement()
     {
         //own data or only rectangular range available
 
+        if( xNewDoc->hasInternalDataProvider() )
+            SchXMLTableHelper::applyTableToInternalDataProvider( maTable, xNewDoc );
+
         bool bOlderThan2_3 = SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( Reference< frame::XModel >( xNewDoc, uno::UNO_QUERY ));
         bool bOldFileWithOwnDataFromRows = (bOlderThan2_3 && bHasOwnData && (meDataRowSource==chart::ChartDataRowSource_ROWS)); // in this case there are range addresses that are simply wrong.
 
@@ -885,21 +887,12 @@ void SchXMLChartContext::EndElement()
         {
             //bHasOwnData is true in this case!
             //e.g. for normal files with own data or also in case of copy paste scenario (e.g. calc to impress)
-            if( xNewDoc->hasInternalDataProvider() )
-                SchXMLTableHelper::applyTableToInternalDataProvider( maTable, xNewDoc );
             bSwitchRangesFromOuterToInternalIfNecessary = true;
         }
         else
         {
             //apply data from rectangular range
 
-            // apply data read from the table sub-element to the chart
-            // if the data provider supports the XChartDataArray interface like
-            // the internal data provider
-            uno::Reference< chart::XChartDataArray > xChartData( xNewDoc->getDataProvider(), uno::UNO_QUERY );
-            if( xChartData.is())
-                SchXMLTableHelper::applyTableSimple( maTable, xChartData );
-
             // create datasource from data provider with rectangular range
             // parameters and change the diagram via template mechanism
             try
@@ -922,9 +915,7 @@ void SchXMLChartContext::EndElement()
                     if( !xNewDoc->hasInternalDataProvider() )
                     {
                         xNewDoc->createInternalDataProvider( sal_False /* bCloneExistingData */ );
-                        xChartData = uno::Reference< chart::XChartDataArray >( xNewDoc->getDataProvider(), uno::UNO_QUERY );
-                        if( xChartData.is())
-                            SchXMLTableHelper::applyTableSimple( maTable, xChartData );
+                        SchXMLTableHelper::applyTableToInternalDataProvider( maTable, xNewDoc );
                         try
                         {
                             lcl_ApplyDataFromRectangularRangeToDiagram( xNewDoc, msChartAddress, meDataRowSource, mbRowHasLabels, mbColHasLabels, bHasOwnData, msColTrans, msRowTrans );
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 78cc6ef8e94d..b62d3c6df56e 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -74,7 +74,7 @@
 #include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
 #include <com/sun/star/chart/XTwoAxisYSupplier.hpp>
 #include <com/sun/star/chart/XAxisZSupplier.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
+#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart/ChartAxisAssign.hpp>
 #include <com/sun/star/chart/ChartSeriesAddress.hpp>
@@ -119,6 +119,7 @@ using ::rtl::OUStringToOString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
+using ::std::vector;
 
 namespace
 {
@@ -463,12 +464,6 @@ sal_Int32 lcl_getMaxSequenceLength(
     for( SchXMLExportHelper::tDataSequenceCont::const_iterator aIt( rContainer.begin());
          aIt != rContainer.end(); ++aIt )
     {
-        if( aIt->first.is())
-        {
-            sal_Int32 nSeqLength = aIt->first->getData().getLength();
-            if( nSeqLength > nResult )
-                nResult = nSeqLength;
-        }
         if( aIt->second.is())
         {
             sal_Int32 nSeqLength = aIt->second->getData().getLength();
@@ -547,17 +542,23 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque
     return false;
 }
 
+typedef vector< OUString > tStringVector;
+typedef vector< vector< OUString > > t2DStringVector;
+typedef vector< vector< double > > t2DNumberContainer;
+
 struct lcl_TableData
 {
-    typedef ::std::vector< OUString > tStringContainer;
-    typedef ::std::vector< ::std::vector< double > > tTwoDimNumberContainer;
+    t2DNumberContainer  aDataInRows;
+    tStringVector       aDataRangeRepresentations;
 
-    tTwoDimNumberContainer aDataInRows;
-    tStringContainer       aDataRangeRepresentations;
-    tStringContainer       aFirstRowStrings;
-    tStringContainer       aFirstRowRangeRepresentations;
-    tStringContainer       aFirstColumnStrings;
-    tStringContainer       aFirstColumnRangeRepresentations;
+    tStringVector       aColumnDescriptions;
+    tStringVector       aColumnDescriptions_Ranges;
+
+    tStringVector       aRowDescriptions;
+    tStringVector       aRowDescriptions_Ranges;
+
+    Sequence< Sequence< OUString > >    aComplexColumnDescriptions;//outer index is columns - inner index is level
+    Sequence< Sequence< OUString > >    aComplexRowDescriptions;//outer index is rows - inner index is level
 
     ::std::vector< sal_Int32 > aHiddenColumns;
 };
@@ -623,97 +624,113 @@ void lcl_ReorderInternalSequencesAccordingToTheirRangeName(
 
 
 lcl_TableData lcl_getDataForLocalTable(
-    const SchXMLExportHelper::tDataSequenceCont & aPassedSequences,
-    const Sequence< OUString >& rInputCategories,
+    const SchXMLExportHelper::tDataSequenceCont & aSequencesToExport,
+    const Reference< chart::XComplexDescriptionAccess >& xComplexDescriptionAccess,
     const OUString& rCategoriesRange,
-    bool bSwap,
-    bool bHasOwnData,
+    bool bSeriesFromColumns,
     const Reference< chart2::data::XRangeXMLConversion > & xRangeConversion )
 {
     lcl_TableData aResult;
 
-    SchXMLExportHelper::tDataSequenceCont aSequencesToExport( aPassedSequences );
-    if( bHasOwnData )
-        lcl_ReorderInternalSequencesAccordingToTheirRangeName( aSequencesToExport );
+    try
+    {
+        Sequence< OUString > aSimpleCategories;
+        if( xComplexDescriptionAccess.is() )
+        {
+            if( bSeriesFromColumns )
+                aSimpleCategories = xComplexDescriptionAccess->getRowDescriptions();
+            else
+                aSimpleCategories = xComplexDescriptionAccess->getColumnDescriptions();
 
-    SchXMLExportHelper::tDataSequenceCont::size_type nNumSequences = aSequencesToExport.size();
-    SchXMLExportHelper::tDataSequenceCont::const_iterator aBegin( aSequencesToExport.begin());
-    SchXMLExportHelper::tDataSequenceCont::const_iterator aEnd( aSequencesToExport.end());
-    SchXMLExportHelper::tDataSequenceCont::const_iterator aIt( aBegin );
+            aResult.aComplexColumnDescriptions = xComplexDescriptionAccess->getComplexColumnDescriptions();
+            aResult.aComplexRowDescriptions = xComplexDescriptionAccess->getComplexRowDescriptions();
+        }
 
-    size_t nMaxSequenceLength( lcl_getMaxSequenceLength( aSequencesToExport ));
-    nMaxSequenceLength = std::max( nMaxSequenceLength, size_t( rInputCategories.getLength() ) );
-    size_t nNumColumns( bSwap ? nMaxSequenceLength : nNumSequences );
-    size_t nNumRows( bSwap ? nNumSequences : nMaxSequenceLength );
+        SchXMLExportHelper::tDataSequenceCont::size_type nNumSequences = aSequencesToExport.size();
+        SchXMLExportHelper::tDataSequenceCont::const_iterator aBegin( aSequencesToExport.begin());
+        SchXMLExportHelper::tDataSequenceCont::const_iterator aEnd( aSequencesToExport.end());
+        SchXMLExportHelper::tDataSequenceCont::const_iterator aIt( aBegin );
 
-    // resize data
-    aResult.aDataInRows.resize( nNumRows );
-    double fNan = 0.0;
-    ::rtl::math::setNan( &fNan );
-    ::std::for_each( aResult.aDataInRows.begin(), aResult.aDataInRows.end(),
-                     lcl_resize< lcl_TableData::tTwoDimNumberContainer::value_type >( nNumColumns, fNan ));
-    aResult.aFirstRowStrings.resize( nNumColumns );
-    aResult.aFirstColumnStrings.resize( nNumRows );
-
-    lcl_TableData::tStringContainer & rCategories =
-        (bSwap ? aResult.aFirstRowStrings : aResult.aFirstColumnStrings );
-    lcl_TableData::tStringContainer & rLabels =
-        (bSwap ? aResult.aFirstColumnStrings : aResult.aFirstRowStrings );
-
-    //categories
-    lcl_SequenceToVector( rInputCategories, rCategories );
-    if(rCategoriesRange.getLength())
-    {
-        OUString aRange(rCategoriesRange);
-        if( xRangeConversion.is())
-            aRange = xRangeConversion->convertRangeToXML( aRange );
-        if( bSwap )
-            aResult.aFirstRowRangeRepresentations.push_back( aRange );
-        else
-            aResult.aFirstColumnRangeRepresentations.push_back( aRange );
-    }
+        size_t nMaxSequenceLength( lcl_getMaxSequenceLength( aSequencesToExport ));
+        nMaxSequenceLength = std::max( nMaxSequenceLength, size_t( aSimpleCategories.getLength() ) );
+        size_t nNumColumns( bSeriesFromColumns ? nNumSequences : nMaxSequenceLength );
+        size_t nNumRows( bSeriesFromColumns ? nMaxSequenceLength : nNumSequences );
 
-    // iterate over all sequences
-    size_t nSeqIdx = 0;
-    for( ; aIt != aEnd; ++aIt, ++nSeqIdx )
-    {
-        OUString aRange;
-        if( aIt->first.is())
+        // resize data
+        aResult.aDataInRows.resize( nNumRows );
+        double fNan = 0.0;
+        ::rtl::math::setNan( &fNan );
+        ::std::for_each( aResult.aDataInRows.begin(), aResult.aDataInRows.end(),
+                         lcl_resize< t2DNumberContainer::value_type >( nNumColumns, fNan ));
+        aResult.aColumnDescriptions.resize( nNumColumns );
+        aResult.aComplexColumnDescriptions.realloc( nNumColumns );
+        aResult.aRowDescriptions.resize( nNumRows );
+        aResult.aComplexRowDescriptions.realloc( nNumRows );
+
+        tStringVector& rCategories = bSeriesFromColumns ? aResult.aRowDescriptions    : aResult.aColumnDescriptions;
+        tStringVector& rLabels     = bSeriesFromColumns ? aResult.aColumnDescriptions : aResult.aRowDescriptions;
+
+        //categories
+        lcl_SequenceToVector( aSimpleCategories, rCategories );
+        if( rCategoriesRange.getLength() )
         {
-            rLabels[nSeqIdx] = lcl_getLabelString( aIt->first );
-            aRange = aIt->first->getSourceRangeRepresentation();
+            OUString aRange(rCategoriesRange);
             if( xRangeConversion.is())
                 aRange = xRangeConversion->convertRangeToXML( aRange );
+            if( bSeriesFromColumns )
+                aResult.aRowDescriptions_Ranges.push_back( aRange );
+            else
+                aResult.aColumnDescriptions_Ranges.push_back( aRange );
         }
-        else if( aIt->second.is())
-            rLabels[nSeqIdx] = lcl_flattenStringSequence(
-                aIt->second->generateLabel( chart2::data::LabelOrigin_SHORT_SIDE ));
-        if( bSwap )
-            aResult.aFirstColumnRangeRepresentations.push_back( aRange );
-        else
-            aResult.aFirstRowRangeRepresentations.push_back( aRange );
 
-        ::std::vector< double > aNumbers( lcl_getAllValuesFromSequence( aIt->second ));
-        if( bSwap )
-            aResult.aDataInRows[nSeqIdx] = aNumbers;
-        else
+        // iterate over all sequences
+        size_t nSeqIdx = 0;
+        for( ; aIt != aEnd; ++aIt, ++nSeqIdx )
         {
-            const sal_Int32 nSize( static_cast< sal_Int32 >( aNumbers.size()));
-            for( sal_Int32 nIdx=0; nIdx<nSize; ++nIdx )
-                aResult.aDataInRows[nIdx][nSeqIdx] = aNumbers[nIdx];
-        }
+            OUString aRange;
+            if( aIt->first.is())
+            {
+                rLabels[nSeqIdx] = lcl_getLabelString( aIt->first );
+                aRange = aIt->first->getSourceRangeRepresentation();
+                if( xRangeConversion.is())
+                    aRange = xRangeConversion->convertRangeToXML( aRange );
+            }
+            else if( aIt->second.is())
+                rLabels[nSeqIdx] = lcl_flattenStringSequence(
+                    aIt->second->generateLabel( chart2::data::LabelOrigin_SHORT_SIDE ));
+            if( bSeriesFromColumns )
+                aResult.aColumnDescriptions_Ranges.push_back( aRange );
+            else
+                aResult.aRowDescriptions_Ranges.push_back( aRange );
 
-        if( aIt->second.is())
-        {
-            aRange =  aIt->second->getSourceRangeRepresentation();
-            if( xRangeConversion.is())
-                aRange = xRangeConversion->convertRangeToXML( aRange );
-        }
-        aResult.aDataRangeRepresentations.push_back( aRange );
+            ::std::vector< double > aNumbers( lcl_getAllValuesFromSequence( aIt->second ));
+            if( bSeriesFromColumns )
+            {
+                const sal_Int32 nSize( static_cast< sal_Int32 >( aNumbers.size()));
+                for( sal_Int32 nIdx=0; nIdx<nSize; ++nIdx )
+                    aResult.aDataInRows[nIdx][nSeqIdx] = aNumbers[nIdx];
+            }
+            else
+                aResult.aDataInRows[nSeqIdx] = aNumbers;
 
-        //is column hidden?
-        if( !lcl_SequenceHasUnhiddenData(aIt->first) && !lcl_SequenceHasUnhiddenData(aIt->second) )
-            aResult.aHiddenColumns.push_back(nSeqIdx);
+            if( aIt->second.is())
+            {
+                aRange =  aIt->second->getSourceRangeRepresentation();
+                if( xRangeConversion.is())
+                    aRange = xRangeConversion->convertRangeToXML( aRange );
+            }
+            aResult.aDataRangeRepresentations.push_back( aRange );
+
+            //is column hidden?
+            if( !lcl_SequenceHasUnhiddenData(aIt->first) && !lcl_SequenceHasUnhiddenData(aIt->second) )
+                aResult.aHiddenColumns.push_back(nSeqIdx);
+        }
+    }
+    catch( uno::Exception & rEx )
+    {
+        (void)rEx; // avoid warning for pro build
+        OSL_TRACE( OUStringToOString( OUString( RTL_CONSTASCII_USTRINGPARAM(
+                    "something went wrong during table data collection: " )) + rEx.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
     }
 
     return aResult;
@@ -1394,6 +1411,19 @@ void SchXMLExportHelper::parseDocument( Reference< chart::XChartDocument >& rCha
         delete pElChart;
 }
 
+void lcl_exportComplexLabel( const Sequence< OUString >& rComplexLabel, SvXMLExport& rExport )
+{
+    sal_Int32 nLength = rComplexLabel.getLength();
+    if( nLength<=1 )
+        return;
+    SvXMLElementExport aTextList( rExport, XML_NAMESPACE_TEXT, XML_LIST, sal_True, sal_True );
+    for(sal_Int32 nN=0; nN<nLength; nN++)
+    {
+        SvXMLElementExport aListItem( rExport, XML_NAMESPACE_TEXT, XML_LIST_ITEM, sal_True, sal_True );
+        SchXMLTools::exportText( rExport, rComplexLabel[nN], false /*bConvertTabsLFs*/ );
+    }
+}
+
 void SchXMLExportHelper::exportTable()
 {
     // table element
@@ -1410,30 +1440,24 @@ void SchXMLExportHelper::exportTable()
         xRangeConversion.set( xNewDoc->getDataProvider(), uno::UNO_QUERY );
     }
 
-    Sequence< OUString > aCategories;
-    if(mbHasCategoryLabels)
+    Reference< chart::XComplexDescriptionAccess > xComplexDescriptionAccess;
     {
-        //ensure correct strings even for complex hierarchical categories
         Reference< chart::XChartDocument > xChartDoc( mrExport.GetModel(), uno::UNO_QUERY );
         if( xChartDoc.is() )
-        {
-            Reference< chart::XChartDataArray > xData( xChartDoc->getData(), uno::UNO_QUERY );
-            if(xData.is())
-            {
-                if( mbRowSourceColumns )
-                    aCategories = xData->getRowDescriptions();
-                else
-                    aCategories = xData->getColumnDescriptions();
-            }
-        }
+            xComplexDescriptionAccess = Reference< chart::XComplexDescriptionAccess >( xChartDoc->getData(), uno::UNO_QUERY );
     }
-    lcl_TableData aData( lcl_getDataForLocalTable(
-                             m_aDataSequencesToExport, aCategories, maCategoriesRange, !mbRowSourceColumns, bHasOwnData, xRangeConversion ));
 
-    lcl_TableData::tStringContainer::const_iterator aDataRangeIter( aData.aDataRangeRepresentations.begin());
-    const lcl_TableData::tStringContainer::const_iterator aDataRangeEndIter( aData.aDataRangeRepresentations.end());
-    lcl_TableData::tStringContainer::const_iterator aFirstColumnRangeIter( aData.aFirstColumnRangeRepresentations.begin());
-    const lcl_TableData::tStringContainer::const_iterator aFirstColumnRangeEndIter( aData.aFirstColumnRangeRepresentations.end());
+    if( bHasOwnData )
+        lcl_ReorderInternalSequencesAccordingToTheirRangeName( m_aDataSequencesToExport );
+    lcl_TableData aData( lcl_getDataForLocalTable( m_aDataSequencesToExport
+                                , xComplexDescriptionAccess, maCategoriesRange
+                                , mbRowSourceColumns, xRangeConversion ));
+
+    tStringVector::const_iterator aDataRangeIter( aData.aDataRangeRepresentations.begin());
+    const tStringVector::const_iterator aDataRangeEndIter( aData.aDataRangeRepresentations.end());
+
+    tStringVector::const_iterator aRowDescriptions_RangeIter( aData.aRowDescriptions_Ranges.begin());
+    const tStringVector::const_iterator aRowDescriptions_RangeEnd( aData.aRowDescriptions_Ranges.end());
 
     // declare columns
     {
@@ -1461,7 +1485,7 @@ void SchXMLExportHelper::exportTable()
             nNextIndex = nHiddenIndex+1;
         }
 
-        sal_Int32 nEndIndex = aData.aFirstRowStrings.size()-1;
+        sal_Int32 nEndIndex = aData.aColumnDescriptions.size()-1;
         if( nEndIndex >= nNextIndex )
         {
             sal_Int64 nRepeat = static_cast< sal_Int64 >( nEndIndex - nNextIndex + 1 );
@@ -1473,59 +1497,78 @@ void SchXMLExportHelper::exportTable()
     }
 
     // export rows with content
+    //export header row
     {
         SvXMLElementExport aHeaderRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, sal_True, sal_True );
         SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
+
+        //first one empty cell for the row descriptions
         {
             SvXMLElementExport aEmptyCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
             SvXMLElementExport aEmptyParagraph( mrExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_True );
         }
 
-        lcl_TableData::tStringContainer::const_iterator aFirstRowRangeIter( aData.aFirstRowRangeRepresentations.begin());
-        const lcl_TableData::tStringContainer::const_iterator aFirstRowRangeEndIter( aData.aFirstRowRangeRepresentations.end());
-        for( lcl_TableData::tStringContainer::const_iterator aIt( aData.aFirstRowStrings.begin());
-             aIt != aData.aFirstRowStrings.end(); ++aIt )
+        //export column descriptions
+        tStringVector::const_iterator aColumnDescriptions_RangeIter( aData.aColumnDescriptions_Ranges.begin());
+        const tStringVector::const_iterator aColumnDescriptions_RangeEnd( aData.aColumnDescriptions_Ranges.end());
+        const Sequence< Sequence< OUString > >& rComplexColumnDescriptions = aData.aComplexColumnDescriptions;
+        sal_Int32 nComplexCount = rComplexColumnDescriptions.getLength();
+        sal_Int32 nC = 0;
+        for( tStringVector::const_iterator aIt( aData.aColumnDescriptions.begin());
+             aIt != aData.aColumnDescriptions.end(); ++aIt )
         {
             mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
             SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
             // write the original range name as id into the local table
             // to allow a correct re-association when copying via clipboard
-            if( !bHasOwnData && aFirstRowRangeIter != aFirstRowRangeEndIter )
+            if( !bHasOwnData && aColumnDescriptions_RangeIter != aColumnDescriptions_RangeEnd )
             {
-                if( (*aFirstRowRangeIter).getLength())
-                    mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aFirstRowRangeIter );
-                ++aFirstRowRangeIter;
+                if( (*aColumnDescriptions_RangeIter).getLength())
+                    mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aColumnDescriptions_RangeIter );
+                ++aColumnDescriptions_RangeIter;
             }
             exportText( *aIt );
+            if( nC < nComplexCount )
+                lcl_exportComplexLabel( rComplexColumnDescriptions[nC++], mrExport );
         }
-        OSL_ASSERT( bHasOwnData || aFirstRowRangeIter == aFirstRowRangeEndIter );
+        OSL_ASSERT( bHasOwnData || aColumnDescriptions_RangeIter == aColumnDescriptions_RangeEnd );
     } // closing row and header-rows elements
 
-    // value rows
+    // export value rows
     {
         SvXMLElementExport aRows( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROWS, sal_True, sal_True );
-        lcl_TableData::tStringContainer::const_iterator aFirstColIt( aData.aFirstColumnStrings.begin());
-        for( lcl_TableData::tTwoDimNumberContainer::const_iterator aColIt( aData.aDataInRows.begin());
-             aColIt != aData.aDataInRows.end(); ++aColIt )
+        tStringVector::const_iterator aRowDescriptionsIter( aData.aRowDescriptions.begin());
+        const Sequence< Sequence< OUString > >& rComplexRowDescriptions = aData.aComplexRowDescriptions;
+        sal_Int32 nComplexCount = rComplexRowDescriptions.getLength();
+        sal_Int32 nC = 0;
+
+        for( t2DNumberContainer::const_iterator aRowIt( aData.aDataInRows.begin());
+             aRowIt != aData.aDataInRows.end(); ++aRowIt )
         {
             SvXMLElementExport aRow( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_ROW, sal_True, sal_True );
+
+            //export row descriptions
             {
                 mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_STRING );
                 SvXMLElementExport aCell( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_CELL, sal_True, sal_True );
-                if( aFirstColIt != aData.aFirstColumnStrings.end())
+                if( aRowDescriptionsIter != aData.aRowDescriptions.end())
                 {
                     // write the original range name as id into the local table
                     // to allow a correct re-association when copying via clipboard
-                    if( !bHasOwnData && aFirstColumnRangeIter != aFirstColumnRangeEndIter )
-                        mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aFirstColumnRangeIter++ );
-                    exportText( *aFirstColIt );
-                    ++aFirstColIt;
+                    if( !bHasOwnData && aRowDescriptions_RangeIter != aRowDescriptions_RangeEnd )
+                        mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aRowDescriptions_RangeIter++ );
+                    exportText( *aRowDescriptionsIter );
+                    ++aRowDescriptionsIter;
+                    if( nC < nComplexCount )
+                        lcl_exportComplexLabel( rComplexRowDescriptions[nC++], mrExport );
                 }
             }
-            for( lcl_TableData::tTwoDimNumberContainer::value_type::const_iterator aInnerIt( aColIt->begin());
-                 aInnerIt != aColIt->end(); ++aInnerIt )
+
+            //export row values
+            for( t2DNumberContainer::value_type::const_iterator aColIt( aRowIt->begin());
+                 aColIt != aRowIt->end(); ++aColIt )
             {
-                SvXMLUnitConverter::convertDouble( msStringBuffer, *aInnerIt );
+                SvXMLUnitConverter::convertDouble( msStringBuffer, *aColIt );
                 msString = msStringBuffer.makeStringAndClear();
                 mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT );
                 mrExport.AddAttribute( XML_NAMESPACE_OFFICE, XML_VALUE, msString );
@@ -1533,7 +1576,7 @@ void SchXMLExportHelper::exportTable()
                 // write the original range name as id into the local table to
                 // allow a correct re-association when copying via clipboard
                 if( ( !bHasOwnData && aDataRangeIter != aDataRangeEndIter ) &&
-                    ( mbRowSourceColumns || (aInnerIt == aColIt->begin())) )
+                    ( mbRowSourceColumns || (aColIt == aRowIt->begin())) )
                 {
                     if( (*aDataRangeIter).getLength())
                         mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aDataRangeIter );
@@ -1546,7 +1589,7 @@ void SchXMLExportHelper::exportTable()
 
     // if range iterator was used it should have reached its end
     OSL_ASSERT( bHasOwnData || (aDataRangeIter == aDataRangeEndIter) );
-    OSL_ASSERT( bHasOwnData || (aFirstColumnRangeIter == aFirstColumnRangeEndIter) );
+    OSL_ASSERT( bHasOwnData || (aRowDescriptions_RangeIter == aRowDescriptions_RangeEnd) );
 }
 
 void SchXMLExportHelper::exportPlotArea(
@@ -2071,8 +2114,8 @@ void SchXMLExportHelper::exportAxes(
                         if( xValues.is())
                         {
                             Reference< chart2::XChartDocument > xNewDoc( mrExport.GetModel(), uno::UNO_QUERY );
-                            aCategoriesRange = lcl_ConvertRange( xValues->getSourceRangeRepresentation(), xNewDoc );
-                            maCategoriesRange = aCategoriesRange;
+                            maCategoriesRange = xValues->getSourceRangeRepresentation();
+                            aCategoriesRange = lcl_ConvertRange( maCategoriesRange, xNewDoc );
                         }
                     }
                 }
@@ -3381,24 +3424,6 @@ awt::Size SchXMLExportHelper::getPageSize( const Reference< chart2::XChartDocume
     return aSize;
 }
 
-void SchXMLExportHelper::swapDataArray( Sequence< Sequence< double > >& rSequence )
-{
-    sal_Int32 nOuterSize = rSequence.getLength();
-    sal_Int32 nInnerSize = rSequence[0].getLength();    // assume that all subsequences have same length
-    sal_Int32 i, o;
-
-    Sequence< Sequence< double > > aResult( nInnerSize );
-    Sequence< double >* pArray = aResult.getArray();
-    for( i = 0; i < nInnerSize; i++ )
-    {
-        pArray[ i ].realloc( nOuterSize );
-        for( o = 0 ; o < nOuterSize ; o++ )
-            aResult[ i ][ o ] = rSequence[ o ][ i ];
-    }
-
-    rSequence = aResult;
-}
-
 void SchXMLExportHelper::CollectAutoStyle( const std::vector< XMLPropertyState >& aStates )
 {
     if( !aStates.empty() )
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index dd955e6d69d5..b60086c97633 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -50,7 +50,6 @@
 #include <xmloff/xmlstyle.hxx>
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -510,113 +509,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetRegEquationAttrTokenMap()
 
 // ----------------------------------------
 
-sal_Int32 SchXMLImportHelper::GetNumberOfSeries()
-{
-    if( mxChartDoc.is())
-    {
-        Reference< chart::XChartDataArray > xData( mxChartDoc->getData(), uno::UNO_QUERY );
-        if( xData.is())
-        {
-            Sequence< Sequence< double > > xArray = xData->getData();
-
-            if( xArray.getLength())
-                return xArray[ 0 ].getLength();
-        }
-    }
-
-    return 0;
-}
-
-sal_Int32 SchXMLImportHelper::GetLengthOfSeries()
-{
-    if( mxChartDoc.is())
-    {
-        Reference< chart::XChartDataArray > xData( mxChartDoc->getData(), uno::UNO_QUERY );
-        if( xData.is())
-        {
-            Sequence< Sequence< double > > xArray = xData->getData();
-
-            return xArray.getLength();
-        }
-    }
-
-    return 0;
-}
-
-// -1 means don't change
-void SchXMLImportHelper::ResizeChartData( sal_Int32 nSeries, sal_Int32 nDataPoints )
-{
-    if( mxChartDoc.is())
-    {
-        sal_Bool bWasChanged = sal_False;
-
-        sal_Bool bDataInColumns = sal_True;
-        Reference< beans::XPropertySet > xDiaProp( mxChartDoc->getDiagram(), uno::UNO_QUERY );
-        if( xDiaProp.is())
-        {
-            chart::ChartDataRowSource eRowSource;
-            xDiaProp->getPropertyValue( OUString::createFromAscii( "DataRowSource" )) >>= eRowSource;
-            bDataInColumns = ( eRowSource == chart::ChartDataRowSource_COLUMNS );
-
-            // the chart core treats donut chart with interchanged rows/columns
-            Reference< chart::XDiagram > xDiagram( xDiaProp, uno::UNO_QUERY );
-            if( xDiagram.is())
-            {
-                OUString sChartType = xDiagram->getDiagramType();
-                if( 0 == sChartType.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart.DonutDiagram" )))
-                {
-                    bDataInColumns = ! bDataInColumns;
-                }
-            }
-        }
-        sal_Int32 nColCount = bDataInColumns ? nSeries : nDataPoints;
-        sal_Int32 nRowCount = bDataInColumns ? nDataPoints : nSeries;
-
-        Reference< chart::XChartDataArray > xData( mxChartDoc->getData(), uno::UNO_QUERY );
-        if( xData.is())
-        {
-            Sequence< Sequence< double > > xArray = xData->getData();
-
-            // increase number of rows
-            if( xArray.getLength() < nRowCount )
-            {
-                sal_Int32 nOldLen = xArray.getLength();
-                xArray.realloc( nRowCount );
-                if( nColCount == -1 )
-                {
-                    sal_Int32 nSize = xArray[ 0 ].getLength();
-                    for( sal_Int32 i = nOldLen; i < nRowCount; i++ )
-                        xArray[ i ].realloc( nSize );
-                }
-                bWasChanged = sal_True;
-            }
-
-            if( nSeries == -1 &&
-                nRowCount > 0 )
-                nColCount = xArray[ 0 ].getLength();
-
-            // columns
-            if( nColCount > 0 &&
-                xArray[ 0 ].getLength() < nColCount )
-            {
-                if( nDataPoints == -1 )
-                    nRowCount = xArray.getLength();
-
-                for( sal_Int32 i = 0; i < nRowCount; i++ )
-                    xArray[ i ].realloc( nColCount );
-                bWasChanged = sal_True;
-            }
-
-            if( bWasChanged )
-            {
-                xData->setData( xArray );
-                mxChartDoc->attachData(
-                    Reference< chart::XChartData >( xData, uno::UNO_QUERY ));
-            }
-        }
-    }
-}
-
 //static
 void SchXMLImportHelper::DeleteDataSeries(
                     const Reference< chart2::XDataSeries > & xSeries,
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index a1c021171a92..ea24524ac25f 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -33,6 +33,7 @@
 
 #include "SchXMLTableContext.hxx"
 #include "SchXMLParagraphContext.hxx"
+#include "SchXMLTextListContext.hxx"
 #include "SchXMLImport.hxx"
 #include "SchXMLTools.hxx"
 #include "transporttypes.hxx"
@@ -47,7 +48,7 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
+#include <com/sun/star/chart/XComplexDescriptionAccess.hpp>
 #include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -141,26 +142,10 @@ std::vector< Reference< chart2::XAxis > > lcl_getAxesHoldingCategoriesFromDiagra
     return aRet;
 }
 
-void lcl_ApplyColumnLabels(
-    const ::std::vector< SchXMLCell > & rFirstRow,
-    Sequence< OUString > & rOutColumnLabels,
-    sal_Int32 nOffset )
-{
-    const sal_Int32 nColumnLabelsSize = rOutColumnLabels.getLength();
-    const sal_Int32 nMax = ::std::min< sal_Int32 >( nColumnLabelsSize,
-                                                    static_cast< sal_Int32 >( rFirstRow.size()) - nOffset );
-    OSL_ASSERT( nMax == nColumnLabelsSize );
-    for( sal_Int32 i=0; i<nMax; ++i )
-        if( rFirstRow[i+nOffset].eType == SCH_CELL_TYPE_STRING )
-            rOutColumnLabels[i] = rFirstRow[i+nOffset].aString;
-}
-
 struct lcl_ApplyCellToData : public ::std::unary_function< SchXMLCell, void >
 {
-    lcl_ApplyCellToData( Sequence< double > & rOutData,
-                         Sequence< OUString > & rOutRowLabels ) :
+    lcl_ApplyCellToData( Sequence< double > & rOutData ) :
             m_rData( rOutData ),
-            m_rRowLabels( rOutRowLabels ),
             m_nIndex( 0 ),
             m_nSize( rOutData.getLength())
     {
@@ -181,49 +166,11 @@ struct lcl_ApplyCellToData : public ::std::unary_function< SchXMLCell, void >
 
 private:
     Sequence< double > & m_rData;
-    Sequence< OUString > & m_rRowLabels;
     sal_Int32 m_nIndex;
     sal_Int32 m_nSize;
     double m_fNaN;
 };
 
-struct lcl_ApplyRowsToData : public ::std::unary_function< ::std::vector< SchXMLCell >, void >
-{
-    lcl_ApplyRowsToData( Sequence< Sequence< double > > & rOutData,
-                         Sequence< OUString > & rOutRowLabels,
-                         sal_Int32 nOffset,
-                         bool bHasHeader ) :
-            m_rData( rOutData ),
-            m_rRowLabels( rOutRowLabels ),
-            m_nIndex( 0 ),
-            m_nOuterSize( rOutData.getLength()),
-            m_nOffset( nOffset ),
-            m_bHasHeader( bHasHeader )
-    {}
-    void operator() ( const ::std::vector< SchXMLCell > & rRow )
-    {
-        if( ! rRow.empty())
-        {
-            // label
-            if( m_bHasHeader && m_nIndex < m_rRowLabels.getLength() && rRow.front().eType == SCH_CELL_TYPE_STRING )
-                m_rRowLabels[m_nIndex] = rRow.front().aString;
-
-            // values
-            if( m_nIndex < m_nOuterSize )
-                ::std::for_each( rRow.begin() + m_nOffset, rRow.end(), lcl_ApplyCellToData( m_rData[m_nIndex], m_rRowLabels ));
-        }
-        ++m_nIndex;
-    }
-
-private:
-    Sequence< Sequence< double > > & m_rData;
-    Sequence< OUString > & m_rRowLabels;
-    sal_Int32 m_nIndex;
-    sal_Int32 m_nOuterSize;
-    sal_Int32 m_nOffset;
-    bool      m_bHasHeader;
-};
-
 Sequence< Sequence< double > > lcl_getSwappedArray( const Sequence< Sequence< double > > & rData )
 {
     sal_Int32 nOldOuterSize = rData.getLength();
@@ -240,47 +187,6 @@ Sequence< Sequence< double > > lcl_getSwappedArray( const Sequence< Sequence< do
     return aResult;
 }
 
-void lcl_applyXMLTableToInternalDataprovider(
-    const SchXMLTable & rTable,
-    const Reference< chart::XChartDataArray > & xDataArray )
-{
-    sal_Int32 nNumRows( static_cast< sal_Int32 >( rTable.aData.size()));
-    sal_Int32 nRowOffset = 0;
-    if( rTable.bHasHeaderRow )
-    {
-        --nNumRows;
-        nRowOffset = 1;
-    }
-    sal_Int32 nNumColumns( rTable.nMaxColumnIndex + 1 );
-    sal_Int32 nColOffset = 0;
-    if( rTable.bHasHeaderColumn )
-    {
-        --nNumColumns;
-        nColOffset = 1;
-    }
-
-    Sequence< Sequence< double > > aData( nNumRows );
-    Sequence< OUString > aRowLabels( nNumRows );
-    Sequence< OUString > aColumnLabels( nNumColumns );
-    for( sal_Int32 i=0; i<nNumRows; ++i )
-        aData[i].realloc( nNumColumns );
-
-    if( rTable.aData.begin() != rTable.aData.end())
-    {
-        if( rTable.bHasHeaderRow )
-            lcl_ApplyColumnLabels( rTable.aData.front(), aColumnLabels, nColOffset );
-        ::std::for_each( rTable.aData.begin() + nRowOffset, rTable.aData.end(),
-                         lcl_ApplyRowsToData( aData, aRowLabels, nColOffset, rTable.bHasHeaderColumn ));
-    }
-
-    xDataArray->setData( aData );
-
-    if( rTable.bHasHeaderColumn )
-        xDataArray->setRowDescriptions( aRowLabels );
-    if( rTable.bHasHeaderRow )
-        xDataArray->setColumnDescriptions( aColumnLabels );
-}
-
 void lcl_fillRangeMapping(
     const SchXMLTable & rTable,
     lcl_tOriginalRangeToInternalRangeMap & rOutRangeMap,
@@ -833,7 +739,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
         }
     }
 
-    mbReadPara = sal_True;
+    mbReadText = sal_True;
     SchXMLCell aCell;
     aCell.eType = eValueType;
 
@@ -844,8 +750,8 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr
         SvXMLUnitConverter::convertDouble( fData, aCellContent );
 
         aCell.fValue = fData;
-        // dont read following <text:p> element
-        mbReadPara = sal_False;
+        // dont read text from following <text:p> or <text:list> element
+        mbReadText = sal_False;
     }
 
     mrTable.aData[ mrTable.nRowIndex ].push_back( aCell );
@@ -861,9 +767,17 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
 {
     SvXMLImportContext* pContext = 0;
 
-    // <text:p> element
-    if( nPrefix == XML_NAMESPACE_TEXT &&
-        IsXMLToken( rLocalName, XML_P ) )
+    // <text:list> element
+    if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_LIST ) && mbReadText )
+    {
+        SchXMLCell& rCell = mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ];
+        rCell.pComplexString = new Sequence< OUString >();
+        rCell.eType = SCH_CELL_TYPE_COMPLEX_STRING;
+        pContext = new SchXMLTextListContext( GetImport(), rLocalName, *rCell.pComplexString );
+        mbReadText = sal_False;//don't apply text from <text:p>
+    }
+    // <text:p> element - read text and range-id
+    else if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_P ) )
     {
         pContext = new SchXMLParagraphContext( GetImport(), rLocalName, maCellContent, &maRangeId );
     }
@@ -877,7 +791,7 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext(
 
 void SchXMLTableCellContext::EndElement()
 {
-    if( mbReadPara && maCellContent.getLength())
+    if( mbReadText && maCellContent.getLength() ) //apply text from <text:p> element
         mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ].aString = maCellContent;
     if( maRangeId.getLength())
         mrTable.aData[ mrTable.nRowIndex ][ mrTable.nColumnIndex ].aRangeId = maRangeId;
@@ -885,133 +799,90 @@ void SchXMLTableCellContext::EndElement()
 
 // ========================================
 
-// just interpret the table in a linear way with no references used
-// (this is just a workaround for clipboard handling in EA2)
-void SchXMLTableHelper::applyTableSimple(
-    const SchXMLTable& rTable,
-    const uno::Reference< chart::XChartDataArray > & xData )
+void lcl_ApplyCellToComplexLabel( const SchXMLCell& rCell, Sequence< OUString >& rComplexLabel )
 {
-    // interpret table like this:
-    //
-    //  series ----+---+
-    //             |   |
-    //  categories |   |
-    //        |    |   |
-    //        V    V   V
-    //        A    B   C  ...
-    //   1         x   x        <--- labels
-    //   2    x    0   0
-    //   3    x    0   0
-    //  ...
-
-    // Standard Role-interpretation:
-
-    // Column 1 contains the Categories
-
-    // Chart Type/Class | Col 2  Col 3  Col 4  Col 5  Col 6 | Series | Domain
-    // -----------------+-----------------------------------+--------+-------
-    // Category Charts  | Y 1    Y 2    Y 3    Y 4     ...  |   Y    |   -
-    // XY Chart         | X all  Y 1    Y 2    Y 3     ...  |   Y    |   X
-    // Stock Chart 1    | Min    Max    Close    -      -   | Close  |   -
-    // Stock Chart 2    | Open   Min    Max    Close    -   | Close  |   -
-    // Stock Chart 3    | Volume Min    Max    Close    -   | Close  |   -
-    // Stock Chart 4    | Volume Open   Min    Max    Close | Close  |   -
-
-    if( xData.is())
+    if( rCell.eType == SCH_CELL_TYPE_STRING )
     {
-        // get NaN
-        double fSolarNaN;
-        ::rtl::math::setNan( &fSolarNaN );
-        double fNaN = fSolarNaN;
-        sal_Bool bConvertNaN = sal_False;
-
-        uno::Reference< chart::XChartData > xChartData( xData, uno::UNO_QUERY );
-        if( xChartData.is())
-        {
-            fNaN = xChartData->getNotANumber();
-            bConvertNaN = ( ! ::rtl::math::isNan( fNaN ));
-        }
+        rComplexLabel.realloc(1);
+        rComplexLabel[0] = rCell.aString;
+    }
+    else if( rCell.pComplexString && rCell.eType == SCH_CELL_TYPE_COMPLEX_STRING )
+        rComplexLabel = *rCell.pComplexString;
+}
 
-        sal_Int32 nRowCount = rTable.aData.size();
-        sal_Int32 nColumnCount = 0;
-        sal_Int32 nCol = 0, nRow = 0;
-        if( nRowCount )
-        {
-            nColumnCount = rTable.aData[ 0 ].size();
-            ::std::vector< ::std::vector< SchXMLCell > >::const_iterator iRow = rTable.aData.begin();
-            while( iRow != rTable.aData.end() )
-            {
-                nColumnCount = ::std::max( nColumnCount, static_cast<sal_Int32>(iRow->size()) );
-                iRow++;
-            }
-        }
+void SchXMLTableHelper::applyTableToInternalDataProvider(
+    const SchXMLTable& rTable,
+    uno::Reference< chart2::XChartDocument > xChartDoc )
+{
+    // apply all data read from the local table to the internal data provider
+    if( !xChartDoc.is() || !xChartDoc->hasInternalDataProvider() )
+        return;
+    Reference< chart2::data::XDataProvider >  xDataProv( xChartDoc->getDataProvider() );
+    if( !xDataProv.is() )
+        return;
 
-        // #i27909# avoid illegal index access for empty tables
-        if( nColumnCount == 0 || nRowCount == 0 )
-            return;
+    //prepare the read local table data
+    sal_Int32 nNumRows( static_cast< sal_Int32 >( rTable.aData.size()));
+    sal_Int32 nRowOffset = 0;
+    if( rTable.bHasHeaderRow )
+    {
+        --nNumRows;
+        nRowOffset = 1;
+    }
+    sal_Int32 nNumColumns( rTable.nMaxColumnIndex + 1 );
+    sal_Int32 nColOffset = 0;
+    if( rTable.bHasHeaderColumn )
+    {
+        --nNumColumns;
+        nColOffset = 1;
+    }
 
-        uno::Sequence< ::rtl::OUString > aCategories( nRowCount - 1 );
-        uno::Sequence< ::rtl::OUString > aLabels( nColumnCount - 1 );
-        uno::Sequence< uno::Sequence< double > > aData( nRowCount - 1 );
-        for( nRow = 0; nRow < nRowCount - 1; nRow++ )
-            aData[ nRow ].realloc( nColumnCount - 1 );
+    Sequence< Sequence< double > > aDataInRows( nNumRows );
+    Sequence< Sequence< OUString > > aComplexRowDescriptions( nNumRows );
+    Sequence< Sequence< OUString > > aComplexColumnDescriptions( nNumColumns );
+    for( sal_Int32 i=0; i<nNumRows; ++i )
+        aDataInRows[i].realloc( nNumColumns );
 
-        // set labels
-        ::std::vector< ::std::vector< SchXMLCell > >::const_iterator iRow = rTable.aData.begin();
-        sal_Int32 nColumnCountOnFirstRow = iRow->size();
-        for( nCol = 1; nCol < nColumnCountOnFirstRow; nCol++ )
+    if( rTable.aData.begin() != rTable.aData.end())
+    {
+        //apply column labels
+        if( rTable.bHasHeaderRow )
         {
-            aLabels[ nCol - 1 ] = (*iRow)[ nCol ].aString;
+            const ::std::vector< SchXMLCell >& rFirstRow = rTable.aData.front();
+            const sal_Int32 nColumnLabelsSize = aComplexColumnDescriptions.getLength();
+            const sal_Int32 nMax = ::std::min< sal_Int32 >( nColumnLabelsSize, static_cast< sal_Int32 >( rFirstRow.size()) - nColOffset );
+            OSL_ASSERT( nMax == nColumnLabelsSize );
+            for( sal_Int32 i=0; i<nMax; ++i )
+                lcl_ApplyCellToComplexLabel( rFirstRow[i+nColOffset], aComplexColumnDescriptions[i] );
         }
-        xData->setColumnDescriptions( aLabels );
 
-        double fVal;
-        const sal_Bool bConstConvertNan = bConvertNaN;
-        for( ++iRow, nRow = 0; iRow != rTable.aData.end(); iRow++, nRow++ )
+        std::vector< ::std::vector< SchXMLCell > >::const_iterator aRowIter( rTable.aData.begin() + nRowOffset );
+        std::vector< ::std::vector< SchXMLCell > >::const_iterator aEnd( rTable.aData.end() );
+        for( sal_Int32 nRow = 0; aRowIter != aEnd && nRow < nNumRows; ++aRowIter, ++nRow )
         {
-            aCategories[ nRow ] = (*iRow)[ 0 ].aString;
-            sal_Int32 nTableColCount( static_cast< sal_Int32 >((*iRow).size()));
-            for( nCol = 1; nCol < nTableColCount; nCol++ )
+            const ::std::vector< SchXMLCell >& rRow = *aRowIter;
+            if( !rRow.empty() )
             {
-                fVal = (*iRow)[ nCol ].fValue;
-                if( bConstConvertNan &&
-                    ::rtl::math::isNan( fVal ))
-                    aData[ nRow ][ nCol - 1 ] = fNaN;
-                else
-                    aData[ nRow ][ nCol - 1 ] = fVal;
+                // row label
+                if( rTable.bHasHeaderColumn )
+                    lcl_ApplyCellToComplexLabel( rRow.front(), aComplexRowDescriptions[nRow] );
+
+                // values
+                ::std::for_each( rRow.begin() + nColOffset, rRow.end(), lcl_ApplyCellToData( aDataInRows[nRow] ));
             }
-            // set remaining cells to NaN
-            for( ; nCol < nColumnCount; ++nCol )
-                if( bConstConvertNan )
-                    aData[ nRow ][nCol - 1 ] = fNaN;
-                else
-                    ::rtl::math::setNan( &(aData[ nRow ][nCol - 1 ]));
         }
-        xData->setRowDescriptions( aCategories );
-        xData->setData( aData );
     }
-}
 
-// ----------------------------------------
-
-void SchXMLTableHelper::applyTableToInternalDataProvider(
-    const SchXMLTable& rTable,
-    uno::Reference< chart2::XChartDocument > xChartDoc )
-{
-    if( ! (xChartDoc.is() && xChartDoc->hasInternalDataProvider()))
-        return;
-    Reference< chart2::data::XDataProvider >  xDataProv( xChartDoc->getDataProvider());
-    Reference< chart::XChartDataArray > xDataArray( xDataProv, uno::UNO_QUERY );
-    if( ! xDataArray.is())
+    //apply the collected data to the chart
+    Reference< chart::XComplexDescriptionAccess > xDataAccess( xDataProv, uno::UNO_QUERY );
+    if( !xDataAccess.is() )
         return;
-    OSL_ASSERT( xDataProv.is());
 
-    // prerequisite for this method: all objects (data series, domains, etc.)
-    // need their own range string.
-
-    // apply all data read in the table to the chart data-array of the internal
-    // data provider
-    lcl_applyXMLTableToInternalDataprovider( rTable, xDataArray );
+    xDataAccess->setData( aDataInRows );
+    if( rTable.bHasHeaderColumn )
+        xDataAccess->setComplexRowDescriptions( aComplexRowDescriptions );
+    if( rTable.bHasHeaderRow )
+        xDataAccess->setComplexColumnDescriptions( aComplexColumnDescriptions );
 }
 
 void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index 7cff3e7ecff7..0148e46e003e 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -48,7 +48,6 @@ namespace com { namespace sun { namespace star {
     }}
     namespace chart {
         class XChartDocument;
-        class XChartDataArray;
         struct ChartSeriesAddress;
 }}}}
 
@@ -99,21 +98,11 @@ private:
                            sal_Int32& nRows, sal_Int32& nColumns );
 
 public:
-    /// The data for the ChartDocument is applied linearly
-    static void applyTableSimple(
-        const SchXMLTable& rTable,
-        const com::sun::star::uno::Reference< com::sun::star::chart::XChartDataArray > & xData );
-
-    /** The data for the ChartDocument is applied by reading the
-        table, the addresses of series, the addresses of labels,
-        the cell-range-address for the categories
-     */
     static void applyTableToInternalDataProvider( const SchXMLTable& rTable,
                             com::sun::star::uno::Reference< com::sun::star::chart2::XChartDocument > xChartDoc );
 
-    /** Second part of applyTableToInternalDataProvider that has to be called after the data series
-        got their styles set.  This function reorders local data to fit the
-        correct data structure.
+    /** This function reorders local data to fit the correct data structure.
+        Call it after the data series got their styles set.
      */
     static void switchRangesFromOuterToInternalIfNecessary( const SchXMLTable& rTable,
                                   const tSchXMLLSequencesPerIndex & rLSequencesPerIndex,
@@ -223,7 +212,7 @@ private:
     SchXMLTable& mrTable;
     rtl::OUString maCellContent;
     rtl::OUString maRangeId;
-    sal_Bool mbReadPara;
+    sal_Bool mbReadText;
 
 public:
     SchXMLTableCellContext( SchXMLImportHelper& rImpHelper,
diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx
new file mode 100755
index 000000000000..075c4c5150a5
--- /dev/null
+++ b/xmloff/source/chart/SchXMLTextListContext.cxx
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: SchXMLTextListContext.cxx,v $
+ * $Revision: 1.1 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_xmloff.hxx"
+
+#include "SchXMLImport.hxx"
+#include "SchXMLTextListContext.hxx"
+#include "SchXMLParagraphContext.hxx"
+
+#include "xmlnmspe.hxx"
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/nmspmap.hxx>
+
+using ::rtl::OUString;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Reference;
+using namespace com::sun::star;
+using namespace ::xmloff::token;
+
+//-------------------------------------------------
+class SchXMLListItemContext : public SvXMLImportContext
+{
+public:
+    SchXMLListItemContext( SvXMLImport& rImport, const OUString& rLocalName, OUString& rText );
+    virtual ~SchXMLListItemContext();
+    virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList );
+    virtual void EndElement();
+
+    virtual SvXMLImportContext* CreateChildContext(
+        USHORT nPrefix,
+        const ::rtl::OUString& rLocalName,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+    ::rtl::OUString& m_rText;
+};
+
+SchXMLListItemContext::SchXMLListItemContext(
+        SvXMLImport& rImport
+        , const OUString& rLocalName
+        , OUString& rText )
+        : SvXMLImportContext( rImport, XML_NAMESPACE_TEXT, rLocalName )
+        , m_rText( rText )
+{
+}
+
+SchXMLListItemContext::~SchXMLListItemContext()
+{}
+
+void SchXMLListItemContext::StartElement( const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+}
+
+void SchXMLListItemContext::EndElement()
+{
+}
+
+SvXMLImportContext* SchXMLListItemContext::CreateChildContext(
+    USHORT nPrefix, const OUString& rLocalName,
+    const uno::Reference< xml::sax::XAttributeList >& )
+{
+    SvXMLImportContext* pContext = 0;
+    if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_P ) )
+        pContext = new SchXMLParagraphContext( GetImport(), rLocalName, m_rText );
+    else
+        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+    return pContext;
+}
+
+//-------------------------------------------------
+
+SchXMLTextListContext::SchXMLTextListContext(
+        SvXMLImport& rImport
+        , const OUString& rLocalName
+        , Sequence< OUString>& rTextList )
+        : SvXMLImportContext( rImport, XML_NAMESPACE_TEXT, rLocalName )
+        , m_rTextList( rTextList )
+        , m_aTextVector()
+{
+}
+
+SchXMLTextListContext::~SchXMLTextListContext()
+{
+}
+
+void SchXMLTextListContext::StartElement( const Reference< xml::sax::XAttributeList >& xAttrList )
+{
+}
+
+void SchXMLTextListContext::EndElement()
+{
+    sal_Int32 nCount = m_aTextVector.size();
+    m_rTextList.realloc(nCount);
+    for( sal_Int32 nN=0; nN<nCount; nN++ )
+        m_rTextList[nN]=m_aTextVector[nN];
+}
+
+SvXMLImportContext* SchXMLTextListContext::CreateChildContext(
+    USHORT nPrefix, const OUString& rLocalName,
+    const uno::Reference< xml::sax::XAttributeList >& )
+{
+    SvXMLImportContext* pContext = 0;
+    if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_LIST_ITEM ) )
+    {
+        m_aTextVector.push_back( OUString() );
+        pContext = new SchXMLListItemContext( GetImport(), rLocalName, m_aTextVector.back() );
+    }
+    else
+        pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+    return pContext;
+}
diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx
new file mode 100755
index 000000000000..85ffc701ed95
--- /dev/null
+++ b/xmloff/source/chart/SchXMLTextListContext.hxx
@@ -0,0 +1,61 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: SchXMLTextListContext.hxx,v $
+ * $Revision: 1.1 $
+ *
+ * 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 _SCH_XMLTEXTLISTCONTEXT_HXX_
+#define _SCH_XMLTEXTLISTCONTEXT_HXX_
+
+#include <xmloff/xmlictxt.hxx>
+#include "rtl/ustring.hxx"
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace xml { namespace sax {
+        class XAttributeList;
+}}}}}
+
+class SchXMLTextListContext : public SvXMLImportContext
+{
+public:
+    SchXMLTextListContext( SvXMLImport& rImport,
+                            const ::rtl::OUString& rLocalName,
+                            ::com::sun::star::uno::Sequence< ::rtl::OUString>& rTextList );
+    virtual ~SchXMLTextListContext();
+    virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
+    virtual void EndElement();
+
+    virtual SvXMLImportContext* CreateChildContext(
+        USHORT nPrefix,
+        const ::rtl::OUString& rLocalName,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+private:
+    ::com::sun::star::uno::Sequence< ::rtl::OUString>& m_rTextList;
+    std::vector< ::rtl::OUString> m_aTextVector;
+};
+
+#endif  // _SCH_XMLTEXTLISTCONTEXT_HXX_
diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx
index e3e3389e18d2..b396485f0d7b 100644
--- a/xmloff/source/chart/contexts.cxx
+++ b/xmloff/source/chart/contexts.cxx
@@ -38,13 +38,6 @@
 #include "SchXMLImport.hxx"
 #include "SchXMLCalculationSettingsContext.hxx"
 
-//  #ifndef _XMLOFF_XMLCHARTSTYLECONTEXT_HXX_
-//  #include "XMLChartStyleContext.hxx"
-//  #endif
-#include <com/sun/star/chart/XChartDocument.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
-#include <com/sun/star/chart/ChartDataRowSource.hpp>
-
 #include "contexts.hxx"
 #include "SchXMLChartContext.hxx"
 
diff --git a/xmloff/source/chart/makefile.mk b/xmloff/source/chart/makefile.mk
index 5b47b77702d5..53964ee0eb8a 100644
--- a/xmloff/source/chart/makefile.mk
+++ b/xmloff/source/chart/makefile.mk
@@ -51,6 +51,7 @@ SLOFILES =	$(SLO)$/ColorPropertySet.obj \
             $(SLO)$/SchXMLChartContext.obj \
             $(SLO)$/SchXMLPlotAreaContext.obj \
             $(SLO)$/SchXMLParagraphContext.obj \
+            $(SLO)$/SchXMLTextListContext.obj \
             $(SLO)$/SchXMLSeriesHelper.obj \
             $(SLO)$/SchXMLSeries2Context.obj \
             $(SLO)$/PropertyMaps.obj \
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index 6046ec4606fc..c9eaf415a663 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -40,17 +40,37 @@ enum SchXMLCellType
 {
     SCH_CELL_TYPE_UNKNOWN,
     SCH_CELL_TYPE_FLOAT,
-    SCH_CELL_TYPE_STRING
+    SCH_CELL_TYPE_STRING,
+    SCH_CELL_TYPE_COMPLEX_STRING
 };
 
 struct SchXMLCell
 {
     rtl::OUString aString;
+    ::com::sun::star::uno::Sequence< rtl::OUString >* pComplexString;
     double fValue;
     SchXMLCellType eType;
     rtl::OUString aRangeId;
 
-    SchXMLCell() : fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN ) {}
+    SchXMLCell() : pComplexString(0), fValue( 0.0 ), eType( SCH_CELL_TYPE_UNKNOWN )
+    {}
+
+    SchXMLCell( const SchXMLCell& rOther )
+        : aString( rOther.aString )
+        , pComplexString( rOther.pComplexString ? new ::com::sun::star::uno::Sequence< rtl::OUString >( *rOther.pComplexString ) : 0 )
+        , fValue( rOther.fValue )
+        , eType( rOther.eType )
+        , aRangeId( rOther.aRangeId )
+    {}
+
+    ~SchXMLCell()
+    {
+        if(pComplexString)
+        {
+            delete pComplexString;
+            pComplexString=0;
+        }
+    }
 };
 
 struct SchXMLTable