From 38ba8d444010706f050175cb63e7b9ac0e3488c7 Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Wed, 26 Aug 2009 09:55:20 +0000 Subject: CWS-TOOLING: integrate CWS fillednetchart 2009-07-22 17:48:07 +0200 oc r274255 : #i103584# new testcase for fillednetchart added 2009-07-22 17:42:41 +0200 oc r274254 : #i103584# Case 8 set to maximum 4 because of new fillednetchart 2009-07-13 17:29:40 +0200 iha r273946 : CWS-TOOLING: rebase CWS fillednetchart to trunk@273858 (milestone: DEV300:m52) 2009-07-03 15:04:36 +0200 dr r273704 : #i102667# import/export of filled radar charts 2009-07-03 09:50:28 +0200 dr r273680 : #i102677# import filled radar charts from MSOOXML 2009-06-11 18:21:05 +0200 iha r272896 : #i64752# filled net chart 2009-06-11 17:30:46 +0200 iha r272892 : #i64752# filled net chart 2009-06-11 17:07:11 +0200 iha r272889 : #i64752# filled net chart 2009-06-11 16:25:01 +0200 iha r272883 : #i64752# filled net chart 2009-06-11 16:15:10 +0200 iha r272878 : #i64752# filled net chart --- xmloff/inc/xmloff/xmltoken.hxx | 1 + xmloff/source/chart/SchXMLTools.cxx | 8 ++++++++ xmloff/source/chart/SchXMLTools.hxx | 1 + xmloff/source/core/xmltoken.cxx | 1 + 4 files changed, 11 insertions(+) (limited to 'xmloff') diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 988614298fbb..66abd40a44f4 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -3074,6 +3074,7 @@ namespace xmloff { namespace token { XML_AT_LABELS, XML_AT_AXIS, XML_AT_LABELS_AND_AXIS, + XML_FILLED_RADAR, // MathML only XML_MATHVARIANT, diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 57ba65868140..08f2c043894c 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -158,6 +158,7 @@ static __FAR_DATA SvXMLEnumMapEntry aXMLChartClassMap[] = { XML_RING, XML_CHART_CLASS_RING }, { XML_SCATTER, XML_CHART_CLASS_SCATTER }, { XML_RADAR, XML_CHART_CLASS_RADAR }, + { XML_FILLED_RADAR, XML_CHART_CLASS_FILLED_RADAR }, { XML_BAR, XML_CHART_CLASS_BAR }, { XML_STOCK, XML_CHART_CLASS_STOCK }, { XML_BUBBLE, XML_CHART_CLASS_BUBBLE }, @@ -202,6 +203,9 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.NetDiagram" ) , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.NetChartType" ) ) + ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.FilledNetDiagram" ) + , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.FilledNetChartType" ) ) + ( ::rtl::OUString::createFromAscii( "com.sun.star.chart.StockDiagram" ) , ::rtl::OUString::createFromAscii( "com.sun.star.chart2.CandleStickChartType" ) ) @@ -269,6 +273,8 @@ OUString GetChartTypeByClassName( aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Bubble")); else if( IsXMLToken( rClassName, XML_RADAR )) aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("Net")); + else if( IsXMLToken( rClassName, XML_FILLED_RADAR )) + aResultBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM("FilledNet")); else if( IsXMLToken( rClassName, XML_STOCK )) { if( bUseOldNames ) @@ -336,6 +342,8 @@ XMLTokenEnum getTokenByChartType( eResult = XML_BUBBLE; else if( aServiceName.equalsAscii("Net")) eResult = XML_RADAR; + else if( aServiceName.equalsAscii("FilledNet")) + eResult = XML_FILLED_RADAR; else if( (bUseOldNames && aServiceName.equalsAscii("Stock")) || (!bUseOldNames && aServiceName.equalsAscii("CandleStick"))) eResult = XML_STOCK; diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index 916fffc382aa..1ceaf6090707 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -65,6 +65,7 @@ namespace SchXMLTools XML_CHART_CLASS_RING, XML_CHART_CLASS_SCATTER, XML_CHART_CLASS_RADAR, + XML_CHART_CLASS_FILLED_RADAR, XML_CHART_CLASS_BAR, XML_CHART_CLASS_STOCK, XML_CHART_CLASS_BUBBLE, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index a9e5b2abc517..35b0cc1ec741 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3076,6 +3076,7 @@ namespace xmloff { namespace token { TOKEN( "at-labels", XML_AT_LABELS ), TOKEN( "at-axis", XML_AT_AXIS ), TOKEN( "at-labels-and-axis", XML_AT_LABELS_AND_AXIS ), + TOKEN( "filled-radar", XML_FILLED_RADAR ), TOKEN( "mathvariant", XML_MATHVARIANT ), TOKEN( "mathsize", XML_MATHSIZE ), -- cgit