diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-24 22:20:02 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-25 22:50:50 -0400 |
| commit | 44fc32edcddc7f290e3e5162be9a80917c499ade (patch) | |
| tree | b62bf9cf371d688d9f127b08df752dcf5deb95f6 /xmloff | |
| parent | 05efb605b36ea340762ef1583b3aea6a6b5cdddb (diff) | |
Properly import and export the new chart type to and from ODF.
Change-Id: I38e9813c6eb853dfb92b1537cea0b9ad97473b57
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index b6fe29603aab..06efa57c82f1 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -140,6 +140,7 @@ static const SvXMLEnumMapEntry aXMLChartClassMap[] = { XML_BAR, XML_CHART_CLASS_BAR }, { XML_STOCK, XML_CHART_CLASS_STOCK }, { XML_BUBBLE, XML_CHART_CLASS_BUBBLE }, + { XML_GL3DBAR, XML_CHART_CLASS_GL3DBAR }, { XML_SURFACE, XML_CHART_CLASS_BAR }, //@todo change this if a surface chart is available { XML_ADD_IN, XML_CHART_CLASS_ADDIN }, { XML_TOKEN_INVALID, XML_CHART_CLASS_UNKNOWN } @@ -191,6 +192,9 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() ( OUString( "com.sun.star.chart.BubbleDiagram" ) , OUString( "com.sun.star.chart2.BubbleChartType" ) ) + ( OUString( "com.sun.star.chart.GL3DBarDiagram" ) + , OUString( "com.sun.star.chart2.GL3DBarChartType" ) ) + ; return g_aChartTypeNameMap; } @@ -268,6 +272,8 @@ OUString GetChartTypeByClassName( else aResultBuffer.append("Column"); } + else if (IsXMLToken(rClassName, XML_GL3DBAR)) + aResultBuffer.append("GL3DBar"); else bInternalType = false; @@ -333,6 +339,8 @@ XMLTokenEnum getTokenByChartType( else if( (bUseOldNames && aServiceName == "Stock") || (!bUseOldNames && aServiceName == "CandleStick")) eResult = XML_STOCK; + else if (aServiceName == "GL3DBar") + eResult = XML_GL3DBAR; } } diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 9c18303666f7..0b6f49a57bc9 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -63,6 +63,7 @@ namespace SchXMLTools XML_CHART_CLASS_BAR, XML_CHART_CLASS_STOCK, XML_CHART_CLASS_BUBBLE, + XML_CHART_CLASS_GL3DBAR, XML_CHART_CLASS_ADDIN, XML_CHART_CLASS_UNKNOWN }; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index cedae8843972..e01343174496 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -904,6 +904,7 @@ namespace xmloff { namespace token { TOKEN( "gcd", XML_GCD ), TOKEN( "generator", XML_GENERATOR ), TOKEN( "geq", XML_GEQ ), + TOKEN( "gl3d-bar", XML_GL3DBAR ), TOKEN( "gouraud", XML_GOURAUD ), TOKEN( "gradient", XML_GRADIENT ), TOKEN( "angle", XML_GRADIENT_ANGLE ), |