Skip to content

C
core
Kaydet (Commit) c3abff8a authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

use constexprs and static_assert() 

Change-Id: Ia7abeed325d8bc845e35bb9e7667cec6b83ac11f
üst 9bc9b093
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
sw/source/core/unocore/unostyle.cxx
Dosyayı görüntüle @ c3abff8a
...@@ -482,17 +482,17 @@ uno::Any SwXStyleFamily::getByIndex(sal_Int32 nIndex) ...@@ -482,17 +482,17 @@ uno::Any SwXStyleFamily::getByIndex(sal_Int32 nIndex)
if(!m_pBasePool) if(!m_pBasePool)
throw uno::RuntimeException(); throw uno::RuntimeException();
OUString sStyleName; OUString sStyleName;
switch( m_eFamily ) switch(m_eFamily)
{ {
case SFX_STYLE_FAMILY_CHAR: case SFX_STYLE_FAMILY_CHAR:
{ {
if ( nIndex < ( RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN ) ) constexpr sal_Int32 nPoolChrNormalRange = RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN;
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCHR_NORMAL_BEGIN + nIndex), sStyleName ); constexpr sal_Int32 nPoolChrHtmlRange = RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN;
else if ( nIndex < ( RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN + static_assert(nPoolChrNormalRange > 0 && nPoolChrHtmlRange > 0, "invalid pool range");
RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN ) ) if(nIndex < nPoolChrNormalRange)
SwStyleNameMapper::FillUIName ( RES_POOLCHR_HTML_BEGIN SwStyleNameMapper::FillUIName(static_cast<sal_uInt16>(RES_POOLCHR_NORMAL_BEGIN + nIndex), sStyleName);
- RES_POOLCHR_NORMAL_END + RES_POOLCHR_NORMAL_BEGIN else if(nIndex < (nPoolChrHtmlRange+nPoolChrNormalRange))
+ nIndex, sStyleName ); SwStyleNameMapper::FillUIName(RES_POOLCHR_HTML_BEGIN + nPoolChrNormalRange + nIndex, sStyleName );
} }
break; break;
case SFX_STYLE_FAMILY_PARA: case SFX_STYLE_FAMILY_PARA:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment