undoapi: replace validateXRef with UNO_QUERY/SET_THROW resp. ENSURE_OR_THROW

1 files changed, 5 insertions, 12 deletions

diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index 5d3350f635e3..bea38a67a8f1 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -29,6 +29,7 @@
 #include "precompiled_scripting.hxx"
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
+#include <tools/diagnose_ex.h>
 
 #include <util/scriptingconstants.hxx>
 #include <util/util.hxx>
@@ -39,7 +40,6 @@
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::script;
-using namespace ::scripting_util;
 
 namespace func_provider
 {
@@ -51,7 +51,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
     // will use createContentEnumeration
 
     m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr, "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
+    ENSURE_OR_THROW( m_xMgr.is(), "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
     populateCache();
 }
 
@@ -64,7 +64,7 @@ ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, co
     // will use createContentEnumeration
 
     m_xMgr = m_xContext->getServiceManager();
-    validateXRef( m_xMgr, "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
+    ENSURE_OR_THROW( m_xMgr.is(), "ProviderCache::ProviderCache() failed to obtain ServiceManager" );
     populateCache();
 }
 
@@ -163,14 +163,8 @@ ProviderCache::populateCache() throw ( RuntimeException )
         while ( xEnum->hasMoreElements() )
         {
 
-            Reference< lang::XSingleComponentFactory > factory;
-            if ( sal_False == ( xEnum->nextElement() >>= factory ) )
-            {
-                throw new RuntimeException( ::rtl::OUString::createFromAscii( "  error extracting XSingleComponentFactory from Content enumeration. " ), Reference< XInterface >() );
-            }
-            validateXRef( factory, "ProviderCache::populateCache() invalid factory" );
+            Reference< lang::XSingleComponentFactory > factory( xEnum->nextElement(), UNO_QUERY_THROW );
             Reference< lang::XServiceInfo > xServiceInfo( factory, UNO_QUERY_THROW );
-            validateXRef( xServiceInfo, "ProviderCache::populateCache() failed to get XServiceInfo from factory" );
 
             Sequence< ::rtl::OUString > serviceNames = xServiceInfo->getSupportedServiceNames();
 
@@ -207,9 +201,8 @@ ProviderCache::createProvider( ProviderDetails& details ) throw ( RuntimeExcepti
 {
     try
     {
-        details.provider  = Reference< provider::XScriptProvider >(
+        details.provider.set(
             details.factory->createInstanceWithArgumentsAndContext( m_Sctx, m_xContext ), UNO_QUERY_THROW );
-        validateXRef( details.provider, "ProviderCache::createProvider, failed to create provider");
     }
     catch ( RuntimeException& e )
     {