[Libreoffice-commits] core.git: 2 commits - vcl/backendtest vcl/workben

[Michael Stahl]

 vcl/backendtest/VisualBackendTest.cxx |    4 ++--
 vcl/workben/vcldemo.cxx               |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dc99e5e9ba7eb5a4782d889675ad7d14129e37d8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 22 17:33:11 2017 +0200

    vcl: [loplugin:badstatics] aApp
    
    DemoApp::xMSF doesn't need to be a member.
    
    Change-Id: I3b2d0d4c58ab04e0a82b31938c5f64b274ca004e

diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 9155fb7db3ad..48a0bb0bc2ca 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -2268,13 +2268,13 @@ public:
     }
 
 protected:
-    uno::Reference<lang::XMultiServiceFactory> xMSF;
     void Init() override
     {
         try
         {
             uno::Reference<uno::XComponentContext> xComponentContext
                 = ::cppu::defaultBootstrap_InitialComponentContext();
+            uno::Reference<lang::XMultiServiceFactory> xMSF;
             xMSF.set(xComponentContext->getServiceManager(), uno::UNO_QUERY);
             if(!xMSF.is())
                 Application::Abort("Bootstrap failure - no service manager");
commit d67ec7324bcad0ba945f200a790ded3df98009ab
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Sep 22 17:23:44 2017 +0200

    vcl: [loplugin:badstatics] aApplication
    
    VisualBackendTestApp::xMSF doesn't need to be a member.
    
    Change-Id: I307ba56377b822a148db809c16b8ff05708d0ca7

diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx
index 0c0584cad792..fb75618c5a88 100644
--- a/vcl/backendtest/VisualBackendTest.cxx
+++ b/vcl/backendtest/VisualBackendTest.cxx
@@ -538,13 +538,13 @@ public:
     }
 
 protected:
-    uno::Reference<lang::XMultiServiceFactory> xMSF;
-
     void Init() override
     {
         try
         {
             uno::Reference<uno::XComponentContext> xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext();
+            uno::Reference<lang::XMultiServiceFactory> xMSF;
+
             xMSF = uno::Reference<lang::XMultiServiceFactory>(xComponentContext->getServiceManager(), uno::UNO_QUERY);
 
             if (!xMSF.is())