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

[Jochen Nitschke]

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

New commits:
commit 80df81c560364a246fc26ef87d22279c18bc778d
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Mon Apr 18 09:57:03 2016 +0000

    cppcheck: silence known condition warning in sw undobj
    
    Change-Id: Iedbb6bbdcdccf4ea44a7ad4d2e11ce630431034f
    Reviewed-on: https://gerrit.libreoffice.org/24210
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 7696d1a..b45a5b3 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -171,7 +171,7 @@ void SwUndoFlyBase::DelFly( SwDoc* pDoc )
         const_cast<SwFormatContent&>(rContent).SetNewContentIdx( nullptr );
     }
     // OD 02.07.2003 #108784# - remove 'master' drawing object from drawing page
-    else if ( RES_DRAWFRMFMT == pFrameFormat->Which() )
+    else
     {
         SwDrawContact* pDrawContact =
             static_cast<SwDrawContact*>(pFrameFormat->FindContactObj());