Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
25bb667c
Kaydet (Commit)
25bb667c
authored
Kas 10, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:nullptr (automatic rewrite)
Change-Id: Idb2987dc7641c5b07d8bb99546cf5e5402032476
üst
c3dcdeb1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
inunx.cxx
i18nlangtag/source/isolang/inunx.cxx
+2
-2
isolang.cxx
i18nlangtag/source/isolang/isolang.cxx
+7
-7
languagetag.cxx
i18nlangtag/source/languagetag/languagetag.cxx
+4
-4
languagetag.hxx
include/i18nlangtag/languagetag.hxx
+1
-1
No files found.
i18nlangtag/source/isolang/inunx.cxx
Dosyayı görüntüle @
25bb667c
...
...
@@ -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
)
...
...
i18nlangtag/source/isolang/isolang.cxx
Dosyayı görüntüle @
25bb667c
...
...
@@ -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
)
{
...
...
i18nlangtag/source/languagetag/languagetag.cxx
Dosyayı görüntüle @
25bb667c
...
...
@@ -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
;
...
...
include/i18nlangtag/languagetag.hxx
Dosyayı görüntüle @
25bb667c
...
...
@@ -498,7 +498,7 @@ public:
private use, like 'x-...', are not allowed and FALSE is
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
);
/** If nLang is a generated on-the-fly LangID */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment