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 /ucbhelper/source/client/contentbroker.cxx | |
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 'ucbhelper/source/client/contentbroker.cxx')
-rw-r--r-- | ucbhelper/source/client/contentbroker.cxx | 343 |
1 files changed, 8 insertions, 335 deletions
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx index 219a7a13d077..24cec09b7ea5 100644 --- a/ucbhelper/source/client/contentbroker.cxx +++ b/ucbhelper/source/client/contentbroker.cxx @@ -17,194 +17,25 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "sal/config.h" -/************************************************************************** - TODO - ************************************************************************** +#ifdef ANDROID - *************************************************************************/ -#include <osl/diagnose.h> -#include <osl/mutex.hxx> -#include <rtl/instance.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XContentIdentifierFactory.hpp> -#include <com/sun/star/ucb/XContentProvider.hpp> -#include <com/sun/star/ucb/XContentProviderManager.hpp> -#include <com/sun/star/ucb/XCommandProcessor.hpp> -#include <ucbhelper/contentbroker.hxx> - -#ifdef ANDROID -#include <cppuhelper/bootstrap.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <ucbhelper/configurationkeys.hxx> -#endif +#include <cppuhelper/bootstrap.hxx> -using namespace com::sun::star::beans; -using namespace com::sun::star::lang; using namespace com::sun::star::ucb; using namespace com::sun::star::uno; -using ::rtl::OUString; - -namespace -{ - struct theContentBrokerMutex : public rtl::Static< osl::Mutex, theContentBrokerMutex > {}; -} // namespace - -namespace ucbhelper -{ - -//========================================================================= -//========================================================================= -// -// class ContentBroker_Impl. -// -//========================================================================= -//========================================================================= - -class ContentBroker_Impl -{ - Reference< XMultiServiceFactory > m_xSMgr; - Reference< XContentIdentifierFactory > m_xIdFac; - Reference< XContentProvider > m_xProvider; - Reference< XContentProviderManager > m_xProviderMgr; - Reference< XCommandProcessor > m_xCommandProc; - osl::Mutex m_aMutex; - Sequence< Any > m_aArguments; - ContentProviderDataList m_aProvData; - bool m_bInitDone; - -public: - ContentBroker_Impl( const Reference< XMultiServiceFactory >& rSMgr, - const Sequence< Any >& rArguments ) - : m_xSMgr( rSMgr ), m_aArguments( rArguments ), m_bInitDone( sal_False ) - {} - - ContentBroker_Impl( const Reference< XMultiServiceFactory >& rSMgr, - const ContentProviderDataList & rData ) - : m_xSMgr( rSMgr ), m_aProvData( rData ), m_bInitDone( sal_False ) - {} - - ~ContentBroker_Impl(); - - bool initialize(); - - const Reference< XMultiServiceFactory >& getServiceManager() const - { return m_xSMgr; } - - const Reference< XContentIdentifierFactory >& getIdFactory() const - { return m_xIdFac; } - - const Reference< XContentProvider >& getProvider() const - { return m_xProvider; } - - const Reference< XContentProviderManager >& getProviderManager() const - { return m_xProviderMgr; } - - const Reference< XCommandProcessor >& getCommandProcessor() const - { return m_xCommandProc; } -}; - -//========================================================================= -//========================================================================= -// -// ContentBroker Implementation. -// -//========================================================================= -//========================================================================= - -// static member! -ContentBroker* ContentBroker::m_pTheBroker = 0; - -//========================================================================= -ContentBroker::ContentBroker( const Reference< XMultiServiceFactory >& rSMgr, - const Sequence< Any >& rArguments ) -{ - m_pImpl = new ContentBroker_Impl( rSMgr, rArguments ); -} - -//========================================================================= -ContentBroker::~ContentBroker() -{ - delete m_pImpl; -} - -//========================================================================= -Reference< XMultiServiceFactory > ContentBroker::getServiceManager() const -{ - return m_pImpl->getServiceManager(); -} - -//========================================================================= -Reference< XContentIdentifierFactory > - ContentBroker::getContentIdentifierFactoryInterface() const -{ - return m_pImpl->getIdFactory(); -} - -//========================================================================= -Reference< XContentProvider > - ContentBroker::getContentProviderInterface() const -{ - return m_pImpl->getProvider(); -} - -//========================================================================= -Reference< XContentProviderManager > - ContentBroker::getContentProviderManagerInterface() const -{ - return m_pImpl->getProviderManager(); -} - -//========================================================================= -Reference< XCommandProcessor > - ContentBroker::getCommandProcessorInterface() const -{ - return m_pImpl->getCommandProcessor(); -} - -//========================================================================= -// static -sal_Bool ContentBroker::initialize( - const Reference< XMultiServiceFactory >& rSMgr, - const Sequence< Any >& rArguments ) -{ - OSL_ENSURE( !m_pTheBroker, - "ContentBroker::initialize - already initialized!" ); - - if ( !m_pTheBroker ) - { - osl::Guard< osl::Mutex > aGuard( theContentBrokerMutex::get() ); - - if ( !m_pTheBroker ) - { - ContentBroker * pBroker = new ContentBroker( rSMgr, rArguments ); - - // Force init to be able to detect UCB init trouble immediately. - if ( pBroker->m_pImpl->initialize() ) - m_pTheBroker = pBroker; - else - delete pBroker; - } - } - - return m_pTheBroker != 0; -} - -#ifdef ANDROID - +//TODO: Is this relevant still? extern "C" __attribute__ ((visibility("default"))) void InitUCBHelper() { - Reference< XMultiServiceFactory > xFactory; + Reference< XComponentContext > xCtx; try { Reference< XComponentContext > xCtx = ::cppu::defaultBootstrap_InitialComponentContext(); - xFactory = Reference< XMultiServiceFactory >( xCtx->getServiceManager(), - UNO_QUERY ); } catch( Exception& ) { @@ -217,169 +48,11 @@ InitUCBHelper() exit( 1 ); } - // Create UCB. - Sequence< Any > aArgs( 2 ); - aArgs[ 0 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY1_LOCAL ); - aArgs[ 1 ] <<= rtl::OUString( UCB_CONFIGURATION_KEY2_OFFICE ); - ::ucbhelper::ContentBroker::initialize( xFactory, aArgs ); + // Create UCB (for backwards compatibility, in case some code still uses + // plain createInstance w/o args directly to obtain an instance): + UniversalContentBroker::create( xCtx ); } #endif -//========================================================================= -// static -void ContentBroker::deinitialize() -{ - osl::MutexGuard aGuard( theContentBrokerMutex::get() ); - - delete m_pTheBroker; - m_pTheBroker = 0; -} - -//========================================================================= -// static -ContentBroker* ContentBroker::get() -{ - return m_pTheBroker; -} - -//========================================================================= -//========================================================================= -// -// ContentBroker_Impl Implementation. -// -//========================================================================= -//========================================================================= - -ContentBroker_Impl::~ContentBroker_Impl() -{ - Reference< XComponent > xComponent( m_xProvider, UNO_QUERY ); - if ( xComponent.is() ) - { - m_xIdFac = 0; - m_xProvider = 0; - m_xProviderMgr = 0; - - xComponent->dispose(); - } -} - -//========================================================================= -bool ContentBroker_Impl::initialize() -{ - if ( !m_bInitDone ) - { - osl::MutexGuard aGuard( m_aMutex ); - - if ( !m_bInitDone ) - { - Reference< XInterface > xIfc; - - if ( m_aProvData.size() > 0 ) - { - try - { - xIfc = m_xSMgr->createInstance( - OUString( - "com.sun.star.ucb.UniversalContentBroker" ) ); - } - catch ( Exception const & ) - { - } - - if ( xIfc.is() ) - { - m_xProviderMgr - = Reference< XContentProviderManager >( xIfc, UNO_QUERY ); - - if ( m_xProviderMgr.is() ) - { - ContentProviderDataList::const_iterator aEnd(m_aProvData.end()); - for (ContentProviderDataList::const_iterator aIt(m_aProvData.begin()); - aIt != aEnd; ++aIt) - { - registerAtUcb(m_xProviderMgr, - m_xSMgr, - aIt->ServiceName, - aIt->Arguments, - aIt->URLTemplate, - 0); - } - - } - } - } - else - { - try - { - Reference< XPropertySet > xFactoryProperties( m_xSMgr, UNO_QUERY_THROW ); - Reference< XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY_THROW ); - if( m_aArguments.getLength() == 0 ) - xIfc = UniversalContentBroker::createDefault(xContext); - else - { - rtl::OUString aPrimaryConfigKey, aSecondaryConfigKey; - m_aArguments[0] >>= aPrimaryConfigKey; - m_aArguments[1] >>= aSecondaryConfigKey; - xIfc = UniversalContentBroker::createWithKeys(xContext, aPrimaryConfigKey, aSecondaryConfigKey); - } - } - catch ( const Exception & e) - { - SAL_WARN("ucbhelper", "exception while initialising UniversalContentBroker " << e.Message); - } - } - - OSL_ENSURE( xIfc.is(), "Error creating UCB service 'com.sun.star.ucb.UniversalContentBroker'" ); - - if ( !xIfc.is() ) - return false; - - - m_xIdFac - = Reference< XContentIdentifierFactory >( xIfc, UNO_QUERY ); - - OSL_ENSURE( m_xIdFac.is(), - "UCB without required interface XContentIdentifierFactory!" ); - - if ( !m_xIdFac.is() ) - return false; - - m_xProvider = Reference< XContentProvider >( xIfc, UNO_QUERY ); - - OSL_ENSURE( m_xProvider.is(), - "UCB without required interface XContentProvider!" ); - - if ( !m_xProvider.is() ) - return false; - - if ( !m_xProviderMgr.is() ) - m_xProviderMgr - = Reference< XContentProviderManager >( xIfc, UNO_QUERY ); - - OSL_ENSURE( m_xProviderMgr.is(), - "UCB without required interface XContentProviderManager!" ); - - if ( !m_xProviderMgr.is() ) - return false; - - m_xCommandProc = Reference< XCommandProcessor >( xIfc, UNO_QUERY ); - - OSL_ENSURE( m_xCommandProc.is(), - "UCB without required interface XCommandProcessor!" ); - - if ( !m_xCommandProc.is() ) - return false; - - // Everything okay. - m_bInitDone = sal_True; - } - } - - return true; -} - -} /* namespace ucbhelper */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |