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

5 files changed, 5 insertions, 5 deletions

diff --git a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
index 688df54b7e75..ef0fdb62c174 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XSortedDynamicResultSetFactory.java
@@ -74,7 +74,7 @@ public class _XSortedDynamicResultSetFactory extends MultiMethodTest {
         try {
             Object oUCB = xMSF.createInstanceWithArguments
                 ("com.sun.star.ucb.UniversalContentBroker",
-                new Object[] {"Local", "Office"}) ;
+                new Object[0]) ;
 
             XContentIdentifierFactory ciFac = UnoRuntime.queryInterface
                 (XContentIdentifierFactory.class,oUCB) ;
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
index fbf6a94db84d..d55bc7db403d 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetFactory.java
@@ -102,7 +102,7 @@ public class CachedContentResultSetFactory extends TestCase {
         try {
             Object oUCB = xMSF.createInstanceWithArguments
                 ("com.sun.star.ucb.UniversalContentBroker",
-                new Object[] {"Local", "Office"}) ;
+                new Object[0]) ;
 
             XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
 
diff --git a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
index 27db3a10d8d4..b206180a6609 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedContentResultSetStubFactory.java
@@ -100,7 +100,7 @@ public class CachedContentResultSetStubFactory extends TestCase {
         try {
             Object oUCB = xMSF.createInstanceWithArguments
                 ("com.sun.star.ucb.UniversalContentBroker",
-                new Object[] {"Local", "Office"}) ;
+                new Object[0]) ;
 
             XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
 
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
index 68e053daebb2..2f3d93cf0252 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetFactory.java
@@ -100,7 +100,7 @@ public class CachedDynamicResultSetFactory extends TestCase {
         try {
             Object oUCB = xMSF.createInstanceWithArguments
                 ("com.sun.star.ucb.UniversalContentBroker",
-                new Object[] {"Local", "Office"}) ;
+                new Object[0]) ;
 
             XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;
 
diff --git a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
index af216c672a3f..f42a9ab839a1 100644
--- a/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
+++ b/qadevOOo/tests/java/mod/_cached/CachedDynamicResultSetStubFactory.java
@@ -97,7 +97,7 @@ public class CachedDynamicResultSetStubFactory extends TestCase {
         try {
             Object oUCB = xMSF.createInstanceWithArguments
                 ("com.sun.star.ucb.UniversalContentBroker",
-                new Object[] {"Local", "Office"}) ;
+                new Object[0]) ;
 
             XContentIdentifierFactory ciFac = UnoRuntime.queryInterface(XContentIdentifierFactory.class, oUCB) ;