diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-05-29 17:23:51 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-29 18:03:34 +0100 |
commit | 6e6d81e9cfc593d865e409ad22b2307f87a37859 (patch) | |
tree | 4d578e5be2dfd3a403576d7c638f83f041d56911 /linguistic | |
parent | remove useless argument (diff) | |
download | core-6e6d81e9cfc593d865e409ad22b2307f87a37859.tar.gz core-6e6d81e9cfc593d865e409ad22b2307f87a37859.zip |
targetted SAL_N_ELEMENTS reversion.
Change-Id: I30be93ccaeb1f9fd17cbe9e3ed3165e094810b2e
Diffstat (limited to 'linguistic')
-rw-r--r-- | linguistic/source/gciterator.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngopt.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngprophelp.cxx | 6 | ||||
-rw-r--r-- | linguistic/source/misc.cxx | 2 | ||||
-rw-r--r-- | linguistic/workben/sprophelp.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index bdd6ee3af79e..37e08d276d1c 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -137,7 +137,7 @@ static sal_Unicode aWhiteSpaces[] = 0xfffb /* INTERLINEAR ANNOTATION TERMINATOR */ }; -static int nWhiteSpaces = SAL_N_ELEMENTS( aWhiteSpaces ); +static int nWhiteSpaces = sizeof( aWhiteSpaces ) / sizeof( aWhiteSpaces[0] ); static bool lcl_IsWhiteSpace( sal_Unicode cChar ) { diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index da17ba193acd..c29205ab8581 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -139,7 +139,7 @@ OUString LinguOptions::GetName( sal_Int32 nWID ) OUString aRes; - sal_Int32 nLen = SAL_N_ELEMENTS( aWID_Name ); + sal_Int32 nLen = sizeof (aWID_Name) / sizeof (aWID_Name[0]); if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID) aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName); else diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 82a7c4d76142..730f35d325c9 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -61,7 +61,7 @@ static const char *aCH[] = UPN_IS_USE_DICTIONARY_LIST, }; -static int nCHCount = SAL_N_ELEMENTS(aCH); +static int nCHCount = sizeof(aCH) / sizeof(aCH[0]); PropertyChgHelper::PropertyChgHelper( @@ -383,7 +383,7 @@ PropertyHelper_Spell::PropertyHelper_Spell( Reference< XPropertySet > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_SPELLCHECKER ) { - AddPropNames( aSP, SAL_N_ELEMENTS(aSP)); + AddPropNames( aSP, sizeof(aSP) / sizeof(aSP[0]) ); SetDefaultValues(); GetCurrentValues(); @@ -571,7 +571,7 @@ PropertyHelper_Hyphen::PropertyHelper_Hyphen( Reference< XPropertySet > &rxPropSet ) : PropertyChgHelper ( rxSource, rxPropSet, AE_HYPHENATOR ) { - AddPropNames( aHP, SAL_N_ELEMENTS(aHP)); + AddPropNames( aHP, sizeof(aHP) / sizeof(aHP[0]) ); SetDefaultValues(); GetCurrentValues(); } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 59c3f3725773..1513371f44d1 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -686,7 +686,7 @@ static const sal_uInt32 the_aDigitZeroes [] = sal_Bool HasDigits( const OUString &rText ) { - static const int nNumDigitZeroes = SAL_N_ELEMENTS(the_aDigitZeroes); + static const int nNumDigitZeroes = sizeof(the_aDigitZeroes) / sizeof(the_aDigitZeroes[0]); const sal_Int32 nLen = rText.getLength(); sal_Int32 i = 0; diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 134b0d8d14ec..b5ca84245191 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -188,7 +188,7 @@ static const char *aSP[] = PropertyHelper_Spell::PropertyHelper_Spell( const Reference< XInterface > & rxSource, Reference< XPropertySet > &rxPropSet ) : - PropertyChgHelper ( rxSource, rxPropSet, aSP, SAL_N_ELEMENTS(aSP)) + PropertyChgHelper ( rxSource, rxPropSet, aSP, sizeof(aSP) / sizeof(aSP[0]) ) { SetDefault(); sal_Int32 nLen = GetPropNames().getLength(); |