desktop/source/app/check_ext_deps.cxx | 2 +-
desktop/source/app/officeipcthread.cxx | 6 +++---
desktop/source/deployment/dp_persmap.cxx | 2 +-
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 4 ++--
desktop/source/deployment/misc/dp_dependencies.cxx | 12 ++++++------
desktop/source/lib/init.cxx | 8 ++++----
desktop/source/migration/migration.cxx | 8 ++++----
desktop/source/splash/services_spl.cxx | 2 +-
8 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 5b3edd4bc3dfa2736abfc3074033cb25d7d264ed
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jun 30 23:20:11 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 1 07:09:09 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: desktop
Change-Id: I1fadfc0fb62df56a890c6cd789435135671349a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97554
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index 8eb39f4e0340..297f6dfc8444 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -207,7 +207,7 @@ void SilentCommandEnv::pop()
} // end namespace
-static const char aAccessSrvc[] =
"com.sun.star.configuration.ConfigurationUpdateAccess";
+const char aAccessSrvc[] =
"com.sun.star.configuration.ConfigurationUpdateAccess";
static sal_Int16 impl_showExtensionDialog( uno::Reference<
uno::XComponentContext > const &xContext )
{
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 18c9f4e40dc4..a0e6b98cc006 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -60,9 +60,9 @@ using namespace ::com::sun::star::frame;
namespace {
-static char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments";
-static char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments";
-static char const PROCESSING_DONE[] = "InternalIPC::ProcessingDone";
+char const ARGUMENT_PREFIX[] = "InternalIPC::Arguments";
+char const SEND_ARGUMENTS[] = "InternalIPC::SendArguments";
+char const PROCESSING_DONE[] = "InternalIPC::ProcessingDone";
// Receives packets from the pipe until a packet ends in a NUL character (that
// will not be included in the returned string) or it cannot read anything (due
diff --git a/desktop/source/deployment/dp_persmap.cxx
b/desktop/source/deployment/dp_persmap.cxx
index 14e1f2076e47..222a6cf99c03 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -35,7 +35,7 @@ using namespace ::rtl;
namespace dp_misc
{
-static const char PmapMagic[4] = {'P','m','p','1'};
+const char PmapMagic[4] = {'P','m','p','1'};
PersistentMap::PersistentMap( OUString const & url_ )
: m_MapFile( expandUnoRcUrl(url_) )
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 5d65f4e7c618..bea08615c459 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -83,8 +83,8 @@ using dp_gui::UpdateDialog;
namespace {
-static sal_Unicode const LF = 0x000A;
-static sal_Unicode const CR = 0x000D;
+sal_Unicode const LF = 0x000A;
+sal_Unicode const CR = 0x000D;
#define IGNORED_UPDATES
OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates")
#define PROPERTY_VERSION "Version"
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 081144af3bc1..eae5ca5cb7d8 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -40,19 +40,19 @@
namespace {
-static char const namespaceLibreOffice[] =
+char const namespaceLibreOffice[] =
"http://libreoffice.org/extensions/description/2011";;
-static char const namespaceOpenOfficeOrg[] =
+char const namespaceOpenOfficeOrg[] =
"http://openoffice.org/extensions/description/2006";;
-static char const minimalVersionLibreOffice[] = "LibreOffice-minimal-version";
-static char const maximalVersionLibreOffice[] = "LibreOffice-maximal-version";
+char const minimalVersionLibreOffice[] = "LibreOffice-minimal-version";
+char const maximalVersionLibreOffice[] = "LibreOffice-maximal-version";
-static char const minimalVersionOpenOfficeOrg[] =
+char const minimalVersionOpenOfficeOrg[] =
"OpenOffice.org-minimal-version";
-static char const maximalVersionOpenOfficeOrg[] =
+char const maximalVersionOpenOfficeOrg[] =
"OpenOffice.org-maximal-version";
OUString getLibreOfficeMajorMinorMicro() {
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9dcd1a2e0dac..8b86eb2e4b8f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -195,7 +195,7 @@ struct ExtensionMap
}
-static const ExtensionMap aWriterExtensionMap[] =
+const ExtensionMap aWriterExtensionMap[] =
{
{ "doc", "MS Word 97" },
{ "docm", "MS Word 2007 XML VBA" },
@@ -213,7 +213,7 @@ static const ExtensionMap aWriterExtensionMap[] =
{ nullptr, nullptr }
};
-static const ExtensionMap aCalcExtensionMap[] =
+const ExtensionMap aCalcExtensionMap[] =
{
{ "csv", "Text - txt - csv (StarCalc)" },
{ "fods", "OpenDocument Spreadsheet Flat XML" },
@@ -229,7 +229,7 @@ static const ExtensionMap aCalcExtensionMap[] =
{ nullptr, nullptr }
};
-static const ExtensionMap aImpressExtensionMap[] =
+const ExtensionMap aImpressExtensionMap[] =
{
{ "fodp", "OpenDocument Presentation Flat XML" },
{ "html", "impress_html_Export" },
@@ -249,7 +249,7 @@ static const ExtensionMap aImpressExtensionMap[] =
{ nullptr, nullptr }
};
-static const ExtensionMap aDrawExtensionMap[] =
+const ExtensionMap aDrawExtensionMap[] =
{
{ "fodg", "draw_ODG_FlatXML" },
{ "html", "draw_html_Export" },
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 40729d7d9ffd..85ce844db1ab 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -70,9 +70,9 @@ using namespace com::sun::star;
namespace desktop
{
-static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
-static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
-static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
+const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
+const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
+const char ITEM_DESCRIPTOR_LABEL[] = "Label";
static OUString mapModuleShortNameToIdentifier(const OUString& sShortName)
{
@@ -397,7 +397,7 @@ static FileBase::RC _checkAndCreateDirectory(INetURLObject
const & dirURL)
#if defined UNX && ! defined MACOSX
-static const char XDG_CONFIG_PART[] = "/.config/";
+const char XDG_CONFIG_PART[] = "/.config/";
OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir)
{
diff --git a/desktop/source/splash/services_spl.cxx
b/desktop/source/splash/services_spl.cxx
index dfa8728fd0d3..cdb3151f230f 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -28,7 +28,7 @@
namespace {
-static cppu::ImplementationEntry const services[] = {
+cppu::ImplementationEntry const services[] = {
{
&desktop::splash::create,
&desktop::splash::getImplementationName,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
