summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-11-18 04:37:02 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2018-11-19 02:06:48 +0100
commit388fd9918c0a2cf5f72bbb14aa8d22cc99681c0d (patch)
treed1d3728c97f43114262c4ef57445537dc376fc44 /oox
parent6436c8fd5f0da3de6d8af639432c9b4924cb417d (diff)
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.mohrhard@googlemail.com> (cherry picked from commit 4bd2e57653ce22044ab984b06c84f22ef287cecf) Reviewed-on: https://gerrit.libreoffice.org/63512
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/seriescontext.cxx4
1 files changed, 2 insertions, 2 deletions
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 )
{