New loplugin:externvar: desktop

Change-Id: I3942e7496c6014c0118a9e90a8fa8251bffe8443

desktop/source/deployment/dp_log.cxx

@@ -19,6 +19,7 @@
 
 
 #include "dp_misc.h"
+#include "dp_services.hxx"
 #include <rtl/strbuf.hxx>
 #include <osl/time.h>
 #include <osl/thread.h>
@@ -185,8 +186,8 @@ void ProgressLogImpl::pop() throw (RuntimeException, std::exception)
 }
 
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<ProgressLogImpl, sdecl::with_args<true> > servicePLI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<ProgressLogImpl, sdecl::with_args<true> > const servicePLI;
+sdecl::ServiceDecl const serviceDecl(
     servicePLI,
     // a private one:
     "com.sun.star.comp.deployment.ProgressLog",

desktop/source/deployment/dp_services.cxx

@@ -20,54 +20,11 @@
 
 #include <comphelper/servicedecl.hxx>
 
+#include <dp_services.hxx>
+
 using namespace com::sun::star;
 namespace sdecl = comphelper::service_decl;
 
-namespace dp_registry {
-namespace backend {
-
-namespace configuration {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace component {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace script {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace sfwk {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace help {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace executable {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-} // namespace backend
-} // namespace dp_registry
-
-namespace dp_manager {
-namespace factory {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace dp_log {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace dp_info {
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(

desktop/source/deployment/gui/dp_gui_service.cxx

@@ -299,19 +299,19 @@ void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException, std
     startExecuteModal( Reference< ui::dialogs::XDialogClosedListener >() );
 }
 
-sdecl::class_<ServiceImpl, sdecl::with_args<true> > serviceSI;
+sdecl::class_<ServiceImpl, sdecl::with_args<true> > const serviceSI;
 sdecl::ServiceDecl const serviceDecl(
     serviceSI,
     "com.sun.star.comp.deployment.ui.PackageManagerDialog",
     "com.sun.star.deployment.ui.PackageManagerDialog" );
 
-sdecl::class_<LicenseDialog, sdecl::with_args<true> > licenseSI;
+sdecl::class_<LicenseDialog, sdecl::with_args<true> > const licenseSI;
 sdecl::ServiceDecl const licenseDecl(
     licenseSI,
     "com.sun.star.comp.deployment.ui.LicenseDialog",
     "com.sun.star.deployment.ui.LicenseDialog" );
 
-sdecl::class_<UpdateRequiredDialogService, sdecl::with_args<true> > updateSI;
+sdecl::class_<UpdateRequiredDialogService, sdecl::with_args<true> > const updateSI;
 sdecl::ServiceDecl const updateDecl(
     updateSI,
     "com.sun.star.comp.deployment.ui.UpdateRequiredDialog",

desktop/source/deployment/inc/dp_services.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_SERVICES_HXX
+#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_SERVICES_HXX
+
+#include <sal/config.h>
+
+namespace comphelper { namespace service_decl { class ServiceDecl; } }
+
+namespace dp_info {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace dp_log {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace dp_manager {
+
+namespace factory {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+
+}
+
+namespace dp_registry { namespace backend {
+
+namespace component {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace configuration {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace executable {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace help {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace script {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace sfwk {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+} }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */

desktop/source/deployment/manager/dp_extensionmanager.cxx

@@ -47,6 +47,7 @@
 #include <vcl/svapp.hxx>
 #include "dp_interact.h"
 #include "dp_resource.h"
+#include "dp_services.hxx"
 #include "dp_ucb.h"
 #include "dp_identifier.hxx"
 #include "dp_descriptioninfoset.hxx"
@@ -1439,8 +1440,8 @@ sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository)
 
 
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<ExtensionManager> servicePIP;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<ExtensionManager> const servicePIP;
+sdecl::ServiceDecl const serviceDecl(
     servicePIP,
     // a private one:
     "com.sun.star.comp.deployment.ExtensionManager",

desktop/source/deployment/manager/dp_informationprovider.cxx

@@ -42,6 +42,7 @@
 #include "dp_dependencies.hxx"
 #include "dp_descriptioninfoset.hxx"
 #include "dp_identifier.hxx"
+#include "dp_services.hxx"
 #include "dp_version.hxx"
 #include "dp_misc.h"
 #include "dp_update.hxx"
@@ -314,8 +315,8 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::
 
 
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<PackageInformationProvider> servicePIP;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<PackageInformationProvider> const servicePIP;
+sdecl::ServiceDecl const serviceDecl(
     servicePIP,
     // a private one:
     "com.sun.star.comp.deployment.PackageInformationProvider",

desktop/source/deployment/manager/dp_managerfac.cxx

@@ -20,6 +20,7 @@
 
 #include "dp_manager.h"
 #include "dp_resource.h"
+#include "dp_services.hxx"
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <com/sun/star/deployment/thePackageManagerFactory.hpp>
@@ -65,8 +66,8 @@ public:
 
 
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<PackageManagerFactoryImpl> servicePMFI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<PackageManagerFactoryImpl> const servicePMFI;
+sdecl::ServiceDecl const serviceDecl(
     servicePMFI,
     // a private one:
     "com.sun.star.comp.deployment.PackageManagerFactory",

desktop/source/deployment/registry/component/dp_component.cxx

@@ -21,6 +21,7 @@
 #include "dp_component.hrc"
 #include "dp_backend.h"
 #include "dp_platform.hxx"
+#include "dp_services.hxx"
 #include "dp_ucb.h"
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
@@ -1722,7 +1723,7 @@ BackendImpl::ComponentsPackageImpl::ComponentsPackageImpl(
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     IMPLEMENTATION_NAME,
     BACKEND_SERVICE_NAME );

desktop/source/deployment/registry/configuration/dp_configuration.cxx

@@ -27,6 +27,7 @@
 #if HAVE_FEATURE_EXTENSIONS
 #include "dp_persmap.h"
 #endif
+#include "dp_services.hxx"
 #include "dp_ucb.h"
 #include <rtl/string.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -802,7 +803,7 @@ void BackendImpl::PackageImpl::processPackage_(
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     "com.sun.star.comp.deployment.configuration.PackageRegistryBackend",
     BACKEND_SERVICE_NAME );

desktop/source/deployment/registry/executable/dp_executable.cxx

@@ -20,6 +20,7 @@
 
 #include "dp_misc.h"
 #include "dp_backend.h"
+#include "dp_services.hxx"
 #include "dp_ucb.h"
 #include "dp_interact.h"
 #include <rtl/string.hxx>
@@ -310,7 +311,7 @@ bool BackendImpl::ExecutablePackageImpl::getFileAttributes(sal_uInt64& out_Attri
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     "com.sun.star.comp.deployment.executable.PackageRegistryBackend",
     BACKEND_SERVICE_NAME );

desktop/source/deployment/registry/help/dp_help.cxx

@@ -22,6 +22,7 @@
 #include "dp_help.hrc"
 #include "dp_backend.h"
 #include "dp_helpbackenddb.hxx"
+#include "dp_services.hxx"
 #include "dp_ucb.h"
 #include <rtl/uri.hxx>
 #include <osl/file.hxx>
@@ -611,7 +612,7 @@ Reference< ucb::XSimpleFileAccess3 > const & BackendImpl::getFileAccess()
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     "com.sun.star.comp.deployment.help.PackageRegistryBackend",
     BACKEND_SERVICE_NAME );

desktop/source/deployment/registry/script/dp_script.cxx

@@ -19,6 +19,7 @@
 
 
 #include "dp_script.hrc"
+#include "dp_services.hxx"
 #include "dp_lib_container.h"
 #include "dp_backend.h"
 #include "dp_ucb.h"
@@ -457,7 +458,7 @@ void BackendImpl::PackageImpl::processPackage_(
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     "com.sun.star.comp.deployment.script.PackageRegistryBackend",
     BACKEND_SERVICE_NAME );

desktop/source/deployment/registry/sfwk/dp_sfwk.cxx

@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
+
+#include "dp_services.hxx"
 #include "dp_sfwk.hrc"
 #include "dp_backend.h"
 #include "dp_ucb.h"
@@ -361,8 +364,8 @@ void BackendImpl::PackageImpl::processPackage_(
 }
 
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<BackendImpl, sdecl::with_args<true> > serviceBI;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<BackendImpl, sdecl::with_args<true> > const serviceBI;
+sdecl::ServiceDecl const serviceDecl(
     serviceBI,
     "com.sun.star.comp.deployment.sfwk.PackageRegistryBackend",
     BACKEND_SERVICE_NAME );

desktop/source/migration/services/cexports.cxx

@@ -26,7 +26,7 @@
 extern "C"
 {
 
-::cppu::ImplementationEntry oo2_entries [] =
+::cppu::ImplementationEntry const oo2_entries [] =
 {
     {
         migration::BasicMigration_create, migration::BasicMigration_getImplementationName,

desktop/source/migration/services/cexportsoo3.cxx

@@ -24,7 +24,7 @@
 extern "C"
 {
 
-::cppu::ImplementationEntry oo3_entries [] =
+::cppu::ImplementationEntry const oo3_entries [] =
 {
     {
         migration::OO3ExtensionMigration_create, migration::OO3ExtensionMigration_getImplementationName,

desktop/unx/source/start.c

@@ -705,7 +705,7 @@ exec_javaldx (Args *args)
 #endif
 
 // has to be a global :(
-oslProcess * volatile g_pProcess = NULL;
+static oslProcess * volatile g_pProcess = NULL;
 
 void sigterm_handler(int ignored)
 {