From 2af36506592908e19b02bdfe00359dfe71eb3322 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue, 30 Apr 2013 18:04:52 +0200
Subject: export markers to OOXML

Change-Id: I0c2cabc8636b0988bdd779f002c1e7dc1e34b65b
---
 oox/source/export/chartexport.cxx | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

(limited to 'oox')

diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 48e2e601ef9a..68880cdb5539 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2468,10 +2468,42 @@ void ChartExport::exportMarker()
     if( GetProperty( xPropSet, "SymbolType" ) )
         mAny >>= nSymbolType;
     // TODO: more properties support for marker
-    if( nSymbolType == ::com::sun::star::chart::ChartSymbolType::NONE )
+    const char* pSymbolType = NULL;
+    switch( nSymbolType )
+    {
+        case cssc::ChartSymbolType::NONE:
+            pSymbolType = "none";
+            break;
+        case cssc::ChartSymbolType::SYMBOL0:
+            pSymbolType = "square";
+            break;
+        case cssc::ChartSymbolType::SYMBOL1:
+            pSymbolType = "diamond";
+            break;
+        // map all triangle variants to the OOXML version
+        case cssc::ChartSymbolType::SYMBOL2:
+        case cssc::ChartSymbolType::SYMBOL3:
+        case cssc::ChartSymbolType::SYMBOL4:
+        case cssc::ChartSymbolType::SYMBOL5:
+            pSymbolType = "triangle";
+            break;
+        case cssc::ChartSymbolType::SYMBOL6:
+            pSymbolType = "plus";
+            break;
+        case cssc::ChartSymbolType::SYMBOL7:
+            pSymbolType = "plus";
+            break;
+        case cssc::ChartSymbolType::AUTO:
+            break;
+        case cssc::ChartSymbolType::BITMAPURL:
+            break;
+        default:
+            SAL_WARN("oox", "unknown data series symbol");
+    }
+    if( pSymbolType )
     {
         pFS->singleElement( FSNS( XML_c, XML_symbol ),
-            XML_val, "none",
+            XML_val, pSymbolType,
             FSEND );
     }
     pFS->endElement( FSNS( XML_c, XML_marker ) );
-- 
cgit