sal/osl/unx/nlsupport.cxx | 2 sal/osl/unx/pipe.cxx | 2 sal/osl/unx/process.cxx | 4 sal/osl/unx/socket.cxx | 16 sal/osl/unx/tempfile.cxx | 4 sal/osl/unx/thread.cxx | 2 sal/qa/OStringBuffer/rtl_String_Const.h | 598 ++++++++++++++++---------------- sal/rtl/bootstrap.cxx | 2 sal/rtl/cipher.cxx | 2 sal/rtl/crc.cxx | 2 sal/rtl/digest.cxx | 14 sal/rtl/math.cxx | 4 sal/rtl/string.cxx | 2 sal/rtl/ustring.cxx | 2 sal/textenc/convertbig5hkscs.tab | 4 sal/textenc/converteuctw.tab | 4 sal/textenc/convertgb18030.tab | 4 sal/textenc/convertisciidevangari.cxx | 2 sal/textenc/convertisciidevangari.tab | 2 sal/textenc/convertiso2022cn.tab | 4 sal/textenc/convertiso2022jp.tab | 4 sal/textenc/convertiso2022kr.tab | 4 sal/textenc/convertsimple.cxx | 4 sal/textenc/generate/big5hkscs2001.tab | 10 sal/textenc/generate/cns116431992.tab | 12 sal/textenc/generate/gb180302000.tab | 8 sal/textenc/tables.cxx | 6 sal/textenc/tcvtarb1.tab | 60 +-- sal/textenc/tcvteas1.tab | 24 - sal/textenc/tcvtest1.tab | 284 +++++++-------- sal/textenc/tcvtjp1.tab | 100 ++--- sal/textenc/tcvtjp2.tab | 216 +++++------ sal/textenc/tcvtjp3.tab | 292 +++++++-------- sal/textenc/tcvtjp4.tab | 192 +++++----- sal/textenc/tcvtjp5.tab | 176 ++++----- sal/textenc/tcvtjp6.tab | 52 +- sal/textenc/tcvtkr1.tab | 248 ++++++------- sal/textenc/tcvtkr2.tab | 290 +++++++-------- sal/textenc/tcvtkr4.tab | 224 +++++------ sal/textenc/tcvtkr5.tab | 290 +++++++-------- sal/textenc/tcvtkr6.tab | 26 - sal/textenc/tcvtlat1.tab | 100 ++--- sal/textenc/tcvtscn1.tab | 252 ++++++------- sal/textenc/tcvtscn2.tab | 264 +++++++------- sal/textenc/tcvtscn3.tab | 148 +++---- sal/textenc/tcvtscn4.tab | 162 ++++---- sal/textenc/tcvtscn5.tab | 164 ++++---- sal/textenc/tcvtscn6.tab | 44 +- sal/textenc/tcvtsym1.tab | 2 sal/textenc/tcvttcn1.tab | 178 ++++----- sal/textenc/tcvttcn2.tab | 204 +++++----- sal/textenc/tcvttcn6.tab | 26 - sal/textenc/tcvtuni1.tab | 2 sal/textenc/tcvtutf7.cxx | 6 sal/textenc/textenc.cxx | 28 - 55 files changed, 2389 insertions(+), 2389 deletions(-)
New commits: commit d563b9a5960e9bfe7077ee5aca44966d0bb3e2f1 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Wed Jul 1 19:53:00 2020 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Thu Jul 2 07:09:56 2020 +0200 Upcoming improved loplugin:staticanonymous -> redundantstatic: sal Change-Id: I022f5ed37d25f2c8a8870033bab32ff59d4d8da6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97648 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx index a4c7c807c201..3a0b1021e726 100644 --- a/sal/osl/unx/nlsupport.cxx +++ b/sal/osl/unx/nlsupport.cxx @@ -294,7 +294,7 @@ static const Pair nl_language_list[] = { #elif defined(LINUX) -static const Pair nl_language_list[] = { +const Pair nl_language_list[] = { { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */ { "ANSI_X3.4-1968", RTL_TEXTENCODING_ISO_8859_1 }, /* fake: ASCII_US */ { "ASMO_449", RTL_TEXTENCODING_DONTKNOW }, /* ISO_9036 ARABIC7 */ diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx index ec9fe4b9d5ca..034979ba0e4e 100644 --- a/sal/osl/unx/pipe.cxx +++ b/sal/osl/unx/pipe.cxx @@ -41,7 +41,7 @@ static oslPipe osl_psz_createPipe(const char *pszPipeName, oslPipeOptions Options, oslSecurity Security); -static struct +struct { int errcode; oslPipeError error; diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx index 39db4936fa3f..861324963dec 100644 --- a/sal/osl/unx/process.cxx +++ b/sal/osl/unx/process.cxx @@ -92,8 +92,8 @@ struct ProcessData oslFileHandle *m_pErrorRead; }; -static oslProcessImpl* ChildList; -static oslMutex ChildListMutex; +oslProcessImpl* ChildList; +oslMutex ChildListMutex; } //Anonymous namespace diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 4f67795a60ee..56a8f6cd63ac 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -94,7 +94,7 @@ /* Buffer size for getnameinfo */ #define MAX_HOSTBUFFER_SIZE 2048 -static const unsigned long FamilyMap[]= { +const unsigned long FamilyMap[]= { AF_INET, /* osl_Socket_FamilyInet */ AF_IPX, /* osl_Socket_FamilyIpx */ 0 /* osl_Socket_FamilyInvalid */ @@ -117,7 +117,7 @@ static oslAddrFamily osl_AddrFamilyFromNative(sal_uInt32 nativeType) #define FAMILY_FROM_NATIVE(y) osl_AddrFamilyFromNative(y) #define FAMILY_TO_NATIVE(x) static_cast<short>(FamilyMap[x]) -static const sal_uInt32 ProtocolMap[]= { +const sal_uInt32 ProtocolMap[]= { 0, /* osl_Socket_ProtocolIp */ NSPROTO_IPX, /* osl_Socket_ProtocolIpx */ NSPROTO_SPX, /* osl_Socket_ProtocolSpx */ @@ -127,7 +127,7 @@ static const sal_uInt32 ProtocolMap[]= { #define PROTOCOL_TO_NATIVE(x) ProtocolMap[x] -static const sal_uInt32 TypeMap[]= { +const sal_uInt32 TypeMap[]= { SOCK_STREAM, /* osl_Socket_TypeStream */ SOCK_DGRAM, /* osl_Socket_TypeDgram */ SOCK_RAW, /* osl_Socket_TypeRaw */ @@ -153,7 +153,7 @@ static oslSocketType osl_SocketTypeFromNative(sal_uInt32 nativeType) #define TYPE_TO_NATIVE(x) TypeMap[x] #define TYPE_FROM_NATIVE(y) osl_SocketTypeFromNative(y) -static const sal_uInt32 OptionMap[]= { +const sal_uInt32 OptionMap[]= { SO_DEBUG, /* osl_Socket_OptionDebug */ SO_ACCEPTCONN, /* osl_Socket_OptionAcceptConn */ SO_REUSEADDR, /* osl_Socket_OptionReuseAddr */ @@ -177,7 +177,7 @@ static const sal_uInt32 OptionMap[]= { #define OPTION_TO_NATIVE(x) OptionMap[x] -static const sal_uInt32 OptionLevelMap[]= { +const sal_uInt32 OptionLevelMap[]= { SOL_SOCKET, /* osl_Socket_LevelSocket */ IPPROTO_TCP, /* osl_Socket_LevelTcp */ 0 /* osl_Socket_LevelInvalid */ @@ -185,7 +185,7 @@ static const sal_uInt32 OptionLevelMap[]= { #define OPTION_LEVEL_TO_NATIVE(x) OptionLevelMap[x] -static const sal_uInt32 SocketMsgFlagMap[]= { +const sal_uInt32 SocketMsgFlagMap[]= { 0, /* osl_Socket_MsgNormal */ MSG_OOB, /* osl_Socket_MsgOOB */ MSG_PEEK, /* osl_Socket_MsgPeek */ @@ -196,7 +196,7 @@ static const sal_uInt32 SocketMsgFlagMap[]= { #define MSG_FLAG_TO_NATIVE(x) SocketMsgFlagMap[x] -static const sal_uInt32 SocketDirection[]= { +const sal_uInt32 SocketDirection[]= { SD_RECEIVE, /* osl_Socket_DirRead */ SD_SEND, /* osl_Socket_DirWrite */ SD_BOTH, /* osl_Socket_DirReadWrite */ @@ -205,7 +205,7 @@ static const sal_uInt32 SocketDirection[]= { #define DIRECTION_TO_NATIVE(x) SocketDirection[x] -static const struct +const struct { int errcode; oslSocketError error; diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx index 84f44cbd4b32..01247ae24fe3 100644 --- a/sal/osl/unx/tempfile.cxx +++ b/sal/osl/unx/tempfile.cxx @@ -67,8 +67,8 @@ oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir ) * receives the random name ******************************************************************/ -static const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; -static const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1; +const char LETTERS[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; +const int COUNT_OF_LETTERS = SAL_N_ELEMENTS(LETTERS) - 1; #define RAND_NAME_LENGTH 6 diff --git a/sal/osl/unx/thread.cxx b/sal/osl/unx/thread.cxx index ab19bdc8aa5b..2472efec8618 100644 --- a/sal/osl/unx/thread.cxx +++ b/sal/osl/unx/thread.cxx @@ -590,7 +590,7 @@ struct HashEntry } static HashEntry* HashTable[31]; -static const int HashSize = SAL_N_ELEMENTS(HashTable); +const int HashSize = SAL_N_ELEMENTS(HashTable); static pthread_mutex_t HashLock = PTHREAD_MUTEX_INITIALIZER; diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index 1abdefefcb7a..551191fcced5 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -30,280 +30,280 @@ extern "C" { #endif -static const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US; - -static const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS; -static const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS; - -static const char * const kTestStr1 = "Sun Microsystems"; -static const char * const kTestStr2 = "Sun Microsystems Java Technology"; -static const char * const kTestStr7 = "Sun "; -static const char * const kTestStr8 = "Microsystems"; -static const char * const kTestStr14 = " Sun Microsystems"; -static const char * const kTestStr17 = " Sun Microsystems "; -static const char * const kTestStr23 = " Java Technology"; -static const char * const kTestStr25 = ""; -static const char * const kTestStr27 = "s"; -static const char * const kTestStr28 = "\50\3\5\7\11\13\15\17sun"; -static const char * const kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50"; -static const char * const kTestStr31 = "sun Microsystems"; -static const char * const kTestStr36 = "Microsystems Java Technology"; -static const char * const kTestStr37 = "Sun Java Technology"; -static const char * const kTestStr38 = "\21\23\25\27\31\33\50"; -static const char * const kTestStr39 = "\50\3\5\7\11\13\15\17sun Sun Microsystems "; -static const char * const kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems"; -static const char * const kTestStr45 = "Sun true"; -static const char * const kTestStr46 = "Sun false"; -static const char * const kTestStr47 = "true"; -static const char * const kTestStr48 = "false"; -static const char * const kTestStr49 = "\50\3\5\7\11\13\15\17suntrue"; -static const char * const kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse"; -static const char * const kTestStr51 = "Sun M"; +const rtl_TextEncoding kEncodingRTLTextUSASCII = RTL_TEXTENCODING_ASCII_US; + +const sal_uInt32 kConvertFlagsOUStringToOString = OUSTRING_TO_OSTRING_CVTFLAGS; +const sal_uInt32 kConvertFlagsOStringToOUString = OSTRING_TO_OUSTRING_CVTFLAGS; + +const char * const kTestStr1 = "Sun Microsystems"; +const char * const kTestStr2 = "Sun Microsystems Java Technology"; +const char * const kTestStr7 = "Sun "; +const char * const kTestStr8 = "Microsystems"; +const char * const kTestStr14 = " Sun Microsystems"; +const char * const kTestStr17 = " Sun Microsystems "; +const char * const kTestStr23 = " Java Technology"; +const char * const kTestStr25 = ""; +const char * const kTestStr27 = "s"; +const char * const kTestStr28 = "\50\3\5\7\11\13\15\17sun"; +const char * const kTestStr29 = "\50\3\5\7\11\13\15\17sun\21\23\25\27\31\33\50"; +const char * const kTestStr31 = "sun Microsystems"; +const char * const kTestStr36 = "Microsystems Java Technology"; +const char * const kTestStr37 = "Sun Java Technology"; +const char * const kTestStr38 = "\21\23\25\27\31\33\50"; +const char * const kTestStr39 = "\50\3\5\7\11\13\15\17sun Sun Microsystems "; +const char * const kTestStr40 = "\50\3\5\7\11\13\15\17sunsun Microsystems"; +const char * const kTestStr45 = "Sun true"; +const char * const kTestStr46 = "Sun false"; +const char * const kTestStr47 = "true"; +const char * const kTestStr48 = "false"; +const char * const kTestStr49 = "\50\3\5\7\11\13\15\17suntrue"; +const char * const kTestStr50 = "\50\3\5\7\11\13\15\17sunfalse"; +const char * const kTestStr51 = "Sun M"; //static const char *kTestStr52 = "Sun \077777"; //static const char *kTestStr53 = "Sun \100000"; //static const char *kTestStr54 = "\77777"; //static const char *kTestStr55 = "\100000"; -static const char * const kTestStr56 = "\50\3\5\7\11\13\15\17suns"; +const char * const kTestStr56 = "\50\3\5\7\11\13\15\17suns"; //static const char *kTestStr57 = "\50\3\5\7\11\13\15\17sun\77777"; //static const char *kTestStr58 = "\50\3\5\7\11\13\15\17sun\10000"; -static const char * const kTestStr59 = "Sun 11"; -static const char * const kTestStr60 = "11"; -static const char * const kTestStr61 = "\50\3\5\7\11\13\15\17sun11"; -static const char * const kTestStr62 = "Sun 0"; -static const char * const kTestStr63 = "Sun -11"; -static const char * const kTestStr64 = "Sun 2147483647"; -static const char * const kTestStr65 = "Sun -2147483648"; -static const char * const kTestStr66 = "0"; -static const char * const kTestStr67 = "-11"; -static const char * const kTestStr68 = "2147483647"; -static const char * const kTestStr69 = "-2147483648"; -static const char * const kTestStr70 = "\50\3\5\7\11\13\15\17sun0"; -static const char * const kTestStr71 = "\50\3\5\7\11\13\15\17sun-11"; -static const char * const kTestStr72 = "\50\3\5\7\11\13\15\17sun2147483647"; -static const char * const kTestStr73 = "\50\3\5\7\11\13\15\17sun-2147483648"; -static const char * const kTestStr116 = "Sun 9223372036854775807"; -static const char * const kTestStr117 = "Sun -9223372036854775808"; -static const char * const kTestStr118 = "9223372036854775807"; -static const char * const kTestStr119 = "-9223372036854775808"; -static const char * const kTestStr120 = "\50\3\5\7\11\13\15\17sun9223372036854775807"; -static const char * const kTestStr121 = "\50\3\5\7\11\13\15\17sun-9223372036854775808"; -static const char * const kTestStr143 = "Sun \377"; -static const char * const kTestStr144 = "\377"; -static const char * const kTestStr145 = "\50\3\5\7\11\13\15\17sun\377"; - -static const sal_Int32 kTestStr1Len = 16; -static const sal_Int32 kTestStr2Len = 32; -static const sal_Int32 kTestStr3Len = 16; -static const sal_Int32 kTestStr4Len = 16; -static const sal_Int32 kTestStr5Len = 16; -static const sal_Int32 kTestStr6Len = 15; -static const sal_Int32 kTestStr7Len = 4; -static const sal_Int32 kTestStr8Len = 12; -static const sal_Int32 kTestStr9Len = 32; -static const sal_Int32 kTestStr10Len = 17; -static const sal_Int32 kTestStr11Len = 17; -static const sal_Int32 kTestStr12Len = 18; -static const sal_Int32 kTestStr13Len = 19; -static const sal_Int32 kTestStr14Len = 19; -static const sal_Int32 kTestStr15Len = 20; -static const sal_Int32 kTestStr16Len = 20; -static const sal_Int32 kTestStr17Len = 22; -static const sal_Int32 kTestStr18Len = 16; -static const sal_Int32 kTestStr19Len = 22; -static const sal_Int32 kTestStr20Len = 3; -static const sal_Int32 kTestStr21Len = 3; -static const sal_Int32 kTestStr22Len = 32; -static const sal_Int32 kTestStr23Len = 16; -static const sal_Int32 kTestStr24Len = 31; -static const sal_Int32 kTestStr25Len = 0; -static const sal_Int32 kTestStr26Len = 4; -static const sal_Int32 kTestStr27Len = 1; -static const sal_Int32 kTestStr28Len = 11; -static const sal_Int32 kTestStr29Len = 18; -static const sal_Int32 kTestStr30Len = 10; -static const sal_Int32 kTestStr31Len = 16; -static const sal_Int32 kTestStr32Len = 16; -static const sal_Int32 kTestStr33Len = 1; -static const sal_Int32 kTestStr34Len = 11; -static const sal_Int32 kTestStr35Len = 11; -static const sal_Int32 kTestStr36Len = 28; -static const sal_Int32 kTestStr37Len = 20; -static const sal_Int32 kTestStr38Len = 7; -static const sal_Int32 kTestStr39Len = 33; -static const sal_Int32 kTestStr40Len = 27; -static const sal_Int32 kTestStr41Len = 3; -static const sal_Int32 kTestStr42Len = 10; -static const sal_Int32 kTestStr43Len = 13; -static const sal_Int32 kTestStr44Len = 2; -static const sal_Int32 kTestStr45Len = 8; -static const sal_Int32 kTestStr46Len = 9; -static const sal_Int32 kTestStr47Len = 4; -static const sal_Int32 kTestStr48Len = 5; -static const sal_Int32 kTestStr49Len = 15; -static const sal_Int32 kTestStr50Len = 16; -static const sal_Int32 kTestStr51Len = 5; -static const sal_Int32 kTestStr52Len = 5; -static const sal_Int32 kTestStr53Len = 5; -static const sal_Int32 kTestStr54Len = 1; -static const sal_Int32 kTestStr55Len = 1; -static const sal_Int32 kTestStr56Len = 12; -static const sal_Int32 kTestStr57Len = 12; -static const sal_Int32 kTestStr58Len = 12; -static const sal_Int32 kTestStr59Len = 6; -static const sal_Int32 kTestStr60Len = 2; -static const sal_Int32 kTestStr61Len = 13; -static const sal_Int32 kTestStr62Len = 5; -static const sal_Int32 kTestStr63Len = 7; -static const sal_Int32 kTestStr64Len = 14; -static const sal_Int32 kTestStr65Len = 15; -static const sal_Int32 kTestStr66Len = 1; -static const sal_Int32 kTestStr67Len = 3; -static const sal_Int32 kTestStr68Len = 10; -static const sal_Int32 kTestStr69Len = 11; -static const sal_Int32 kTestStr70Len = 12; -static const sal_Int32 kTestStr71Len = 14; -static const sal_Int32 kTestStr72Len = 21; -static const sal_Int32 kTestStr73Len = 22; -static const sal_Int32 kTestStr74Len = 7; -static const sal_Int32 kTestStr75Len = 7; -static const sal_Int32 kTestStr76Len = 10; -static const sal_Int32 kTestStr77Len = 12; -static const sal_Int32 kTestStr78Len = 12; -static const sal_Int32 kTestStr79Len = 13; -static const sal_Int32 kTestStr80Len = 13; -static const sal_Int32 kTestStr81Len = 3; -static const sal_Int32 kTestStr82Len = 3; -static const sal_Int32 kTestStr83Len = 6; -static const sal_Int32 kTestStr84Len = 8; -static const sal_Int32 kTestStr85Len = 8; -static const sal_Int32 kTestStr86Len = 9; -static const sal_Int32 kTestStr87Len = 9; -static const sal_Int32 kTestStr88Len = 14; -static const sal_Int32 kTestStr89Len = 14; -static const sal_Int32 kTestStr90Len = 17; -static const sal_Int32 kTestStr91Len = 19; -static const sal_Int32 kTestStr92Len = 19; -static const sal_Int32 kTestStr93Len = 20; -static const sal_Int32 kTestStr94Len = 20; -static const sal_Int32 kTestStr95Len = 8; -static const sal_Int32 kTestStr96Len = 8; -static const sal_Int32 kTestStr97Len = 11; -static const sal_Int32 kTestStr98Len = 13; -static const sal_Int32 kTestStr99Len = 13; -static const sal_Int32 kTestStr100Len = 14; -static const sal_Int32 kTestStr101Len = 14; -static const sal_Int32 kTestStr102Len = 4; -static const sal_Int32 kTestStr103Len = 4; -static const sal_Int32 kTestStr104Len = 7; -static const sal_Int32 kTestStr105Len = 9; -static const sal_Int32 kTestStr106Len = 9; -static const sal_Int32 kTestStr107Len = 10; -static const sal_Int32 kTestStr108Len = 10; -static const sal_Int32 kTestStr109Len = 15; -static const sal_Int32 kTestStr110Len = 15; -static const sal_Int32 kTestStr111Len = 18; -static const sal_Int32 kTestStr112Len = 20; -static const sal_Int32 kTestStr113Len = 20; -static const sal_Int32 kTestStr114Len = 21; -static const sal_Int32 kTestStr115Len = 21; -static const sal_Int32 kTestStr116Len = 23; -static const sal_Int32 kTestStr117Len = 24; -static const sal_Int32 kTestStr118Len = 19; -static const sal_Int32 kTestStr119Len = 20; -static const sal_Int32 kTestStr120Len = 30; -static const sal_Int32 kTestStr121Len = 31; -static const sal_Int32 kTestStr122Len = 16; -static const sal_Int32 kTestStr123Len = 21; -static const sal_Int32 kTestStr124Len = 23; -static const sal_Int32 kTestStr125Len = 30; -static const sal_Int32 kTestStr126Len = 12; -static const sal_Int32 kTestStr127Len = 17; -static const sal_Int32 kTestStr128Len = 19; -static const sal_Int32 kTestStr129Len = 26; -static const sal_Int32 kTestStr130Len = 23; -static const sal_Int32 kTestStr131Len = 28; -static const sal_Int32 kTestStr132Len = 30; -static const sal_Int32 kTestStr133Len = 37; -static const sal_Int32 kTestStr134Len = 22; -static const sal_Int32 kTestStr135Len = 24; -static const sal_Int32 kTestStr136Len = 31; -static const sal_Int32 kTestStr137Len = 18; -static const sal_Int32 kTestStr138Len = 20; -static const sal_Int32 kTestStr139Len = 27; -static const sal_Int32 kTestStr140Len = 29; -static const sal_Int32 kTestStr141Len = 31; -static const sal_Int32 kTestStr142Len = 38; -static const sal_Int32 kTestStr143Len = 5; -static const sal_Int32 kTestStr144Len = 1; -static const sal_Int32 kTestStr145Len = 12; -static const sal_Int32 kTestStr146Len = 19; -static const sal_Int32 kTestStr147Len = 19; -static const sal_Int32 kTestStr148Len = 19; -static const sal_Int32 kTestStr149Len = 32; -static const sal_Int32 kTestStr150Len = 32; -static const sal_Int32 kTestStr151Len = 31; -static const sal_Int32 kTestStr152Len = 31; -static const sal_Int32 kTestStr153Len = 31; -static const sal_Int32 kTestStr154Len = 36; -static const sal_Int32 kTestStr155Len = 36; -static const sal_Int32 kTestStr156Len = 36; -static const sal_Int32 kTestStr157Len = 49; -static const sal_Int32 kTestStr158Len = 49; -static const sal_Int32 kTestStr159Len = 49; -static const sal_Int32 kTestStr160Len = 48; -static const sal_Int32 kTestStr161Len = 48; -static const sal_Int32 kTestStr162Len = 48; -static const sal_Int32 kTestStr163Len = 15; -static const sal_Int32 kTestStr164Len = 15; -static const sal_Int32 kTestStr165Len = 15; -static const sal_Int32 kTestStr166Len = 28; -static const sal_Int32 kTestStr167Len = 28; -static const sal_Int32 kTestStr168Len = 28; -static const sal_Int32 kTestStr169Len = 27; -static const sal_Int32 kTestStr170Len = 27; -static const sal_Int32 kTestStr171Len = 27; -static const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len; - -static const sal_Int32 uTestStr1Len = 16; -static const sal_Int32 uTestStr2Len = 32; -static const sal_Int32 uTestStr3Len = 16; -static const sal_Int32 uTestStr4Len = 16; -static const sal_Int32 uTestStr5Len = 16; -static const sal_Int32 uTestStr9Len = 32; -static const sal_Int32 uTestStr22Len = 32; +const char * const kTestStr59 = "Sun 11"; +const char * const kTestStr60 = "11"; +const char * const kTestStr61 = "\50\3\5\7\11\13\15\17sun11"; +const char * const kTestStr62 = "Sun 0"; +const char * const kTestStr63 = "Sun -11"; +const char * const kTestStr64 = "Sun 2147483647"; +const char * const kTestStr65 = "Sun -2147483648"; +const char * const kTestStr66 = "0"; +const char * const kTestStr67 = "-11"; +const char * const kTestStr68 = "2147483647"; +const char * const kTestStr69 = "-2147483648"; +const char * const kTestStr70 = "\50\3\5\7\11\13\15\17sun0"; +const char * const kTestStr71 = "\50\3\5\7\11\13\15\17sun-11"; +const char * const kTestStr72 = "\50\3\5\7\11\13\15\17sun2147483647"; +const char * const kTestStr73 = "\50\3\5\7\11\13\15\17sun-2147483648"; +const char * const kTestStr116 = "Sun 9223372036854775807"; +const char * const kTestStr117 = "Sun -9223372036854775808"; +const char * const kTestStr118 = "9223372036854775807"; +const char * const kTestStr119 = "-9223372036854775808"; +const char * const kTestStr120 = "\50\3\5\7\11\13\15\17sun9223372036854775807"; +const char * const kTestStr121 = "\50\3\5\7\11\13\15\17sun-9223372036854775808"; +const char * const kTestStr143 = "Sun \377"; +const char * const kTestStr144 = "\377"; +const char * const kTestStr145 = "\50\3\5\7\11\13\15\17sun\377"; + +const sal_Int32 kTestStr1Len = 16; +const sal_Int32 kTestStr2Len = 32; +const sal_Int32 kTestStr3Len = 16; +const sal_Int32 kTestStr4Len = 16; +const sal_Int32 kTestStr5Len = 16; +const sal_Int32 kTestStr6Len = 15; +const sal_Int32 kTestStr7Len = 4; +const sal_Int32 kTestStr8Len = 12; +const sal_Int32 kTestStr9Len = 32; +const sal_Int32 kTestStr10Len = 17; +const sal_Int32 kTestStr11Len = 17; +const sal_Int32 kTestStr12Len = 18; +const sal_Int32 kTestStr13Len = 19; +const sal_Int32 kTestStr14Len = 19; +const sal_Int32 kTestStr15Len = 20; +const sal_Int32 kTestStr16Len = 20; +const sal_Int32 kTestStr17Len = 22; +const sal_Int32 kTestStr18Len = 16; +const sal_Int32 kTestStr19Len = 22; +const sal_Int32 kTestStr20Len = 3; +const sal_Int32 kTestStr21Len = 3; +const sal_Int32 kTestStr22Len = 32; +const sal_Int32 kTestStr23Len = 16; +const sal_Int32 kTestStr24Len = 31; +const sal_Int32 kTestStr25Len = 0; +const sal_Int32 kTestStr26Len = 4; +const sal_Int32 kTestStr27Len = 1; +const sal_Int32 kTestStr28Len = 11; +const sal_Int32 kTestStr29Len = 18; +const sal_Int32 kTestStr30Len = 10; +const sal_Int32 kTestStr31Len = 16; +const sal_Int32 kTestStr32Len = 16; +const sal_Int32 kTestStr33Len = 1; +const sal_Int32 kTestStr34Len = 11; +const sal_Int32 kTestStr35Len = 11; +const sal_Int32 kTestStr36Len = 28; +const sal_Int32 kTestStr37Len = 20; +const sal_Int32 kTestStr38Len = 7; +const sal_Int32 kTestStr39Len = 33; +const sal_Int32 kTestStr40Len = 27; +const sal_Int32 kTestStr41Len = 3; +const sal_Int32 kTestStr42Len = 10; +const sal_Int32 kTestStr43Len = 13; +const sal_Int32 kTestStr44Len = 2; +const sal_Int32 kTestStr45Len = 8; +const sal_Int32 kTestStr46Len = 9; +const sal_Int32 kTestStr47Len = 4; +const sal_Int32 kTestStr48Len = 5; +const sal_Int32 kTestStr49Len = 15; +const sal_Int32 kTestStr50Len = 16; +const sal_Int32 kTestStr51Len = 5; +const sal_Int32 kTestStr52Len = 5; +const sal_Int32 kTestStr53Len = 5; +const sal_Int32 kTestStr54Len = 1; +const sal_Int32 kTestStr55Len = 1; +const sal_Int32 kTestStr56Len = 12; +const sal_Int32 kTestStr57Len = 12; +const sal_Int32 kTestStr58Len = 12; +const sal_Int32 kTestStr59Len = 6; +const sal_Int32 kTestStr60Len = 2; +const sal_Int32 kTestStr61Len = 13; +const sal_Int32 kTestStr62Len = 5; +const sal_Int32 kTestStr63Len = 7; +const sal_Int32 kTestStr64Len = 14; +const sal_Int32 kTestStr65Len = 15; +const sal_Int32 kTestStr66Len = 1; +const sal_Int32 kTestStr67Len = 3; +const sal_Int32 kTestStr68Len = 10; +const sal_Int32 kTestStr69Len = 11; +const sal_Int32 kTestStr70Len = 12; +const sal_Int32 kTestStr71Len = 14; +const sal_Int32 kTestStr72Len = 21; +const sal_Int32 kTestStr73Len = 22; +const sal_Int32 kTestStr74Len = 7; +const sal_Int32 kTestStr75Len = 7; +const sal_Int32 kTestStr76Len = 10; +const sal_Int32 kTestStr77Len = 12; +const sal_Int32 kTestStr78Len = 12; +const sal_Int32 kTestStr79Len = 13; +const sal_Int32 kTestStr80Len = 13; +const sal_Int32 kTestStr81Len = 3; +const sal_Int32 kTestStr82Len = 3; +const sal_Int32 kTestStr83Len = 6; +const sal_Int32 kTestStr84Len = 8; +const sal_Int32 kTestStr85Len = 8; +const sal_Int32 kTestStr86Len = 9; +const sal_Int32 kTestStr87Len = 9; +const sal_Int32 kTestStr88Len = 14; +const sal_Int32 kTestStr89Len = 14; +const sal_Int32 kTestStr90Len = 17; +const sal_Int32 kTestStr91Len = 19; +const sal_Int32 kTestStr92Len = 19; +const sal_Int32 kTestStr93Len = 20; +const sal_Int32 kTestStr94Len = 20; +const sal_Int32 kTestStr95Len = 8; +const sal_Int32 kTestStr96Len = 8; +const sal_Int32 kTestStr97Len = 11; +const sal_Int32 kTestStr98Len = 13; +const sal_Int32 kTestStr99Len = 13; +const sal_Int32 kTestStr100Len = 14; +const sal_Int32 kTestStr101Len = 14; +const sal_Int32 kTestStr102Len = 4; +const sal_Int32 kTestStr103Len = 4; +const sal_Int32 kTestStr104Len = 7; +const sal_Int32 kTestStr105Len = 9; +const sal_Int32 kTestStr106Len = 9; +const sal_Int32 kTestStr107Len = 10; +const sal_Int32 kTestStr108Len = 10; +const sal_Int32 kTestStr109Len = 15; +const sal_Int32 kTestStr110Len = 15; +const sal_Int32 kTestStr111Len = 18; +const sal_Int32 kTestStr112Len = 20; +const sal_Int32 kTestStr113Len = 20; +const sal_Int32 kTestStr114Len = 21; +const sal_Int32 kTestStr115Len = 21; +const sal_Int32 kTestStr116Len = 23; +const sal_Int32 kTestStr117Len = 24; +const sal_Int32 kTestStr118Len = 19; +const sal_Int32 kTestStr119Len = 20; +const sal_Int32 kTestStr120Len = 30; +const sal_Int32 kTestStr121Len = 31; +const sal_Int32 kTestStr122Len = 16; +const sal_Int32 kTestStr123Len = 21; +const sal_Int32 kTestStr124Len = 23; +const sal_Int32 kTestStr125Len = 30; +const sal_Int32 kTestStr126Len = 12; +const sal_Int32 kTestStr127Len = 17; +const sal_Int32 kTestStr128Len = 19; +const sal_Int32 kTestStr129Len = 26; +const sal_Int32 kTestStr130Len = 23; +const sal_Int32 kTestStr131Len = 28; +const sal_Int32 kTestStr132Len = 30; +const sal_Int32 kTestStr133Len = 37; +const sal_Int32 kTestStr134Len = 22; +const sal_Int32 kTestStr135Len = 24; +const sal_Int32 kTestStr136Len = 31; +const sal_Int32 kTestStr137Len = 18; +const sal_Int32 kTestStr138Len = 20; +const sal_Int32 kTestStr139Len = 27; +const sal_Int32 kTestStr140Len = 29; +const sal_Int32 kTestStr141Len = 31; +const sal_Int32 kTestStr142Len = 38; +const sal_Int32 kTestStr143Len = 5; +const sal_Int32 kTestStr144Len = 1; +const sal_Int32 kTestStr145Len = 12; +const sal_Int32 kTestStr146Len = 19; +const sal_Int32 kTestStr147Len = 19; +const sal_Int32 kTestStr148Len = 19; +const sal_Int32 kTestStr149Len = 32; +const sal_Int32 kTestStr150Len = 32; +const sal_Int32 kTestStr151Len = 31; +const sal_Int32 kTestStr152Len = 31; +const sal_Int32 kTestStr153Len = 31; +const sal_Int32 kTestStr154Len = 36; +const sal_Int32 kTestStr155Len = 36; +const sal_Int32 kTestStr156Len = 36; +const sal_Int32 kTestStr157Len = 49; +const sal_Int32 kTestStr158Len = 49; +const sal_Int32 kTestStr159Len = 49; +const sal_Int32 kTestStr160Len = 48; +const sal_Int32 kTestStr161Len = 48; +const sal_Int32 kTestStr162Len = 48; +const sal_Int32 kTestStr163Len = 15; +const sal_Int32 kTestStr164Len = 15; +const sal_Int32 kTestStr165Len = 15; +const sal_Int32 kTestStr166Len = 28; +const sal_Int32 kTestStr167Len = 28; +const sal_Int32 kTestStr168Len = 28; +const sal_Int32 kTestStr169Len = 27; +const sal_Int32 kTestStr170Len = 27; +const sal_Int32 kTestStr171Len = 27; +const sal_Int32 kTestStr1PlusStr6Len = kTestStr1Len + kTestStr6Len; + +const sal_Int32 uTestStr1Len = 16; +const sal_Int32 uTestStr2Len = 32; +const sal_Int32 uTestStr3Len = 16; +const sal_Int32 uTestStr4Len = 16; +const sal_Int32 uTestStr5Len = 16; +const sal_Int32 uTestStr9Len = 32; +const sal_Int32 uTestStr22Len = 32; const sal_Unicode uTestStr31[]= {0x400,0x410,0x4DF}; const sal_Unicode uTestStr32[]= {0x9F9F,0xA000,0x8F80,0x9AD9}; -static const sal_Int32 uTestStr31Len = 3; -static const sal_Int32 uTestStr32Len = 4; +const sal_Int32 uTestStr31Len = 3; +const sal_Int32 uTestStr32Len = 4; -static const sal_Int16 kRadixBinary = 2; -static const sal_Int16 kRadixOctol = 8; -static const sal_Int16 kRadixDecimal = 10; -static const sal_Int16 kRadixHexdecimal = 16; -static const sal_Int16 kRadixBase36 = 36; +const sal_Int16 kRadixBinary = 2; +const sal_Int16 kRadixOctol = 8; +const sal_Int16 kRadixDecimal = 10; +const sal_Int16 kRadixHexdecimal = 16; +const sal_Int16 kRadixBase36 = 36; -static const sal_Int8 kSInt8Max = SCHAR_MAX; -static const sal_Int16 kUInt8Max = UCHAR_MAX; -static const sal_Int16 kSInt16Max = SHRT_MAX; -static const sal_Int32 kUInt16Max = USHRT_MAX; -static const sal_Int32 kSInt32Max = INT_MAX; -static const sal_Int64 kUInt32Max = UINT_MAX; -static const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807); +const sal_Int8 kSInt8Max = SCHAR_MAX; +const sal_Int16 kUInt8Max = UCHAR_MAX; +const sal_Int16 kSInt16Max = SHRT_MAX; +const sal_Int32 kUInt16Max = USHRT_MAX; +const sal_Int32 kSInt32Max = INT_MAX; +const sal_Int64 kUInt32Max = UINT_MAX; +const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807); -static const sal_Int32 kInt32MaxNumsCount = 5; +const sal_Int32 kInt32MaxNumsCount = 5; -static const sal_Int32 kInt32MaxNums[kInt32MaxNumsCount] = +const sal_Int32 kInt32MaxNums[kInt32MaxNumsCount] = { kSInt8Max, kUInt8Max, kSInt16Max, kUInt16Max, kSInt32Max }; -static const sal_Int32 kInt64MaxNumsCount = 7; +const sal_Int32 kInt64MaxNumsCount = 7; -static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] = +const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] = { kSInt8Max, kUInt8Max, kSInt16Max, kUInt16Max, @@ -311,28 +311,28 @@ static const sal_Int64 kInt64MaxNums[kInt64MaxNumsCount] = kSInt64Max }; -static const sal_Int32 kBinaryNumsCount = 16; +const sal_Int32 kBinaryNumsCount = 16; -static const sal_Int32 kBinaryMaxNumsCount = 7; +const sal_Int32 kBinaryMaxNumsCount = 7; -static const sal_Int32 kOctolNumsCount = 16; +const sal_Int32 kOctolNumsCount = 16; -static const sal_Int32 kOctolMaxNumsCount = 7; +const sal_Int32 kOctolMaxNumsCount = 7; -static const sal_Int32 kDecimalNumsCount = 16; +const sal_Int32 kDecimalNumsCount = 16; -static const sal_Int32 kDecimalMaxNumsCount = 7; +const sal_Int32 kDecimalMaxNumsCount = 7; -static const sal_Int32 kHexDecimalNumsCount = 16; +const sal_Int32 kHexDecimalNumsCount = 16; -static const sal_Int32 kHexDecimalMaxNumsCount = 7; +const sal_Int32 kHexDecimalMaxNumsCount = 7; -static const sal_Int32 kBase36NumsCount = 36; +const sal_Int32 kBase36NumsCount = 36; -static const sal_Int32 kBase36MaxNumsCount = 7; +const sal_Int32 kBase36MaxNumsCount = 7; -static const sal_Int32 nDoubleCount=24; -static const double expValDouble[nDoubleCount]= +const sal_Int32 nDoubleCount=24; +const double expValDouble[nDoubleCount]= { 3.0,3.1,3.1415,3.1415926535,3.141592653589793, 3.1415926535897932,3.14159265358979323,3.1, @@ -341,8 +341,8 @@ static const double expValDouble[nDoubleCount]= 0.0,0.0,0.0,1.00e+308 }; -static const sal_Int32 nFloatCount=22; -static const float expValFloat[nFloatCount] = +const sal_Int32 nFloatCount=22; +const float expValFloat[nFloatCount] = { 3.0f,3.1f,3.1415f,3.14159f,3.141592f, 3.1415926f,3.14159265f,3.141592653589793238462643f, @@ -351,8 +351,8 @@ static const float expValFloat[nFloatCount] = 3.1f,0.0f,0.0f,0.0f }; -static const sal_Int32 nCharCount=15; -static const sal_Unicode expValChar[nCharCount] = +const sal_Int32 nCharCount=15; +const sal_Unicode expValChar[nCharCount] = { 65,97,48,45,95, 21,27,29, @@ -360,104 +360,104 @@ static const sal_Unicode expValChar[nCharCount] = 0,0,83 }; -static const sal_Int32 nDefaultCount=6; -static const sal_Unicode input1Default[nDefaultCount] = +const sal_Int32 nDefaultCount=6; +const sal_Unicode input1Default[nDefaultCount] = { 77,115,85,119,32,0 }; -static const sal_Int32 input2Default[nDefaultCount] = +const sal_Int32 input2Default[nDefaultCount] = { 0,0,0,0,0,0 }; -static const sal_Int32 expValDefault[nDefaultCount] = +const sal_Int32 expValDefault[nDefaultCount] = { 4,9,-1,-1,3,-1 }; -static const sal_Int32 nNormalCount=10; -static const sal_Unicode input1Normal[nNormalCount] = +const sal_Int32 nNormalCount=10; +const sal_Unicode input1Normal[nNormalCount] = { 77,77,77,115,115,115,119,119,0,0 }; -static const sal_Int32 input2Normal[nNormalCount] = +const sal_Int32 input2Normal[nNormalCount] = { 0,32,80,0,13,20,0,80,0,32 }; -static const sal_Int32 expValNormal[nNormalCount] = +const sal_Int32 expValNormal[nNormalCount] = { 4,-1,-1,9,15,-1,-1,-1,-1,-1 }; -static const sal_Int32 nlastDefaultCount=5; -static const sal_Unicode input1lastDefault[nlastDefaultCount] = +const sal_Int32 nlastDefaultCount=5; +const sal_Unicode input1lastDefault[nlastDefaultCount] = { 77,115,119,32,0 }; -static const sal_Int32 input2lastDefault[nlastDefaultCount] = +const sal_Int32 input2lastDefault[nlastDefaultCount] = { 31,31,31,31,31 }; -static const sal_Int32 expVallastDefault[nlastDefaultCount] = +const sal_Int32 expVallastDefault[nlastDefaultCount] = { 4,15,-1,21,-1 }; -static const sal_Int32 nlastNormalCount=8; -static const sal_Unicode input1lastNormal[nlastNormalCount] = +const sal_Int32 nlastNormalCount=8; +const sal_Unicode input1lastNormal[nlastNormalCount] = { 77,77,77,115,115,119,119,0 }; -static const sal_Int32 input2lastNormal[nlastNormalCount] = +const sal_Int32 input2lastNormal[nlastNormalCount] = { 29,0,80,31,3,31,80,31 }; -static const sal_Int32 expVallastNormal[nlastNormalCount] = +const sal_Int32 expVallastNormal[nlastNormalCount] = { 4,-1,4,15,-1,-1,-1,-1 }; -static const sal_Int32 nStrDefaultCount=6; -static const sal_Int32 input2StrDefault[nStrDefaultCount] = +const sal_Int32 nStrDefaultCount=6; +const sal_Int32 input2StrDefault[nStrDefaultCount] = { 0,0,0,0,0,0 }; -static const sal_Int32 expValStrDefault[nStrDefaultCount] = +const sal_Int32 expValStrDefault[nStrDefaultCount] = { 0,4,-1,-1,-1,3 }; -static const sal_Int32 nStrNormalCount=9; -static const sal_Int32 input2StrNormal[nStrNormalCount] = +const sal_Int32 nStrNormalCount=9; +const sal_Int32 input2StrNormal[nStrNormalCount] = { 0,32,0,30,0,0,0,32,0 }; -static const sal_Int32 expValStrNormal[nStrNormalCount] = +const sal_Int32 expValStrNormal[nStrNormalCount] = { 0,-1,4,-1,-1,-1,-1,-1,3 }; -static const sal_Int32 nStrLastDefaultCount=6; -static const sal_Int32 input2StrLastDefault[nStrLastDefaultCount] = +const sal_Int32 nStrLastDefaultCount=6; +const sal_Int32 input2StrLastDefault[nStrLastDefaultCount] = { 31,31,31,31,31,31 }; -static const sal_Int32 expValStrLastDefault[nStrLastDefaultCount] = +const sal_Int32 expValStrLastDefault[nStrLastDefaultCount] = { 0,4,-1,-1,-1,3 }; -static const sal_Int32 nStrLastNormalCount=12; -static const sal_Int32 input2StrLastNormal[nStrLastNormalCount] = +const sal_Int32 nStrLastNormalCount=12; +const sal_Int32 input2StrLastNormal[nStrLastNormalCount] = { 31,0,80,31,2,31,31,31,0,31,31,14 }; -static const sal_Int32 expValStrLastNormal[nStrLastNormalCount] = +const sal_Int32 expValStrLastNormal[nStrLastNormalCount] = { 0,-1,0,4,-1,-1,-1,-1,-1,3,15,11 }; -static const sal_Int32 kNonSInt32Max = INT_MIN; -static const sal_Int32 kNonSInt16Max = SHRT_MIN; +const sal_Int32 kNonSInt32Max = INT_MIN; +const sal_Int32 kNonSInt16Max = SHRT_MIN; #ifdef __cplusplus } diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 460786c77b1e..a8dc87b6fd98 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -60,7 +60,7 @@ namespace struct Bootstrap_Impl; -static char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:"; +char const VND_SUN_STAR_PATHNAME[] = "vnd.sun.star.pathname:"; bool isPathnameUrl(OUString const & url) { diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx index db9b1bdd20bf..bb0884b7a3d6 100644 --- a/sal/rtl/cipher.cxx +++ b/sal/rtl/cipher.cxx @@ -274,7 +274,7 @@ static void BF_decode(CipherKeyBF *key, sal_uInt32 *xl, sal_uInt32 *xr); static sal_uInt32 BF(CipherKeyBF *key, sal_uInt32 x); -static const CipherKeyBF BF_key = +const CipherKeyBF BF_key = { /* S */ { diff --git a/sal/rtl/crc.cxx b/sal/rtl/crc.cxx index 479281e765fd..621b01643b4c 100644 --- a/sal/rtl/crc.cxx +++ b/sal/rtl/crc.cxx @@ -23,7 +23,7 @@ /** rtl_crc32Table (CRC polynomial 0xEDB88320). */ -static const sal_uInt32 rtl_crc32Table[256] = +const sal_uInt32 rtl_crc32Table[256] = { /* 0 */ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx index 55af5ad7c3b2..ed545ae87bb8 100644 --- a/sal/rtl/digest.cxx +++ b/sal/rtl/digest.cxx @@ -201,7 +201,7 @@ static void initMD2 (DigestContextMD2 *ctx); static void updateMD2 (DigestContextMD2 *ctx); static void endMD2 (DigestContextMD2 *ctx); -static const sal_uInt32 S[256] = +const sal_uInt32 S[256] = { 0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01, 0x3D, 0x36, 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13, @@ -237,7 +237,7 @@ static const sal_uInt32 S[256] = 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14, }; -static const Digest_Impl MD2 = +const Digest_Impl MD2 = { rtl_Digest_AlgorithmMD2, RTL_DIGEST_LENGTH_MD2, @@ -492,7 +492,7 @@ static void endMD5 (DigestContextMD5 *ctx); a = RTL_DIGEST_ROTL(a, s); \ a += b; } -static const Digest_Impl MD5 = +const Digest_Impl MD5 = { rtl_Digest_AlgorithmMD5, RTL_DIGEST_LENGTH_MD5, @@ -1086,7 +1086,7 @@ static void endSHA(DigestContextSHA *ctx) updateSHA(ctx); } -static const Digest_Impl SHA_0 = +const Digest_Impl SHA_0 = { rtl_Digest_AlgorithmSHA, RTL_DIGEST_LENGTH_SHA, @@ -1245,7 +1245,7 @@ void SAL_CALL rtl_digest_destroySHA(rtlDigest Digest) SAL_THROW_EXTERN_C() } } -static const Digest_Impl SHA_1 = +const Digest_Impl SHA_1 = { rtl_Digest_AlgorithmSHA1, RTL_DIGEST_LENGTH_SHA1, @@ -1426,7 +1426,7 @@ static void initHMAC_MD5(ContextHMAC_MD5 * ctx); static void ipadHMAC_MD5(ContextHMAC_MD5 * ctx); static void opadHMAC_MD5(ContextHMAC_MD5 * ctx); -static const Digest_Impl HMAC_MD5 = +const Digest_Impl HMAC_MD5 = { rtl_Digest_AlgorithmHMAC_MD5, RTL_DIGEST_LENGTH_MD5, @@ -1626,7 +1626,7 @@ static void initHMAC_SHA1(ContextHMAC_SHA1 * ctx); static void ipadHMAC_SHA1(ContextHMAC_SHA1 * ctx); static void opadHMAC_SHA1(ContextHMAC_SHA1 * ctx); -static const Digest_Impl HMAC_SHA1 = +const Digest_Impl HMAC_SHA1 = { rtl_Digest_AlgorithmHMAC_SHA1, RTL_DIGEST_LENGTH_SHA1, diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 981009aa036c..1115b6f174c8 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -42,8 +42,8 @@ #include <dtoa.h> -static int const n10Count = 16; -static double const n10s[2][n10Count] = { +int const n10Count = 16; +double const n10s[2][n10Count] = { { 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16 }, { 1e-1, 1e-2, 1e-3, 1e-4, 1e-5, 1e-6, 1e-7, 1e-8, diff --git a/sal/rtl/string.cxx b/sal/rtl/string.cxx index 13bf7542c885..aa6e2f58f3ae 100644 --- a/sal/rtl/string.cxx +++ b/sal/rtl/string.cxx @@ -38,7 +38,7 @@ /* static data to be referenced by all empty strings * the refCount is predefined to 1 and must never become 0 ! */ -static rtl_String const aImplEmpty_rtl_String = +rtl_String const aImplEmpty_rtl_String = { SAL_STRING_STATIC_FLAG|1, /* sal_Int32 refCount; */ diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx index 01fea63e160c..66e2fe03ce9d 100644 --- a/sal/rtl/ustring.cxx +++ b/sal/rtl/ustring.cxx @@ -47,7 +47,7 @@ /* static data to be referenced by all empty strings * the refCount is predefined to 1 and must never become 0 ! */ -static rtl_uString const aImplEmpty_rtl_uString = +rtl_uString const aImplEmpty_rtl_uString = { sal_Int32(SAL_STRING_INTERN_FLAG|SAL_STRING_STATIC_FLAG|1), /*sal_Int32 refCount; */ 0, /*sal_Int32 length; */ diff --git a/sal/textenc/convertbig5hkscs.tab b/sal/textenc/convertbig5hkscs.tab index 78dbeb428558..8aa45facf0e9 100644 --- a/sal/textenc/convertbig5hkscs.tab +++ b/sal/textenc/convertbig5hkscs.tab @@ -26,7 +26,7 @@ #include "generate/big5hkscs2001.tab" #include "tenchelp.hxx" -static ImplBig5HkscsConverterData const aImplBig5HkscsConvertData +ImplBig5HkscsConverterData const aImplBig5HkscsConvertData = { aImplBig5Hkscs2001ToUnicodeData, aImplBig5Hkscs2001ToUnicodeRowOffsets, aBIG5UniLeadTab, /* from tcvttcn6.tab */ @@ -37,7 +37,7 @@ static ImplBig5HkscsConverterData const aImplBig5HkscsConvertData aImplMS950DBCSEUDCTab, /* from tcvttcn6.tab */ DBCS_EUDC_MS950_COUNT }; /* from tcvttcn6.tab */ -static ImplTextEncodingData const aImplBig5HkscsTextEncodingData +ImplTextEncodingData const aImplBig5HkscsTextEncodingData = { { &aImplBig5HkscsConvertData, &ImplConvertBig5HkscsToUnicode, &ImplConvertUnicodeToBig5Hkscs, diff --git a/sal/textenc/converteuctw.tab b/sal/textenc/converteuctw.tab index ce41377bdc83..67982f7b4ed3 100644 --- a/sal/textenc/converteuctw.tab +++ b/sal/textenc/converteuctw.tab @@ -26,7 +26,7 @@ #include "generate/cns116431992.tab" -static ImplEucTwConverterData const aImplEucTwConvertData +ImplEucTwConverterData const aImplEucTwConvertData = { aImplCns116431992ToUnicodeData, aImplCns116431992ToUnicodeRowOffsets, aImplCns116431992ToUnicodePlaneOffsets, @@ -34,7 +34,7 @@ static ImplEucTwConverterData const aImplEucTwConvertData aImplUnicodeToCns116431992PageOffsets, aImplUnicodeToCns116431992PlaneOffsets }; -static ImplTextEncodingData const aImplEucTwTextEncodingData +ImplTextEncodingData const aImplEucTwTextEncodingData = { { &aImplEucTwConvertData, &ImplConvertEucTwToUnicode, &ImplConvertUnicodeToEucTw, diff --git a/sal/textenc/convertgb18030.tab b/sal/textenc/convertgb18030.tab index 899fe9e163fd..d0a25c2a330a 100644 --- a/sal/textenc/convertgb18030.tab +++ b/sal/textenc/convertgb18030.tab @@ -25,13 +25,13 @@ #include "convertgb18030.hxx" #include "generate/gb180302000.tab" -static ImplGb18030ConverterData const aImplGb18030ConvertData +ImplGb18030ConverterData const aImplGb18030ConvertData = { aImplGb180302000ToUnicodeData, aImplGb180302000ToUnicodeRanges, aImplUnicodeToGb180302000Data, aImplUnicodeToGb180302000Ranges }; -static ImplTextEncodingData const aImplGb18030TextEncodingData +ImplTextEncodingData const aImplGb18030TextEncodingData = { { &aImplGb18030ConvertData, &ImplConvertGb18030ToUnicode, &ImplConvertUnicodeToGb18030, diff --git a/sal/textenc/convertisciidevangari.cxx b/sal/textenc/convertisciidevangari.cxx index 9367bbb747e9..759328565690 100644 --- a/sal/textenc/convertisciidevangari.cxx +++ b/sal/textenc/convertisciidevangari.cxx @@ -61,7 +61,7 @@ struct UnicodeToIsciiDevanagari } -static const sal_Unicode IsciiDevanagariMap[256] = +const sal_Unicode IsciiDevanagariMap[256] = { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, diff --git a/sal/textenc/convertisciidevangari.tab b/sal/textenc/convertisciidevangari.tab index 5e045b6a2547..f66ad95bca97 100644 --- a/sal/textenc/convertisciidevangari.tab +++ b/sal/textenc/convertisciidevangari.tab @@ -14,7 +14,7 @@ #include "convertisciidevangari.hxx" -static ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData +ImplTextEncodingData const aImplIsciiDevanagariTextEncodingData = { { nullptr, &ImplConvertIsciiDevanagariToUnicode, &ImplConvertUnicodeToIsciiDevanagari, diff --git a/sal/textenc/convertiso2022cn.tab b/sal/textenc/convertiso2022cn.tab index c0625792a8f7..3fd4bad21539 100644 --- a/sal/textenc/convertiso2022cn.tab +++ b/sal/textenc/convertiso2022cn.tab @@ -24,7 +24,7 @@ #include "convertiso2022cn.hxx" #include "tenchelp.hxx" -static ImplIso2022CnConverterData const aImplIso2022CnConvertData +ImplIso2022CnConverterData const aImplIso2022CnConvertData = { aGB2312UniLeadTab, /* from tcvtscn6.tab */ aImplCns116431992ToUnicodeData, /* from generate/cns116431992.tab */ aImplCns116431992ToUnicodeRowOffsets, @@ -38,7 +38,7 @@ static ImplIso2022CnConverterData const aImplIso2022CnConvertData aImplUnicodeToCns116431992PlaneOffsets }; /* from generate/cns116431992.tab */ -static ImplTextEncodingData const aImplIso2022CnTextEncodingData +ImplTextEncodingData const aImplIso2022CnTextEncodingData = { { &aImplIso2022CnConvertData, &ImplConvertIso2022CnToUnicode, &ImplConvertUnicodeToIso2022Cn, diff --git a/sal/textenc/convertiso2022jp.tab b/sal/textenc/convertiso2022jp.tab index 743d34782ce5..41093bfc1a7a 100644 --- a/sal/textenc/convertiso2022jp.tab +++ b/sal/textenc/convertiso2022jp.tab @@ -24,11 +24,11 @@ #include "convertiso2022jp.hxx" #include "tenchelp.hxx" -static ImplIso2022JpConverterData const aImplIso2022JpConvertData +ImplIso2022JpConverterData const aImplIso2022JpConvertData = { aJIS0208UniLeadTab, /* from tcvtjp6.tab */ aJIS0208DBCSHighTab }; /* from tcvtjp6.tab */ -static ImplTextEncodingData const aImplIso2022JpTextEncodingData +ImplTextEncodingData const aImplIso2022JpTextEncodingData = { { &aImplIso2022JpConvertData, &ImplConvertIso2022JpToUnicode, &ImplConvertUnicodeToIso2022Jp, diff --git a/sal/textenc/convertiso2022kr.tab b/sal/textenc/convertiso2022kr.tab index fce869caee12..6356aa3de4fb 100644 --- a/sal/textenc/convertiso2022kr.tab +++ b/sal/textenc/convertiso2022kr.tab @@ -24,11 +24,11 @@ #include "convertiso2022kr.hxx" #include "tenchelp.hxx" -static ImplIso2022KrConverterData const aImplIso2022KrConvertData +ImplIso2022KrConverterData const aImplIso2022KrConvertData = { aKSC5601UniLeadTab, /* from tcvtkr6.tab */ aKSC5601DBCSHighTab }; /* from tcvtkr6.tab */ -static ImplTextEncodingData const aImplIso2022KrTextEncodingData +ImplTextEncodingData const aImplIso2022KrTextEncodingData = { { &aImplIso2022KrConvertData, &ImplConvertIso2022KrToUnicode, &ImplConvertUnicodeToIso2022Kr, diff --git a/sal/textenc/convertsimple.cxx b/sal/textenc/convertsimple.cxx index ab4e136ef711..2738acc13be1 100644 --- a/sal/textenc/convertsimple.cxx +++ b/sal/textenc/convertsimple.cxx @@ -26,7 +26,7 @@ struct ImplReplaceCharData sal_uInt16 mnReplaceChar; }; -static ImplReplaceCharData const aImplRepCharTab[] = +ImplReplaceCharData const aImplRepCharTab[] = { { 0x00A0, 0x0020 }, /* NO-BREAK-SPACE */ { 0x00A1, 0x0021 }, /* INVERTED EXCLAMATION MARK */ @@ -357,7 +357,7 @@ struct ImplReplaceCharStrData sal_uInt16 maReplaceChars[IMPL_MAX_REPLACECHAR]; }; -static ImplReplaceCharStrData const aImplRepCharStrTab[] = +ImplReplaceCharStrData const aImplRepCharStrTab[] = { { 0x00A9, { 0x0028, 0x0063, 0x0029, 0x0000, 0x0000 } }, /* COPYRIGHT SIGN */ { 0x00AB, { 0x003C, 0x003C, 0x0000, 0x0000, 0x0000 } }, /* LEFT-POINTING-DOUBLE ANGLE QUOTATION MARK */ diff --git a/sal/textenc/generate/big5hkscs2001.tab b/sal/textenc/generate/big5hkscs2001.tab index dddd1d5d57a0..b8609633f367 100644 --- a/sal/textenc/generate/big5hkscs2001.tab +++ b/sal/textenc/generate/big5hkscs2001.tab @@ -18,7 +18,7 @@ #include <sal/types.h> -static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = { +sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = { /* row 0: --- */ /* row 1: --- */ /* row 2: --- */ @@ -952,7 +952,7 @@ static sal_uInt16 const aImplBig5Hkscs2001ToUnicodeData[] = { /* row 255: --- */ }; -static sal_Int32 const aImplBig5Hkscs2001ToUnicodeRowOffsets[] = { +sal_Int32 const aImplBig5Hkscs2001ToUnicodeRowOffsets[] = { -1, /* row 0 */ -1, /* row 1 */ -1, /* row 2 */ @@ -1211,7 +1211,7 @@ static sal_Int32 const aImplBig5Hkscs2001ToUnicodeRowOffsets[] = { -1, /* row 255 */ }; -static sal_uInt16 const aImplUnicodeToBig5Hkscs2001Data[] = { +sal_uInt16 const aImplUnicodeToBig5Hkscs2001Data[] = { /* plane 0, page 0 */ 168 | (252 << 8), /* first, last */ 0xC6D8, 0, @@ -8261,7 +8261,7 @@ static sal_uInt16 const aImplUnicodeToBig5Hkscs2001Data[] = { /* plane 16: --- */ }; -static sal_Int32 const aImplUnicodeToBig5Hkscs2001PageOffsets[] = { +sal_Int32 const aImplUnicodeToBig5Hkscs2001PageOffsets[] = { 0, /* plane 0, page 0; 44/172 bytes (25.6%) */ 86, /* plane 0, page 1; 46/444 bytes (10.4%) */ 308, /* plane 0, page 2; 22/240 bytes (9.2%) */ @@ -8791,7 +8791,7 @@ static sal_Int32 const aImplUnicodeToBig5Hkscs2001PageOffsets[] = { /* plane 16: --- */ }; -static sal_Int32 const aImplUnicodeToBig5Hkscs2001PlaneOffsets[] = { +sal_Int32 const aImplUnicodeToBig5Hkscs2001PlaneOffsets[] = { 0 * 256, /* plane 0; 576/1024 bytes (56.3%), 11016/62348 bytes (17.7%) */ -1, /* plane 1 */ 1 * 256, /* plane 2; 664/1024 bytes (64.8%), 3634/56982 bytes (6.4%) */ diff --git a/sal/textenc/generate/cns116431992.tab b/sal/textenc/generate/cns116431992.tab index 801badfa3cdf..b1d72705a655 100644 --- a/sal/textenc/generate/cns116431992.tab +++ b/sal/textenc/generate/cns116431992.tab @@ -18,7 +18,7 @@ #include <sal/types.h> -static sal_uInt16 const aImplCns116431992ToUnicodeData[] = { +sal_uInt16 const aImplCns116431992ToUnicodeData[] = { /* plane 1, row 1 */ 1 | (94 << 8), /* first, last */ 0x3000,0xFF0C,0x3001,0x3002,0xFF0E,0x30FB,0xFF1B,0xFF1A,0xFF1F, @@ -11729,7 +11729,7 @@ static sal_uInt16 const aImplCns116431992ToUnicodeData[] = { /* plane 15, row 94: --- */ }; -static sal_Int32 const aImplCns116431992ToUnicodeRowOffsets[] = { +sal_Int32 const aImplCns116431992ToUnicodeRowOffsets[] = { 0, /* plane 1, row 1; 182/190 bytes (95.8%) */ 95, /* plane 1, row 2; 186/190 bytes (97.9%) */ 190, /* plane 1, row 3; 94/94 bytes (100.0%) */ @@ -12492,7 +12492,7 @@ static sal_Int32 const aImplCns116431992ToUnicodeRowOffsets[] = { /* plane 16: --- */ }; -static sal_Int32 const aImplCns116431992ToUnicodePlaneOffsets[] = { +sal_Int32 const aImplCns116431992ToUnicodePlaneOffsets[] = { 0 * 94, /* plane 1; 264/376 bytes (70.2%) */ 1 * 94, /* plane 2; 328/376 bytes (87.2%) */ 2 * 94, /* plane 3; 284/376 bytes (75.5%) */ @@ -12511,7 +12511,7 @@ static sal_Int32 const aImplCns116431992ToUnicodePlaneOffsets[] = { -1, /* plane 16 */ }; -static sal_uInt8 const aImplUnicodeToCns116431992Data[] = { +sal_uInt8 const aImplUnicodeToCns116431992Data[] = { /* plane 0, page 0 */ 167, 247, /* first, last */ 1, 1,80, @@ -22306,7 +22306,7 @@ static sal_uInt8 const aImplUnicodeToCns116431992Data[] = { /* plane 16: --- */ }; -static sal_Int32 const aImplUnicodeToCns116431992PageOffsets[] = { +sal_Int32 const aImplUnicodeToCns116431992PageOffsets[] = { 0, /* plane 0, page 0; 20/245 bytes (8.2%) */ -1, /* plane 0, page 1 */ 245, /* plane 0, page 2; 17/59 bytes (28.8%) */ @@ -22836,7 +22836,7 @@ static sal_Int32 const aImplUnicodeToCns116431992PageOffsets[] = { /* plane 16: --- */ }; -static sal_Int32 const aImplUnicodeToCns116431992PlaneOffsets[] = { +sal_Int32 const aImplUnicodeToCns116431992PlaneOffsets[] = { 0 * 256, /* plane 0; 496/1024 bytes (48.4%), 74432/85679 bytes (86.9%) */ -1, /* plane 1 */ 1 * 256, /* plane 2; 680/1024 bytes (66.4%), 92476/129088 bytes (71.6%) */ diff --git a/sal/textenc/generate/gb180302000.tab b/sal/textenc/generate/gb180302000.tab index 00fc5134c727..5c0d469ad681 100644 --- a/sal/textenc/generate/gb180302000.tab +++ b/sal/textenc/generate/gb180302000.tab @@ -22,7 +22,7 @@ #include "../convertgb18030.hxx" -static sal_Unicode const aImplGb180302000ToUnicodeData[] = { +sal_Unicode const aImplGb180302000ToUnicodeData[] = { 0x4E02,0x4E04,0x4E05,0x4E06,0x4E0F,0x4E12,0x4E17,0x4E1F, 0x4E20,0x4E21,0x4E23,0x4E26,0x4E29,0x4E2E,0x4E2F,0x4E31, 0x4E33,0x4E35,0x4E37,0x4E3C,0x4E40,0x4E41,0x4E42,0x4E44, @@ -3867,7 +3867,7 @@ static sal_Unicode const aImplGb180302000ToUnicodeData[] = { 0xFFDB,0xFFDC,0xFFDD,0xFFDE,0xFFDF, }; -static ImplGb180302000ToUnicodeRange const +ImplGb180302000ToUnicodeRange const aImplGb180302000ToUnicodeRanges[] = { { 23940, 820, 7922, 0x0452 }, { 24760, 9219, 11329, 0x2643 }, @@ -3884,7 +3884,7 @@ static ImplGb180302000ToUnicodeRange const { -1, 0, 0, 0 } }; -static sal_uInt32 const aImplUnicodeToGb180302000Data[] = { +sal_uInt32 const aImplUnicodeToGb180302000Data[] = { 0x81308130,0x81308131,0x81308132,0x81308133,0x81308134,0x81308135, 0x81308136,0x81308137,0x81308138,0x81308139,0x81308230,0x81308231, 0x81308232,0x81308233,0x81308234,0x81308235,0x81308236,0x81308237, @@ -9010,7 +9010,7 @@ static sal_uInt32 const aImplUnicodeToGb180302000Data[] = { 0xA3A4, }; -static ImplUnicodeToGb180302000Range const +ImplUnicodeToGb180302000Range const aImplUnicodeToGb180302000Ranges[] = { { 0, 0x0452, 0x200F, 820 }, { 978, 0x2643, 0x2E80, 9219 }, diff --git a/sal/textenc/tables.cxx b/sal/textenc/tables.cxx index d39243d70258..075f1d56f902 100644 --- a/sal/textenc/tables.cxx +++ b/sal/textenc/tables.cxx @@ -35,7 +35,7 @@ #define SAME8090UNI_START 0x80 #define SAME8090UNI_END 0x9F -static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END +sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END - SAME8090UNI_START + 1] = { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, /* 0x80 */ @@ -45,7 +45,7 @@ static sal_uInt16 const aImpl8090SameToUniTab[SAME8090UNI_END #define SAME8090CHAR_START 0x0080 #define SAME8090CHAR_END 0x009F -static unsigned char const aImpl8090SameToCharTab[SAME8090CHAR_END +unsigned char const aImpl8090SameToCharTab[SAME8090CHAR_END - SAME8090CHAR_START + 1] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 0x0080 */ @@ -53,7 +53,7 @@ static unsigned char const aImpl8090SameToCharTab[SAME8090CHAR_END 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, /* 0x0090 */ 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F }; -static sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 }; +sal_uInt16 const aImplDoubleByteIdentifierTab[1] = { 0 }; #include "tcvtarb1.tab" #include "tcvteas1.tab" diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab index f7b0ce945965..49c119f636c7 100644 --- a/sal/textenc/tcvtarb1.tab +++ b/sal/textenc/tcvtarb1.tab @@ -38,7 +38,7 @@ #define IBM862UNI_START 0x80 #define IBM862UNI_END 0xFF -static sal_uInt16 const aImplIBM862ToUniTab[IBM862UNI_END - IBM862UNI_START + 1] = +sal_uInt16 const aImplIBM862ToUniTab[IBM862UNI_END - IBM862UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -64,7 +64,7 @@ static sal_uInt16 const aImplIBM862ToUniTab[IBM862UNI_END - IBM862UNI_START + 1] #define IBM862CHAR_START 0x05D0 #define IBM862CHAR_END 0x05EA -static unsigned char const aImplIBM862ToCharTab[IBM862CHAR_END - IBM862CHAR_START + 1] = +unsigned char const aImplIBM862ToCharTab[IBM862CHAR_END - IBM862CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -77,7 +77,7 @@ static unsigned char const aImplIBM862ToCharTab[IBM862CHAR_END - IBM862CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM862TOCHARTABEX_COUNT 101 -static ImplUniCharTabData const aImplIBM862ToCharTabEx[IBM862TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM862ToCharTabEx[IBM862TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A1, 0xAD, 0 }, @@ -184,7 +184,7 @@ static ImplUniCharTabData const aImplIBM862ToCharTabEx[IBM862TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM862ByteCvtData = +ImplByteConvertData const aImplIBM862ByteCvtData = { aImplIBM862ToUniTab, nullptr, @@ -200,7 +200,7 @@ static ImplByteConvertData const aImplIBM862ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM862TextEncodingData +ImplTextEncodingData const aImplIBM862TextEncodingData = { { &aImplIBM862ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -233,7 +233,7 @@ static ImplTextEncodingData const aImplIBM862TextEncodingData #define IBM864UNI_START 0x80 #define IBM864UNI_END 0xFE -static sal_uInt16 const aImplIBM864ToUniTab[IBM864UNI_END - IBM864UNI_START + 1] = +sal_uInt16 const aImplIBM864ToUniTab[IBM864UNI_END - IBM864UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -259,7 +259,7 @@ static sal_uInt16 const aImplIBM864ToUniTab[IBM864UNI_END - IBM864UNI_START + 1] #define IBM864CHAR_START 0xFE7D #define IBM864CHAR_END 0xFEFC -static unsigned char const aImplIBM864ToCharTab[IBM864CHAR_END - IBM864CHAR_START + 1] = +unsigned char const aImplIBM864ToCharTab[IBM864CHAR_END - IBM864CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -285,7 +285,7 @@ static unsigned char const aImplIBM864ToCharTab[IBM864CHAR_END - IBM864CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM864TOCHARTABEX_COUNT 51 -static ImplUniCharTabData const aImplIBM864ToCharTabEx[IBM864TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM864ToCharTabEx[IBM864TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A2, 0xC0, 0 }, @@ -342,7 +342,7 @@ static ImplUniCharTabData const aImplIBM864ToCharTabEx[IBM864TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM864ByteCvtData = +ImplByteConvertData const aImplIBM864ByteCvtData = { aImplIBM864ToUniTab, nullptr, @@ -358,7 +358,7 @@ static ImplByteConvertData const aImplIBM864ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM864TextEncodingData +ImplTextEncodingData const aImplIBM864TextEncodingData = { { &aImplIBM864ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -391,7 +391,7 @@ static ImplTextEncodingData const aImplIBM864TextEncodingData #define MS1255UNI_START 0x80 #define MS1255UNI_END 0xFF -static sal_uInt16 const aImplMS1255ToUniTab[MS1255UNI_END - MS1255UNI_START + 1] = +sal_uInt16 const aImplMS1255ToUniTab[MS1255UNI_END - MS1255UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -417,7 +417,7 @@ static sal_uInt16 const aImplMS1255ToUniTab[MS1255UNI_END - MS1255UNI_START + 1] #define MS1255CHAR_START 0x05B0 #define MS1255CHAR_END 0x05F4 -static unsigned char const aImplMS1255ToCharTab[MS1255CHAR_END - MS1255CHAR_START + 1] = +unsigned char const aImplMS1255ToCharTab[MS1255CHAR_END - MS1255CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -435,7 +435,7 @@ static unsigned char const aImplMS1255ToCharTab[MS1255CHAR_END - MS1255CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1255TOCHARTABEX_COUNT 54 -static ImplUniCharTabData const aImplMS1255ToCharTabEx[MS1255TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1255ToCharTabEx[MS1255TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A1, 0xA1, 0 }, @@ -495,7 +495,7 @@ static ImplUniCharTabData const aImplMS1255ToCharTabEx[MS1255TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1255ByteCvtData = +ImplByteConvertData const aImplMS1255ByteCvtData = { aImplMS1255ToUniTab, nullptr, @@ -511,7 +511,7 @@ static ImplByteConvertData const aImplMS1255ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1255TextEncodingData +ImplTextEncodingData const aImplMS1255TextEncodingData = { { &aImplMS1255ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -543,7 +543,7 @@ static ImplTextEncodingData const aImplMS1255TextEncodingData #define MS1256UNI_START 0x80 #define MS1256UNI_END 0xFF -static sal_uInt16 const aImplMS1256ToUniTab[MS1256UNI_END - MS1256UNI_START + 1] = +sal_uInt16 const aImplMS1256ToUniTab[MS1256UNI_END - MS1256UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -569,7 +569,7 @@ static sal_uInt16 const aImplMS1256ToUniTab[MS1256UNI_END - MS1256UNI_START + 1] #define MS1256CHAR_START 0x061B #define MS1256CHAR_END 0x0652 -static unsigned char const aImplMS1256ToCharTab[MS1256CHAR_END - MS1256CHAR_START + 1] = +unsigned char const aImplMS1256ToCharTab[MS1256CHAR_END - MS1256CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -586,7 +586,7 @@ static unsigned char const aImplMS1256ToCharTab[MS1256CHAR_END - MS1256CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1256TOCHARTABEX_COUNT 81 -static ImplUniCharTabData const aImplMS1256ToCharTabEx[MS1256TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1256ToCharTabEx[MS1256TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A2, 0xA2, 0 }, @@ -673,7 +673,7 @@ static ImplUniCharTabData const aImplMS1256ToCharTabEx[MS1256TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1256ByteCvtData = +ImplByteConvertData const aImplMS1256ByteCvtData = { aImplMS1256ToUniTab, nullptr, @@ -689,7 +689,7 @@ static ImplByteConvertData const aImplMS1256ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1256TextEncodingData +ImplTextEncodingData const aImplMS1256TextEncodingData = { { &aImplMS1256ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -721,7 +721,7 @@ static ImplTextEncodingData const aImplMS1256TextEncodingData #define ISO88596UNI_START 0xA0 #define ISO88596UNI_END 0xF2 -static sal_uInt16 const aImplISO88596ToUniTab[ISO88596UNI_END - ISO88596UNI_START + 1] = +sal_uInt16 const aImplISO88596ToUniTab[ISO88596UNI_END - ISO88596UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -743,7 +743,7 @@ static sal_uInt16 const aImplISO88596ToUniTab[ISO88596UNI_END - ISO88596UNI_STAR #define ISO88596CHAR_START 0x061B #define ISO88596CHAR_END 0x0669 -static unsigned char const aImplISO88596ToCharTab[ISO88596CHAR_END - ISO88596CHAR_START + 1] = +unsigned char const aImplISO88596ToCharTab[ISO88596CHAR_END - ISO88596CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -763,7 +763,7 @@ static unsigned char const aImplISO88596ToCharTab[ISO88596CHAR_END - ISO88596CHA /* ----------------------------------------------------------------------- */ #define ISO88596TOCHARTABEX_COUNT 4 -static ImplUniCharTabData const aImplISO88596ToCharTabEx[ISO88596TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplISO88596ToCharTabEx[ISO88596TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A4, 0xA4, 0 }, @@ -773,7 +773,7 @@ static ImplUniCharTabData const aImplISO88596ToCharTabEx[ISO88596TOCHARTABEX_COU /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplISO88596ByteCvtData = +ImplByteConvertData const aImplISO88596ByteCvtData = { aImplISO88596ToUniTab, aImpl8090SameToUniTab, @@ -789,7 +789,7 @@ static ImplByteConvertData const aImplISO88596ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplISO88596TextEncodingData +ImplTextEncodingData const aImplISO88596TextEncodingData = { { &aImplISO88596ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -820,7 +820,7 @@ static ImplTextEncodingData const aImplISO88596TextEncodingData #define ISO88598UNI_START 0xA0 #define ISO88598UNI_END 0xFE -static sal_uInt16 const aImplISO88598ToUniTab[ISO88598UNI_END - ISO88598UNI_START + 1] = +sal_uInt16 const aImplISO88598ToUniTab[ISO88598UNI_END - ISO88598UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -842,7 +842,7 @@ static sal_uInt16 const aImplISO88598ToUniTab[ISO88598UNI_END - ISO88598UNI_STAR #define ISO88598CHAR_START 0x05D0 #define ISO88598CHAR_END 0x05EA -static unsigned char const aImplISO88598ToCharTab[ISO88598CHAR_END - ISO88598CHAR_START + 1] = +unsigned char const aImplISO88598ToCharTab[ISO88598CHAR_END - ISO88598CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -855,7 +855,7 @@ static unsigned char const aImplISO88598ToCharTab[ISO88598CHAR_END - ISO88598CHA /* ----------------------------------------------------------------------- */ #define ISO88598TOCHARTABEX_COUNT 33 -static ImplUniCharTabData const aImplISO88598ToCharTabEx[ISO88598TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplISO88598ToCharTabEx[ISO88598TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A2, 0xA2, 0 }, @@ -894,7 +894,7 @@ static ImplUniCharTabData const aImplISO88598ToCharTabEx[ISO88598TOCHARTABEX_COU /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplISO88598ByteCvtData = +ImplByteConvertData const aImplISO88598ByteCvtData = { aImplISO88598ToUniTab, aImpl8090SameToUniTab, @@ -910,7 +910,7 @@ static ImplByteConvertData const aImplISO88598ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplISO88598TextEncodingData +ImplTextEncodingData const aImplISO88598TextEncodingData = { { &aImplISO88598ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, diff --git a/sal/textenc/tcvteas1.tab b/sal/textenc/tcvteas1.tab index c65188a69009..a168e4115545 100644 --- a/sal/textenc/tcvteas1.tab +++ b/sal/textenc/tcvteas1.tab @@ -38,7 +38,7 @@ #define MS874UNI_START 0x80 #define MS874UNI_END 0xFB -static sal_uInt16 const aImplMS874ToUniTab[MS874UNI_END - MS874UNI_START + 1] = +sal_uInt16 const aImplMS874ToUniTab[MS874UNI_END - MS874UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -64,7 +64,7 @@ static sal_uInt16 const aImplMS874ToUniTab[MS874UNI_END - MS874UNI_START + 1] = #define MS874CHAR_START 0x0E01 #define MS874CHAR_END 0x0E5B -static unsigned char const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + 1] = +unsigned char const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -85,7 +85,7 @@ static unsigned char const aImplMS874ToCharTab[MS874CHAR_END - MS874CHAR_START + /* ----------------------------------------------------------------------- */ #define MS874TOCHARTABEX_COUNT 10 -static ImplUniCharTabData const aImplMS874ToCharTabEx[MS874TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS874ToCharTabEx[MS874TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x2013, 0x96, 0 }, @@ -101,7 +101,7 @@ static ImplUniCharTabData const aImplMS874ToCharTabEx[MS874TOCHARTABEX_COUNT] = /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS874ByteCvtData = +ImplByteConvertData const aImplMS874ByteCvtData = { aImplMS874ToUniTab, nullptr, @@ -117,7 +117,7 @@ static ImplByteConvertData const aImplMS874ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS874TextEncodingData +ImplTextEncodingData const aImplMS874TextEncodingData = { { &aImplMS874ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -155,7 +155,7 @@ static ImplTextEncodingData const aImplMS874TextEncodingData * 0xFC--FF are unassigned (TIS 620, same for MS874) */ -static ImplByteConvertData const aImplTis620ByteCvtData = +ImplByteConvertData const aImplTis620ByteCvtData = { aImplMS874ToUniTab + (0xA0 - MS874UNI_START), aImpl8090SameToUniTab, @@ -169,7 +169,7 @@ static ImplByteConvertData const aImplTis620ByteCvtData = 1 }; -static ImplTextEncodingData const aImplTis620TextEncodingData +ImplTextEncodingData const aImplTis620TextEncodingData = { { &aImplTis620ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -199,7 +199,7 @@ static ImplTextEncodingData const aImplTis620TextEncodingData #define MS1258UNI_START 0x80 #define MS1258UNI_END 0xFF -static sal_uInt16 const aImplMS1258ToUniTab[MS1258UNI_END - MS1258UNI_START + 1] = +sal_uInt16 const aImplMS1258ToUniTab[MS1258UNI_END - MS1258UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -225,7 +225,7 @@ static sal_uInt16 const aImplMS1258ToUniTab[MS1258UNI_END - MS1258UNI_START + 1] #define MS1258CHAR_START 0x00A0 #define MS1258CHAR_END 0x00FF -static unsigned char const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_START + 1] = +unsigned char const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -249,7 +249,7 @@ static unsigned char const aImplMS1258ToCharTab[MS1258CHAR_END - MS1258CHAR_STAR MS1258 base + combining modifier are derived from the information present at <http://vietunicode.sourceforge.net/charset/>: */ #define MS1258TOCHARTABEX_COUNT 141 -static ImplUniCharTabData const aImplMS1258ToCharTabEx[MS1258TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1258ToCharTabEx[MS1258TOCHARTABEX_COUNT] = { { 0x00C3, 0x41, 0xDE }, { 0x00CC, 0x49, 0xCC }, @@ -396,7 +396,7 @@ static ImplUniCharTabData const aImplMS1258ToCharTabEx[MS1258TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1258ByteCvtData = +ImplByteConvertData const aImplMS1258ByteCvtData = { aImplMS1258ToUniTab, nullptr, @@ -412,7 +412,7 @@ static ImplByteConvertData const aImplMS1258ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1258TextEncodingData +ImplTextEncodingData const aImplMS1258TextEncodingData = { { &aImplMS1258ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab index 05791fe942ed..96c1d090f5b5 100644 --- a/sal/textenc/tcvtest1.tab +++ b/sal/textenc/tcvtest1.tab @@ -38,7 +38,7 @@ #define IBM737UNI_START 0x80 #define IBM737UNI_END 0xFF -static sal_uInt16 const aImplIBM737ToUniTab[IBM737UNI_END - IBM737UNI_START + 1] = +sal_uInt16 const aImplIBM737ToUniTab[IBM737UNI_END - IBM737UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -64,7 +64,7 @@ static sal_uInt16 const aImplIBM737ToUniTab[IBM737UNI_END - IBM737UNI_START + 1] #define IBM737CHAR_START 0x0386 #define IBM737CHAR_END 0x03CE -static unsigned char const aImplIBM737ToCharTab[IBM737CHAR_END - IBM737CHAR_START + 1] = +unsigned char const aImplIBM737ToCharTab[IBM737CHAR_END - IBM737CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -83,7 +83,7 @@ static unsigned char const aImplIBM737ToCharTab[IBM737CHAR_END - IBM737CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM737TOCHARTABEX_COUNT 61 -static ImplUniCharTabData const aImplIBM737ToCharTabEx[IBM737TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM737ToCharTabEx[IBM737TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00B0, 0xF8, 0 }, @@ -150,7 +150,7 @@ static ImplUniCharTabData const aImplIBM737ToCharTabEx[IBM737TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM737ByteCvtData = +ImplByteConvertData const aImplIBM737ByteCvtData = { aImplIBM737ToUniTab, nullptr, @@ -166,7 +166,7 @@ static ImplByteConvertData const aImplIBM737ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM737TextEncodingData +ImplTextEncodingData const aImplIBM737TextEncodingData = { { &aImplIBM737ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -197,7 +197,7 @@ static ImplTextEncodingData const aImplIBM737TextEncodingData #define IBM775UNI_START 0x80 #define IBM775UNI_END 0xFF -static sal_uInt16 const aImplIBM775ToUniTab[IBM775UNI_END - IBM775UNI_START + 1] = +sal_uInt16 const aImplIBM775ToUniTab[IBM775UNI_END - IBM775UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -222,7 +222,7 @@ static sal_uInt16 const aImplIBM775ToUniTab[IBM775UNI_END - IBM775UNI_START + 1] /* ----------------------------------------------------------------------- */ #define IBM775TOCHARTABEX_COUNT 128 -static ImplUniCharTabData const aImplIBM775ToCharTabEx[IBM775TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM775ToCharTabEx[IBM775TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A2, 0x96, 0 }, @@ -356,7 +356,7 @@ static ImplUniCharTabData const aImplIBM775ToCharTabEx[IBM775TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM775ByteCvtData = +ImplByteConvertData const aImplIBM775ByteCvtData = { aImplIBM775ToUniTab, nullptr, @@ -372,7 +372,7 @@ static ImplByteConvertData const aImplIBM775ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM775TextEncodingData +ImplTextEncodingData const aImplIBM775TextEncodingData = { { &aImplIBM775ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -403,7 +403,7 @@ static ImplTextEncodingData const aImplIBM775TextEncodingData #define IBM852UNI_START 0x80 #define IBM852UNI_END 0xFF -static sal_uInt16 const aImplIBM852ToUniTab[IBM852UNI_END - IBM852UNI_START + 1] = +sal_uInt16 const aImplIBM852ToUniTab[IBM852UNI_END - IBM852UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -428,7 +428,7 @@ static sal_uInt16 const aImplIBM852ToUniTab[IBM852UNI_END - IBM852UNI_START + 1] /* ----------------------------------------------------------------------- */ #define IBM852TOCHARTABEX_COUNT 128 -static ImplUniCharTabData const aImplIBM852ToCharTabEx[IBM852TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM852ToCharTabEx[IBM852TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A4, 0xCF, 0 }, @@ -562,7 +562,7 @@ static ImplUniCharTabData const aImplIBM852ToCharTabEx[IBM852TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM852ByteCvtData = +ImplByteConvertData const aImplIBM852ByteCvtData = { aImplIBM852ToUniTab, nullptr, @@ -578,7 +578,7 @@ static ImplByteConvertData const aImplIBM852ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM852TextEncodingData +ImplTextEncodingData const aImplIBM852TextEncodingData = { { &aImplIBM852ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -609,7 +609,7 @@ static ImplTextEncodingData const aImplIBM852TextEncodingData #define IBM855UNI_START 0x80 #define IBM855UNI_END 0xFF -static sal_uInt16 const aImplIBM855ToUniTab[IBM855UNI_END - IBM855UNI_START + 1] = +sal_uInt16 const aImplIBM855ToUniTab[IBM855UNI_END - IBM855UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -635,7 +635,7 @@ static sal_uInt16 const aImplIBM855ToUniTab[IBM855UNI_END - IBM855UNI_START + 1] #define IBM855CHAR_START 0x0401 #define IBM855CHAR_END 0x045F -static unsigned char const aImplIBM855ToCharTab[IBM855CHAR_END - IBM855CHAR_START + 1] = +unsigned char const aImplIBM855ToCharTab[IBM855CHAR_END - IBM855CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -656,7 +656,7 @@ static unsigned char const aImplIBM855ToCharTab[IBM855CHAR_END - IBM855CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM855TOCHARTABEX_COUNT 36 -static ImplUniCharTabData const aImplIBM855ToCharTabEx[IBM855TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM855ToCharTabEx[IBM855TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A4, 0xCF, 0 }, @@ -698,7 +698,7 @@ static ImplUniCharTabData const aImplIBM855ToCharTabEx[IBM855TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM855ByteCvtData = +ImplByteConvertData const aImplIBM855ByteCvtData = { aImplIBM855ToUniTab, nullptr, @@ -714,7 +714,7 @@ static ImplByteConvertData const aImplIBM855ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM855TextEncodingData +ImplTextEncodingData const aImplIBM855TextEncodingData = { { &aImplIBM855ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -745,7 +745,7 @@ static ImplTextEncodingData const aImplIBM855TextEncodingData #define IBM857UNI_START 0x80 #define IBM857UNI_END 0xFF -static sal_uInt16 const aImplIBM857ToUniTab[IBM857UNI_END - IBM857UNI_START + 1] = +sal_uInt16 const aImplIBM857ToUniTab[IBM857UNI_END - IBM857UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -771,7 +771,7 @@ static sal_uInt16 const aImplIBM857ToUniTab[IBM857UNI_END - IBM857UNI_START + 1] #define IBM857CHAR_START 0x00A0 #define IBM857CHAR_END 0x00FF -static unsigned char const aImplIBM857ToCharTab[IBM857CHAR_END - IBM857CHAR_START + 1] = +unsigned char const aImplIBM857ToCharTab[IBM857CHAR_END - IBM857CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -792,7 +792,7 @@ static unsigned char const aImplIBM857ToCharTab[IBM857CHAR_END - IBM857CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM857TOCHARTABEX_COUNT 35 -static ImplUniCharTabData const aImplIBM857ToCharTabEx[IBM857TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM857ToCharTabEx[IBM857TOCHARTABEX_COUNT] = { { 0x011E, 0xA6, 0 }, { 0x011F, 0xA7, 0 }, @@ -833,7 +833,7 @@ static ImplUniCharTabData const aImplIBM857ToCharTabEx[IBM857TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM857ByteCvtData = +ImplByteConvertData const aImplIBM857ByteCvtData = { aImplIBM857ToUniTab, nullptr, @@ -849,7 +849,7 @@ static ImplByteConvertData const aImplIBM857ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM857TextEncodingData +ImplTextEncodingData const aImplIBM857TextEncodingData = { { &aImplIBM857ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -880,7 +880,7 @@ static ImplTextEncodingData const aImplIBM857TextEncodingData #define IBM866UNI_START 0x80 #define IBM866UNI_END 0xFF -static sal_uInt16 const aImplIBM866ToUniTab[IBM866UNI_END - IBM866UNI_START + 1] = +sal_uInt16 const aImplIBM866ToUniTab[IBM866UNI_END - IBM866UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -906,7 +906,7 @@ static sal_uInt16 const aImplIBM866ToUniTab[IBM866UNI_END - IBM866UNI_START + 1] #define IBM866CHAR_START 0x0401 #define IBM866CHAR_END 0x045E -static unsigned char const aImplIBM866ToCharTab[IBM866CHAR_END - IBM866CHAR_START + 1] = +unsigned char const aImplIBM866ToCharTab[IBM866CHAR_END - IBM866CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -927,7 +927,7 @@ static unsigned char const aImplIBM866ToCharTab[IBM866CHAR_END - IBM866CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM866TOCHARTABEX_COUNT 56 -static ImplUniCharTabData const aImplIBM866ToCharTabEx[IBM866TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM866ToCharTabEx[IBM866TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A4, 0xFD, 0 }, @@ -989,7 +989,7 @@ static ImplUniCharTabData const aImplIBM866ToCharTabEx[IBM866TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM866ByteCvtData = +ImplByteConvertData const aImplIBM866ByteCvtData = { aImplIBM866ToUniTab, nullptr, @@ -1005,7 +1005,7 @@ static ImplByteConvertData const aImplIBM866ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM866TextEncodingData +ImplTextEncodingData const aImplIBM866TextEncodingData = { { &aImplIBM866ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1036,7 +1036,7 @@ static ImplTextEncodingData const aImplIBM866TextEncodingData #define IBM869UNI_START 0x86 #define IBM869UNI_END 0xFF -static sal_uInt16 const aImplIBM869ToUniTab[IBM869UNI_END - IBM869UNI_START + 1] = +sal_uInt16 const aImplIBM869ToUniTab[IBM869UNI_END - IBM869UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1062,7 +1062,7 @@ static sal_uInt16 const aImplIBM869ToUniTab[IBM869UNI_END - IBM869UNI_START + 1] #define IBM869CHAR_START 0x0384 #define IBM869CHAR_END 0x03CE -static unsigned char const aImplIBM869ToCharTab[IBM869CHAR_END - IBM869CHAR_START + 1] = +unsigned char const aImplIBM869ToCharTab[IBM869CHAR_END - IBM869CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1081,7 +1081,7 @@ static unsigned char const aImplIBM869ToCharTab[IBM869CHAR_END - IBM869CHAR_STAR /* ----------------------------------------------------------------------- */ #define IBM869TOCHARTABEX_COUNT 48 -static ImplUniCharTabData const aImplIBM869ToCharTabEx[IBM869TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplIBM869ToCharTabEx[IBM869TOCHARTABEX_COUNT] = { { 0x00A0, 0xFF, 0 }, { 0x00A3, 0x9C, 0 }, @@ -1135,7 +1135,7 @@ static ImplUniCharTabData const aImplIBM869ToCharTabEx[IBM869TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplIBM869ByteCvtData = +ImplByteConvertData const aImplIBM869ByteCvtData = { aImplIBM869ToUniTab, nullptr, @@ -1151,7 +1151,7 @@ static ImplByteConvertData const aImplIBM869ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplIBM869TextEncodingData +ImplTextEncodingData const aImplIBM869TextEncodingData = { { &aImplIBM869ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1182,7 +1182,7 @@ static ImplTextEncodingData const aImplIBM869TextEncodingData #define MS1250UNI_START 0x80 #define MS1250UNI_END 0xFF -static sal_uInt16 const aImplMS1250ToUniTab[MS1250UNI_END - MS1250UNI_START + 1] = +sal_uInt16 const aImplMS1250ToUniTab[MS1250UNI_END - MS1250UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1207,7 +1207,7 @@ static sal_uInt16 const aImplMS1250ToUniTab[MS1250UNI_END - MS1250UNI_START + 1] /* ----------------------------------------------------------------------- */ #define MS1250TOCHARTABEX_COUNT 123 -static ImplUniCharTabData const aImplMS1250ToCharTabEx[MS1250TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1250ToCharTabEx[MS1250TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A4, 0xA4, 0 }, @@ -1336,7 +1336,7 @@ static ImplUniCharTabData const aImplMS1250ToCharTabEx[MS1250TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1250ByteCvtData = +ImplByteConvertData const aImplMS1250ByteCvtData = { aImplMS1250ToUniTab, nullptr, @@ -1352,7 +1352,7 @@ static ImplByteConvertData const aImplMS1250ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1250TextEncodingData +ImplTextEncodingData const aImplMS1250TextEncodingData = { { &aImplMS1250ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1383,7 +1383,7 @@ static ImplTextEncodingData const aImplMS1250TextEncodingData #define MS1251UNI_START 0x80 #define MS1251UNI_END 0xFF -static sal_uInt16 const aImplMS1251ToUniTab[MS1251UNI_END - MS1251UNI_START + 1] = +sal_uInt16 const aImplMS1251ToUniTab[MS1251UNI_END - MS1251UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1409,7 +1409,7 @@ static sal_uInt16 const aImplMS1251ToUniTab[MS1251UNI_END - MS1251UNI_START + 1] #define MS1251CHAR_START 0x0401 #define MS1251CHAR_END 0x045F -static unsigned char const aImplMS1251ToCharTab[MS1251CHAR_END - MS1251CHAR_START + 1] = +unsigned char const aImplMS1251ToCharTab[MS1251CHAR_END - MS1251CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1430,7 +1430,7 @@ static unsigned char const aImplMS1251ToCharTab[MS1251CHAR_END - MS1251CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1251TOCHARTABEX_COUNT 35 -static ImplUniCharTabData const aImplMS1251ToCharTabEx[MS1251TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1251ToCharTabEx[MS1251TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A4, 0xA4, 0 }, @@ -1471,7 +1471,7 @@ static ImplUniCharTabData const aImplMS1251ToCharTabEx[MS1251TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1251ByteCvtData = +ImplByteConvertData const aImplMS1251ByteCvtData = { aImplMS1251ToUniTab, nullptr, @@ -1487,7 +1487,7 @@ static ImplByteConvertData const aImplMS1251ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1251TextEncodingData +ImplTextEncodingData const aImplMS1251TextEncodingData = { { &aImplMS1251ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1518,7 +1518,7 @@ static ImplTextEncodingData const aImplMS1251TextEncodingData #define MS1253UNI_START 0x80 #define MS1253UNI_END 0xFF -static sal_uInt16 const aImplMS1253ToUniTab[MS1253UNI_END - MS1253UNI_START + 1] = +sal_uInt16 const aImplMS1253ToUniTab[MS1253UNI_END - MS1253UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1544,7 +1544,7 @@ static sal_uInt16 const aImplMS1253ToUniTab[MS1253UNI_END - MS1253UNI_START + 1] #define MS1253CHAR_START 0x0384 #define MS1253CHAR_END 0x03CE -static unsigned char const aImplMS1253ToCharTab[MS1253CHAR_END - MS1253CHAR_START + 1] = +unsigned char const aImplMS1253ToCharTab[MS1253CHAR_END - MS1253CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1563,7 +1563,7 @@ static unsigned char const aImplMS1253ToCharTab[MS1253CHAR_END - MS1253CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1253TOCHARTABEX_COUNT 40 -static ImplUniCharTabData const aImplMS1253ToCharTabEx[MS1253TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1253ToCharTabEx[MS1253TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A3, 0xA3, 0 }, @@ -1609,7 +1609,7 @@ static ImplUniCharTabData const aImplMS1253ToCharTabEx[MS1253TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1253ByteCvtData = +ImplByteConvertData const aImplMS1253ByteCvtData = { aImplMS1253ToUniTab, nullptr, @@ -1625,7 +1625,7 @@ static ImplByteConvertData const aImplMS1253ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1253TextEncodingData +ImplTextEncodingData const aImplMS1253TextEncodingData = { { &aImplMS1253ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1656,7 +1656,7 @@ static ImplTextEncodingData const aImplMS1253TextEncodingData #define MS1254UNI_START 0x80 #define MS1254UNI_END 0xFF -static sal_uInt16 const aImplMS1254ToUniTab[MS1254UNI_END - MS1254UNI_START + 1] = +sal_uInt16 const aImplMS1254ToUniTab[MS1254UNI_END - MS1254UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1682,7 +1682,7 @@ static sal_uInt16 const aImplMS1254ToUniTab[MS1254UNI_END - MS1254UNI_START + 1] #define MS1254CHAR_START 0x00A0 #define MS1254CHAR_END 0x00FF -static unsigned char const aImplMS1254ToCharTab[MS1254CHAR_END - MS1254CHAR_START + 1] = +unsigned char const aImplMS1254ToCharTab[MS1254CHAR_END - MS1254CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1703,7 +1703,7 @@ static unsigned char const aImplMS1254ToCharTab[MS1254CHAR_END - MS1254CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1254TOCHARTABEX_COUNT 31 -static ImplUniCharTabData const aImplMS1254ToCharTabEx[MS1254TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1254ToCharTabEx[MS1254TOCHARTABEX_COUNT] = { { 0x011E, 0xD0, 0 }, { 0x011F, 0xF0, 0 }, @@ -1740,7 +1740,7 @@ static ImplUniCharTabData const aImplMS1254ToCharTabEx[MS1254TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1254ByteCvtData = +ImplByteConvertData const aImplMS1254ByteCvtData = { aImplMS1254ToUniTab, nullptr, @@ -1756,7 +1756,7 @@ static ImplByteConvertData const aImplMS1254ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1254TextEncodingData +ImplTextEncodingData const aImplMS1254TextEncodingData = { { &aImplMS1254ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1787,7 +1787,7 @@ static ImplTextEncodingData const aImplMS1254TextEncodingData #define MS1257UNI_START 0x80 #define MS1257UNI_END 0xFF -static sal_uInt16 const aImplMS1257ToUniTab[MS1257UNI_END - MS1257UNI_START + 1] = +sal_uInt16 const aImplMS1257ToUniTab[MS1257UNI_END - MS1257UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1813,7 +1813,7 @@ static sal_uInt16 const aImplMS1257ToUniTab[MS1257UNI_END - MS1257UNI_START + 1] #define MS1257CHAR_START 0x00A0 #define MS1257CHAR_END 0x017E -static unsigned char const aImplMS1257ToCharTab[MS1257CHAR_END - MS1257CHAR_START + 1] = +unsigned char const aImplMS1257ToCharTab[MS1257CHAR_END - MS1257CHAR_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1850,7 +1850,7 @@ static unsigned char const aImplMS1257ToCharTab[MS1257CHAR_END - MS1257CHAR_STAR /* ----------------------------------------------------------------------- */ #define MS1257TOCHARTABEX_COUNT 20 -static ImplUniCharTabData const aImplMS1257ToCharTabEx[MS1257TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplMS1257ToCharTabEx[MS1257TOCHARTABEX_COUNT] = { { 0x02C7, 0x8E, 0 }, { 0x02D9, 0xFF, 0 }, @@ -1876,7 +1876,7 @@ static ImplUniCharTabData const aImplMS1257ToCharTabEx[MS1257TOCHARTABEX_COUNT] /* ----------------------------------------------------------------------- */ -static ImplByteConvertData const aImplMS1257ByteCvtData = +ImplByteConvertData const aImplMS1257ByteCvtData = { aImplMS1257ToUniTab, nullptr, @@ -1892,7 +1892,7 @@ static ImplByteConvertData const aImplMS1257ByteCvtData = /* ----------------------------------------------------------------------- */ -static ImplTextEncodingData const aImplMS1257TextEncodingData +ImplTextEncodingData const aImplMS1257TextEncodingData = { { &aImplMS1257ByteCvtData, sal::detail::textenc::convertCharToUnicode, sal::detail::textenc::convertUnicodeToChar, @@ -1921,7 +1921,7 @@ static ImplTextEncodingData const aImplMS1257TextEncodingData #define ISO88592UNI_START 0xA0 #define ISO88592UNI_END 0xFF -static sal_uInt16 const aImplISO88592ToUniTab[ISO88592UNI_END - ISO88592UNI_START + 1] = +sal_uInt16 const aImplISO88592ToUniTab[ISO88592UNI_END - ISO88592UNI_START + 1] = { /* 0 1 2 3 4 5 6 7 */ /* 8 9 A B C D E F */ @@ -1942,7 +1942,7 @@ static sal_uInt16 const aImplISO88592ToUniTab[ISO88592UNI_END - ISO88592UNI_STAR /* ----------------------------------------------------------------------- */ #define ISO88592TOCHARTABEX_COUNT 96 -static ImplUniCharTabData const aImplISO88592ToCharTabEx[ISO88592TOCHARTABEX_COUNT] = +ImplUniCharTabData const aImplISO88592ToCharTabEx[ISO88592TOCHARTABEX_COUNT] = { { 0x00A0, 0xA0, 0 }, { 0x00A4, 0xA4, 0 }, @@ -2044,7 +2044,7 @@ static ImplUniCharTabData const aImplISO88592ToCharTabEx[ISO88592TOCHARTABEX_COU ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits