[Libreoffice-commits] core.git: tools/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 2 09:29:48 UTC 2020
tools/source/datetime/tdate.cxx | 6 +++---
tools/source/fsys/urlobj.cxx | 2 +-
tools/source/generic/b3dtrans.cxx | 4 ++--
tools/source/generic/bigint.cxx | 4 ++--
tools/source/inet/inetmime.cxx | 2 +-
tools/source/inet/inetmsg.cxx | 2 +-
tools/source/zcodec/zcodec.cxx | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 445537bbc2971b970bed244db40f35c9caf43ef4
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 09:31:24 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 11:29:01 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: tools
Change-Id: I832fbcde277a87ab873ce3477a6886c7002e24ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97709
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index e3fd7eff5bbe..a38fb8e986c3 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -22,7 +22,7 @@
#include <systemdatetime.hxx>
-static const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
+const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31 };
// Once upon a time the number of days we internally handled was limited to
@@ -38,8 +38,8 @@ static const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
/* XXX can that dbconversion cope with years > 9999 or negative years at all?
* Database fields may be limited to positive 4 digits. */
-static const sal_Int32 MIN_DAYS = -11968265; // -32768-01-01
-static const sal_Int32 MAX_DAYS = 11967900; // 32767-12-31
+const sal_Int32 MIN_DAYS = -11968265; // -32768-01-01
+const sal_Int32 MAX_DAYS = 11967900; // 32767-12-31
namespace
{
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 8818f548da29..2478a2bd5d55 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -453,7 +453,7 @@ enum
PR = INetURLObject::PART_HTTP_QUERY,
};
-static sal_uInt32 const aMustEncodeMap[128]
+sal_uInt32 const aMustEncodeMap[128]
= { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* */ PP,
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index b8e29be31d4a..1f63cc2e381d 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -22,8 +22,8 @@
#include <osl/diagnose.h>
// Near and far clipping planes
-static constexpr double gfNearBound = 0.001;
-static constexpr double gfFarBound = 1.001;
+constexpr double gfNearBound = 0.001;
+constexpr double gfFarBound = 1.001;
// B3dTransformationSet --------------------------------------------------------
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 903cf826f44a..4a1ddfff391e 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.cxx
@@ -28,8 +28,8 @@
/**
* The range in which we can perform add/sub without fear of overflow
*/
-static const sal_Int32 MY_MAXLONG = 0x3fffffff;
-static const sal_Int32 MY_MINLONG = -MY_MAXLONG;
+const sal_Int32 MY_MAXLONG = 0x3fffffff;
+const sal_Int32 MY_MINLONG = -MY_MAXLONG;
/*
* The algorithms for Addition, Subtraction, Multiplication and Division
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index fd00fe3a4603..d92a02790ee0 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -747,7 +747,7 @@ struct EncodingEntry
// The source for the following table is <ftp://ftp.iana.org/in-notes/iana/
// assignments/character-sets> as of Jan, 21 2000 12:46:00, unless otherwise
// noted:
-static EncodingEntry const aEncodingMap[]
+EncodingEntry const aEncodingMap[]
= { { "US-ASCII", RTL_TEXTENCODING_ASCII_US },
{ "ANSI_X3.4-1968", RTL_TEXTENCODING_ASCII_US },
{ "ISO-IR-6", RTL_TEXTENCODING_ASCII_US },
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index f8912bb9d231..3adf1ebd4487 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -190,7 +190,7 @@ bool INetMIMEMessage::ParseDateField (
(rDateTime.GetHour() > 23) ));
}
-static const std::map<InetMessageMime, const char*> ImplINetMIMEMessageHeaderData =
+const std::map<InetMessageMime, const char*> ImplINetMIMEMessageHeaderData =
{
{ InetMessageMime::VERSION, "MIME-Version"},
{ InetMessageMime::CONTENT_DISPOSITION, "Content-Disposition"},
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index b6b1b2112b32..525834681ef8 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -35,7 +35,7 @@
#define GZ_COMMENT 0x10 /* bit 4 set: file comment present */
#define GZ_RESERVED 0xE0 /* bits 5..7: reserved */
-static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
+const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
ZCodec::ZCodec( size_t nInBufSize, size_t nOutBufSize )
: meState(STATE_INIT)
More information about the Libreoffice-commits
mailing list