summaryrefslogtreecommitdiff
path: root/i18nlangtag
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /i18nlangtag
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff)
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'i18nlangtag')
-rw-r--r--i18nlangtag/source/isolang/inunx.cxx6
-rw-r--r--i18nlangtag/source/isolang/inwnt.cxx4
-rw-r--r--i18nlangtag/source/isolang/isolang.cxx11
-rw-r--r--i18nlangtag/source/languagetag/languagetag.cxx2
4 files changed, 0 insertions, 23 deletions
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index fb91b090222b..cf0e5f4854cc 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -35,12 +35,10 @@
#include "i18nlangtag/mslangid.hxx"
-
static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
-
// Get locale of category LC_CTYPE of environment variables
static const sal_Char* getLangFromEnvironment()
{
@@ -59,7 +57,6 @@ static const sal_Char* getLangFromEnvironment()
}
-
// Get locale of category LC_MESSAGES of environment variables
static const sal_Char* getUILangFromEnvironment()
{
@@ -80,7 +77,6 @@ static const sal_Char* getUILangFromEnvironment()
}
-
typedef const sal_Char * (*getLangFromEnv)();
static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
@@ -122,7 +118,6 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
}
-
LanguageType MsLangId::getPlatformSystemLanguage()
{
getPlatformSystemLanguageImpl( nImplSystemLanguage, &getLangFromEnvironment);
@@ -130,7 +125,6 @@ LanguageType MsLangId::getPlatformSystemLanguage()
}
-
LanguageType MsLangId::getPlatformSystemUILanguage()
{
getPlatformSystemLanguageImpl( nImplSystemUILanguage, &getUILangFromEnvironment);
diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index 158dd8bdf627..8521e5469924 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -37,7 +37,6 @@ static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
-
static LanguageType GetSVLang( LANGID nWinLangId )
{
// No Translation, we work with the original MS code without the SORT_ID.
@@ -47,7 +46,6 @@ static LanguageType GetSVLang( LANGID nWinLangId )
}
-
typedef LANGID (WINAPI *getLangFromEnv)();
static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
@@ -81,7 +79,6 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
}
-
LanguageType MsLangId::getPlatformSystemLanguage()
{
getPlatformSystemLanguageImpl( nImplSystemLanguage,
@@ -90,7 +87,6 @@ LanguageType MsLangId::getPlatformSystemLanguage()
}
-
LanguageType MsLangId::getPlatformSystemUILanguage()
{
// TODO: this could be distinguished, #if(WINVER >= 0x0500)
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 8718e2f8ecad..b50ae484cc7b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -28,7 +28,6 @@
using namespace com::sun::star;
-
static const LanguageType kSAME = 0xffff;
namespace {
@@ -125,7 +124,6 @@ struct IsoLangOtherEntry
};
-
// Entries for languages are lower case, for countries upper case, as
// recommended by rfc5646 (obsoletes rfc4646 (obsoletes rfc3066 (obsoletes
// rfc1766))). convertIsoNamesToLanguage(), convertLocaleToLanguageImpl()
@@ -803,7 +801,6 @@ css::lang::Locale Bcp47CountryEntry::getLocale() const
}
-
// In this table are the countries which should mapped to a specific
// english language
static IsoLangEngEntry const aImplIsoLangEngEntries[] =
@@ -872,7 +869,6 @@ static IsoLangEngEntry const aImplIsoLangEngEntries[] =
};
-
static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] =
{
{ LANGUAGE_NORWEGIAN_BOKMAL, "no", "BOK" }, // registered subtags for "no" in rfc1766
@@ -885,7 +881,6 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] =
};
-
// in this table are only names to find the best language
static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] =
{
@@ -896,7 +891,6 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] =
};
-
// in this table are only names to find the best language
static IsoLangOtherEntry const aImplOtherEntries[] =
{
@@ -922,7 +916,6 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
};
-
// static
void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
css::lang::Locale & rLocale, bool bIgnoreOverride )
@@ -1006,7 +999,6 @@ Label_Override_Lang_Locale:
}
-
// static
css::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageCountryEntry * pEntry )
{
@@ -1155,7 +1147,6 @@ css::lang::Locale MsLangId::Conversion::lookupFallbackLocale(
}
-
// static
LanguageType MsLangId::Conversion::convertPrivateUseToLanguage( const OUString& rPriv )
{
@@ -1358,7 +1349,6 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
}
-
// static
LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLang,
const OString& rCountry )
@@ -1369,7 +1359,6 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLa
}
-
struct IsoLangGLIBCModifiersEntry
{
LanguageType mnLang;
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 9d0b29589263..782a7e247dbb 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2016,8 +2016,6 @@ bool LanguageTag::isValidBcp47() const
}
-
-
LanguageTag & LanguageTag::makeFallback()
{
if (!mbIsFallback)