[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

Stephan Bergmann sbergman at redhat.com
Fri May 13 06:46:24 UTC 2016


 sw/source/core/layout/fly.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02af67f6e43fa86e7e6faed7eaec4178396e36a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 11 16:14:24 2016 +0200

    Missing break in switch
    
    caused by c2ea2e6ca99395cc6d9ea8f2edf009252dc87957 "coverity#704901 Dereference
    after null check"
    
    Change-Id: I7e53493bcb2857ccc840429cd2fd2e802180aa19
    (cherry picked from commit 838994da2af5f069654456dc86c5ffbc4322c37c)
    Reviewed-on: https://gerrit.libreoffice.org/24920
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 57c7d1d..5bb29a5 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -820,8 +820,8 @@ void SwFlyFrame::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
                 if ( FrameSizeChg( rNew ) )
                     NotifyDrawObj();
                 rInvFlags |= 0x1A;
-                break;
             }
+            break;
 
         case RES_FRM_SIZE:
         case RES_FMT_CHG:


More information about the Libreoffice-commits mailing list