[Libreoffice-commits] core.git: i18nutil/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 1 09:06:19 UTC 2020
i18nutil/source/utility/casefolding.cxx | 20 ++++++++++----------
i18nutil/source/utility/casefolding_data.h | 6 +++---
i18nutil/source/utility/paper.cxx | 4 ++--
i18nutil/source/utility/scripttypedetector.cxx | 2 +-
i18nutil/source/utility/unicode_data.h | 14 +++++++-------
5 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit df6d9c0d3a7ef442c05d91ac7fedbaf0ba6848b7
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 09:49:37 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 11:05:31 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: i18nutil
Change-Id: I2264559759133cb6617e8a7db28a26749bb59191
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97590
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 94cd9fab1ffc..432de0bf1228 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -31,16 +31,16 @@ using namespace com::sun::star::uno;
namespace i18nutil {
-static const Mapping mapping_03a3[] = {{0, 1, {0x03c2, 0, 0}},{0, 1, {0x03c3, 0, 0}}};
-static const Mapping mapping_0307[] = {{0, 0, {0, 0, 0}},{0, 1, {0x0307, 0, 0}}};
-static const Mapping mapping_004a[] = {{0, 2, {0x006a, 0x0307, 0}},{0, 1, {0x006a, 0, 0}}};
-static const Mapping mapping_012e[] = {{0, 2, {0x012f, 0x0307, 0}},{0, 1, {0x012f, 0, 0}}};
-static const Mapping mapping_00cc[] = {{0, 3, {0x0069, 0x0307, 0x0300}},{0, 1, {0x00ec, 0, 0}}};
-static const Mapping mapping_00cd[] = {{0, 3, {0x0069, 0x0307, 0x0301}},{0, 1, {0x00ed, 0, 0}}};
-static const Mapping mapping_0128[] = {{0, 3, {0x0069, 0x0307, 0x0303}},{0, 1, {0x0129, 0, 0}}};
-static const Mapping mapping_0049[] = {{0, 2, {0x0069, 0x0307, 0}},{0, 1, {0x0131, 0, 0}},{0, 1, {0x0069, 0, 0}}};
-static const Mapping mapping_0069[] = {{0, 1, {0x0130, 0, 0}},{0, 1, {0x0049, 0, 0}}};
-static const Mapping mapping_0130[] = {{0, 1, {0x0069, 0, 0}},{0, 1, {0x0130, 0, 0}}};
+const Mapping mapping_03a3[] = {{0, 1, {0x03c2, 0, 0}},{0, 1, {0x03c3, 0, 0}}};
+const Mapping mapping_0307[] = {{0, 0, {0, 0, 0}},{0, 1, {0x0307, 0, 0}}};
+const Mapping mapping_004a[] = {{0, 2, {0x006a, 0x0307, 0}},{0, 1, {0x006a, 0, 0}}};
+const Mapping mapping_012e[] = {{0, 2, {0x012f, 0x0307, 0}},{0, 1, {0x012f, 0, 0}}};
+const Mapping mapping_00cc[] = {{0, 3, {0x0069, 0x0307, 0x0300}},{0, 1, {0x00ec, 0, 0}}};
+const Mapping mapping_00cd[] = {{0, 3, {0x0069, 0x0307, 0x0301}},{0, 1, {0x00ed, 0, 0}}};
+const Mapping mapping_0128[] = {{0, 3, {0x0069, 0x0307, 0x0303}},{0, 1, {0x0129, 0, 0}}};
+const Mapping mapping_0049[] = {{0, 2, {0x0069, 0x0307, 0}},{0, 1, {0x0131, 0, 0}},{0, 1, {0x0069, 0, 0}}};
+const Mapping mapping_0069[] = {{0, 1, {0x0130, 0, 0}},{0, 1, {0x0049, 0, 0}}};
+const Mapping mapping_0130[] = {{0, 1, {0x0069, 0, 0}},{0, 1, {0x0130, 0, 0}}};
#define langIs(lang) (aLocale.Language == lang)
diff --git a/i18nutil/source/utility/casefolding_data.h b/i18nutil/source/utility/casefolding_data.h
index 43c0ab44414f..4335d12f554e 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -23,7 +23,7 @@
namespace i18nutil {
-static const sal_Int8 CaseMappingIndex[] = {
+const sal_Int8 CaseMappingIndex[] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, -1, -1, // 0000 - 07ff
-1, -1, -1, -1, -1, -1, -1, -1, // 0800 - 0fff
-1, -1, -1, -1, -1, -1, -1, -1, // 1000 - 17ff
@@ -89,7 +89,7 @@ static const sal_Int8 CaseMappingIndex[] = {
};
-static const Value CaseMappingValue[] = {
+const Value CaseMappingValue[] = {
{0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, // 0000 - 0007
{0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, // 0008 - 000f
{0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, {0x00, 0x0000}, // 0010 - 0017
@@ -688,7 +688,7 @@ static const Value CaseMappingValue[] = {
#define MaxCaseMappingExtras 3
-static Mapping const CaseMappingExtra[] = {
+Mapping const CaseMappingExtra[] = {
{0x80, 0, {0x0000, 0x0000, 0x0000}}, // 0x0000 (0 0x0)
{0x60, 1, {0x0131, 0x0000, 0x0000}}, // 0x0049 (1 0x1)
{0x8a, 0, {0x0000, 0x0000, 0x0000}}, // 0x0049 (2 0x2)
diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx
index a8476334622e..c80fa10f00e0 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -67,7 +67,7 @@ struct PageDesc
//!! The order of these entries must correspond to enum Paper in <i18nutil/paper.hxx>
-static const PageDesc aDinTab[] =
+const PageDesc aDinTab[] =
{
{ MM2MM100( 841 ), MM2MM100( 1189 ), "A0", nullptr },
{ MM2MM100( 594 ), MM2MM100( 841 ), "A1", nullptr },
@@ -158,7 +158,7 @@ static const PageDesc aDinTab[] =
};
-static const size_t nTabSize = SAL_N_ELEMENTS(aDinTab);
+const size_t nTabSize = SAL_N_ELEMENTS(aDinTab);
#define MAXSLOPPY 21
diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx
index 884bc304cd01..dda64dbce071 100644
--- a/i18nutil/source/utility/scripttypedetector.cxx
+++ b/i18nutil/source/utility/scripttypedetector.cxx
@@ -25,7 +25,7 @@
using namespace com::sun::star::i18n;
-static const sal_Int16 scriptDirection[] = {
+const sal_Int16 scriptDirection[] = {
ScriptDirection::LEFT_TO_RIGHT, // DirectionProperty_LEFT_TO_RIGHT = 0,
ScriptDirection::RIGHT_TO_LEFT, // DirectionProperty_RIGHT_TO_LEFT = 1,
ScriptDirection::LEFT_TO_RIGHT, // DirectionProperty_EUROPEAN_NUMBER = 2,
diff --git a/i18nutil/source/utility/unicode_data.h b/i18nutil/source/utility/unicode_data.h
index 7e1d56813dc2..1c909605b6df 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.h
@@ -25,7 +25,7 @@
#define UnicodeTypeNumberBlock 5
-static const sal_Int8 UnicodeTypeIndex[] = {
+const sal_Int8 UnicodeTypeIndex[] = {
0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, // 0000 - 07ff
0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, // 0800 - 0fff
0x14, 0x15, 0x16, 0x17, 0x18, 0x01, 0x19, 0x1a, // 1000 - 17ff
@@ -61,12 +61,12 @@ static const sal_Int8 UnicodeTypeIndex[] = {
};
-static const sal_Int8 UnicodeTypeBlockValue[] = {
+const sal_Int8 UnicodeTypeBlockValue[] = {
0, 5, 17, 18, 27,
};
-static const sal_Int8 UnicodeTypeValue[] = {
+const sal_Int8 UnicodeTypeValue[] = {
15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,// 0000 - 000f
15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,// 0010 - 001f
12,23,23,23,25,23,23,23,20,21,23,24,23,19,23,23,// 0020 - 002f
@@ -905,7 +905,7 @@ static const sal_Int8 UnicodeTypeValue[] = {
#define UnicodeDirectionNumberBlock 3
-static const sal_Int8 UnicodeDirectionIndex[] = {
+const sal_Int8 UnicodeDirectionIndex[] = {
0x03, 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, // 0000 - 07ff
0x00, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, // 0800 - 0fff
0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13, // 1000 - 17ff
@@ -941,12 +941,12 @@ static const sal_Int8 UnicodeDirectionIndex[] = {
};
-static const sal_Int8 UnicodeDirectionBlockValue[] = {
+const sal_Int8 UnicodeDirectionBlockValue[] = {
0, 10, 13,
};
-static const sal_Int8 UnicodeDirectionValue[] = {
+const sal_Int8 UnicodeDirectionValue[] = {
18,18,18,18,18,18,18,18,18, 8, 7, 8, 9, 7,18,18,// 0000 - 000f
18,18,18,18,18,18,18,18,18,18,18,18, 7, 7, 7, 8,// 0010 - 001f
9,10,10, 4, 4, 4,10,10,10,10,10, 4, 6, 4, 6, 3,// 0020 - 002f
@@ -1548,7 +1548,7 @@ static const sal_Int8 UnicodeDirectionValue[] = {
#define UnicodeScriptTypeFrom 0
#define UnicodeScriptTypeTo 1
-static const sal_Unicode UnicodeScriptType[][2] = {
+const sal_Unicode UnicodeScriptType[][2] = {
{0x0000, 0x007f}, // 0. Basic Latin
{0x0080, 0x00ff}, // 1. Latin-1 Supplement
{0x0100, 0x017f}, // 2. Latin Extended-A
More information about the Libreoffice-commits
mailing list