Kaydet (Commit) 25bb667c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:nullptr (automatic rewrite)

Change-Id: Idb2987dc7641c5b07d8bb99546cf5e5402032476
üst c3dcdeb1
...@@ -45,7 +45,7 @@ static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW; ...@@ -45,7 +45,7 @@ static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
static const sal_Char* getLangFromEnvironment() static const sal_Char* getLangFromEnvironment()
{ {
static const sal_Char* pFallback = "C"; static const sal_Char* pFallback = "C";
const sal_Char *pLang = NULL; const sal_Char *pLang = nullptr;
pLang = getenv ( "LC_ALL" ); pLang = getenv ( "LC_ALL" );
if (! pLang || pLang[0] == 0) if (! pLang || pLang[0] == 0)
...@@ -64,7 +64,7 @@ static const sal_Char* getLangFromEnvironment() ...@@ -64,7 +64,7 @@ static const sal_Char* getLangFromEnvironment()
static const sal_Char* getUILangFromEnvironment() static const sal_Char* getUILangFromEnvironment()
{ {
static const sal_Char* pFallback = "C"; static const sal_Char* pFallback = "C";
const sal_Char *pLang = NULL; const sal_Char *pLang = nullptr;
pLang = getenv ( "LANGUAGE" ); // respect the GNU extension pLang = getenv ( "LANGUAGE" ); // respect the GNU extension
if (! pLang || pLang[0] == 0) if (! pLang || pLang[0] == 0)
......
...@@ -904,7 +904,7 @@ static IsoLangOtherEntry const aImplOtherEntries[] = ...@@ -904,7 +904,7 @@ static IsoLangOtherEntry const aImplOtherEntries[] =
{ LANGUAGE_KOREAN, "korean" }, { LANGUAGE_KOREAN, "korean" },
{ LANGUAGE_ENGLISH_US, "posix" }, { LANGUAGE_ENGLISH_US, "posix" },
{ LANGUAGE_CHINESE_TRADITIONAL, "tchinese" }, { 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[] = ...@@ -915,7 +915,7 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
{ LANGUAGE_USER_PRIV_DEFAULT, "x-default" }, { LANGUAGE_USER_PRIV_DEFAULT, "x-default" },
{ LANGUAGE_USER_PRIV_COMMENT, "x-comment" }, { LANGUAGE_USER_PRIV_COMMENT, "x-comment" },
{ LANGUAGE_USER_PRIV_JOKER, "*" }, //! not BCP47 but transferable in configmgr { 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[] = ...@@ -924,8 +924,8 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang, void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
css::lang::Locale & rLocale, bool bIgnoreOverride ) css::lang::Locale & rLocale, bool bIgnoreOverride )
{ {
const IsoLanguageScriptCountryEntry* pScriptEntryOverride = NULL; const IsoLanguageScriptCountryEntry* pScriptEntryOverride = nullptr;
const IsoLanguageCountryEntry* pEntryOverride = NULL; const IsoLanguageCountryEntry* pEntryOverride = nullptr;
Label_Override_Lang_Locale: Label_Override_Lang_Locale:
...@@ -1053,7 +1053,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale( ...@@ -1053,7 +1053,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
} }
// Search in ISO lll-Ssss-CC // Search in ISO lll-Ssss-CC
const IsoLanguageScriptCountryEntry* pFirstScript = NULL; const IsoLanguageScriptCountryEntry* pFirstScript = nullptr;
for (const IsoLanguageScriptCountryEntry* pScriptEntry = aImplIsoLangScriptEntries; for (const IsoLanguageScriptCountryEntry* pScriptEntry = aImplIsoLangScriptEntries;
pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry) pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
{ {
...@@ -1097,7 +1097,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale( ...@@ -1097,7 +1097,7 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
} }
// Search for locale and remember first lang-only. // Search for locale and remember first lang-only.
const IsoLanguageCountryEntry* pFirstLang = NULL; const IsoLanguageCountryEntry* pFirstLang = nullptr;
const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
for ( ; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) for ( ; pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
{ {
...@@ -1271,7 +1271,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL ...@@ -1271,7 +1271,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
OUString aUpperCountry = rCountry.toAsciiUpperCase(); OUString aUpperCountry = rCountry.toAsciiUpperCase();
// first look for exact match // first look for exact match
const IsoLanguageCountryEntry* pFirstLang = NULL; const IsoLanguageCountryEntry* pFirstLang = nullptr;
for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries; for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry) pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
{ {
......
...@@ -45,7 +45,7 @@ using namespace com::sun::star; ...@@ -45,7 +45,7 @@ using namespace com::sun::star;
struct myLtError struct myLtError
{ {
lt_error_t* p; lt_error_t* p;
myLtError() : p(NULL) {} myLtError() : p(nullptr) {}
~myLtError() { if (p) lt_error_unref( p); } ~myLtError() { if (p) lt_error_unref( p); }
}; };
...@@ -369,7 +369,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & rLanguageTag ) ...@@ -369,7 +369,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTag & rLanguageTag )
: :
maLocale( rLanguageTag.maLocale), maLocale( rLanguageTag.maLocale),
maBcp47( rLanguageTag.maBcp47), maBcp47( rLanguageTag.maBcp47),
mpImplLangtag( NULL), mpImplLangtag( nullptr),
mnLangID( rLanguageTag.mnLangID), mnLangID( rLanguageTag.mnLangID),
meIsValid( DECISION_DONTKNOW), meIsValid( DECISION_DONTKNOW),
meIsIsoLocale( DECISION_DONTKNOW), meIsIsoLocale( DECISION_DONTKNOW),
...@@ -396,7 +396,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & rLanguageTagImpl ) ...@@ -396,7 +396,7 @@ LanguageTagImpl::LanguageTagImpl( const LanguageTagImpl & rLanguageTagImpl )
maCachedCountry( rLanguageTagImpl.maCachedCountry), maCachedCountry( rLanguageTagImpl.maCachedCountry),
maCachedVariants( rLanguageTagImpl.maCachedVariants), maCachedVariants( rLanguageTagImpl.maCachedVariants),
mpImplLangtag( rLanguageTagImpl.mpImplLangtag ? mpImplLangtag( rLanguageTagImpl.mpImplLangtag ?
lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL), lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr),
mnLangID( rLanguageTagImpl.mnLangID), mnLangID( rLanguageTagImpl.mnLangID),
meIsValid( rLanguageTagImpl.meIsValid), meIsValid( rLanguageTagImpl.meIsValid),
meIsIsoLocale( rLanguageTagImpl.meIsIsoLocale), meIsIsoLocale( rLanguageTagImpl.meIsIsoLocale),
...@@ -429,7 +429,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const LanguageTagImpl & rLanguageTa ...@@ -429,7 +429,7 @@ LanguageTagImpl& LanguageTagImpl::operator=( const LanguageTagImpl & rLanguageTa
maCachedVariants = rLanguageTagImpl.maCachedVariants; maCachedVariants = rLanguageTagImpl.maCachedVariants;
lt_tag_t * oldTag = mpImplLangtag; lt_tag_t * oldTag = mpImplLangtag;
mpImplLangtag = rLanguageTagImpl.mpImplLangtag ? mpImplLangtag = rLanguageTagImpl.mpImplLangtag ?
lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : NULL; lt_tag_copy( rLanguageTagImpl.mpImplLangtag) : nullptr;
lt_tag_unref(oldTag); lt_tag_unref(oldTag);
mnLangID = rLanguageTagImpl.mnLangID; mnLangID = rLanguageTagImpl.mnLangID;
meIsValid = rLanguageTagImpl.meIsValid; meIsValid = rLanguageTagImpl.meIsValid;
......
...@@ -498,7 +498,7 @@ public: ...@@ -498,7 +498,7 @@ public:
private use, like 'x-...', are not allowed and FALSE is private use, like 'x-...', are not allowed and FALSE is
returned in this case. returned in this case.
*/ */
static bool isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = NULL, static bool isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = nullptr,
bool bDisallowPrivate = false ); bool bDisallowPrivate = false );
/** If nLang is a generated on-the-fly LangID */ /** If nLang is a generated on-the-fly LangID */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment