[Libreoffice-commits] core.git: hwpfilter/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 1 07:59:27 UTC 2020
hwpfilter/source/datecode.h | 2 +-
hwpfilter/source/grammar.cxx | 18 +++++++++---------
hwpfilter/source/hbox.cxx | 12 ++++++------
hwpfilter/source/hcode.cxx | 18 +++++++++---------
hwpfilter/source/hwpeq.cxx | 2 +-
hwpfilter/source/hwpreader.cxx | 2 +-
hwpfilter/source/ksc5601.h | 4 ++--
hwpfilter/source/lexer.cxx | 14 +++++++-------
8 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 04445c599f166dacbfe4f6440ea7252f5441db21
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 1 08:45:03 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 1 09:58:45 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: hwpfilter
Change-Id: I6f5a81cf83d15b9c8a21bf0581c009bdfe03f4a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97564
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/hwpfilter/source/datecode.h b/hwpfilter/source/datecode.h
index e35b6e50a58f..0478dcce5e62 100644
--- a/hwpfilter/source/datecode.h
+++ b/hwpfilter/source/datecode.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_HWPFILTER_SOURCE_DATECODE_H
#define INCLUDED_HWPFILTER_SOURCE_DATECODE_H
-static const hchar defaultform[] =
+const hchar defaultform[] =
{
'1', 0x9165, 32, '2', 0xB6A9, 32, '3', 0xB7A9, 0
};
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 9c44eab4383b..d2c91860aeb6 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -62,7 +62,7 @@ static int debug(const char *format, ...);
#define YYTRANSLATE(x) (static_cast<unsigned>(x) <= 285 ? yytranslate[x] : 66)
-static const char yytranslate[] = { 0,
+const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -159,7 +159,7 @@ static const char * const yytname[] = { "$","error","$undefined.","ACCENT",
};
#endif
-static const short yyr1[] = { 0,
+const short yyr1[] = { 0,
43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
43, 43, 43, 43, 43, 43, 43, 44, 44, 45,
45, 45, 45, 45, 45, 45, 46, 46, 46, 46,
@@ -170,7 +170,7 @@ static const short yyr1[] = { 0,
65, 65
};
-static const short yyr2[] = { 0,
+const short yyr2[] = { 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
2, 2, 2, 2, 3, 1, 2, 2, 2, 2,
@@ -181,7 +181,7 @@ static const short yyr2[] = { 0,
1, 1
};
-static const short yydefact[] = { 0,
+const short yydefact[] = { 0,
46, 1, 4, 10, 9, 14, 2, 3, 5, 6,
0, 0, 12, 13, 48, 7, 8, 17, 11, 0,
0, 0, 26, 16, 15, 0, 0, 18, 70, 0,
@@ -195,13 +195,13 @@ static const short yydefact[] = { 0,
0, 0
};
-static const short yydefgoto[] = { 28,
+const short yydefgoto[] = { 28,
29, 30, 84, 31, 32, 33, 51, 34, 35, 36,
37, 38, 39, 40, 41, 42, 43, 100, 44, 45,
46, 47
};
-static const short yypact[] = { 393,
+const short yypact[] = { 393,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-30, -19,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -19,
-19, -3,-32768,-32768,-32768, 290, 107,-32768, 425, 393,
@@ -215,7 +215,7 @@ static const short yypact[] = { 393,
23,-32768
};
-static const short yypgoto[] = { -2,
+const short yypgoto[] = { -2,
-32768,-32768,-32768,-32768,-32768, -11,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -33,
-24, -27
@@ -225,7 +225,7 @@ static const short yypgoto[] = { -2,
#define YYLAST 457
-static const short yytable[] = { 50,
+const short yytable[] = { 50,
52, 61, 63, 48, 49, 65, 91, 68, 53, 54,
96, 92, 93, 94, 95, 49, 78, 98, 69, 70,
71, 101, 102, 73, 74, 66, 64, 67, 55, 56,
@@ -274,7 +274,7 @@ static const short yytable[] = { 50,
0, 0, 0, 0, 0, 24, 25
};
-static const short yycheck[] = { 11,
+const short yycheck[] = { 11,
12, 26, 27, 34, 35, 30, 32, 28, 20, 21,
42, 37, 38, 39, 40, 35, 32, 32, 46, 41,
42, 0, 0, 48, 49, 37, 29, 39, 32, 33,
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 2af25d8793c3..6bbf6d22448b 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -112,22 +112,22 @@ DateCode::DateCode()
{
}
-static const hchar kor_week[] =
+const hchar kor_week[] =
{
0xB7A9, 0xB6A9, 0xD1C1, 0xAE81, 0xA1A2, 0x8B71, 0xC9A1
};
-static const hchar china_week[] =
+const hchar china_week[] =
{
0x4CC8, 0x4BE4, 0x525A, 0x48D8, 0x45AB, 0x4270, 0x50B4
};
-static const char eng_week[] = { "SunMonTueWedThuFriSat" };
-static const char eng_mon[] = { "JanFebMarAprMayJunJulAugSepOctNovDec" };
-static const char * const en_mon[] =
+const char eng_week[] = { "SunMonTueWedThuFriSat" };
+const char eng_mon[] = { "JanFebMarAprMayJunJulAugSepOctNovDec" };
+const char * const en_mon[] =
{
"January", "February", "March", "April", "May", "June", "July",
"August", "September", "October", "November", "December"
};
-static const char * const en_week[] =
+const char * const en_week[] =
{
"Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday"
diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index 99885d00460b..a895caec1eab 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -51,7 +51,7 @@ static hchar jaso2ks(hchar hh);
/**
* kssm code table matching with ks index
*/
-static const hchar ksTbl[2350] =
+const hchar ksTbl[2350] =
{
0x8861, 0x8862, 0x8865, 0x8868, 0x8869, 0x886A, 0x886B, 0x8871,
0x8873, 0x8874, 0x8875, 0x8876, 0x8877, 0x8878, 0x8879, 0x887B,
@@ -352,7 +352,7 @@ static const hchar ksTbl[2350] =
/**
* ks symbols
*/
-static const unsigned tblhhtg_ks[] =
+const unsigned tblhhtg_ks[] =
{
0xC7D1, 0xB1DB, 0xB0FA, 0xC4C4, 0xC7BB, 0xC5CD, noneks, noneks,
0xA2B1, 0xA3DF, 0xA2D5, 0xA6B1, 0xA1B8, 0xA1B9, 0xA3DF, 0xA1DA,
@@ -367,7 +367,7 @@ static const unsigned tblhhtg_ks[] =
/**
* kssm symbols
*/
-static const unsigned hhtg_tg[] =
+const unsigned hhtg_tg[] =
{
0xD065, 0x8B69, 0x89C1, 0xC4F1, 0xCF41, 0xC8E1, 0xD3C5, 0xD931,
0xD931, 0xD481, 0xD482, 0xD488, 0xD48A, 0xD48F, 0xD493, 0xD494,
@@ -534,7 +534,7 @@ static hchar cdkssm2ks_han(hchar kssm)
#define IsHangul(c) ((c) & 0x8000)
#define IsHanja(c) (((c) & 0x4000)==0x4000)
-static const hchar jaso_hh_code[] =
+const hchar jaso_hh_code[] =
{
34881, 35905, 33860, 36929, 33862, 33863, 37953, 38977, 40001, 33866,
33867,
@@ -571,7 +571,7 @@ static hchar jaso2ks(hchar hh)
//1 00011 00 001 00011
-static const hchar choseong_to_unicode[] =
+const hchar choseong_to_unicode[] =
{
0x111e, 0, 0x1100, 0x1101, 0x1102, 0x1103, 0x1104, 0x1105,
0x1106, 0x1107, 0x1108, 0x1109, 0x110a, 0x110b, 0x110c, 0x110d,
@@ -579,7 +579,7 @@ static const hchar choseong_to_unicode[] =
0x112b, 0x112d, 0x112f, 0x1132, 0x1136, 0x1140, 0x114c, 0x1158
};
/* There are some other codes where the medial sound is 0 or 1. It needs to extract the rules in those area */
-static const hchar joongseong_to_unicode[] =
+const hchar joongseong_to_unicode[] =
{
0, 0, 0, 0x1161, 0x1162, 0x1163, 0x1164, 0x1165,
0, 0, 0x1166, 0x1167, 0x1168, 0x1169, 0x116a, 0x116b,
@@ -587,7 +587,7 @@ static const hchar joongseong_to_unicode[] =
0x1191, 0x1194, 0x1172, 0x1173, 0x1174, 0x1175, 0x119e, 0x11a1
};
-static const hchar jongseong_to_unicode[] =
+const hchar jongseong_to_unicode[] =
{
0x11d9, 0 , 0x11a8, 0x11a9, 0x11aa, 0x11ab, 0x11ac, 0x11ad,
0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5,
@@ -601,7 +601,7 @@ static const hchar jongseong_to_unicode[] =
* consonants and vowels area is made as a general table and the rest are made of a structure mapping table
*
* 844, except for the remaining 1152-308 is a combination of consonants and vowels. */
-static const hchar jamo_to_unicode[] =
+const hchar jamo_to_unicode[] =
{
0x3131, 0x3132, 0x3133, 0x3134, 0x3135, 0x3136, 0x3137, 0x3138,
0x3139, 0x313a, 0x313b, 0x313c, 0x313d, 0x313e, 0x313f, 0x3140,
@@ -665,7 +665,7 @@ struct JamoComp{
}
/* 704 + 12 = 706 */
-static const JamoComp jamocomp1_to_unicode[] =
+const JamoComp jamocomp1_to_unicode[] =
{
{3, 0x1100, 0x1161, 0x11e7}, {3, 0x1100, 0x1161, 0x3167},
{3, 0x1100, 0x1161, 0x11dd}, {3, 0x1100, 0x1161, 0x11e2},
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index 5aa6487fae2a..f2325508fc9f 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/hwpfilter/source/hwpeq.cxx
@@ -79,7 +79,7 @@ struct hwpeq {
}
-static const hwpeq eq_tbl[] = {
+const hwpeq eq_tbl[] = {
{ "!=", "\\equiv ", 0, 0 },
{ "#", "\\\\", 0, 0 },
{ "+-", "\\pm ", 0, 0 },
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index d0ba9b0abf82..4db88bcc732e 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -399,7 +399,7 @@ ArrowShape[] =
{ "Square", false }
};
-static struct
+struct
{
double dots1;
double dots2;
diff --git a/hwpfilter/source/ksc5601.h b/hwpfilter/source/ksc5601.h
index 85237103bb6d..e4d60b32f15b 100644
--- a/hwpfilter/source/ksc5601.h
+++ b/hwpfilter/source/ksc5601.h
@@ -22,7 +22,7 @@
* KSC5601.1987-0
*/
-static const hchar ksc5601_2uni_page21[1115] = {
+const hchar ksc5601_2uni_page21[1115] = {
/* 0x21 */
0x3000, 0x3001, 0x3002, 0x00b7, 0x2025, 0x2026, 0x00a8, 0x3003,
0x00ad, 0x2015, 0x2225, 0xff3c, 0x223c, 0x2018, 0x2019, 0x201c,
@@ -181,7 +181,7 @@ static const hchar ksc5601_2uni_page21[1115] = {
};
-static const hchar ksc5601_2uni_page4a[4888] = {
+const hchar ksc5601_2uni_page4a[4888] = {
/* 0x4a */
0x4f3d, 0x4f73, 0x5047, 0x50f9, 0x52a0, 0x53ef, 0x5475, 0x54e5,
0x5609, 0x5ac1, 0x5bb6, 0x6687, 0x67b6, 0x67b7, 0x67ef, 0x6b4c,
diff --git a/hwpfilter/source/lexer.cxx b/hwpfilter/source/lexer.cxx
index 829431cfcc50..2cf76bf3e49f 100644
--- a/hwpfilter/source/lexer.cxx
+++ b/hwpfilter/source/lexer.cxx
@@ -233,7 +233,7 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
yy_c_buf_p = yy_cp;
#define YY_END_OF_BUFFER 46
-static yyconst short int yy_accept[994] =
+yyconst short int yy_accept[994] =
{ 0,
0, 0, 46, 44, 41, 41, 44, 42, 39, 37,
37, 36, 39, 39, 44, 44, 38, 40, 35, 43,
@@ -347,7 +347,7 @@ static yyconst short int yy_accept[994] =
} ;
-static yyconst int yy_ec[256] =
+yyconst int yy_ec[256] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
@@ -379,7 +379,7 @@ static yyconst int yy_ec[256] =
73, 73, 73, 73, 1
} ;
-static yyconst int yy_meta[74] =
+yyconst int yy_meta[74] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -391,7 +391,7 @@ static yyconst int yy_meta[74] =
1, 1, 1
} ;
-static yyconst short int yy_base[995] =
+yyconst short int yy_base[995] =
{ 0,
0, 72, 1314, 1315, 1315, 1315, 1297, 1315, 1315, 1315,
1295, 2, 8, 1294, 1281, 142, 1315, 1315, 1315, 1236,
@@ -505,7 +505,7 @@ static yyconst short int yy_base[995] =
} ;
-static yyconst short int yy_def[995] =
+yyconst short int yy_def[995] =
{ 0,
994, 994, 993, 993, 993, 993, 993, 993, 993, 993,
993, 993, 993, 993, 993, 993, 993, 993, 993, 993,
@@ -619,7 +619,7 @@ static yyconst short int yy_def[995] =
} ;
-static yyconst short int yy_nxt[1389] =
+yyconst short int yy_nxt[1389] =
{ 0,
993, 5, 6, 7, 8, 9, 9, 10, 993, 11,
993, 12, 23, 24, 13, 10, 14, 25, 23, 24,
@@ -775,7 +775,7 @@ static yyconst short int yy_nxt[1389] =
993, 993, 993, 993, 993, 993, 993, 993
} ;
-static yyconst short int yy_chk[1389] =
+yyconst short int yy_chk[1389] =
{ 0,
0, 1, 1, 1, 1, 1, 1, 1, 0, 1,
0, 1, 12, 12, 1, 1, 1, 13, 24, 24,
More information about the Libreoffice-commits
mailing list