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

3 files changed, 6 insertions, 4 deletions

diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 101d5830f565..0dabd641744e 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-
+#include <comphelper/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
 #include "convdiclist.hxx"
@@ -314,7 +314,8 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
         try
         {
             ::ucbhelper::Content    aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ),
-                                    uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () );
+                                    uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+                                    comphelper::getProcessComponentContext() );
             aCnt.executeCommand( "delete", makeAny( sal_Bool( sal_True ) ) );
         }
         catch( ::com::sun::star::ucb::CommandAbortedException& )
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 1513371f44d1..89bbd8df5656 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -432,7 +432,7 @@ sal_Bool    IsReadOnly( const String &rURL, sal_Bool *pbExist )
         try
         {
             uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xCmdEnv;
-            ::ucbhelper::Content aContent( rURL, xCmdEnv );
+            ::ucbhelper::Content aContent( rURL, xCmdEnv, comphelper::getProcessComponentContext() );
 
             bExists = aContent.isDocument();
             if (bExists)
diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx
index 40633659eec7..d4daf2d151c9 100644
--- a/linguistic/source/misc2.cxx
+++ b/linguistic/source/misc2.cxx
@@ -59,7 +59,8 @@ sal_Bool FileExists( const String &rMainURL )
         try
         {
             ::ucbhelper::Content aContent( rMainURL,
-                    uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >());
+                    uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
+                    comphelper::getProcessComponentContext());
             bExists = aContent.isDocument();
         }
         catch (uno::Exception &)