summaryrefslogtreecommitdiff
path: root/i18nlangtag
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:16:46 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:28 +0100
commit25bb667cff3cdd5d2a446f5eea036f9084a3fa17 (patch)
treed5d251db98a706a8c50263b4a0efd5fd2e7f1018 /i18nlangtag
parentc3dcdeb1d2bccc3785e3675843a5228e183b307f (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: Idb2987dc7641c5b07d8bb99546cf5e5402032476
Diffstat (limited to 'i18nlangtag')
-rw-r--r--i18nlangtag/source/isolang/inunx.cxx4
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx14
-rw-r--r--i18nlangtag/source/languagetag/languagetag.cxx8
3 files changed, 13 insertions, 13 deletions
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index fd62c9462c37..fb91b090222b 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -45,7 +45,7 @@ static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
static const sal_Char* getLangFromEnvironment()
{
static const sal_Char* pFallback = "C";
- const sal_Char *pLang = NULL;
+ const sal_Char *pLang = nullptr;
pLang = getenv ( "LC_ALL" );
if (! pLang || pLang[0] == 0)
@@ -64,7 +64,7 @@ static const sal_Char* getLangFromEnvironment()
static const sal_Char* getUILangFromEnvironment()
{
static const sal_Char* pFallback = "C";
- const sal_Char *pLang = NULL;
+ const sal_Char *pLang = nullptr;
pLang = getenv ( "LANGUAGE" ); // respect the GNU extension
if (! pLang || pLang[0] == 0)
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index d5589be49ce6..3b50dd58d994 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -904,7 +904,7 @@ static IsoLangOtherEntry const aImplOtherEntries[] =
{ LANGUAGE_KOREAN, "korean" },
{ LANGUAGE_ENGLISH_US, "posix" },
{ LANGUAGE_CHINESE_TRADITIONAL, "tchinese" },
- { LANGUAGE_DONTKNOW, NULL } // marks end of table
+ { LANGUAGE_DONTKNOW, nullptr } // marks end of table
};
@@ -915,7 +915,7 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
{ LANGUAGE_USER_PRIV_DEFAULT, "x-default" },
{ LANGUAGE_USER_PRIV_COMMENT, "x-comment" },
{ LANGUAGE_USER_PRIV_JOKER, "*" }, //! not BCP47 but transferable in configmgr
- { LANGUAGE_DONTKNOW, NULL } // marks end of table
+ { LANGUAGE_DONTKNOW, nullptr } // marks end of table
};
@@ -924,8 +924,8 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
css::lang::Locale & rLocale, bool bIgnoreOverride )
{
- const IsoLanguageScriptCountryEntry* pScriptEntryOverride = NULL;
- const IsoLanguageCountryEntry* pEntryOverride = NULL;
+ const IsoLanguageScriptCountryEntry* pScriptEntryOverride = nullptr;
+ const IsoLanguageCountryEntry* pEntryOverride = nullptr;
Label_Override_Lang_Locale:
@@ -1053,7 +1053,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
}
// Search in ISO lll-Ssss-CC
- const IsoLanguageScriptCountryEntry* pFirstScript = NULL;
+ const IsoLanguageScriptCountryEntry* pFirstScript = nullptr;
for (const IsoLanguageScriptCountryEntry* pScriptEntry = aImplIsoLangScriptEntries;
pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
{
@@ -1097,7 +1097,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
}
// Search for locale and remember first lang-only.
- const IsoLanguageCountryEntry* pFirstLang = NULL;
+ const IsoLanguageCountryEntry* pFirstLang = nullptr;
const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
for ( ; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
{
@@ -1271,7 +1271,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
OUString aUpperCountry = rCountry.toAsciiUpperCase();
// first look for exact match
- const IsoLanguageCountryEntry* pFirstLang = NULL;
+ const IsoLanguageCountryEntry* pFirstLang = nullptr;
for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
{
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 2b3567dd2766..bca22d5c1732 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -45,7 +45,7 @@ using namespace com::sun::star;
struct myLtError
{
lt_error_t* p;
- myLtError() : p(NULL) {}
+ myLtError() : p(nullptr) {}
~myLtError() { if (p) lt_error_unref( p); }
};
@@ -369,7 +369,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & rLanguageTag )
:
maLocale( rLanguageTag.maLocale),
maBcp47( rLanguageTag.maBcp47),
- mpImplLangtag( NULL),
+ mpImplLangtag( nullptr),
mnLangID( rLanguageTag.mnLangID),
meIsValid( DECISION_DONTKNOW),
meIsIsoLocale( DECISION_DONTKNOW),
@@ -396,7 +396,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & rLanguageTagImpl )
maCachedCountry( rLanguageTagImpl.maCachedCountry),
maCachedVariants( rLanguageTagImpl.maCachedVariants),
mpImplLangtag( rLanguageTagImpl.mpImplLangtag ?
- lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL),
+ lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr),
mnLangID( rLanguageTagImpl.mnLangID),
meIsValid( rLanguageTagImpl.meIsValid),
meIsIsoLocale( rLanguageTagImpl.meIsIsoLocale),
@@ -429,7 +429,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const LanguageTagImpl & rLanguageTa
maCachedVariants = rLanguageTagImpl.maCachedVariants;
lt_tag_t * oldTag = mpImplLangtag;
mpImplLangtag = rLanguageTagImpl.mpImplLangtag ?
- lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL;
+ lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr;
lt_tag_unref(oldTag);
mnLangID = rLanguageTagImpl.mnLangID;
meIsValid = rLanguageTagImpl.meIsValid;