From 3eff437c462808df929ae6fd0034c0989f7fda3d Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 20 Apr 2015 05:07:08 +0200 Subject: fix showLeaderLines MSO 2007 vs OOXML Change-Id: I762383de76ecbabc867ebf3fc9128287421f9c6b --- oox/source/drawingml/chart/seriescontext.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx index a9de7fb568ec..446bad10caff 100644 --- a/oox/source/drawingml/chart/seriescontext.cxx +++ b/oox/source/drawingml/chart/seriescontext.cxx @@ -127,6 +127,7 @@ DataLabelsContext::~DataLabelsContext() ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { + bool bMSO2007Doc = getFilter().isMSO2007Document(); if( isRootElement() ) switch( nElement ) { case C_TOKEN( dLbl ): @@ -134,12 +135,10 @@ ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const case C_TOKEN( leaderLines ): return new ShapePrWrapperContext( *this, mrModel.mxLeaderLines.create() ); case C_TOKEN( showLeaderLines ): - // default is 'false', not 'true' as specified - mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, false ); + mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, !bMSO2007Doc ); return 0; } - bool bMSO2007 = getFilter().isMSO2007Document(); - return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel, bMSO2007 ); + return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel, bMSO2007Doc ); } void DataLabelsContext::onCharacters( const OUString& rChars ) -- cgit