diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:16:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:28 +0100 |
| commit | 6a33fb16bdd91055c2e13b7b1823093b000ca60d (patch) | |
| tree | 31652a5f38c54f792699e2502b8574b5f7012a79 /i18npool/source/indexentry | |
| parent | 25bb667cff3cdd5d2a446f5eea036f9084a3fa17 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I7af8d14bfe7337fea3f18dbbd41eb32e0f7ae331
Diffstat (limited to 'i18npool/source/indexentry')
| -rw-r--r-- | i18npool/source/indexentry/genindex_data.cxx | 4 | ||||
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_asian.cxx | 6 | ||||
| -rw-r--r-- | i18npool/source/indexentry/indexentrysupplier_default.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
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) { } |