diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-16 22:58:53 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-07-17 02:59:19 +0200 |
commit | 026e2623f7f498432e6dc970fb06145dfc77dc45 (patch) | |
tree | 22229b7aab2fff3c4f4f12f856e55494dc7fb565 /xmloff | |
parent | 13660d4b311501d80b3e1a9541fb7db80cc42f87 (diff) |
remove the GL based 3D charts
Change-Id: Ia578c71ae70aa0a85b49fa50138edf90f961b1e9
Reviewed-on: https://gerrit.libreoffice.org/57533
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/PropertyMap.hxx | 3 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 9 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTools.hxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/token/tokens.txt | 2 |
5 files changed, 1 insertions, 16 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index d81a11993082..f00726a65b3e 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -148,9 +148,6 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF_EXT( "BuiltInUnit", LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), MAP_ENTRY_ODF_EXT( "ExternalData", LO_EXT, XML_EXTERNALDATA, XML_TYPE_STRING), - // OpenGL 3D chart flags - MAP_ENTRY_ODF_EXT( "RoundedEdge", LO_EXT, XML_ROUNDED_EDGE, XML_TYPE_BOOL), - MAP_ENTRY_ODF_EXT( "LabelBorderColor", LO_EXT, XML_LABEL_STROKE_COLOR, XML_TYPE_COLOR ), MAP_ENTRY_ODF_EXT( "LabelBorderStyle", LO_EXT, XML_LABEL_STROKE, XML_SCH_TYPE_LABEL_BORDER_STYLE ), MAP_ENTRY_ODF_EXT( "LabelBorderTransparency", LO_EXT, XML_LABEL_STROKE_OPACITY, XML_SCH_TYPE_LABEL_BORDER_OPACITY ), diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 74d4989292a3..7b1348ec846e 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -141,7 +141,6 @@ static const SvXMLEnumMapEntry<SchXMLChartTypeEnum> 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 } @@ -179,9 +178,7 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap() {"com.sun.star.chart.StockDiagram", "com.sun.star.chart2.CandleStickChartType"}, {"com.sun.star.chart.BubbleDiagram", - "com.sun.star.chart2.BubbleChartType"}, - {"com.sun.star.chart.GL3DBarDiagram", - "com.sun.star.chart2.GL3DBarChartType"}}; + "com.sun.star.chart2.BubbleChartType"}}; return g_aChartTypeNameMap; } @@ -258,8 +255,6 @@ OUString GetChartTypeByClassName( else aResultBuffer.append("Column"); } - else if (IsXMLToken(rClassName, XML_GL3DBAR)) - aResultBuffer.append("GL3DBar"); else bInternalType = false; @@ -325,8 +320,6 @@ 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 c8b888d00ed7..d8f16eda480c 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -63,7 +63,6 @@ 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 8287fd4797fa..5e6700252e78 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -919,7 +919,6 @@ 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 ), @@ -1570,7 +1569,6 @@ namespace xmloff { namespace token { TOKEN( "rotation-align", XML_ROTATION_ALIGN ), TOKEN( "rotation-angle", XML_ROTATION_ANGLE ), TOKEN( "round", XML_ROUND ), - TOKEN( "rounded-edge", XML_ROUNDED_EDGE ), TOKEN( "row", XML_ROW ), TOKEN( "row-height", XML_ROW_HEIGHT ), TOKEN( "row-number", XML_ROW_NUMBER ), diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 6551c5b7b9f2..27b83a01872e 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -842,7 +842,6 @@ gap-width gcd generator geq -gl3d-bar gouraud gradient angle @@ -1488,7 +1487,6 @@ rotation rotation-align rotation-angle round -rounded-edge row row-height row-number |