summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-05-12 15:16:22 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-05-12 15:16:22 +0200
commit13801e2c734d44cff49ea3d700749010dcb4c099 (patch)
treeca59d016af9311b913135b5a263315d0f2aa3188
parent544d2408e7d8c89ee9e6c802b5487b5a8fb6e0fd (diff)
Massage code to avoid warnings
Change-Id: I51e982f7a1a2434f2e26621f9d26ee09136f38f7
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 2a02b440d4cf..10b00a426b82 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