[Libreoffice-commits] core.git: 3 commits - oox/source

[Markus Mohrhard]

 oox/source/export/chartexport.cxx |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit d8dcf2d4861b830ce9dfdf04bee4d365b4724d1e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Apr 21 19:17:00 2015 +0200

    fix marker export if none is selected
    
    Change-Id: I7e09a355d515c4782605602b2e5edc93e70921fd

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index cd1d814..3c609be 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3093,7 +3093,7 @@ void ChartExport::exportMarker(Reference< chart2::XDataSeries > xSeries)
     if( GetProperty( xPropSet, "Symbol" ) )
         mAny >>= aSymbol;
 
-    if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_AUTO)
+    if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != chart2::SymbolStyle_AUTO && aSymbol.Style != chart2::SymbolStyle_NONE)
         return;
 
     FSHelperPtr pFS = GetFS();
commit a4f16736496fda7b29561de14fe8990028e88799
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Apr 21 19:16:38 2015 +0200

    first step for better scatterStyle export
    
    Change-Id: I33f7a0e629564834730a13a8501100a62f16017e

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index f8a33a8..cd1d814 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1558,7 +1558,18 @@ void ChartExport::exportScatterChart( Reference< chart2::XChartType > xChartType
     pFS->startElement( FSNS( XML_c, XML_scatterChart ),
             FSEND );
     // TODO:scatterStyle
+
+    sal_Int32 nSymbolType = ::com::sun::star::chart::ChartSymbolType::NONE;
+    Reference< XPropertySet > xPropSet( mxDiagram , uno::UNO_QUERY);
+    if( GetProperty( xPropSet, "SymbolType" ) )
+        mAny >>= nSymbolType;
+
     const char* scatterStyle = "lineMarker";
+    if (nSymbolType == css::chart::ChartSymbolType::NONE)
+    {
+        scatterStyle = "line";
+    }
+
     pFS->singleElement( FSNS( XML_c, XML_scatterStyle ),
             XML_val, scatterStyle,
             FSEND );
commit c8961a43bd6605f4a06165f31f7a7fbb8ffdb8d0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Apr 21 13:36:09 2015 +0200

    export data labels for all chart types, tdf#90729
    
    Change-Id: I55b9b87a8de2ecee4f1ae3159938bfd2fb3acbaa

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 445c341..f8a33a8 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1820,10 +1820,7 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_
                     exportDataPoints( uno::Reference< beans::XPropertySet >( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
 
                     // export data labels
-                    // Excel does not like our current data label export
-                    // for scatter charts
-                    if( eChartType != chart::TYPEID_SCATTER )
-                        exportDataLabels(aSeriesSeq[nSeriesIdx], nSeriesLength, eChartType);
+                    exportDataLabels(aSeriesSeq[nSeriesIdx], nSeriesLength, eChartType);
 
                     exportTrendlines( aSeriesSeq[nSeriesIdx] );