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

Stephan Bergmann sbergman at redhat.com
Thu May 12 13:16:55 UTC 2016


 sw/source/core/doc/SwStyleNameMapper.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 13801e2c734d44cff49ea3d700749010dcb4c099
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 12 15:16:22 2016 +0200

    Massage code to avoid warnings
    
    Change-Id: I51e982f7a1a2434f2e26621f9d26ee09136f38f7

diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 2a02b44..10b00a4 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -430,9 +430,6 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
 
     switch ( eFlags )
     {
-        default:
-            assert(false && "unknown pool family");
-            //fall-through
         case nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL:
         {
             pHashPointer = bProgName ? &m_pParaProgMap : &m_pParaUIMap;
@@ -469,6 +466,8 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
             vIndexes.push_back( std::make_tuple(RES_POOLNUMRULE_BEGIN, RES_POOLNUMRULE_END, bProgName ? &GetNumRuleProgNameArray : &GetNumRuleUINameArray) );
         }
         break;
+        default:
+            assert(false && "unknown pool family");
     }
 
     // Proceed if we have a pointer to a hash, and the hash hasn't already been populated


More information about the Libreoffice-commits mailing list