New loplugin:externvar: desktop

Change-Id: I3942e7496c6014c0118a9e90a8fa8251bffe8443

6 files changed, 15 insertions, 7 deletions

diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 58b98aff9919..97b72f3c9978 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/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 );
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index f2f7dfb45492..b508c8a1ba5b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/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 );
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 430ae5e8bc5b..c400a0b7eb0c 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/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 );
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 84f52443811d..436452acbace 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/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 );
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index c463b31e96f9..43bcdd14b844 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/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 );
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index e19df09bc353..687e651b0cb2 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/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 );