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

[Libreoffice Gerrit user]

 oox/source/drawingml/chart/seriescontext.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47c05f6e1bb4ec77f242001e4c2d297af48f511e
Author:     Markus Mohrhard <markus.mohrh...@googlemail.com>
AuthorDate: Sun Nov 18 04:37:02 2018 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 19 15:59:59 2018 +0100

    tdf#102186, don't overwrite the deleted flag
    
    Change-Id: I3cc69a0baebc55ad52b64960657e9daa4be8f39d
    Reviewed-on: https://gerrit.libreoffice.org/63510
    Tested-by: Jenkins
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    (cherry picked from commit 4bd2e57653ce22044ab984b06c84f22ef287cecf)
    Reviewed-on: https://gerrit.libreoffice.org/63513
    Tested-by: Xisco Faulí <xiscofa...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/oox/source/drawingml/chart/seriescontext.cxx 
b/oox/source/drawingml/chart/seriescontext.cxx
index a6763ad2fb74..10e3af70108f 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -93,6 +93,7 @@ void lclDataLabelSharedCharacters( ContextHandler2 const & 
rContext, const OUStr
 DataLabelContext::DataLabelContext( ContextHandler2Helper& rParent, 
DataLabelModel& rModel ) :
     ContextBase< DataLabelModel >( rParent, rModel )
 {
+    mrModel.mbDeleted = false;
 }
 
 DataLabelContext::~DataLabelContext()
@@ -101,7 +102,6 @@ DataLabelContext::~DataLabelContext()
 
 ContextHandlerRef DataLabelContext::onCreateContext( sal_Int32 nElement, const 
AttributeList& rAttribs )
 {
-    mrModel.mbDeleted = false;
     if( isRootElement() ) switch( nElement )
     {
         case C_TOKEN( idx ):
@@ -124,6 +124,7 @@ void DataLabelContext::onCharacters( const OUString& rChars 
)
 DataLabelsContext::DataLabelsContext( ContextHandler2Helper& rParent, 
DataLabelsModel& rModel ) :
     ContextBase< DataLabelsModel >( rParent, rModel )
 {
+    mrModel.mbDeleted = false;
 }
 
 DataLabelsContext::~DataLabelsContext()
@@ -132,7 +133,6 @@ DataLabelsContext::~DataLabelsContext()
 
 ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, 
const AttributeList& rAttribs )
 {
-    mrModel.mbDeleted = false;
     bool bMSO2007Doc = getFilter().isMSO2007Document();
     if( isRootElement() ) switch( nElement )
     {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits