connectivity Writer driver: make ProviderRequest members private

And two more trivial readability cleanups.

Change-Id: Ie79d9afbdc79260821c27c3f62be3e4635f40395
Reviewed-on: https://gerrit.libreoffice.org/63677
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 1566b4eacc45..10e0e3ef32e7 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -30,10 +30,12 @@ using createFactoryFunc = uno::Reference<lang::XSingleServiceFactory> (*)(
 
 struct ProviderRequest
 {
+private:
     uno::Reference<lang::XSingleServiceFactory> xRet;
     uno::Reference<lang::XMultiServiceFactory> const xServiceManager;
     OUString const sImplementationName;
 
+public:
     ProviderRequest(void* pServiceManager, sal_Char const* pImplementationName)
         : xServiceManager(static_cast<lang::XMultiServiceFactory*>(pServiceManager))
         , sImplementationName(OUString::createFromAscii(pImplementationName))
@@ -56,7 +58,7 @@ struct ProviderRequest
         return xRet.is();
     }
 
-    void* getProvider() const { return xRet.get(); }
+    uno::XInterface* getProvider() const { return xRet.get(); }
 };
 
 extern "C" SAL_DLLPUBLIC_EXPORT void*
@@ -73,8 +75,8 @@ connectivity_writer_component_getFactory(const sal_Char* pImplementationName, vo
                              connectivity::writer::ODriver_CreateInstance,
                              ::cppu::createSingleFactory);
 
-        if (aReq.xRet.is())
-            aReq.xRet->acquire();
+        if (aReq.getProvider())
+            aReq.getProvider()->acquire();
 
         pRet = aReq.getProvider();
     }