3 files changed, 4 insertions, 6 deletions
diff --git a/compilerplugins/clang/fieldcast.results b/compilerplugins/clang/fieldcast.results
index c1ede6ef7ae5..7be14a330da5 100644
--- a/compilerplugins/clang/fieldcast.results
+++ b/compilerplugins/clang/fieldcast.results
@@ -625,9 +625,6 @@ vcl/source/window/impldockingwrapper.hxx:46
 vcl/source/window/menufloatingwindow.hxx:38
     MenuFloatingWindow pMenu VclPtr<Menu>
     PopupMenu
-writerfilter/source/dmapper/DomainMapper_Impl.hxx:529
-    writerfilter::dmapper::DomainMapper_Impl m_pLastSectionContext PropertyMapPtr
-    writerfilter::dmapper::SectionPropertyMap
 writerfilter/source/dmapper/NumberingManager.hxx:221
     writerfilter::dmapper::ListsManager m_pCurrentDefinition class AbstractListDef::Pointer
     writerfilter::dmapper::ListDef
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ae69b3ba5b89..e24d0e55389a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1269,7 +1269,8 @@ void    DomainMapper_Impl::PopProperties(ContextType eId)
     {
         if (m_aPropertyStacks[eId].size() == 1) // tdf#112202 only top level !!!
         {
-            m_pLastSectionContext = m_aPropertyStacks[eId].top();
+            m_pLastSectionContext = dynamic_cast< SectionPropertyMap* >( m_aPropertyStacks[eId].top().get() );
+            assert(m_pLastSectionContext);
         }
     }
     else if (eId == CONTEXT_CHARACTER)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index ec34244400dc..c6fa87537d9a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -526,7 +526,7 @@ private:
     std::unique_ptr<ThemeHandler> m_pThemeHandler;
 
     PropertyMapPtr                  m_pTopContext;
-    PropertyMapPtr           m_pLastSectionContext;
+    tools::SvRef<SectionPropertyMap> m_pLastSectionContext;
     PropertyMapPtr           m_pLastCharacterContext;
 
     ::std::vector<DeletableTabStop> m_aCurrentTabStops;
@@ -655,7 +655,7 @@ public:
 
     SectionPropertyMap* GetLastSectionContext( )
     {
-        return dynamic_cast< SectionPropertyMap* >( m_pLastSectionContext.get( ) );
+        return m_pLastSectionContext.get( );
     }
 
     css::uno::Reference<css::container::XNameContainer> const & GetPageStyles();