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

[PriyankaGaikwad]

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

New commits:
commit 8181fb0cd2b4063695eee1efa8b88ce02085402a
Author: PriyankaGaikwad <priyanka.gaikwad at synerzip.com>
Date:   Wed Dec 4 14:51:51 2013 +0530

    fdo#72221: Fixed for doughnut chart - RT is invalid
    
    Doughnut chart is exported as pie chart.
    
    Change-Id: I440fa86786be8c9bdd4663475faf8e2a5f5e8070
    Reviewed-on: https://gerrit.libreoffice.org/6924
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 17a86ff6..0bbbef6 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1026,16 +1026,12 @@ void ChartExport::exportPlotArea( )
             exportBubbleChart( xChartType );
             break;
         }
-        case chart::TYPEID_DOUGHNUT:
-        {
-            exportDoughnutChart( xChartType );
-            break;
-        }
         case chart::TYPEID_OFPIE:
         {
             exportOfPieChart( xChartType );
             break;
         }
+        case chart::TYPEID_DOUGHNUT:
         case chart::TYPEID_PIE:
         {
             exportPieChart( xChartType );
@@ -1268,6 +1264,12 @@ void ChartExport::exportOfPieChart( Reference< chart2::XChartType > /*xChartType
 
 void ChartExport::exportPieChart( Reference< chart2::XChartType > xChartType )
 {
+    sal_Int32 eChartType = getChartType( );
+    if(eChartType == chart::TYPEID_DOUGHNUT)
+    {
+        exportDoughnutChart( xChartType );
+        return;
+    }
     FSHelperPtr pFS = GetFS();
     sal_Int32 nTypeId = XML_pieChart;
     if( mbIs3DChart )