summaryrefslogtreecommitdiff
path: root/i18npool/source/collator
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 /i18npool/source/collator
parent25bb667cff3cdd5d2a446f5eea036f9084a3fa17 (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I7af8d14bfe7337fea3f18dbbd41eb32e0f7ae331
Diffstat (limited to 'i18npool/source/collator')
-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
3 files changed, 10 insertions, 10 deletions
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;