sb123: #i111598# OfficeConnection getFactory -> getComponentContext

3 files changed, 30 insertions, 28 deletions

diff --git a/test/inc/test/officeconnection.hxx b/test/inc/test/officeconnection.hxx
index 99a319d51a7e..45c0a370d3c4 100644
--- a/test/inc/test/officeconnection.hxx
+++ b/test/inc/test/officeconnection.hxx
@@ -33,8 +33,8 @@
 #include "osl/process.h"
 #include "test/detail/testdllapi.hxx"
 
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
+namespace com { namespace sun { namespace star { namespace uno {
+    class XComponentContext;
 } } } }
 
 namespace test {
@@ -51,13 +51,13 @@ public:
 
     void tearDown();
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-    getFactory() const;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+    getComponentContext() const;
 
 private:
     oslProcess process_;
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-        factory_;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+        context_;
 };
 
 }
diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
index ccfd2cd0a069..c8c42873c4a8 100644
--- a/test/source/cpp/officeconnection.cxx
+++ b/test/source/cpp/officeconnection.cxx
@@ -30,8 +30,8 @@
 #include "com/sun/star/connection/NoConnectException.hpp"
 #include "com/sun/star/frame/XDesktop.hpp"
 #include "com/sun/star/lang/DisposedException.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
 #include "cppuhelper/bootstrap.hxx"
 #include "cppunit/TestAssert.h"
 #include "osl/process.h"
@@ -118,14 +118,14 @@ void OfficeConnection::setUp() {
             cppu::defaultBootstrap_InitialComponentContext()));
     for (;;) {
         try {
-            factory_ =
-                css::uno::Reference< css::lang::XMultiServiceFactory >(
+            context_ =
+                css::uno::Reference< css::uno::XComponentContext >(
                     resolver->resolve(
                         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("uno:")) +
                         desc +
                         rtl::OUString(
                             RTL_CONSTASCII_USTRINGPARAM(
-                                ";urp;StarOffice.ServiceManager"))),
+                                ";urp;StarOffice.ComponentContext"))),
                     css::uno::UNO_QUERY_THROW);
             break;
         } catch (css::connection::NoConnectException &) {}
@@ -139,13 +139,14 @@ void OfficeConnection::setUp() {
 }
 
 void OfficeConnection::tearDown() {
-    if (factory_.is()) {
+    if (context_.is()) {
         css::uno::Reference< css::frame::XDesktop > desktop(
-            factory_->createInstance(
+            context_->getServiceManager()->createInstanceWithContext(
                 rtl::OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
+                    RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")),
+                context_),
             css::uno::UNO_QUERY_THROW);
-        factory_.clear();
+        context_.clear();
         try {
             CPPUNIT_ASSERT(desktop->terminate());
             desktop.clear();
@@ -165,9 +166,9 @@ void OfficeConnection::tearDown() {
     }
 }
 
-css::uno::Reference< css::lang::XMultiServiceFactory >
-OfficeConnection::getFactory() const {
-    return factory_;
+css::uno::Reference< css::uno::XComponentContext >
+OfficeConnection::getComponentContext() const {
+    return context_;
 }
 
 }
diff --git a/test/source/java/OfficeConnection.java b/test/source/java/OfficeConnection.java
index 6887c3bfa3cd..b0b08c1643fd 100644
--- a/test/source/java/OfficeConnection.java
+++ b/test/source/java/OfficeConnection.java
@@ -31,8 +31,8 @@ import com.sun.star.comp.helper.Bootstrap;
 import com.sun.star.connection.NoConnectException;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.lang.DisposedException;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
@@ -85,11 +85,11 @@ public final class OfficeConnection {
             Bootstrap.createInitialComponentContext(null));
         for (;;) {
             try {
-                factory = UnoRuntime.queryInterface(
-                    XMultiServiceFactory.class,
+                context = UnoRuntime.queryInterface(
+                    XComponentContext.class,
                     resolver.resolve(
                         "uno:" + description +
-                        ";urp;StarOffice.ServiceManager"));
+                        ";urp;StarOffice.ComponentContext"));
                 break;
             } catch (NoConnectException e) {}
             if (process != null) {
@@ -104,11 +104,12 @@ public final class OfficeConnection {
         throws InterruptedException, com.sun.star.uno.Exception
     {
         boolean desktopTerminated = true;
-        if (factory != null) {
+        if (context != null) {
             XDesktop desktop = UnoRuntime.queryInterface(
                 XDesktop.class,
-                factory.createInstance("com.sun.star.frame.Desktop"));
-            factory = null;
+                context.getServiceManager().createInstanceWithContext(
+                    "com.sun.star.frame.Desktop", context));
+            context = null;
             try {
                 desktopTerminated = desktop.terminate();
             } catch (DisposedException e) {}
@@ -130,10 +131,10 @@ public final class OfficeConnection {
         assertTrue(errTerminated);
     }
 
-    /** Obtain the service factory of the running OOo instance.
+    /** Obtain the component context of the running OOo instance.
     */
-    public XMultiServiceFactory getFactory() {
-        return factory;
+    public XComponentContext getComponentContext() {
+        return context;
     }
 
     //TODO: get rid of this hack for legacy qa/unoapi tests
@@ -217,5 +218,5 @@ public final class OfficeConnection {
     private Process process = null;
     private Forward outForward = null;
     private Forward errForward = null;
-    private XMultiServiceFactory factory = null;
+    private XComponentContext context = null;
 }