diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-01-10 16:00:18 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-01-10 16:52:33 +0100 |
| commit | 2c3d0ff9f83aab89980529da2aa3837390b84ef7 (patch) | |
| tree | a7ff1a3e2271c219b29c4ab3a4e54411c22ed20c /sw | |
| parent | a2dd79d14ee2e76e3b6c13f2880706292ea90c26 (diff) | |
Use SAL_N_ELEMENTS
Some more like Thorstens diff 9c59cd15b150638c845bbc275b9b04460afc23bd
Done with some regex magic (and a check if this var is an array):
s/sizeof\(\s*$var\s*\)\s*\/\s*sizeof\(\s*\*$var\s*/SAL_N_ELEMENTS\($var/gs
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww1/w1class.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww1/w1sprm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx index a7e35cd65e41..c1630cab5a04 100644 --- a/sw/source/filter/ww1/w1class.cxx +++ b/sw/source/filter/ww1/w1class.cxx @@ -160,7 +160,7 @@ sal_uInt16 Ww1Style::ReadName( sal_uInt8*&p, sal_uInt16& rnCountBytes, sal_uInt1 size_t nSize(stc); if (!nSize) pStr = "W1 Normal"; - else if (nSize - 222 >= sizeof(names) / sizeof(*names)) + else if (nSize - 222 >= SAL_N_ELEMENTS(names)) pStr = "?"; else pStr = names[nSize-222]; diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx index 14d9f773313b..a2d451f91d5b 100644 --- a/sw/source/filter/ww1/w1sprm.cxx +++ b/sw/source/filter/ww1/w1sprm.cxx @@ -172,7 +172,7 @@ void Ww1SingleSprmPJc::Start( SVX_ADJUST_RIGHT, SVX_ADJUST_BLOCK }; sal_uInt8 nPara = SVBT8ToByte(pSprm); - nPara %=(sizeof(aAdj)/sizeof(*aAdj)); + nPara %=SAL_N_ELEMENTS(aAdj); rOut << SvxAdjustItem(aAdj[nPara], RES_PARATR_ADJUST); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 845a381c40ea..4db2f0495834 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -4931,7 +4931,7 @@ long SwWW8ImplReader::ImportExtSprm(WW8PLCFManResult* pRes) if( pRes->nSprmId < 280 ) { sal_uInt8 nIdx = static_cast< sal_uInt8 >(pRes->nSprmId - eFTN); - if( nIdx < sizeof( aWwSprmTab ) / sizeof( *aWwSprmTab ) + if( nIdx < SAL_N_ELEMENTS(aWwSprmTab) && aWwSprmTab[nIdx] ) return (this->*aWwSprmTab[nIdx])(pRes); else @@ -4955,7 +4955,7 @@ void SwWW8ImplReader::EndExtSprm(sal_uInt16 nSprmId) }; sal_uInt8 nIdx = static_cast< sal_uInt8 >(nSprmId - eFTN); - if( nIdx < sizeof( aWwSprmTab ) / sizeof( *aWwSprmTab ) + if( nIdx < SAL_N_ELEMENTS(aWwSprmTab) && aWwSprmTab[nIdx] ) (this->*aWwSprmTab[nIdx])(); } |