Kaydet (Commit) 4bd2e576 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

tdf#102186, don't overwrite the deleted flag

Change-Id: I3cc69a0baebc55ad52b64960657e9daa4be8f39d
Reviewed-on: https://gerrit.libreoffice.org/63510
Tested-by: Jenkins
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 14f83b8a
...@@ -93,6 +93,7 @@ void lclDataLabelSharedCharacters( ContextHandler2 const & rContext, const OUStr ...@@ -93,6 +93,7 @@ void lclDataLabelSharedCharacters( ContextHandler2 const & rContext, const OUStr
DataLabelContext::DataLabelContext( ContextHandler2Helper& rParent, DataLabelModel& rModel ) : DataLabelContext::DataLabelContext( ContextHandler2Helper& rParent, DataLabelModel& rModel ) :
ContextBase< DataLabelModel >( rParent, rModel ) ContextBase< DataLabelModel >( rParent, rModel )
{ {
mrModel.mbDeleted = false;
} }
DataLabelContext::~DataLabelContext() DataLabelContext::~DataLabelContext()
...@@ -101,7 +102,6 @@ DataLabelContext::~DataLabelContext() ...@@ -101,7 +102,6 @@ DataLabelContext::~DataLabelContext()
ContextHandlerRef DataLabelContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) ContextHandlerRef DataLabelContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{ {
mrModel.mbDeleted = false;
if( isRootElement() ) switch( nElement ) if( isRootElement() ) switch( nElement )
{ {
case C_TOKEN( idx ): case C_TOKEN( idx ):
...@@ -124,6 +124,7 @@ void DataLabelContext::onCharacters( const OUString& rChars ) ...@@ -124,6 +124,7 @@ void DataLabelContext::onCharacters( const OUString& rChars )
DataLabelsContext::DataLabelsContext( ContextHandler2Helper& rParent, DataLabelsModel& rModel ) : DataLabelsContext::DataLabelsContext( ContextHandler2Helper& rParent, DataLabelsModel& rModel ) :
ContextBase< DataLabelsModel >( rParent, rModel ) ContextBase< DataLabelsModel >( rParent, rModel )
{ {
mrModel.mbDeleted = false;
} }
DataLabelsContext::~DataLabelsContext() DataLabelsContext::~DataLabelsContext()
...@@ -132,7 +133,6 @@ DataLabelsContext::~DataLabelsContext() ...@@ -132,7 +133,6 @@ DataLabelsContext::~DataLabelsContext()
ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) ContextHandlerRef DataLabelsContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
{ {
mrModel.mbDeleted = false;
bool bMSO2007Doc = getFilter().isMSO2007Document(); bool bMSO2007Doc = getFilter().isMSO2007Document();
if( isRootElement() ) switch( nElement ) if( isRootElement() ) switch( nElement )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment