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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx      |    3 ++-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9361d5a2dd9615e053b308e358afb8b36b843e71
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 20:56:15 2014 +0100

    coverity#736003 Unchecked dynamic_cast
    
    Change-Id: Ie7451b1c96437df444198152230190d07689c1f1

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c86a6ac..0df4a54 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4362,7 +4362,9 @@ uno::Reference<container::XIndexAccess> DomainMapper_Impl::GetCurrentNumberingRu
         const StyleSheetEntryPtr pEntry = GetStyleSheetTable()->FindStyleSheetByISTD(aStyle);
         if (!pEntry)
             return xRet;
-        const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_cast<const StyleSheetPropertyMap*>(pEntry ? pEntry->pProperties.get() : 0);
+        const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_cast<const StyleSheetPropertyMap*>(pEntry->pProperties.get());
+        if (!pStyleSheetProperties)
+            return xRet;
         sal_Int32 nListId = pStyleSheetProperties->GetListId();
         if (nListId < 0)
             return xRet;
commit 68184cf69655036b9ab0bfcda86ff91dc1277d1b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 20:54:30 2014 +0100

    coverity#705068 Unchecked dynamic_cast
    
    Change-Id: I3573618670d5975d02ec67e3314d734be05fcbe5

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 79c1847..c86a6ac 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -390,7 +390,7 @@ void    DomainMapper_Impl::PushProperties(ContextType eId)
         if (!m_aTextAppendStack.empty())
         {
             uno::Reference< text::XTextAppend >  xTextAppend = m_aTextAppendStack.top().xTextAppend;
-            if (xTextAppend.is())
+            if (xTextAppend.is() && pSectionContext_)
                 pSectionContext_->SetStart( xTextAppend->getEnd() );
         }
     }
commit c24ecb116fd4c89918213e61aab1d6db2c5bb05e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 29 20:51:47 2014 +0100

    coverity#736001 Unchecked dynamic_cast
    
    Change-Id: I39622eb9c0d5f91c910b9c828beead2d1763af0e

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index ecc7be2..f48e654 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -704,7 +704,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
                                 if( pContext.get() )
                                 {
                                     ParagraphPropertyMap* pParaContext = dynamic_cast< ParagraphPropertyMap* >( pContext.get() );
-                                    pParaContext->SetFrameMode(false);
+                                    if (pParaContext)
+                                        pParaContext->SetFrameMode(false);
                                 }
                                 nIntValue = text::VertOrientation::NONE;
                                 break;