[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - oox/source

[Markus Mohrhard]

 oox/source/drawingml/chart/seriescontext.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 25180bde7df62b8fdb1c1b45e8f9837eb95e0cc9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Apr 4 02:25:00 2015 +0200

    fix OOXML vs MSO2007 in chart import in one more place
    
    Change-Id: I96bafad0cc73b27c2a08b5205a35b10b4901afb9
    (cherry picked from commit 547c58a6173535c679027c83fb3ed77f6060fd09)

diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index fde2952..d0d6e46 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -40,13 +40,12 @@ using ::oox::core::ContextHandlerRef;
 namespace {
 
 ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
-        sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase& orModel )
+        sal_Int32 nElement, const AttributeList& rAttribs, DataLabelModelBase& orModel, bool bMSO2007 )
 {
     if( rContext.isRootElement() ) switch( nElement )
     {
         case C_TOKEN( delete ):
-            // default is 'false', not 'true' as specified
-            orModel.mbDeleted = rAttribs.getBool( XML_val, false );
+            orModel.mbDeleted = rAttribs.getBool( XML_val, bMSO2007 ? false : true );
             return 0;
         case C_TOKEN( dLblPos ):
             orModel.monLabelPos = rAttribs.getToken( XML_val, XML_TOKEN_INVALID );
@@ -114,7 +113,8 @@ ContextHandlerRef DataLabelContext::onCreateContext( sal_Int32 nElement, const A
         case C_TOKEN( tx ):
             return new TextContext( *this, mrModel.mxText.create() );
     }
-    return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel );
+    bool bMSO2007 = getFilter().isMSO2007Document();
+    return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel, bMSO2007 );
 }
 
 void DataLabelContext::onCharacters( const OUString& rChars )
@@ -146,7 +146,8 @@ ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const
             mrModel.mbShowLeaderLines = rAttribs.getBool( XML_val, false );
             return 0;
     }
-    return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel );
+    bool bMSO2007 = getFilter().isMSO2007Document();
+    return lclDataLabelSharedCreateContext( *this, nElement, rAttribs, mrModel, bMSO2007 );
 }
 
 void DataLabelsContext::onCharacters( const OUString& rChars )