Improvement on previous commit, UCB clean up

* As UCB is only ever initialized with "Local"/"Office", remove this
configuration vector completely.  The "create" ctor creates an instance
internally initialized with those "Local"/"Office" keys.  Special (test) code
can still instantiate an uninitialized one via plain createInstance.  And for
backwards compatilibity process startup still ensures to create an initialized
instance early, in case there is still code out there (in extensions) that
later calls plain createInstance and expects to get the already-initialized
(single) instance.

* XInitialization is an "implementation detail" of the UniversalContentBroker
service, do not expose in XUniversalContentBroker.

* ucbhelper/configurationkeys.hxx is no longer needed and is removed.

* ucbhelper/contentbroker.hxx is an empty wrapper and is removed; however, that
requires ucbhelper::Content constructors to take explicit XComponentContext
arguments now.

* The only remaining code in ucbhelper/source/client/contentbroker.cxx is
Android-only InitUCBHelper.  Is that relevant still?

Change-Id: I3f7bddd0456bffbcd13590c66d9011915c760f28

4 files changed, 12 insertions, 28 deletions

diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java
index b41f04e656d3..7e82ba795a08 100644
--- a/ucb/qa/complex/tdoc/CheckContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckContentProvider.java
@@ -122,7 +122,7 @@ public class CheckContentProvider {
             XContentProvider xContentProvider =
                             UnoRuntime.queryInterface(XContentProvider.class, o);
 
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
@@ -185,7 +185,7 @@ public class CheckContentProvider {
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider =
                             UnoRuntime.queryInterface(XContentProvider.class, o);
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
@@ -220,7 +220,7 @@ public class CheckContentProvider {
             Object o = xMSF.createInstance("com.sun.star.comp.ucb.TransientDocumentsContentProvider");
             XContentProvider xContentProvider =
                             UnoRuntime.queryInterface(XContentProvider.class, o);
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
@@ -255,7 +255,7 @@ public class CheckContentProvider {
             XContentProvider xContentProvider =
                             UnoRuntime.queryInterface(XContentProvider.class, o);
 
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
index 2898792eca18..7ad0dc07e59a 100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContent.java
@@ -74,7 +74,7 @@ public class CheckTransientDocumentsContent {
      */
     @Test public void checkTransientDocumentsContent() {
         try {
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             XContentProvider xContentProvider =
diff --git a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
index 29059e0ce3d1..6697709180c2 100644
--- a/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
+++ b/ucb/qa/complex/tdoc/CheckTransientDocumentsContentProvider.java
@@ -85,7 +85,7 @@ public class CheckTransientDocumentsContentProvider {
             XContentProvider xContentProvider =
                             UnoRuntime.queryInterface(XContentProvider.class, o);
 
-            // create the ucb
+            // create unconfigured ucb
             XContentIdentifierFactory xContentIdentifierFactory =
                             UnoRuntime.queryInterface(XContentIdentifierFactory.class, xMSF.createInstance("com.sun.star.ucb.UniversalContentBroker"));
             // create a content identifier from the ucb for tdoc
diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java
index 95cc501b5270..2296b7530037 100644
--- a/ucb/qa/complex/ucb/UCB.java
+++ b/ucb/qa/complex/ucb/UCB.java
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.ArrayList;
 
 import com.sun.star.beans.Property;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdbc.XResultSet;
 import com.sun.star.sdbc.XRow;
 // import com.sun.star.uno.XComponentContext;
@@ -54,20 +53,14 @@ import static org.junit.Assert.*;
  * It should be always: dir,filename.
  */
 public class UCB  {
-    private Object ucb;
+    private XUniversalContentBroker ucb;
 
 //  public String[] getTestMethodNames() {
 //      return new String[] {"checkWrongFtpConnection"};
 //  }
 
-    public void init(XMultiServiceFactory xmsf) throws Exception {
-        String[] keys = new String[2];
-        keys[0] = "Local";
-        keys[1] = "Office";
-        ucb =
-            xmsf.createInstanceWithArguments(
-                "com.sun.star.ucb.UniversalContentBroker",
-                keys);
+    public void init() throws Exception {
+        ucb = UniversalContentBroker.create(connection.getComponentContext());
     }
 
     public void delete(String filename) throws Exception {
@@ -193,8 +186,8 @@ public class UCB  {
 
     public Object getContent(String path) throws Exception
         {
-        XContentIdentifier id = (UnoRuntime.queryInterface(XContentIdentifierFactory.class, ucb)).createContentIdentifier(path);
-        return (UnoRuntime.queryInterface(XContentProvider.class, ucb)).queryContent(id);
+        XContentIdentifier id = ucb.createContentIdentifier(path);
+        return ucb.queryContent(id);
     }
 
     public static interface Verifier {
@@ -204,10 +197,9 @@ public class UCB  {
     @Test public void checkWrongFtpConnection() {
         //localhost  ;Lo-1.Germany.sun.com; 10.16.65.155
         try {
-            XMultiServiceFactory xLocMSF = getMSF();
             String acountUrl = "ftp://noname:nopasswd@nohost";
             System.out.println(acountUrl);
-            init(xLocMSF);
+            init();
             Object content = getContent(acountUrl);
 
             OpenCommandArgument2 aArg = new OpenCommandArgument2();
@@ -232,14 +224,6 @@ public class UCB  {
 //      System.exit(0);
     }
 
-
-
-         private XMultiServiceFactory getMSF()
-    {
-        final XMultiServiceFactory xMSF1 = UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager());
-        return xMSF1;
-    }
-
     // setup and close connections
     @BeforeClass public static void setUpConnection() throws Exception {
         System.out.println("setUpConnection()");