New loplugin:externvar: vbahelper

Change-Id: Ic66aa797251b6de1d964dcd66ca1bd952c8c17d3

4 files changed, 36 insertions, 17 deletions

diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 12c6f9b4ad91..97ddbee2dedb 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -19,6 +19,7 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "comphelper/servicedecl.hxx"
 
+#include <service.hxx>
 
 // component exports
 
@@ -27,17 +28,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sdecl = comphelper::service_decl;
 
-// reference service helper(s)
-namespace  controlprovider
-{
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
-namespace  userform
-{
-extern sdecl::ServiceDecl const serviceDecl;
-}
-
 extern "C"
 {
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL msforms_component_getFactory(
diff --git a/vbahelper/source/msforms/service.hxx b/vbahelper/source/msforms/service.hxx
new file mode 100644
index 000000000000..94c69b6ac8db
--- /dev/null
+++ b/vbahelper/source/msforms/service.hxx
@@ -0,0 +1,27 @@
+/* -*- 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_VBAHELPER_SOURCE_MSFORMS_SERVICE_HXX
+#define INCLUDED_VBAHELPER_SOURCE_MSFORMS_SERVICE_HXX
+
+#include <sal/config.h>
+
+namespace comphelper { namespace service_decl { class ServiceDecl; } }
+
+namespace controlprovider {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+namespace userform {
+extern comphelper::service_decl::ServiceDecl const serviceDecl;
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 7d72fc86caa8..cf59d6bcae1d 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -38,6 +38,7 @@
 #include <ooo/vba/XControlProvider.hpp>
 #include <ooo/vba/msforms/fmMousePointer.hpp>
 #include <svtools/bindablecontrolhelper.hxx>
+#include "service.hxx"
 #include "vbacontrol.hxx"
 #include "vbacombobox.hxx"
 #include "vbabutton.hxx"
@@ -439,7 +440,7 @@ struct PointerStyles
 };
 
 // 1 -> 1 map of styles ( some dubious choices in there though )
-PointerStyles styles[] = {
+PointerStyles const styles[] = {
   /// assuming pointer default is Arrow
   { msforms::fmMousePointer::fmMousePointerDefault, PointerStyle::Arrow },
   { msforms::fmMousePointer::fmMousePointerArrow, PointerStyle::Arrow },
@@ -713,7 +714,7 @@ ScVbaControl::getServiceNames()
     return aServiceNames;
 }
 
-sal_Int32 nSysCols[] = { 0xC8D0D4, 0x0, 0x6A240A, 0x808080, 0xE4E4E4, 0xFFFFFF, 0x0, 0x0, 0x0, 0xFFFFFF, 0xE4E4E4, 0xE4E4E4, 0x808080, 0x6A240A, 0xFFFFFF, 0xE4E4E4, 0x808080, 0x808080, 0x0, 0xC8D0D4, 0xFFFFFF, 0x404040, 0xE4E4E4, 0x0, 0xE1FFFF };
+sal_Int32 const nSysCols[] = { 0xC8D0D4, 0x0, 0x6A240A, 0x808080, 0xE4E4E4, 0xFFFFFF, 0x0, 0x0, 0x0, 0xFFFFFF, 0xE4E4E4, 0xE4E4E4, 0x808080, 0x6A240A, 0xFFFFFF, 0xE4E4E4, 0x808080, 0x808080, 0x0, 0xC8D0D4, 0xFFFFFF, 0x404040, 0xE4E4E4, 0x0, 0xE1FFFF };
 
 sal_Int32 ScVbaControl::getBackColor() throw (uno::RuntimeException)
 {
@@ -784,8 +785,8 @@ ControlProviderImpl::createControl( const uno::Reference< drawing::XControlShape
 namespace controlprovider
 {
 namespace sdecl = comphelper::service_decl;
-sdecl::class_<ControlProviderImpl, sdecl::with_args<false> > serviceImpl;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::class_<ControlProviderImpl, sdecl::with_args<false> > const serviceImpl;
+sdecl::ServiceDecl const serviceDecl(
     serviceImpl,
     "ControlProviderImpl",
     "ooo.vba.ControlProvider" );
diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx
index e80106b0dc29..2fca16237d04 100644
--- a/vbahelper/source/msforms/vbauserform.cxx
+++ b/vbahelper/source/msforms/vbauserform.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <vbahelper/helperdecl.hxx>
+#include "service.hxx"
 #include "vbauserform.hxx"
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -312,8 +313,8 @@ ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException
 namespace userform
 {
 namespace sdecl = comphelper::service_decl;
-sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > serviceImpl;
-extern sdecl::ServiceDecl const serviceDecl(
+sdecl::vba_service_class_<ScVbaUserForm, sdecl::with_args<true> > const serviceImpl;
+sdecl::ServiceDecl const serviceDecl(
     serviceImpl,
     "ScVbaUserForm",
     "ooo.vba.msforms.UserForm" );