From 5d3cec6aaf39729cd2511a5f182597ce4d8a6997 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 4 Nov 2013 13:47:13 +0100
Subject: [PATCH] Some clean-up

Change-Id: Ic65d1d5dcf2a0a7dbc0b382002b15e47f7998344
---
 svtools/source/uno/miscservices.cxx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 0414f5d46324..a62b248cfcdb 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -146,9 +146,16 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svt_component_getFactory (
         }
         else
         {
-            pResult =  component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
+            pResult = comphelper::service_decl::component_getFactoryHelper(
+                pImplementationName,
+                static_cast<css::lang::XMultiServiceFactory *>(
+                    _pServiceManager),
+                static_cast<css::registry::XRegistryKey *>(pRegistryKey),
+                serviceDecl );
             if ( !pResult )
-                pResult = ::cppu::component_getFactoryHelper( pImplementationName, _pServiceManager, pRegistryKey, s_aServiceEntries );
+                pResult = cppu::component_getFactoryHelper(
+                    pImplementationName, _pServiceManager, pRegistryKey,
+                    s_aServiceEntries );
         }
 
         if ( xFactory.is() )