diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-14 10:46:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-14 15:14:27 +0200 |
| commit | 546c35519125a769755330c961c7b8fc61e24d89 (patch) | |
| tree | 0b73735081bd279b89b93dabc5c35dee6ec08b94 /sal/textenc | |
| parent | 92b7acdf2a1159af8a31da22ce6227950f709040 (diff) | |
use more SAL_N_ELEMENTS part 2
Change-Id: If00e371c3cd3ae616309a172c875faed016e391b
Reviewed-on: https://gerrit.libreoffice.org/38773
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal/textenc')
| -rw-r--r-- | sal/textenc/convertadobe.tab | 2 | ||||
| -rw-r--r-- | sal/textenc/convertsimple.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/textenc/convertadobe.tab b/sal/textenc/convertadobe.tab index 37cf080a4130..568ccd6be44b 100644 --- a/sal/textenc/convertadobe.tab +++ b/sal/textenc/convertadobe.tab @@ -281,7 +281,7 @@ adobeDingbatsEncodingConverterData = { 0x27A8, 0x27A9, 0x27AA, 0x27AB, 0x27AC, 0x27AD, 0x27AE, 0x27AF, 0xFFFF, 0x27B1, 0x27B2, 0x27B3, 0x27B4, 0x27B5, 0x27B6, 0x27B7, // 0xF0 0x27B8, 0x27B9, 0x27BA, 0x27BB, 0x27BC, 0x27BD, 0x27BE, 0xFFFF }, - (sizeof(unicodeToAdobeDingbatsEncoding) / sizeof(*unicodeToAdobeDingbatsEncoding)), + SAL_N_ELEMENTS(unicodeToAdobeDingbatsEncoding), unicodeToAdobeDingbatsEncoding }; ImplTextEncodingData const adobeStandardEncodingData diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index 99689f6d3d32..507e20907346 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -326,7 +326,7 @@ sal_uInt16 ImplGetReplaceChar( sal_Unicode c ) const ImplReplaceCharData* pCharData; nLow = 0; - nHigh = (sizeof( aImplRepCharTab )/sizeof( ImplReplaceCharData ))-1; + nHigh = SAL_N_ELEMENTS( aImplRepCharTab ) - 1; do { nMid = (nLow+nHigh)/2; @@ -418,7 +418,7 @@ const sal_uInt16* ImplGetReplaceString( sal_Unicode c ) const ImplReplaceCharStrData* pCharData; nLow = 0; - nHigh = (sizeof( aImplRepCharStrTab )/sizeof( ImplReplaceCharStrData ))-1; + nHigh = SAL_N_ELEMENTS( aImplRepCharStrTab ) - 1; do { nMid = (nLow+nHigh)/2; |