Skip to content

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

use constexprs and static_assert() 

Change-Id: Ie0ede65560b7d8f5e8b5f0085bc54485de4b37ef
üst c3abff8a
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 47 deletions
sw/source/core/unocore/unostyle.cxx
Dosyayı görüntüle @ b8f4fe06
...@@ -497,53 +497,31 @@ uno::Any SwXStyleFamily::getByIndex(sal_Int32 nIndex) ...@@ -497,53 +497,31 @@ uno::Any SwXStyleFamily::getByIndex(sal_Int32 nIndex)
break; break;
case SFX_STYLE_FAMILY_PARA: case SFX_STYLE_FAMILY_PARA:
{ {
if ( nIndex < ( RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) ) constexpr sal_uInt16 nPoolCollTextRange = RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN;
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCOLL_TEXT_BEGIN + nIndex), sStyleName ); constexpr sal_uInt16 nPoolCollListsRange = RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN;
else if ( nIndex < ( RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN + constexpr sal_uInt16 nPoolCollExtraRange = RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN;
RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) ) constexpr sal_uInt16 nPoolCollRegisterRange = RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN;
SwStyleNameMapper::FillUIName ( RES_POOLCOLL_LISTS_BEGIN constexpr sal_uInt16 nPoolCollDocRange = RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN;
- RES_POOLCOLL_TEXT_END + RES_POOLCOLL_TEXT_BEGIN constexpr sal_uInt16 nPoolCollHtmlRange = RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN;
+ nIndex, sStyleName ); static_assert(nPoolCollTextRange > 0 && nPoolCollListsRange > 0 && nPoolCollExtraRange > 0 && nPoolCollRegisterRange > 0 && nPoolCollDocRange > 0 && nPoolCollHtmlRange > 0, "weird pool range");
else if ( nIndex < ( RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN + constexpr sal_uInt16 nPoolCollListsStackedStart = nPoolCollTextRange;
RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN + constexpr sal_uInt16 nPoolCollExtraStackedStart = nPoolCollListsStackedStart + nPoolCollListsRange;
RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) ) constexpr sal_uInt16 nPoolCollRegisterStackedStart = nPoolCollExtraStackedStart + nPoolCollExtraRange;
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCOLL_EXTRA_BEGIN constexpr sal_uInt16 nPoolCollDocStackedStart = nPoolCollRegisterStackedStart + nPoolCollRegisterRange;
- RES_POOLCOLL_LISTS_END + RES_POOLCOLL_LISTS_BEGIN constexpr sal_uInt16 nPoolCollHtmlStackedStart = nPoolCollDocStackedStart + nPoolCollDocRange;
- RES_POOLCOLL_TEXT_END + RES_POOLCOLL_TEXT_BEGIN const sal_uInt16 nIndex16 = static_cast<sal_uInt16>(nIndex);
+ nIndex), sStyleName ); if(nIndex16 < nPoolCollListsStackedStart)
else if ( nIndex < ( RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN + SwStyleNameMapper::FillUIName(RES_POOLCOLL_TEXT_BEGIN + nIndex16, sStyleName);
RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN + else if(nIndex16 < nPoolCollExtraStackedStart)
RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN + SwStyleNameMapper::FillUIName(RES_POOLCOLL_LISTS_BEGIN + nPoolCollListsStackedStart + nIndex16, sStyleName);
RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) ) else if(nIndex16 < nPoolCollRegisterStackedStart)
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCOLL_REGISTER_BEGIN SwStyleNameMapper::FillUIName(RES_POOLCOLL_EXTRA_BEGIN + nPoolCollExtraStackedStart + nIndex16, sStyleName);
- RES_POOLCOLL_EXTRA_END + RES_POOLCOLL_EXTRA_BEGIN else if(nIndex16 < nPoolCollDocStackedStart)
- RES_POOLCOLL_LISTS_END + RES_POOLCOLL_LISTS_BEGIN SwStyleNameMapper::FillUIName(RES_POOLCOLL_REGISTER_BEGIN + nPoolCollRegisterStackedStart + nIndex16, sStyleName);
- RES_POOLCOLL_TEXT_END + RES_POOLCOLL_TEXT_BEGIN else if(nIndex16 < nPoolCollHtmlStackedStart)
+ nIndex), sStyleName ); SwStyleNameMapper::FillUIName(RES_POOLCOLL_DOC_BEGIN + nPoolCollDocStackedStart + nIndex16, sStyleName);
else if ( nIndex < ( RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN + else if(nIndex16 < nPoolCollHtmlStackedStart + nPoolCollTextRange)
RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN + SwStyleNameMapper::FillUIName(RES_POOLCOLL_HTML_BEGIN + nPoolCollHtmlStackedStart + nIndex16, sStyleName);
RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN +
RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN +
RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) )
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCOLL_DOC_BEGIN
- RES_POOLCOLL_REGISTER_END + RES_POOLCOLL_REGISTER_BEGIN
- RES_POOLCOLL_EXTRA_END + RES_POOLCOLL_EXTRA_BEGIN
- RES_POOLCOLL_LISTS_END + RES_POOLCOLL_LISTS_BEGIN
- RES_POOLCOLL_TEXT_END + RES_POOLCOLL_TEXT_BEGIN
+ nIndex), sStyleName );
else if ( nIndex < ( RES_POOLCOLL_HTML_END - RES_POOLCOLL_HTML_BEGIN +
RES_POOLCOLL_DOC_END - RES_POOLCOLL_DOC_BEGIN +
RES_POOLCOLL_REGISTER_END - RES_POOLCOLL_REGISTER_BEGIN +
RES_POOLCOLL_EXTRA_END - RES_POOLCOLL_EXTRA_BEGIN +
RES_POOLCOLL_LISTS_END - RES_POOLCOLL_LISTS_BEGIN +
RES_POOLCOLL_TEXT_END - RES_POOLCOLL_TEXT_BEGIN ) )
SwStyleNameMapper::FillUIName ( static_cast< sal_uInt16 >(RES_POOLCOLL_HTML_BEGIN
- RES_POOLCOLL_DOC_END + RES_POOLCOLL_DOC_BEGIN
- RES_POOLCOLL_REGISTER_END + RES_POOLCOLL_REGISTER_BEGIN
- RES_POOLCOLL_EXTRA_END + RES_POOLCOLL_EXTRA_BEGIN
- RES_POOLCOLL_LISTS_END + RES_POOLCOLL_LISTS_BEGIN
- RES_POOLCOLL_TEXT_END + RES_POOLCOLL_TEXT_BEGIN
+ nIndex), sStyleName );
} }
break; break;
case SFX_STYLE_FAMILY_FRAME: case SFX_STYLE_FAMILY_FRAME:
......
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