diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-09 15:40:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-09 15:40:05 +0100 |
| commit | 3b2ec686862e3d3c5634ee06eae12641cf1fe6cf (patch) | |
| tree | ac30e6ddbce77a60613425948c1c3469676926ca /vbahelper/source/msforms/vbacontrol.cxx | |
| parent | 736300b358bc9207b360d6d7e4aa0b70499f4837 (diff) | |
New loplugin:externvar: vbahelper
Change-Id: Ic66aa797251b6de1d964dcd66ca1bd952c8c17d3
Diffstat (limited to 'vbahelper/source/msforms/vbacontrol.cxx')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
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" ); |