Simplified some uses of css.configuration.theDefaultProvider.

* Retro-added new-style UNOIDL singleton specification for it, for easy
instantiation.
* Plus new comphelper::getComponentContext to map from XMultiServiceFactory
to XComponentContext.

2 files changed, 7 insertions, 16 deletions

diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
index b22671fa2f18..7e131cd6a02e 100644
--- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
+++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
@@ -26,6 +26,7 @@
  ************************************************************************/
 package complex.dbaccess;
 
+import com.sun.star.configuration.theDefaultProvider;
 import com.sun.star.lang.NotInitializedException;
 import com.sun.star.frame.DoubleInitializationException;
 import com.sun.star.awt.XTopWindow;
@@ -39,6 +40,7 @@ import com.sun.star.task.XInteractionRequest;
 import com.sun.star.uno.Type;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.frame.XStorable;
+import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.XNameContainer;
@@ -489,11 +491,12 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document.
     // --------------------------------------------------------------------------------------------------------
     private int impl_setMacroSecurityLevel(int _level) throws Exception
     {
-        final XMultiServiceFactory configProvider = UnoRuntime.queryInterface(XMultiServiceFactory.class, getMSF().createInstance("com.sun.star.configuration.ConfigurationProvider"));
+        final XMultiServiceFactory configProvider = theDefaultProvider.get(
+            getComponentContext());
 
-        final PropertyValue[] args = new PropertyValue[]
+        final NamedValue[] args = new NamedValue[]
         {
-            new PropertyValue("nodepath", 0, "/org.openoffice.Office.Common/Security/Scripting", PropertyState.DIRECT_VALUE)
+            new NamedValue("nodepath", "/org.openoffice.Office.Common/Security/Scripting")
         };
 
         final XPropertySet securitySettings = UnoRuntime.queryInterface(XPropertySet.class, configProvider.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess", args));
diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java
index f2cbdf988b38..91378b7dffee 100644
--- a/dbaccess/qa/complex/dbaccess/TestCase.java
+++ b/dbaccess/qa/complex/dbaccess/TestCase.java
@@ -29,7 +29,6 @@ package complex.dbaccess;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import com.sun.star.beans.PropertyValue;
-import com.sun.star.beans.XPropertySet;
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XModel;
 import com.sun.star.lang.XMultiServiceFactory;
@@ -55,18 +54,7 @@ public abstract class TestCase
     // --------------------------------------------------------------------------------------------------------
     protected final XComponentContext getComponentContext()
     {
-        XComponentContext context = null;
-        try
-        {
-            final XPropertySet orbProps = UnoRuntime.queryInterface( XPropertySet.class, getMSF() );
-            context = UnoRuntime.queryInterface( XComponentContext.class,
-                orbProps.getPropertyValue( "DefaultContext" ) );
-        }
-        catch ( Exception ex )
-        {
-            fail( "could not retrieve the ComponentContext" );
-        }
-        return context;
+        return connection.getComponentContext();
     }
 
     // --------------------------------------------------------------------------------------------------------