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

Noel Grandin noel.grandin at collabora.co.uk
Fri Sep 29 12:45:57 UTC 2017


 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 8b12c98ec7ec0b5ba20c28890ee63803fb9518d5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Sep 29 14:44:16 2017 +0200

    remove some SAL_WARN in DomainMapper_Impl
    
    it's obviously not a real problem, because higher up code calls this
    even if it doesn't intend to use the result, and in the places where it
    does intend to use the result, it warns again, so this warning is
    redundant.
    And it's the 3rd largest number of warnings in our logs.
    
    Change-Id: I1a6c40bc99a3252594f87e121a81c661686c5348

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3f07f324a461..a6223b741061 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -575,8 +575,6 @@ void    DomainMapper_Impl::PopProperties(ContextType eId)
 PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId)
 {
     PropertyMapPtr pRet;
-    SAL_WARN_IF( m_aPropertyStacks[eId].empty(), "writerfilter.dmapper",
-        "no context of type " << static_cast<int>(eId) << " available");
     if(!m_aPropertyStacks[eId].empty())
         pRet = m_aPropertyStacks[eId].top();
     return pRet;
@@ -5365,7 +5363,6 @@ SectionPropertyMap * DomainMapper_Impl::GetSectionContext()
     if( !IsAnyTableImport() )
     {
         PropertyMapPtr pContext = GetTopContextOfType(CONTEXT_SECTION);
-        OSL_ENSURE(pContext.get(), "Section context is not in the stack!");
         pSectionContext = dynamic_cast< SectionPropertyMap* >( pContext.get() );
     }
 


More information about the Libreoffice-commits mailing list