[Libreoffice-commits] core.git: writerfilter/source

[Noel Grandin (via logerrit)]

 writerfilter/source/dmapper/DomainMapper.cxx      |    1 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 --
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    2 --
 3 files changed, 5 deletions(-)

New commits:
commit 6f787581ee67207921906442c0cf7f6ed87eebd7
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Sep 18 11:23:12 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Sep 19 09:54:32 2023 +0200

    m_nLastTableCellParagraphDepth is write-only
    
    ever since
      commit 2d43c34333076fad092f0cdc0f60f81580acdbee
      Author: Miklos Vajna <vmik...@collabora.com>
      Date:   Fri Sep 15 13:37:41 2023 +0200
    Related: tdf#55160 sw floattable, nested DOCX imp: fix inner tbl at
    cell start
    
    Change-Id: Ifa2837fde41cecdf51ba4858dd52a59d79e4474e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157041
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 17ad330e5568..5b5647be8bae 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3296,7 +3296,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
     break;
     case NS_ooxml::LN_tcEnd:
         m_pImpl->m_nTableCellDepth--;
-        m_pImpl->m_nLastTableCellParagraphDepth = 0;
     break;
     case NS_ooxml::LN_glow_glow:
     case NS_ooxml::LN_shadow_shadow:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6538f03d6ea4..72b35d7d544d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -392,7 +392,6 @@ DomainMapper_Impl::DomainMapper_Impl(
         
m_bIsReadGlossaries(rMediaDesc.getUnpackedValueOrDefault("ReadGlossaries", 
false)),
         m_nTableDepth(0),
         m_nTableCellDepth(0),
-        m_nLastTableCellParagraphDepth(0),
         m_bHasFtn(false),
         m_bHasFtnSep(false),
         m_bCheckFirstFootnoteTab(false),
@@ -2132,7 +2131,6 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
     TagLogger::getInstance().startElement("finishParagraph");
 #endif
 
-    m_nLastTableCellParagraphDepth = m_nTableCellDepth;
     ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* 
>( pPropertyMap.get() );
     if (m_aTextAppendStack.empty())
         return;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index b2fca78f45fe..c19de5a5c4b9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -1103,8 +1103,6 @@ public:
     sal_Int32 m_nTableDepth;
     /// Raw table cell depth.
     sal_Int32 m_nTableCellDepth;
-    /// Table cell depth of the last finished paragraph.
-    sal_Int32 m_nLastTableCellParagraphDepth;
 
     /// If the current section has footnotes.
     bool m_bHasFtn;