[Libreoffice-commits] core.git: 4 commits - sc/source sw/source tools/source

[Caolán McNamara]

 sc/source/filter/lotus/tool.cxx   |    3 +++
 sw/source/core/layout/findfrm.cxx |    2 +-
 sw/source/filter/ww8/ww8par5.cxx  |    1 +
 tools/source/fsys/urlobj.cxx      |    1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2041a2ee84dd7298e6d8a930d714686d4e7ac61b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 15 14:25:39 2014 +0000

    coverity#704897 Unchecked dynamic_cast
    
    Change-Id: Ib4a794710b6b48bdfbeb326e1aaa28443e42e770

diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index fd6a778..2c4b675 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1496,7 +1496,7 @@ const SwCellFrm& SwCellFrm::FindStartEndOfRowSpanCell( bool bStart, bool bCurren
 
     const SwTabFrm* pTableFrm = dynamic_cast<const SwTabFrm*>(GetUpper()->GetUpper());
 
-    if ( !bStart && pTableFrm->IsFollow() && pTableFrm->IsInHeadline( *this ) )
+    if ( !bStart && pTableFrm && pTableFrm->IsFollow() && pTableFrm->IsInHeadline( *this ) )
         return *this;
 
     OSL_ENSURE( pTableFrm &&
commit 919b77ee2d0bb4f860205fbe8297e4be60ef5f4f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 15 14:21:01 2014 +0000

    coverity#1078651 Missing break in switch
    
    Change-Id: I51101889b13b8160a0fbc2b840ff060bd9b90b49

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f085353..6d64a27 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3422,6 +3422,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, OUString& rStr
                 case 'h':
                 case 'm':
                     OSL_ENSURE( !this, "Auswertung fehlt noch - Daten unbekannt" );
+                    //fall-through
                 case 's':   //worthless fake anchor option
                     bOptions = true;
                     break;
commit 133fa638c16652e8d4f5b63b0bfb60c3860f86f7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 15 14:19:01 2014 +0000

    coverity#705325 Missing break in switch
    
    Change-Id: I575292a649ebdf8e16613f07d0c98a68c603a087

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 539270e..761e0dc 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -5061,6 +5061,7 @@ sal_uInt32 INetURLObject::getUTF32(sal_Unicode const *& rBegin,
                     default:
                         OSL_FAIL(
                             "INetURLObject::getUTF32(): Unsupported charset");
+                        //fall-through
                     case RTL_TEXTENCODING_ASCII_US:
                         rEscapeType = rtl::isAscii(nUTF32) ?
                                           ESCAPE_UTF32 : ESCAPE_OCTET;
commit 55eec51c82acdff0e86e5af89aff62c0cf1f64d9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 15 14:16:47 2014 +0000

    coverity#735797 Explicit null dereferenced
    
    Change-Id: I67345e7eaae16baf677e9aad721d39b4ea0c43d1

diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index d0c136a..f4f2dad 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -94,6 +94,9 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString )
             pJustify = pAttrStandard;
     }
 
+    if (!pString)
+        return;
+
     pDoc->ApplyAttr( nCol, nRow, nTab, *pJustify );
     ScSetStringParam aParam;
     aParam.setTextInput();