[Libreoffice-commits] core.git: svtools/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 2 06:46:53 UTC 2020
svtools/source/config/colorcfg.cxx | 2 +-
svtools/source/config/printoptions.cxx | 2 +-
svtools/source/control/ctrltool.cxx | 2 +-
svtools/source/control/ruler.cxx | 2 +-
svtools/source/java/javainteractionhandler.cxx | 2 +-
svtools/source/misc/imagemgr.cxx | 4 ++--
svtools/source/svhtml/htmlkywd.cxx | 4 ++--
svtools/source/svhtml/htmlsupp.cxx | 2 +-
svtools/source/svhtml/parhtml.cxx | 8 ++++----
svtools/source/uno/miscservices.cxx | 2 +-
svtools/source/uno/unoevent.cxx | 14 +++++++-------
11 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 770ca016b9301cc02beab345f02c085e27f52e71
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 2 07:16:17 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 2 08:46:13 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: svtools
Change-Id: I947b8def12bf27093dc9ad95077c0718dec959a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97696
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index d2973a1d96a1..abd6952e4783 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -42,7 +42,7 @@
using namespace utl;
using namespace com::sun::star;
-static const char g_sIsVisible[] = "/IsVisible";
+const char g_sIsVisible[] = "/IsVisible";
namespace svtools
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index bb08bb3198f3..d0e7db9e04b0 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -34,7 +34,7 @@
#include <sal/macros.h>
#include <tools/diagnose_ex.h>
-static const sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
+const sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
#define DPI_COUNT (SAL_N_ELEMENTS(aDPIArray))
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index cdd1aed8a6db..03599d2114a2 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -792,7 +792,7 @@ struct ImplFSNameItem
const char* mszUtf8Name;
};
-static const ImplFSNameItem aImplSimplifiedChinese[] =
+const ImplFSNameItem aImplSimplifiedChinese[] =
{
{ 50, "\xe5\x85\xab\xe5\x8f\xb7" },
{ 55, "\xe4\xb8\x83\xe5\x8f\xb7" },
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 8608adc3b7fc..ce62c133ff3c 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -143,7 +143,7 @@ ImplRulerData::ImplRulerData() :
{
}
-static const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
+const RulerUnitData aImplRulerUnitTab[RULER_UNIT_COUNT] =
{
{ MapUnit::Map100thMM, 100, 25.0, 25.0, 50.0, 100.0, " mm" }, // MM
{ MapUnit::Map100thMM, 1000, 100.0, 500.0, 1000.0, 1000.0, " cm" }, // CM
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index 9dff4a57e07a..e484eb56a0ac 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star::task;
namespace
{
-static struct JavaEvents {
+struct JavaEvents {
bool bDisabledHandled : 1;
bool bInvalidSettingsHandled : 1;
bool bNotFoundHandled : 1;
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 3f458647564c..665958fa33d7 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -55,7 +55,7 @@ struct SvtExtensionResIdMapping_Impl
}
-static SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
+SvtExtensionResIdMapping_Impl const ExtensionMap_Impl[] =
{
{ "awk", true, STR_DESCRIPTION_SOURCEFILE, SvImageId::NONE },
{ "bas", true, STR_DESCRIPTION_SOURCEFILE, SvImageId::NONE },
@@ -182,7 +182,7 @@ struct SvtFactory2ExtensionMapping_Impl
// mapping from "private:factory" url to extension
-static SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] =
+SvtFactory2ExtensionMapping_Impl const Fac2ExtMap_Impl[] =
{
{ "swriter", "odt" },
{ "swriter/web", "html" },
diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 70bc2ebe49c7..5cdbfe242dc8 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -59,7 +59,7 @@ static T search(TokenEntry<T> const (&dataTable)[LEN], const OUString & key, T n
using HTML_TokenEntry = TokenEntry<HtmlTokenId>;
// this array is sorted by the name (even if it doesn't look like it from the constant names)
-static HTML_TokenEntry const aHTMLTokenTab[] = {
+HTML_TokenEntry const aHTMLTokenTab[] = {
{OUStringLiteral(OOO_STRING_SVTOOLS_HTML_comment), HtmlTokenId::COMMENT},
{OUStringLiteral(OOO_STRING_SVTOOLS_HTML_doctype), HtmlTokenId::DOCTYPE},
{OUStringLiteral(OOO_STRING_SVTOOLS_HTML_anchor), HtmlTokenId::ANCHOR_ON},
@@ -652,7 +652,7 @@ static bool bSortColorKeyWords = false;
// Color names are not exported (source:
// "http://www.uio.no/~mnbjerke/colors_w.html")
// "http://www.infi.net/wwwimages/colorindex.html" seem to be buggy.
-static HTML_ColorEntry const aHTMLColorNameTab[] = {
+HTML_ColorEntry const aHTMLColorNameTab[] = {
{ OUStringLiteral("aliceblue"), 0x00f0f8ffUL },
{ OUStringLiteral("antiquewhite"), 0x00faebd7UL },
{ OUStringLiteral("aqua"), 0x0000ffffUL },
diff --git a/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index cdff0f352029..af9b2b22fd6e 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.cxx
@@ -24,7 +24,7 @@
#include <tools/urlobj.hxx>
// Table for converting option values into strings
-static HTMLOptionEnum<HTMLScriptLanguage> const aScriptLangOptEnums[] =
+HTMLOptionEnum<HTMLScriptLanguage> const aScriptLangOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_LG_starbasic, HTMLScriptLanguage::StarBasic },
{ OOO_STRING_SVTOOLS_HTML_LG_javascript, HTMLScriptLanguage::JavaScript },
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index b3664713affa..76791dc5abcd 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -51,7 +51,7 @@ const sal_Int32 MAX_ENTITY_LEN( 8 );
// Tables to convert option values into strings
// <INPUT TYPE=xxx>
-static HTMLOptionEnum<HTMLInputType> const aInputTypeOptEnums[] =
+HTMLOptionEnum<HTMLInputType> const aInputTypeOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_IT_text, HTMLInputType::Text },
{ OOO_STRING_SVTOOLS_HTML_IT_password, HTMLInputType::Password },
@@ -69,7 +69,7 @@ static HTMLOptionEnum<HTMLInputType> const aInputTypeOptEnums[] =
};
// <TABLE FRAME=xxx>
-static HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] =
+HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_TF_void, HTMLTableFrame::Void },
{ OOO_STRING_SVTOOLS_HTML_TF_above, HTMLTableFrame::Above },
@@ -84,7 +84,7 @@ static HTMLOptionEnum<HTMLTableFrame> const aTableFrameOptEnums[] =
};
// <TABLE RULES=xxx>
-static HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] =
+HTMLOptionEnum<HTMLTableRules> const aTableRulesOptEnums[] =
{
{ OOO_STRING_SVTOOLS_HTML_TR_none, HTMLTableRules::NONE },
{ OOO_STRING_SVTOOLS_HTML_TR_groups, HTMLTableRules::Groups },
@@ -1893,7 +1893,7 @@ enum class HtmlMeta {
}
// <META NAME=xxx>
-static HTMLOptionEnum<HtmlMeta> const aHTMLMetaNameTable[] =
+HTMLOptionEnum<HtmlMeta> const aHTMLMetaNameTable[] =
{
{ OOO_STRING_SVTOOLS_HTML_META_author, HtmlMeta::Author },
{ OOO_STRING_SVTOOLS_HTML_META_changed, HtmlMeta::Changed },
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index bf638535266d..625b336c5e98 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -31,7 +31,7 @@ using namespace css::lang;
namespace
{
- static const struct ::cppu::ImplementationEntry s_aServiceEntries[] =
+ const struct ::cppu::ImplementationEntry s_aServiceEntries[] =
{
{
// FilePicker should not use a constructor, it is only a
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 244ee65498e9..5b24cffd068b 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -33,13 +33,13 @@ using css::lang::IllegalArgumentException;
using css::beans::PropertyValue;
-static const char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
-static const char sEventType[] = "EventType";
-static const char sMacroName[] = "MacroName";
-static const char sLibrary[] = "Library";
-static const char sStarBasic[] = "StarBasic";
-static const char sScript[] = "Script";
-static const char sNone[] = "None";
+const char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
+const char sEventType[] = "EventType";
+const char sMacroName[] = "MacroName";
+const char sLibrary[] = "Library";
+const char sStarBasic[] = "StarBasic";
+const char sScript[] = "Script";
+const char sNone[] = "None";
namespace {
More information about the Libreoffice-commits
mailing list