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

Stephan Bergmann sbergman at redhat.com
Thu May 12 12:39:30 UTC 2016


 sc/source/ui/unoobj/textuno.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3d1b29a7da5c95de7dc9456d05e46bf563eab9c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 12 14:38:56 2016 +0200

    Silence -Werror,-Wimplicit-fallthrough under NDEBUG
    
    Change-Id: Iea1951275966aa9e428505eba3b8133bc10b90f5

diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index bcf9618..f2a9ee9 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -17,6 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include <cstdlib>
+
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 #include <svx/svdpool.hxx>
@@ -337,12 +341,11 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException
         case ScHeaderFooterPart::CENTER:
             pData = rContentObj->GetCenterEditObject();
         break;
-        default: //needed for compiler warning: possible uninitialized pointer
-            assert(!"unexpected enum value of ScHeaderFooterPart");
-        // fall through
         case ScHeaderFooterPart::RIGHT:
             pData = rContentObj->GetRightEditObject();
         break;
+        default: //needed for compiler warning: possible uninitialized pointer
+            for (;;) std::abort();
     }
 
     if (pData)


More information about the Libreoffice-commits mailing list