summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:16:54 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:28 +0100
commit6a33fb16bdd91055c2e13b7b1823093b000ca60d (patch)
tree31652a5f38c54f792699e2502b8574b5f7012a79
parent25bb667cff3cdd5d2a446f5eea036f9084a3fa17 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I7af8d14bfe7337fea3f18dbbd41eb32e0f7ae331
-rw-r--r--i18npool/inc/breakiterator_unicode.hxx2
-rw-r--r--i18npool/inc/transliteration_Ignore.hxx8
-rw-r--r--i18npool/inc/xdictionary.hxx10
-rw-r--r--i18npool/source/breakiterator/breakiterator_cjk.cxx2
-rw-r--r--i18npool/source/breakiterator/breakiterator_ctl.cxx4
-rw-r--r--i18npool/source/breakiterator/breakiterator_th.cxx2
-rw-r--r--i18npool/source/breakiterator/breakiterator_unicode.cxx16
-rw-r--r--i18npool/source/breakiterator/gendict.cxx4
-rw-r--r--i18npool/source/breakiterator/xdictionary.cxx4
-rw-r--r--i18npool/source/calendar/calendar_gregorian.cxx4
-rw-r--r--i18npool/source/characterclassification/cclass_unicode.cxx6
-rw-r--r--i18npool/source/characterclassification/cclass_unicode_parser.cxx10
-rw-r--r--i18npool/source/collator/collatorImpl.cxx4
-rw-r--r--i18npool/source/collator/collator_unicode.cxx10
-rw-r--r--i18npool/source/collator/gencoll_rule.cxx6
-rw-r--r--i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx62
-rw-r--r--i18npool/source/indexentry/genindex_data.cxx4
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_asian.cxx6
-rw-r--r--i18npool/source/indexentry/indexentrysupplier_default.cxx2
-rw-r--r--i18npool/source/inputchecker/inputsequencechecker.cxx6
-rw-r--r--i18npool/source/localedata/LocaleNode.cxx50
-rw-r--r--i18npool/source/localedata/filewriter.cxx2
-rw-r--r--i18npool/source/localedata/localedata.cxx20
-rw-r--r--i18npool/source/localedata/saxparser.cxx2
-rw-r--r--i18npool/source/nativenumber/nativenumbersupplier.cxx2
-rw-r--r--i18npool/source/registerservices/registerservices.cxx4
-rw-r--r--i18npool/source/search/levdis.hxx2
-rw-r--r--i18npool/source/search/textsearch.cxx22
-rw-r--r--i18npool/source/textconversion/genconv_dict.cxx4
-rw-r--r--i18npool/source/textconversion/textconversion.cxx2
-rw-r--r--i18npool/source/textconversion/textconversion_ko.cxx2
-rw-r--r--i18npool/source/textconversion/textconversion_zh.cxx2
-rw-r--r--i18npool/source/transliteration/hiraganaToKatakana.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreDiacritics_CTL.cxx4
-rw-r--r--i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreKashida_CTL.cxx4
-rw-r--r--i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx4
-rw-r--r--i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx4
-rw-r--r--i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreSpace_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx4
-rw-r--r--i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx2
-rw-r--r--i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx4
-rw-r--r--i18npool/source/transliteration/katakanaToHiragana.cxx2
-rw-r--r--i18npool/source/transliteration/textToPronounce_zh.cxx2
-rw-r--r--i18npool/source/transliteration/transliterationImpl.cxx2
-rw-r--r--i18npool/source/transliteration/transliteration_Ignore.cxx2
-rw-r--r--i18npool/source/transliteration/transliteration_OneToOne.cxx2
55 files changed, 172 insertions, 172 deletions
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 94b9f85b6fe9..2d41c01210f5 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -82,7 +82,7 @@ protected:
icu::BreakIterator* aBreakIterator;
css::lang::Locale maLocale;
- BI_Data() : ut(NULL), aBreakIterator(NULL)
+ BI_Data() : ut(nullptr), aBreakIterator(nullptr)
{
}
~BI_Data()
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 672ace293463..e6573b6adfaa 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -101,8 +101,8 @@ class ignore##name : public transliteration_Ignore {\
public:\
ignore##name () {\
func = nullptr;\
- table = 0;\
- map = 0;\
+ table = nullptr;\
+ map = nullptr;\
transliterationName = "ignore"#name;\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
@@ -122,8 +122,8 @@ class ignore##name : public transliteration_Ignore {\
public:\
ignore##name () {\
func = nullptr;\
- table = 0;\
- map = 0;\
+ table = nullptr;\
+ map = nullptr;\
transliterationName = "ignore"#name;\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index f7c0110d39fd..ed6b269aa3c0 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.hxx
@@ -48,11 +48,11 @@ struct xdictionarydata
const sal_Int32 * lenArray;
const sal_Unicode* dataArea;
xdictionarydata() :
- existMark( NULL ),
- index1( NULL ),
- index2( NULL ),
- lenArray( NULL ),
- dataArea( NULL )
+ existMark( nullptr ),
+ index1( nullptr ),
+ index2( nullptr ),
+ lenArray( nullptr ),
+ dataArea( nullptr )
{
}
};
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 8983053fd3cd..88ea6efb29d9 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
// ----------------------------------------------------;
BreakIterator_CJK::BreakIterator_CJK() :
- dict( NULL ),
+ dict( nullptr ),
hangingCharacters()
{
cBreakIterator = "com.sun.star.i18n.BreakIterator_CJK";
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 8a4593238dd8..02bc5c77f115 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -31,8 +31,8 @@ namespace com { namespace sun { namespace star { namespace i18n {
*/
BreakIterator_CTL::BreakIterator_CTL() :
cachedText(),
- nextCellIndex( NULL ),
- previousCellIndex( NULL ),
+ nextCellIndex( nullptr ),
+ previousCellIndex( nullptr ),
cellIndexSize( 512 )
{
cBreakIterator = "com.sun.star.i18n.BreakIterator_CTL";
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index a685427df5ee..7c6f0eb3f374 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
BreakIterator_th::BreakIterator_th()
{
cBreakIterator = "com.sun.star.i18n.BreakIterator_th";
- lineRule=NULL;
+ lineRule=nullptr;
}
BreakIterator_th::~BreakIterator_th()
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 64202b66d624..d76bf14ef269 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -43,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
BreakIterator_Unicode::BreakIterator_Unicode()
: cBreakIterator( "com.sun.star.i18n.BreakIterator_Unicode" ) // implementation name
, lineRule( "line" )
- , icuBI( NULL )
+ , icuBI( nullptr )
, aBreakType(0)
{
}
@@ -107,7 +107,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
rLocale.Variant != icuBI->maLocale.Variant) {
if (icuBI->aBreakIterator) {
delete icuBI->aBreakIterator;
- icuBI->aBreakIterator=NULL;
+ icuBI->aBreakIterator=nullptr;
}
if (rule) {
uno::Sequence< OUString > breakRules = LocaleDataImpl().getBreakIteratorRules(rLocale);
@@ -116,7 +116,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
udata_setAppData("OpenOffice", OpenOffice_dat, &status);
if ( !U_SUCCESS(status) ) throw uno::RuntimeException();
- OOoRuleBasedBreakIterator *rbi = NULL;
+ OOoRuleBasedBreakIterator *rbi = nullptr;
if (breakRules.getLength() > breakType && !breakRules[breakType].isEmpty())
{
@@ -139,7 +139,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
pUData = udata_open("OpenOffice", "brk", rule, &status);
if( U_SUCCESS(status) )
rbi = new OOoRuleBasedBreakIterator( pUData, status);
- if (!U_SUCCESS(status) ) icuBI->aBreakIterator=NULL;
+ if (!U_SUCCESS(status) ) icuBI->aBreakIterator=nullptr;
}
}
if (rbi) {
@@ -172,7 +172,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
break;
}
if ( !U_SUCCESS(status) ) {
- icuBI->aBreakIterator=NULL;
+ icuBI->aBreakIterator=nullptr;
throw uno::RuntimeException();
}
}
@@ -245,7 +245,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int32 nStartPos,
const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException, std::exception)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
result.startPos = icuBI->aBreakIterator->following(nStartPos);
if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE )
@@ -267,7 +267,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_Int32 nStartPos,
const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException, std::exception)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
result.startPos = icuBI->aBreakIterator->preceding(nStartPos);
if( result.startPos < 0 || result.startPos == BreakIterator::DONE)
@@ -289,7 +289,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 nPos, const lang::Locale& rLocale,
sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException, std::exception)
{
- loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
+ loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text);
sal_Int32 len = Text.getLength();
if(icuBI->aBreakIterator->isBoundary(nPos)) {
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index 493d0531a00e..1ccae1942729 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -289,7 +289,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
dictionary_fp = fopen(argv[1], "rb"); // open the source file for read;
- if (dictionary_fp == NULL)
+ if (dictionary_fp == nullptr)
{
fprintf(stderr, "Opening the dictionary source file %s for reading failed: %s\n", argv[1], strerror(errno));
exit(1);
@@ -301,7 +301,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
{
// create the C source file to write
source_fp = fopen(argv[2], "wb");
- if (source_fp == NULL) {
+ if (source_fp == nullptr) {
fclose(dictionary_fp);
fprintf(stderr, "Opening %s for writing failed: %s\n", argv[2], strerror(errno));
exit(1);
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index c6955d852a2b..536b67e3edb8 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -240,8 +240,8 @@ sal_Int32 xdictionary::getLongestMatch(const sal_Unicode* str, sal_Int32 sLen)
WordBreakCache::WordBreakCache() :
length( 0 ),
- contents( NULL ),
- wordboundary( NULL ),
+ contents( nullptr ),
+ wordboundary( nullptr ),
size( 0 )
{
}
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index 0b94421846f8..156e347d489e 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -132,7 +132,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
Calendar_gregorian::Calendar_gregorian()
: mxNatNum(new NativeNumberSupplierService)
{
- init(NULL);
+ init(nullptr);
}
Calendar_gregorian::Calendar_gregorian(const Era *_earArray)
: mxNatNum(new NativeNumberSupplierService)
@@ -165,7 +165,7 @@ Calendar_gregorian::init(const Era *_eraArray)
* not all, language and country and variant), otherwise the current
* default locale would be used again and the calendar keyword ignored.
* */
- icu::Locale aIcuLocale( "", NULL, NULL, "calendar=gregorian");
+ icu::Locale aIcuLocale( "", nullptr, nullptr, "calendar=gregorian");
UErrorCode status;
body = icu::Calendar::createInstance( aIcuLocale, status = U_ZERO_ERROR);
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index 86891ad38d3d..1414e783523e 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -37,9 +37,9 @@ namespace com { namespace sun { namespace star { namespace i18n {
// ----------------------------------------------------;
cclass_Unicode::cclass_Unicode( const uno::Reference < XComponentContext >& rxContext ) : m_xContext( rxContext ),
- pTable( NULL ),
- pStart( NULL ),
- pCont( NULL ),
+ pTable( nullptr ),
+ pStart( nullptr ),
+ pCont( nullptr ),
nStartTypes( 0 ),
nContTypes( 0 ),
eState( ssGetChar ),
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 593c4822d4fc..7321a7e5f19b 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -340,14 +340,14 @@ const sal_Int32 cclass_Unicode::pParseTokensType[ nDefCnt ] =
const sal_Unicode* cclass_Unicode::StrChr( const sal_Unicode* pStr, sal_Unicode c )
{
if ( !pStr )
- return NULL;
+ return nullptr;
while ( *pStr )
{
if ( *pStr == c )
return pStr;
pStr++;
}
- return NULL;
+ return nullptr;
}
@@ -438,12 +438,12 @@ void cclass_Unicode::initParserTable( const Locale& rLocale, sal_Int32 startChar
if ( pStart && userDefinedCharactersStart.getLength() != aStartChars.getLength() )
{
delete [] pStart;
- pStart = NULL;
+ pStart = nullptr;
}
if ( pCont && userDefinedCharactersCont.getLength() != aContChars.getLength() )
{
delete [] pCont;
- pCont = NULL;
+ pCont = nullptr;
}
nStartTypes = startCharTokenType;
nContTypes = contCharTokenType;
@@ -1011,7 +1011,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32
if ( r.TokenType & KParseType::ASC_NUMBER )
{
r.Value = rtl_math_uStringToDouble( pTextStart + r.LeadingWhiteSpace,
- pTextStart + r.EndPos, cDecimalSep, cGroupSep, NULL, NULL );
+ pTextStart + r.EndPos, cDecimalSep, cGroupSep, nullptr, nullptr );
if ( bMightBeWord )
r.TokenType |= KParseType::IDENTNAME;
}
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 6aef93a7e6bd..ca800b194472 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
CollatorImpl::CollatorImpl( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext)
{
mxLocaleData.set( LocaleData::create(rxContext) );
- cachedItem = NULL;
+ cachedItem = nullptr;
}
CollatorImpl::~CollatorImpl()
@@ -206,7 +206,7 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
bLoaded = createCollator( rLocale, "Unicode", rSortAlgorithm);
if (!bLoaded)
{
- cachedItem = NULL;
+ cachedItem = nullptr;
throw RuntimeException(); // could not load any service
}
}
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 8a0486fd8e71..468321c83586 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -38,10 +38,10 @@ namespace com { namespace sun { namespace star { namespace i18n {
Collator_Unicode::Collator_Unicode()
{
implementationName = "com.sun.star.i18n.Collator_Unicode";
- collator = NULL;
- uca_base = NULL;
+ collator = nullptr;
+ uca_base = nullptr;
#ifndef DISABLE_DYNLOADING
- hModule = NULL;
+ hModule = nullptr;
#endif
}
@@ -142,8 +142,8 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
if (! U_SUCCESS(status)) throw RuntimeException();
}
if (!collator && OUString(LOCAL_RULE_LANGS).indexOf(rLocale.Language) >= 0) {
- const sal_uInt8* (*func)() = NULL;
- size_t (*funclen)() = NULL;
+ const sal_uInt8* (*func)() = nullptr;
+ size_t (*funclen)() = nullptr;
#ifndef DISABLE_DYNLOADING
OUStringBuffer aBuf;
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index b4f0ad2671fd..70dd38eab65e 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -35,7 +35,7 @@
void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
{
FILE *fp = fopen(file, "wb");
- if (fp == NULL) {
+ if (fp == nullptr) {
fprintf(stderr, "Opening %s for writing failed: %s\n", file, strerror(errno));
exit(1);
}
@@ -82,7 +82,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (argc < 4) exit(-1);
fp = fopen(argv[1], "rb"); // open the source file for read;
- if (fp == NULL){
+ if (fp == nullptr){
fprintf(stderr, "Opening the rule source file %s for reading failed: %s\n", argv[1], strerror(errno));
exit(1);
}
@@ -116,7 +116,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (U_SUCCESS(status)) {
std::vector<uint8_t> data;
- int32_t len = coll->cloneBinary(0, 0, status);
+ int32_t len = coll->cloneBinary(nullptr, 0, status);
if (status == U_BUFFER_OVERFLOW_ERROR) {
data.resize(len);
status = U_ZERO_ERROR;
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 75b22f323e2c..cb6a974ae3eb 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -260,7 +260,7 @@ static const sal_Unicode table_PersianWord_decadeX[][8]={
};
-DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext),translit(NULL)
+DefaultNumberingProvider::DefaultNumberingProvider( const Reference < XComponentContext >& rxContext ) : m_xContext(rxContext),translit(nullptr)
{
}
@@ -565,7 +565,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
sal_Int16 natNum = 0;
sal_Int16 tableSize = 0;
- const sal_Unicode *table = NULL; // initialize to avoid compiler warning
+ const sal_Unicode *table = nullptr; // initialize to avoid compiler warning
bool bRecycleSymbol = false;
Locale locale;
@@ -897,33 +897,33 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_UPPER_LETTER_N, "AAA", LANG_ALL},
{style::NumberingType::CHARS_LOWER_LETTER_N, "aaa", LANG_ALL},
{style::NumberingType::NATIVE_NUMBERING, "Native Numbering", LANG_CJK|LANG_CTL},
- {style::NumberingType::FULLWIDTH_ARABIC, NULL, LANG_CJK},
- {style::NumberingType::CIRCLE_NUMBER, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_LOWER_ZH, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_UPPER_ZH, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_UPPER_ZH_TW, NULL, LANG_CJK},
- {style::NumberingType::TIAN_GAN_ZH, NULL, LANG_CJK},
- {style::NumberingType::DI_ZI_ZH, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_TRADITIONAL_JA, NULL, LANG_CJK},
- {style::NumberingType::AIU_FULLWIDTH_JA, NULL, LANG_CJK},
- {style::NumberingType::AIU_HALFWIDTH_JA, NULL, LANG_CJK},
- {style::NumberingType::IROHA_FULLWIDTH_JA, NULL, LANG_CJK},
- {style::NumberingType::IROHA_HALFWIDTH_JA, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_UPPER_KO, NULL, LANG_CJK},
- {style::NumberingType::NUMBER_HANGUL_KO, NULL, LANG_CJK},
- {style::NumberingType::HANGUL_JAMO_KO, NULL, LANG_CJK},
- {style::NumberingType::HANGUL_SYLLABLE_KO, NULL, LANG_CJK},
- {style::NumberingType::HANGUL_CIRCLED_JAMO_KO, NULL, LANG_CJK},
- {style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO, NULL, LANG_CJK},
- {style::NumberingType::CHARS_ARABIC, NULL, LANG_CTL},
- {style::NumberingType::CHARS_ARABIC_ABJAD, NULL, LANG_CTL},
- {style::NumberingType::CHARS_THAI, NULL, LANG_CTL},
- {style::NumberingType::CHARS_HEBREW, NULL, LANG_CTL},
- {style::NumberingType::CHARS_NEPALI, NULL, LANG_CTL},
- {style::NumberingType::CHARS_KHMER, NULL, LANG_CTL},
- {style::NumberingType::CHARS_LAO, NULL, LANG_CTL},
- {style::NumberingType::CHARS_MYANMAR, NULL, LANG_CTL},
- {style::NumberingType::CHARS_TIBETAN, NULL, LANG_CTL},
+ {style::NumberingType::FULLWIDTH_ARABIC, nullptr, LANG_CJK},
+ {style::NumberingType::CIRCLE_NUMBER, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_LOWER_ZH, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_UPPER_ZH, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_UPPER_ZH_TW, nullptr, LANG_CJK},
+ {style::NumberingType::TIAN_GAN_ZH, nullptr, LANG_CJK},
+ {style::NumberingType::DI_ZI_ZH, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_TRADITIONAL_JA, nullptr, LANG_CJK},
+ {style::NumberingType::AIU_FULLWIDTH_JA, nullptr, LANG_CJK},
+ {style::NumberingType::AIU_HALFWIDTH_JA, nullptr, LANG_CJK},
+ {style::NumberingType::IROHA_FULLWIDTH_JA, nullptr, LANG_CJK},
+ {style::NumberingType::IROHA_HALFWIDTH_JA, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_UPPER_KO, nullptr, LANG_CJK},
+ {style::NumberingType::NUMBER_HANGUL_KO, nullptr, LANG_CJK},
+ {style::NumberingType::HANGUL_JAMO_KO, nullptr, LANG_CJK},
+ {style::NumberingType::HANGUL_SYLLABLE_KO, nullptr, LANG_CJK},
+ {style::NumberingType::HANGUL_CIRCLED_JAMO_KO, nullptr, LANG_CJK},
+ {style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO, nullptr, LANG_CJK},
+ {style::NumberingType::CHARS_ARABIC, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_ARABIC_ABJAD, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_THAI, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_HEBREW, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_NEPALI, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_KHMER, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_LAO, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_MYANMAR, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_TIBETAN, nullptr, LANG_CTL},
{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_BG, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (bg)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_BG, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (bg)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_BG, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (bg)", LANG_ALL},
@@ -936,8 +936,8 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
- {style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
- {style::NumberingType::CHARS_PERSIAN_WORD, NULL, LANG_CTL},
+ {style::NumberingType::CHARS_PERSIAN, nullptr, LANG_CTL},
+ {style::NumberingType::CHARS_PERSIAN_WORD, nullptr, LANG_CTL},
{style::NumberingType::CHARS_GREEK_UPPER_LETTER, C_GR_A ", " C_GR_B ", ... (gr)", LANG_ALL},
{style::NumberingType::CHARS_GREEK_LOWER_LETTER, S_GR_A ", " S_GR_B ", ... (gr)", LANG_ALL},
};
diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index a4721d8c907c..a185d753462c 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.cxx
@@ -38,7 +38,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (argc < 4) exit(-1);
fp = fopen(argv[1], "rb"); // open the source file for read;
- if (fp == NULL) {
+ if (fp == nullptr) {
fprintf(stderr, "Opening the rule source file %s for reading failed: %s\n", argv[1], strerror(errno));
exit(1);
}
@@ -84,7 +84,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
fclose(fp);
fp = fopen(argv[2], "wb");
- if (fp == NULL) {
+ if (fp == nullptr) {
fprintf(stderr, "Opening %s for writing failed: %s\n", argv[2], strerror(errno));
exit(1);
}
diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index 2700503d5dce..afe5392587ac 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
@@ -82,7 +82,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry,
sal_Int32 i=0;
sal_uInt32 ch = rIndexEntry.iterateCodePoints(&i, 0);
- sal_uInt16** (*func)(sal_Int16*)=NULL;
+ sal_uInt16** (*func)(sal_Int16*)=nullptr;
#ifndef DISABLE_DYNLOADING
if (hModule) {
OUString get("get_indexdata_");
@@ -159,10 +159,10 @@ OUString SAL_CALL
IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry,
const Locale& rLocale ) throw (RuntimeException, std::exception)
{
- sal_uInt16 **(*func)(sal_Int16*)=NULL;
+ sal_uInt16 **(*func)(sal_Int16*)=nullptr;
#ifndef DISABLE_DYNLOADING
if (hModule) {
- const sal_Char *func_name=NULL;
+ const sal_Char *func_name=nullptr;
if ( rLocale.Language == "zh" )
func_name=(OUString("TW HK MO").indexOf(rLocale.Country) >= 0) ? "get_zh_zhuyin" : "get_zh_pinyin";
else if ( rLocale.Language == "ko" )
diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 5f9b3f13f974..72967bd1d5cd 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx
@@ -80,7 +80,7 @@ OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexCharacter( const OUString&
IndexTable::IndexTable()
: start(0)
, end(0)
- , table(0)
+ , table(nullptr)
{
}
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index e1cd90877f80..56599dcb8f9b 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -31,12 +31,12 @@ namespace com { namespace sun { namespace star { namespace i18n {
InputSequenceCheckerImpl::InputSequenceCheckerImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
{
serviceName = "com.sun.star.i18n.InputSequenceChecker";
- cachedItem = NULL;
+ cachedItem = nullptr;
}
InputSequenceCheckerImpl::InputSequenceCheckerImpl(const char *pServiceName)
: serviceName(pServiceName)
- , cachedItem(NULL)
+ , cachedItem(nullptr)
{
}
@@ -101,7 +101,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode
case UnicodeScript_kDevanagari: return const_cast<sal_Char*>("hi");
}
}
- return NULL;
+ return nullptr;
}
Reference< XExtendedInputSequenceChecker >& SAL_CALL
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index e2dcd8ff65b2..098c39228fc0 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -42,8 +42,8 @@ namespace cssi = ::com::sun::star::i18n;
LocaleNode::LocaleNode (const OUString& name, const Reference< XAttributeList > & attr)
: aName(name)
, aAttribs(attr)
- , parent(0)
- , children(0)
+ , parent(nullptr)
+ , children(nullptr)
, nChildren(0)
, childArrSize(0)
, nError(0)
@@ -93,9 +93,9 @@ void LocaleNode::setParent ( LocaleNode * node) {
const LocaleNode* LocaleNode::getRoot() const
{
- const LocaleNode* pRoot = 0;
+ const LocaleNode* pRoot = nullptr;
const LocaleNode* pParent = this;
- while ( (pParent = pParent->getParent()) != 0 )
+ while ( (pParent = pParent->getParent()) != nullptr )
pRoot = pParent;
return pRoot;
}
@@ -108,7 +108,7 @@ const LocaleNode * LocaleNode::findNode ( const sal_Char *name) const {
if (n)
return n;
}
- return 0;
+ return nullptr;
}
LocaleNode::~LocaleNode()
@@ -377,7 +377,7 @@ static OUString aDecSep;
void LCCTYPENode::generateCode (const OFileWriter &of) const
{
- const LocaleNode * sepNode = 0;
+ const LocaleNode * sepNode = nullptr;
OUString useLocale = getAttr().getValueByName("ref");
if (!useLocale.isEmpty()) {
useLocale = useLocale.replace( '-', '_');
@@ -729,7 +729,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
{
of.writeParameter("FormatCode", n->getValue(), formatCount);
// Check separator usage for some FormatCode elements.
- const LocaleNode* pCtype = 0;
+ const LocaleNode* pCtype = nullptr;
switch (formatindex)
{
case cssi::NumberFormatIndex::DATE_SYS_DDMMYYYY :
@@ -759,7 +759,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
"If these two locales use identical format codes, you should consider to use the ref= mechanism also for the LC_FORMAT element, together with replaceFrom= and replaceTo= for the currency.\n",
OSTR( aRef));
bCtypeIsRef = true;
- pCtype = 0;
+ pCtype = nullptr;
}
}
}
@@ -1536,7 +1536,7 @@ static void lcl_writeAbbrFullNarrNames( const OFileWriter & of, const LocaleNode
OUString aAbbrName = currNode->getChildAt(1)->getValue();
OUString aFullName = currNode->getChildAt(2)->getValue();
OUString aNarrName;
- LocaleNode* p = (currNode->getNumberOfChildren() > 3 ? currNode->getChildAt(3) : 0);
+ LocaleNode* p = (currNode->getNumberOfChildren() > 3 ? currNode->getChildAt(3) : nullptr);
if ( p && p->getName() == "DefaultNarrowName" )
aNarrName = p->getValue();
else
@@ -1621,7 +1621,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
// Generate Days of Week
const sal_Char *elementTag;
- LocaleNode * daysNode = NULL;
+ LocaleNode * daysNode = nullptr;
OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
ref_name = ref_name.replace( '-', '_');
if (!ref_name.isEmpty() && i > 0) {
@@ -1631,12 +1631,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
daysNode = getChildAt(j)->getChildAt(0);
}
}
- if (!ref_name.isEmpty() && daysNode == NULL) {
+ if (!ref_name.isEmpty() && daysNode == nullptr) {
of.writeParameter("dayRef", "ref", i);
of.writeParameter("dayRefName", ref_name, i);
nbOfDays[i] = 0;
} else {
- if (daysNode == NULL)
+ if (daysNode == nullptr)
daysNode = calNode -> getChildAt(nChild);
nbOfDays[i] = sal::static_int_cast<sal_Int16>( daysNode->getNumberOfChildren() );
if (bGregorian && nbOfDays[i] != 7)
@@ -1654,7 +1654,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
++nChild;
// Generate Months of Year
- LocaleNode * monthsNode = NULL;
+ LocaleNode * monthsNode = nullptr;
ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
ref_name = ref_name.replace( '-', '_');
if (!ref_name.isEmpty() && i > 0) {
@@ -1664,12 +1664,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
monthsNode = getChildAt(j)->getChildAt(1);
}
}
- if (!ref_name.isEmpty() && monthsNode == NULL) {
+ if (!ref_name.isEmpty() && monthsNode == nullptr) {
of.writeParameter("monthRef", "ref", i);
of.writeParameter("monthRefName", ref_name, i);
nbOfMonths[i] = 0;
} else {
- if (monthsNode == NULL)
+ if (monthsNode == nullptr)
monthsNode = calNode -> getChildAt(nChild);
nbOfMonths[i] = sal::static_int_cast<sal_Int16>( monthsNode->getNumberOfChildren() );
if (bGregorian && nbOfMonths[i] != 12)
@@ -1690,7 +1690,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
// Optional, if not present fall back to month nouns.
if ( calNode->getChildAt(nChild)->getName() != "GenitiveMonths" )
--nChild;
- LocaleNode * genitiveMonthsNode = NULL;
+ LocaleNode * genitiveMonthsNode = nullptr;
ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
ref_name = ref_name.replace( '-', '_');
if (!ref_name.isEmpty() && i > 0) {
@@ -1700,12 +1700,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
genitiveMonthsNode = getChildAt(j)->getChildAt(1);
}
}
- if (!ref_name.isEmpty() && genitiveMonthsNode == NULL) {
+ if (!ref_name.isEmpty() && genitiveMonthsNode == nullptr) {
of.writeParameter("genitiveMonthRef", "ref", i);
of.writeParameter("genitiveMonthRefName", ref_name, i);
nbOfGenitiveMonths[i] = 0;
} else {
- if (genitiveMonthsNode == NULL)
+ if (genitiveMonthsNode == nullptr)
genitiveMonthsNode = calNode -> getChildAt(nChild);
nbOfGenitiveMonths[i] = sal::static_int_cast<sal_Int16>( genitiveMonthsNode->getNumberOfChildren() );
if (bGregorian && nbOfGenitiveMonths[i] != 12)
@@ -1727,7 +1727,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
// months (nouns) if that isn't present either.
if ( calNode->getChildAt(nChild)->getName() != "PartitiveMonths" )
--nChild;
- LocaleNode * partitiveMonthsNode = NULL;
+ LocaleNode * partitiveMonthsNode = nullptr;
ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
ref_name = ref_name.replace( '-', '_');
if (!ref_name.isEmpty() && i > 0) {
@@ -1737,12 +1737,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
partitiveMonthsNode = getChildAt(j)->getChildAt(1);
}
}
- if (!ref_name.isEmpty() && partitiveMonthsNode == NULL) {
+ if (!ref_name.isEmpty() && partitiveMonthsNode == nullptr) {
of.writeParameter("partitiveMonthRef", "ref", i);
of.writeParameter("partitiveMonthRefName", ref_name, i);
nbOfPartitiveMonths[i] = 0;
} else {
- if (partitiveMonthsNode == NULL)
+ if (partitiveMonthsNode == nullptr)
partitiveMonthsNode = calNode -> getChildAt(nChild);
nbOfPartitiveMonths[i] = sal::static_int_cast<sal_Int16>( partitiveMonthsNode->getNumberOfChildren() );
if (bGregorian && nbOfPartitiveMonths[i] != 12)
@@ -1760,7 +1760,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
++nChild;
// Generate Era name
- LocaleNode * erasNode = NULL;
+ LocaleNode * erasNode = nullptr;
ref_name = calNode -> getChildAt(nChild) ->getAttr().getValueByName("ref");
ref_name = ref_name.replace( '-', '_');
if (!ref_name.isEmpty() && i > 0) {
@@ -1770,12 +1770,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
erasNode = getChildAt(j)->getChildAt(2);
}
}
- if (!ref_name.isEmpty() && erasNode == NULL) {
+ if (!ref_name.isEmpty() && erasNode == nullptr) {
of.writeParameter("eraRef", "ref", i);
of.writeParameter("eraRefName", ref_name, i);
nbOfEras[i] = 0;
} else {
- if (erasNode == NULL)
+ if (erasNode == nullptr)
erasNode = calNode -> getChildAt(nChild);
nbOfEras[i] = sal::static_int_cast<sal_Int16>( erasNode->getNumberOfChildren() );
if (bGregorian && nbOfEras[i] != 2)
@@ -2084,7 +2084,7 @@ void LCMiscNode::generateCode (const OFileWriter &of) const
for ( i = 0; i < sal_Int16(SAL_N_ELEMENTS(ReserveWord)); i++,nbOfWords++) {
const LocaleNode * curNode = (reserveNode ? reserveNode->findNode(
- ReserveWord[i].name) : 0);
+ ReserveWord[i].name) : nullptr);
if (!curNode)
fprintf( stderr,
"Warning: No %s in ReservedWords, using en_US default: \"%s\".\n",
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 02b0c327fbca..2026e55b5f72 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -176,7 +176,7 @@ void OFileWriter::closeOutput() const
if(m_f)
{
fclose( m_f );
- const_cast< OFileWriter * > ( this )->m_f = 0;
+ const_cast< OFileWriter * > ( this )->m_f = nullptr;
}
}
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 703406a0e06e..661822a830b6 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -509,7 +509,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
appendAscii( (*pOutCachedItem)->localeName).makeStringAndClear());
}
else
- return NULL;
+ return nullptr;
}
}
}
@@ -536,7 +536,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
appendAscii((*pOutCachedItem)->localeName).makeStringAndClear());
}
else
- return NULL;
+ return nullptr;
}
else
delete module;
@@ -584,7 +584,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
#endif
}
}
- return NULL;
+ return nullptr;
}
} // anonymous namespace
@@ -710,7 +710,7 @@ Sequence< Calendar2 > SAL_CALL
LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException, std::exception)
{
- sal_Unicode const * const * allCalendars = NULL;
+ sal_Unicode const * const * allCalendars = nullptr;
MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getAllCalendars" ));
@@ -862,7 +862,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, s
sal_Unicode const *const *formatArray;
sal_Int16 formatCount;
- FormatSection() : func(0), from(0), to(0), formatArray(0), formatCount(0) {}
+ FormatSection() : func(nullptr), from(nullptr), to(nullptr), formatArray(nullptr), formatCount(0) {}
sal_Int16 getFunc( LocaleDataImpl& rLocaleData, const Locale& rL, const char* pName )
{
func = reinterpret_cast<MyFunc_FormatCode>( rLocaleData.getFunctionSymbol( rL, pName));
@@ -1014,7 +1014,7 @@ LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount)
if (func)
return func(indexCount);
- return NULL;
+ return nullptr;
}
Sequence< OUString > SAL_CALL
@@ -1077,7 +1077,7 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString&
return indexArray+i*5;
}
}
- return NULL;
+ return nullptr;
}
bool SAL_CALL
@@ -1461,8 +1461,8 @@ oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLo
appendAscii(cachedItem->localeName).makeStringAndClear());
}
- oslGenericFunction pSymbol = 0;
- LocaleDataLookupTableItem *pCachedItem = 0;
+ oslGenericFunction pSymbol = nullptr;
+ LocaleDataLookupTableItem *pCachedItem = nullptr;
// Load function with name <func>_<lang>_<country> or <func>_<bcp47> and
// fallbacks.
@@ -1507,7 +1507,7 @@ LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException, std::except
// Check if the locale is really available and not just in the table,
// don't allow fall backs.
- LocaleDataLookupTableItem *pCachedItem = 0;
+ LocaleDataLookupTableItem *pCachedItem = nullptr;
if (lcl_LookupTableStatic::get().getFunctionSymbolByName( name, "getLocaleItem", &pCachedItem )) {
if( pCachedItem )
cachedItem.reset( pCachedItem );
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 695a36b63c07..59bbdc47203c 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -156,7 +156,7 @@ class TestDocumentHandler :
{
public:
TestDocumentHandler(const char* locale, const char* outFile )
- : rootNode(0)
+ : rootNode(nullptr)
, nError(0)
, of(outFile, locale)
{
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index aadc58dde2c6..36a626dcad06 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -525,7 +525,7 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr
if (langnum == -1)
return aNumberString;
- const Number *number = 0;
+ const Number *number = nullptr;
sal_Int16 num = -1;
switch (nNativeNumberMode)
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 598c92786c9f..ba6f03d898a5 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -555,7 +555,7 @@ static const struct InstancesArray {
&halfwidthToFullwidthLikeJIS_CreateInstance },
#endif
// add here new services !!
- { 0, 0, 0 }
+ { nullptr, nullptr, nullptr }
};
@@ -564,7 +564,7 @@ extern "C"
SAL_DLLPUBLIC_EXPORT void* SAL_CALL i18npool_component_getFactory( const sal_Char* sImplementationName, void* _pServiceManager, SAL_UNUSED_PARAMETER void* /*_pRegistryKey*/ )
{
- void* pRet = NULL;
+ void* pRet = nullptr;
lang::XMultiServiceFactory* pServiceManager =
static_cast< lang::XMultiServiceFactory* >( _pServiceManager );
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index e7dcc085cdac..47d669bd571d 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -118,7 +118,7 @@ class WLevDisDistanceMem
int* p;
public:
explicit WLevDisDistanceMem( size_t s )
- : p(0)
+ : p(nullptr)
{
NewMem(s);
}
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 7c9645114416..b0fb546fa7d0 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -107,10 +107,10 @@ bool isSimpleRegexTrans( sal_Int32 n )
TextSearch::TextSearch(const Reference < XComponentContext > & rxContext)
: m_xContext( rxContext )
- , pJumpTable( 0 )
- , pJumpTable2( 0 )
- , pRegexMatcher( NULL )
- , pWLD( 0 )
+ , pJumpTable( nullptr )
+ , pJumpTable2( nullptr )
+ , pRegexMatcher( nullptr )
+ , pWLD( nullptr )
{
SearchOptions aOpt;
aOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
@@ -131,10 +131,10 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
{
aSrchPara = rOptions;
- delete pRegexMatcher, pRegexMatcher = NULL;
- delete pWLD, pWLD = 0;
- delete pJumpTable, pJumpTable = 0;
- delete pJumpTable2, pJumpTable2 = 0;
+ delete pRegexMatcher, pRegexMatcher = nullptr;
+ delete pWLD, pWLD = nullptr;
+ delete pJumpTable, pJumpTable = nullptr;
+ delete pJumpTable2, pJumpTable2 = nullptr;
// Create Transliteration class
if( isSimpleTrans( aSrchPara.transliterateFlags) )
@@ -146,7 +146,7 @@ void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeExcep
aSrchPara.Locale);
}
else if( xTranslit.is() )
- xTranslit = 0;
+ xTranslit = nullptr;
// Create Transliteration for 2<->1, 2<->2 transliteration
if ( isComplexTrans( aSrchPara.transliterateFlags) )
@@ -806,7 +806,7 @@ void TextSearch::RESrchPrepare( const css::util::SearchOptions& rOptions)
{
SAL_INFO( "i18npool", "TextSearch::RESrchPrepare UErrorCode " << nIcuErr);
delete pRegexMatcher;
- pRegexMatcher = NULL;
+ pRegexMatcher = nullptr;
}
else
{
@@ -1115,7 +1115,7 @@ i18nsearch_component_getFactory( const sal_Char* sImplementationName,
void* _pServiceManager,
SAL_UNUSED_PARAMETER void* )
{
- void* pRet = NULL;
+ void* pRet = nullptr;
css::lang::XMultiServiceFactory* pServiceManager =
static_cast< css::lang::XMultiServiceFactory* >
diff --git a/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index f83d4cacff92..e6903a11f643 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.cxx
@@ -43,7 +43,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
sfp = fopen(argv[2], "rb"); // open the source file for read;
- if (sfp == NULL)
+ if (sfp == nullptr)
{
fprintf(stderr, "Opening the dictionary source file %s for reading failed: %s\n", argv[1], strerror(errno));
exit(1);
@@ -51,7 +51,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
// create the C source file to write
cfp = fopen(argv[3], "wb");
- if (cfp == NULL) {
+ if (cfp == nullptr) {
fclose(sfp);
fprintf(stderr, "Opening %s for writing failed: %s\n", argv[3], strerror(errno));
exit(1);
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 7ef257db5e99..1a771a551791 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -56,7 +56,7 @@ TextConversionService::~TextConversionService()
static void* nullFunc()
{
- return NULL;
+ return nullptr;
}
oslGenericFunction SAL_CALL
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 07be1222fb28..0cf0f25108dd 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -274,7 +274,7 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s
// clear reference (when there is no user dictionary) in order
// to not always have to catch this exception again
// in further calls. (save time)
- xCDL = 0;
+ xCDL = nullptr;
}
catch (...) {
// catch all other exceptions to allow
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 084460502502..05f7be58f38d 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -188,7 +188,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
// clear reference (when there is no user dictionary) in order
// to not always have to catch this exception again
// in further calls. (save time)
- xCDL = 0;
+ xCDL = nullptr;
}
catch (...) {
// catch all other exceptions to allow
diff --git a/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx
index ec64885eac63..9cbc41c45a75 100644
--- a/i18npool/source/transliteration/hiraganaToKatakana.cxx
+++ b/i18npool/source/transliteration/hiraganaToKatakana.cxx
@@ -37,7 +37,7 @@ static sal_Unicode toKatakana (const sal_Unicode c) {
hiraganaToKatakana::hiraganaToKatakana()
{
func = toKatakana;
- table = 0;
+ table = nullptr;
transliterationName = "hiraganaToKatakana";
implementationName = "com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA";
}
diff --git a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index 962d3b387832..4fd6462f68e6 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
@@ -34,7 +34,7 @@ static const transliteration_Ignore::Mapping BaFa[] = {
ignoreBaFa_ja_JP::ignoreBaFa_ja_JP()
{
func = nullptr;
- table = 0;
+ table = nullptr;
map = BaFa;
transliterationName = "ignoreBaFa_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreBaFa_ja_JP";
diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
index 8d6022d06f0b..8d6292c38d0d 100644
--- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx
@@ -24,8 +24,8 @@ ignoreDiacritics_CTL_translator (const sal_Unicode c)
ignoreDiacritics_CTL::ignoreDiacritics_CTL()
{
func = ignoreDiacritics_CTL_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreDiacritics_CTL";
implementationName = "com.sun.star.i18n.Transliteration.ignoreDiacritics_CTL";
}
diff --git a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index 50809db8e88c..46ccb91982e1 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
@@ -35,7 +35,7 @@ static const transliteration_Ignore::Mapping HyuByu[] = {
ignoreHyuByu_ja_JP::ignoreHyuByu_ja_JP()
{
func = nullptr;
- table = 0;
+ table = nullptr;
map = HyuByu;
transliterationName = "ignoreHyuByu_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreHyuByu_ja_JP";
diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 6154ad2acfc9..7ed3ee9a6150 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
@@ -75,7 +75,7 @@ ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPo
sal_Unicode * dst = newStr->buffer;
const sal_Unicode * src = inStr.getStr() + startPos;
- sal_Int32 *p = 0;
+ sal_Int32 *p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
// Allocate nCount length to offset argument.
diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index da9bd8a18da8..f5cacb2ea1cc 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
@@ -91,7 +91,7 @@ ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, s
sal_Unicode * dst = newStr->buffer;
const sal_Unicode * src = inStr.getStr() + startPos;
- sal_Int32 * p = 0;
+ sal_Int32 * p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
// Allocate nCount length to offset argument.
diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
index 564590b30b7e..cd225bdaa8b6 100644
--- a/i18npool/source/transliteration/ignoreKashida_CTL.cxx
+++ b/i18npool/source/transliteration/ignoreKashida_CTL.cxx
@@ -23,8 +23,8 @@ ignoreKashida_CTL_translator (const sal_Unicode c)
ignoreKashida_CTL::ignoreKashida_CTL()
{
func = ignoreKashida_CTL_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreKashida_CTL";
implementationName = "com.sun.star.i18n.Transliteration.ignoreKashida_CTL";
}
diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index fcec4472f75d..f03af1054b3d 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
@@ -34,7 +34,7 @@ ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos
sal_Unicode * dst = newStr->buffer;
const sal_Unicode * src = inStr.getStr() + startPos;
- sal_Int32 *p = 0;
+ sal_Int32 *p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
// Allocate nCount length to offset argument.
diff --git a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
index 73f7d005d026..aa5bbafffb87 100644
--- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
@@ -36,8 +36,8 @@ ignoreMiddleDot_ja_JP_translator (const sal_Unicode c)
ignoreMiddleDot_ja_JP::ignoreMiddleDot_ja_JP()
{
func = ignoreMiddleDot_ja_JP_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreMiddleDot_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreMiddleDot_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index 80b58f277a39..4b672b4ec73c 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
@@ -43,8 +43,8 @@ ignoreMinusSign_ja_JP_translator (const sal_Unicode c)
ignoreMinusSign_ja_JP::ignoreMinusSign_ja_JP()
{
func = ignoreMinusSign_ja_JP_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreMinusSign_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreMinusSign_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index 7ff63b79d34d..a1ee6aaac9bb 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
@@ -296,7 +296,7 @@ ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startP
sal_Unicode * dst = newStr->buffer;
const sal_Unicode * src = inStr.getStr() + startPos;
- sal_Int32 *p = 0;
+ sal_Int32 *p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
diff --git a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 9951d8eac562..bb9fa2964d2a 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
@@ -40,7 +40,7 @@ static const transliteration_Ignore::Mapping SeZe[] = {
ignoreSeZe_ja_JP::ignoreSeZe_ja_JP()
{
func = nullptr;
- table = 0;
+ table = nullptr;
map = SeZe;
transliterationName = "ignoreSeZe_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreSeZe_ja_JP";
diff --git a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index 8b886ee4d000..fa2efa4f381a 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
@@ -102,7 +102,7 @@ ignoreSeparator_ja_JP::ignoreSeparator_ja_JP()
static oneToOneMapping _table(ignoreSeparatorTable, sizeof(ignoreSeparatorTable));
func = nullptr;
table = &_table;
- map = 0;
+ map = nullptr;
transliterationName = "ignoreSeparator_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreSeparator_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
index ef5e3207129b..4e527865b4fe 100644
--- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
@@ -44,7 +44,7 @@ ignoreSpace_ja_JP::ignoreSpace_ja_JP()
{
func = nullptr;
table = new oneToOneMapping(ignoreSpace_ja_JP_mappingTable, sizeof(ignoreSpace_ja_JP_mappingTable));
- map = 0;
+ map = nullptr;
transliterationName = "ignoreSpace_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreSpace_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index 686e952c4b8a..3e8f259e449e 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
@@ -44,7 +44,7 @@ static const transliteration_Ignore::Mapping TiJi[] = {
ignoreTiJi_ja_JP::ignoreTiJi_ja_JP()
{
func = nullptr;
- table = 0;
+ table = nullptr;
map = TiJi;
transliterationName = "ignoreTiJi_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreTiJi_ja_JP";
diff --git a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
index ad908010f327..8c093c037910 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
@@ -44,8 +44,8 @@ ignoreTraditionalKana_ja_JP_translator (const sal_Unicode c)
ignoreTraditionalKana_ja_JP::ignoreTraditionalKana_ja_JP()
{
func = ignoreTraditionalKana_ja_JP_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreTraditionalKana_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreTraditionalKana_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
index 765cc33e22ea..1fa378d2b90a 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
@@ -724,7 +724,7 @@ ignoreTraditionalKanji_ja_JP::ignoreTraditionalKanji_ja_JP()
static oneToOneMapping _table(traditionalKanji2updateKanji, sizeof(traditionalKanji2updateKanji));
func = nullptr;
table = &_table;
- map = 0;
+ map = nullptr;
transliterationName = "ignoreTraditionalKanji_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreTraditionalKanji_ja_JP";
}
diff --git a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
index 58f8cc845cbd..180644e90fe9 100644
--- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
@@ -44,8 +44,8 @@ ignoreZiZu_ja_JP_translator (const sal_Unicode c)
ignoreZiZu_ja_JP::ignoreZiZu_ja_JP()
{
func = ignoreZiZu_ja_JP_translator;
- table = 0;
- map = 0;
+ table = nullptr;
+ map = nullptr;
transliterationName = "ignoreZiZu_ja_JP";
implementationName = "com.sun.star.i18n.Transliteration.ignoreZiZu_ja_JP";
}
diff --git a/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx
index 386dc792edf9..9e4ac155e2f5 100644
--- a/i18npool/source/transliteration/katakanaToHiragana.cxx
+++ b/i18npool/source/transliteration/katakanaToHiragana.cxx
@@ -35,7 +35,7 @@ static sal_Unicode toHiragana (const sal_Unicode c)
katakanaToHiragana::katakanaToHiragana()
{
func = toHiragana;
- table = 0;
+ table = nullptr;
transliterationName = "katakanaToHiragana";
implementationName = "com.sun.star.i18n.Transliteration.KATAKANA_HIRAGANA";
}
diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index 1fe87a2810ea..f0d99179e964 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -161,7 +161,7 @@ TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
#endif
hModule = osl_loadModuleRelative(
&thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );
- idx=NULL;
+ idx=nullptr;
if (hModule) {
sal_uInt16** (*function)() = reinterpret_cast<sal_uInt16** (*)()>(osl_getFunctionSymbol(hModule, OUString::createFromAscii(func_name).pData));
if (function)
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index ce163bf25962..72b16e202538 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -134,7 +134,7 @@ static struct TMlist {
// TmItem2 (NumToCharEstern_Arabic_Indic),// () (68)
// TmItem2 (NumToCharIndic), // () (69)
// TmItem2 (NumToCharThai), // () (70)
- {(TransliterationModules)0, (TransliterationModulesNew)0, NULL}
+ {(TransliterationModules)0, (TransliterationModulesNew)0, nullptr}
};
// Constructor/Destructor
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index dc2f251dd11f..a0d9ebf8fab1 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -127,7 +127,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos,
const sal_Unicode * src = inStr.getStr() + startPos;
// Allocate nCount length to offset argument.
- sal_Int32 *p = 0;
+ sal_Int32 *p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
offset.realloc( nCount );
diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index 9b2277283272..b6868a6941ca 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx
@@ -63,7 +63,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP
const sal_Unicode * src = inStr.getStr() + startPos;
// Allocate nCount length to offset argument.
- sal_Int32 *p = 0;
+ sal_Int32 *p = nullptr;
sal_Int32 position = 0;
if (useOffset) {
offset.realloc( nCount );