summaryrefslogtreecommitdiffstats
path: root/oox
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2011-09-09 15:02:34 +0200
committerKohei Yoshida <kohei.yoshida@suse.com>2011-09-20 12:14:13 -0400
commit3e5edf6ca9d3bc56549602bda2adc855dd57f658 (patch)
tree51e8993e730ff7f17721c4b8c126fc92ab92bb34 /oox
parentByteString->rtl::OString[Buffer] (diff)
downloadcore-3e5edf6ca9d3bc56549602bda2adc855dd57f658.tar.gz
core-3e5edf6ca9d3bc56549602bda2adc855dd57f658.zip
Add missing chart data point ODF1.2 standard symbols
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/typegroupconverter.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 5dba350de392..39246947420d 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -451,19 +451,19 @@ void TypeGroupConverter::convertMarker( PropertySet& rPropSet, sal_Int32 nOoxSym
// symbol style
cssc::Symbol aSymbol;
aSymbol.Style = cssc::SymbolStyle_STANDARD;
- switch( nOoxSymbol )
+ switch( nOoxSymbol ) // compare with XclChPropSetHelper::WriteMarkerProperties in xlchart.cxx
{
case XML_auto: aSymbol.Style = cssc::SymbolStyle_AUTO; break;
case XML_none: aSymbol.Style = cssc::SymbolStyle_NONE; break;
case XML_square: aSymbol.StandardSymbol = 0; break; // square
case XML_diamond: aSymbol.StandardSymbol = 1; break; // diamond
case XML_triangle: aSymbol.StandardSymbol = 3; break; // arrow up
- case XML_x: aSymbol.StandardSymbol = 6; break; // bow tie
- case XML_star: aSymbol.StandardSymbol = 7; break; // sand glass
+ case XML_x: aSymbol.StandardSymbol = 10; break; // X, legacy bow tie
+ case XML_star: aSymbol.StandardSymbol = 12; break; // asterisk, legacy sand glass
case XML_dot: aSymbol.StandardSymbol = 4; break; // arrow right
- case XML_dash: aSymbol.StandardSymbol = 2; break; // arrow down
- case XML_circle: aSymbol.StandardSymbol = 4; break; // arrow right
- case XML_plus: aSymbol.StandardSymbol = 5; break; // arrow left
+ case XML_dash: aSymbol.StandardSymbol = 13; break; // horizontal bar, legacy arrow down
+ case XML_circle: aSymbol.StandardSymbol = 8; break; // circle, legacy arrow right
+ case XML_plus: aSymbol.StandardSymbol = 11; break; // plus, legacy arrow left
}
// symbol size (points in OOXML, 1/100 mm in Chart2)