diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-14 18:08:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-14 18:24:49 +0200 |
| commit | 9ac86f484b0c278aafbce685ed19d3ea005ee8f8 (patch) | |
| tree | cf2fe16d76992bcbd1bd89a8693c5f4996cd55f2 /basic | |
| parent | 2e284203da7f9882842111265f5f68ea0a145065 (diff) | |
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
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/CppunitTest_basic_enable.mk | 1 | ||||
| -rw-r--r-- | basic/CppunitTest_basic_nested_struct.mk | 1 | ||||
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index b0ab5fd1498d..f6c72f5c8206 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -53,5 +53,6 @@ $(eval $(call gb_CppunitTest_use_ure,basic_enable)) $(eval $(call gb_CppunitTest_use_components,basic_enable,\ configmgr/source/configmgr \ ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ )) $(eval $(call gb_CppunitTest_use_configuration,basic_enable)) diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index b6e421cbb499..78aee47899e3 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -54,6 +54,7 @@ $(eval $(call gb_CppunitTest_use_ure,basic_nested_struct)) $(eval $(call gb_CppunitTest_use_components,basic_nested_struct,\ configmgr/source/configmgr \ ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ )) $(eval $(call gb_CppunitTest_use_configuration,basic_nested_struct)) diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 4ac4fa400c15..ea1b0f7c11d6 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -285,7 +285,7 @@ bool hasUno( void ) } else { - Reference< XUniversalContentBroker > xManager = UniversalContentBroker::createDefault(xContext); + Reference< XUniversalContentBroker > xManager = UniversalContentBroker::create(xContext); if ( !( xManager->queryContentProvider( ::rtl::OUString("file:///" ) ).is() ) ) { |