[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source

[Markus Mohrhard]

 oox/source/drawingml/chart/seriescontext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c5f422e373a2d5830a2799ee09cb011fb266cc3
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Dec 16 20:15:34 2017 +0100

    fix searched attribute for 3D chart shape, tdf114169
    
    Change-Id: Ic0642d4b223db121bdf5968af73811af8571bd72
    Reviewed-on: https://gerrit.libreoffice.org/46614
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit b3a85fbc00bedba534a3f1ecfed9abe28b308247)
    Reviewed-on: https://gerrit.libreoffice.org/46628

diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index faccf0fb8390..a6763ad2fb74 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -474,7 +474,7 @@ ContextHandlerRef BarSeriesContext::onCreateContext( sal_Int32 nElement, const A
                 case C_TOKEN( pictureOptions ):
                     return new PictureOptionsContext( *this, mrModel.mxPicOptions.create(bMSO2007Doc) );
                 case C_TOKEN( shape ):
-                    mrModel.monShape = rAttribs.getToken( bMSO2007Doc ? XML_val : XML_box );
+                    mrModel.monShape = rAttribs.getToken(XML_val);
                     return nullptr;
                 case C_TOKEN( trendline ):
                     return new TrendlineContext( *this, mrModel.maTrendlines.create(bMSO2007Doc) );