mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, use service constructor for ucb::Store

Browse Source 
Change-Id: I62719ef9d58215e287af3e1be52404993722ec67
This commit is contained in:
Noel Grandin
2012-10-31 16:08:53 +02:00
committed by Stephan Bergmann
parent 1dedb15b17
commit 8ec2fed7c8
26 changed files with 114 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ucb/source/ucp/cmis/cmis_provider.cxx
View File

@@ -28,6 +28,7 @@
#include <stdio.h>
#include <comphelper/processfactory.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <ucbhelper/contenthelper.hxx>
#include <com/sun/star/ucb/ContentCreationException.hpp>
@@ -59,12 +60,12 @@ ContentProvider::queryContent(
URL aUrl( Identifier->getContentIdentifier( ) );
if ( aUrl.getRepositoryId( ).isEmpty( ) )
{
xContent = new RepoContent( m_xSMgr, this, Identifier );
xContent = new RepoContent( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier );
registerNewContent( xContent );
}
else
{
xContent = new Content( m_xSMgr, this, Identifier );
xContent = new Content( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier );
registerNewContent( xContent );
}
}
@@ -96,8 +97,8 @@ void ContentProvider::registerSession( const rtl::OUString& sBindingUrl, libcmis
}
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr )
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext )
{
}
@@ -115,7 +116,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
lang::XServiceInfo,
com::sun::star::ucb::XContentProvider );
XSERVICEINFO_IMPL_1( ContentProvider,
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.CmisContentProvider" )),
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(

2
ucb/source/ucp/cmis/cmis_provider.hxx
View File

@@ -43,7 +43,7 @@ private:
public:
ContentProvider( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XInterface

11
ucb/source/ucp/ext/ucpext_provider.cxx
View File

@@ -54,8 +54,8 @@ namespace ucb { namespace ucp { namespace ext
//= ContentProvider
//==================================================================================================================
//------------------------------------------------------------------------------------------------------------------
ContentProvider::ContentProvider( const Reference< XMultiServiceFactory >& i_rServiceManager )
:ContentProvider_Base( i_rServiceManager )
ContentProvider::ContentProvider( const Reference< XComponentContext >& rxContext )
:ContentProvider_Base( rxContext )
{
}
@@ -94,8 +94,7 @@ namespace ucb { namespace ucp { namespace ext
//------------------------------------------------------------------------------------------------------------------
Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext )
{
const ::comphelper::ComponentContext aContext( i_rContext );
return *( new ContentProvider( aContext.getLegacyServiceFactory() ) );
return *( new ContentProvider( i_rContext ) );
}
//------------------------------------------------------------------------------------------------------------------
@@ -173,7 +172,7 @@ namespace ucb { namespace ucp { namespace ext
}
}
}
const Reference< XContentIdentifier > xNormalizedIdentifier( new ::ucbhelper::ContentIdentifier( m_xSMgr, aComposer.makeStringAndClear() ) );
const Reference< XContentIdentifier > xNormalizedIdentifier( new ::ucbhelper::ContentIdentifier( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), aComposer.makeStringAndClear() ) );
::osl::MutexGuard aGuard( m_aMutex );
@@ -183,7 +182,7 @@ namespace ucb { namespace ucp { namespace ext
return xContent;
// create a new content
xContent = new Content( m_xSMgr, this, xNormalizedIdentifier );
xContent = new Content( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), this, xNormalizedIdentifier );
if ( !xContent->getIdentifier().is() )
throw IllegalIdentifierException();

2
ucb/source/ucp/ext/ucpext_provider.hxx
View File

@@ -34,7 +34,7 @@ namespace ucb { namespace ucp { namespace ext
class ContentProvider : public ContentProvider_Base
{
public:
ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rServiceManager );
ContentProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XServiceInfo

3
ucb/source/ucp/file/filrow.cxx
View File

@@ -43,8 +43,7 @@ sal_Bool convert( shell* pShell,
{
if( ! xConverter.is() )
{
xConverter = uno::Reference< script::XTypeConverter >(
script::Converter::create(comphelper::getComponentContext(pShell->m_xMultiServiceFactory)) );
xConverter = script::Converter::create(pShell->m_xContext);
}
try

7
ucb/source/ucp/file/filrset.cxx
View File

@@ -705,8 +705,7 @@ XResultSet_impl::connectToCache(
ucb::ServiceNotFoundException,
uno::RuntimeException )
{
uno::Reference< lang::XMultiServiceFactory > mxSMgr
= m_pMyShell->m_xMultiServiceFactory;
uno::Reference< lang::XMultiServiceFactory > mxSMgr(m_pMyShell->m_xContext->getServiceManager(), uno::UNO_QUERY_THROW);
if( m_xListener.is() )
throw ucb::ListenerAlreadySetException( ::rtl::OUString( OSL_LOG_PREFIX ), uno::Reference< uno::XInterface >() );
@@ -773,7 +772,7 @@ XResultSet_impl::getMetaData(
::ucbhelper::ResultSetMetaData* p =
new ::ucbhelper::ResultSetMetaData(
m_pMyShell->m_xMultiServiceFactory,
uno::Reference<lang::XMultiServiceFactory>(m_pMyShell->m_xContext->getServiceManager(), uno::UNO_QUERY_THROW),
m_sProperty,
aColumnData );
return uno::Reference< sdbc::XResultSetMetaData >( p );
@@ -782,7 +781,7 @@ XResultSet_impl::getMetaData(
::ucbhelper::ResultSetMetaData* p =
new ::ucbhelper::ResultSetMetaData(
m_pMyShell->m_xMultiServiceFactory, m_sProperty );
uno::Reference<lang::XMultiServiceFactory>(m_pMyShell->m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_sProperty );
return uno::Reference< sdbc::XResultSetMetaData >( p );
}

13
ucb/source/ucp/file/prov.cxx
View File

@@ -20,6 +20,7 @@
#include <osl/security.hxx>
#include <osl/file.hxx>
#include <osl/socket.h>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/factory.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/ucb/FileSystemNotation.hpp>
@@ -80,8 +81,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
FileProvider::FileProvider( const Reference< XMultiServiceFactory >& xMultiServiceFactory )
: m_xMultiServiceFactory( xMultiServiceFactory ),
FileProvider::FileProvider( const Reference< XComponentContext >& rxContext )
: m_xContext( rxContext ),
m_pMyShell( 0 )
{
}
@@ -139,7 +140,7 @@ FileProvider::queryInterface(
void SAL_CALL FileProvider::init()
{
if( ! m_pMyShell )
m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_True );
m_pMyShell = new shell( m_xContext, this, sal_True );
}
@@ -153,9 +154,9 @@ FileProvider::initialize(
if( aArguments.getLength() > 0 &&
(aArguments[0] >>= config) &&
config.compareToAscii("NoConfig") == 0 )
m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_False );
m_pMyShell = new shell( m_xContext, this, sal_False );
else
m_pMyShell = new shell( m_xMultiServiceFactory, this, sal_True );
m_pMyShell = new shell( m_xContext, this, sal_True );
}
}
@@ -244,7 +245,7 @@ Reference< XInterface > SAL_CALL
FileProvider::CreateInstance(
const Reference< XMultiServiceFactory >& xMultiServiceFactory )
{
XServiceInfo* xP = (XServiceInfo*) new FileProvider( xMultiServiceFactory );
XServiceInfo* xP = (XServiceInfo*) new FileProvider( comphelper::getComponentContext(xMultiServiceFactory) );
return Reference< XInterface >::query( xP );
}

4
ucb/source/ucp/file/prov.hxx
View File

@@ -60,7 +60,7 @@ namespace fileaccess {
friend class BaseContent;
public:
FileProvider( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF );
FileProvider( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
~FileProvider();
// XInterface
@@ -211,7 +211,7 @@ namespace fileaccess {
void SAL_CALL init();
// Members
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
void SAL_CALL initProperties( void );
osl::Mutex m_aMutex;

13
ucb/source/ucp/file/shell.cxx
View File

@@ -28,6 +28,7 @@
#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/Store.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
@@ -146,12 +147,12 @@ shell::MyProperty::~MyProperty()
#include "filinl.hxx"
shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceFactory,
shell::shell( const uno::Reference< uno::XComponentContext >& rxContext,
FileProvider* pProvider, sal_Bool bWithConfig )
: TaskManager(),
m_bWithConfig( bWithConfig ),
m_pProvider( pProvider ),
m_xMultiServiceFactory( xMultiServiceFactory ),
m_xContext( rxContext ),
Title( "Title" ),
CasePreservingURL( "CasePreservingURL" ),
IsDocument( "IsDocument" ),
@@ -386,16 +387,10 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
if(m_bWithConfig)
{
rtl::OUString Store("com.sun.star.ucb.Store");
uno::Reference< XPropertySetRegistryFactory > xRegFac(
m_xMultiServiceFactory->createInstance( Store ),
uno::UNO_QUERY );
if ( xRegFac.is() )
{
uno::Reference< XPropertySetRegistryFactory > xRegFac = ucb::Store::create( m_xContext );
// Open/create a registry
m_xFileRegistry = xRegFac->createPropertySetRegistry( rtl::OUString() );
}
}
}

5
ucb/source/ucp/file/shell.hxx
View File

@@ -48,6 +48,7 @@
#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
@@ -159,7 +160,7 @@ namespace fileaccess {
public:
// MethodenDefinitionen
shell( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory,
shell( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
FileProvider* pProvider,sal_Bool bWithConfig );
virtual ~shell();
@@ -401,7 +402,7 @@ namespace fileaccess {
sal_Bool m_bWithConfig;
FileProvider* m_pProvider;
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory;
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > m_xFileRegistry;
private:

15
ucb/source/ucp/ftp/ftpcontentprovider.cxx
View File

@@ -50,8 +50,8 @@ using namespace com::sun::star::beans;
//=========================================================================
FTPContentProvider::FTPContentProvider(
const Reference< XMultiServiceFactory >& rSMgr)
: ::ucbhelper::ContentProviderImplHelper(rSMgr),
const Reference< XComponentContext >& rxContext)
: ::ucbhelper::ContentProviderImplHelper(rxContext),
m_ftpLoaderThread(0),
m_pProxyDecider(0)
{
@@ -93,7 +93,7 @@ XTYPEPROVIDER_IMPL_3(FTPContentProvider,
//
//=========================================================================
XSERVICEINFO_IMPL_1(
XSERVICEINFO_IMPL_1_CTX(
FTPContentProvider,
rtl::OUString("com.sun.star.comp.FTPContentProvider"),
rtl::OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME));
@@ -154,7 +154,7 @@ FTPContentProvider::queryContent(
aURL.host(),
aURL.port().toInt32()))
{
xContent = new FTPContent(m_xSMgr,this,xCanonicId,aURL);
xContent = new FTPContent( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), this,xCanonicId,aURL);
registerNewContent(xContent);
}
else {
@@ -178,7 +178,7 @@ FTPContentProvider::queryContent(
void FTPContentProvider::init() {
m_ftpLoaderThread = new FTPLoaderThread();
m_pProxyDecider = new ucbhelper::InternetProxyDecider(comphelper::getComponentContext(m_xSMgr));
m_pProxyDecider = new ucbhelper::InternetProxyDecider( m_xContext );
}
@@ -250,10 +250,7 @@ FTPContentProvider::getHttpProvider()
throw(RuntimeException)
{
// used for access to ftp-proxy
return
UniversalContentBroker::create(
comphelper::getComponentContext(m_xSMgr))->
queryContentProvider("http:");
return UniversalContentBroker::create( m_xContext )->queryContentProvider("http:");
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
ucb/source/ucp/ftp/ftpcontentprovider.hxx
View File

@@ -55,8 +55,7 @@ namespace ftp {
public:
FTPContentProvider(
const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory>& xMSF );
const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
~FTPContentProvider();

9
ucb/source/ucp/gvfs/gvfs_provider.cxx
View File

@@ -18,6 +18,7 @@
*/
#include <comphelper/processfactory.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <libgnomevfs/gnome-vfs-init.h>
#include "gvfs_provider.hxx"
@@ -35,8 +36,8 @@ using namespace gvfs;
//=========================================================================
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr )
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext )
{
}
// sdafas
@@ -74,7 +75,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
//
//=========================================================================
XSERVICEINFO_IMPL_1( ContentProvider,
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
rtl::OUString( "com.sun.star.comp.GnomeVFSContentProvider" ),
rtl::OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) );
//=========================================================================
@@ -114,7 +115,7 @@ ContentProvider::queryContent(
try
{
xContent = new ::gvfs::Content(m_xSMgr, this, Identifier );
xContent = new ::gvfs::Content(uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier );
registerNewContent( xContent );
}
catch ( com::sun::star::ucb::ContentCreationException const & )

2
ucb/source/ucp/gvfs/gvfs_provider.hxx
View File

@@ -29,7 +29,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
{
public:
ContentProvider( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XInterface

19
ucb/source/ucp/hierarchy/hierarchyprovider.cxx
View File

@@ -49,8 +49,8 @@ using namespace hierarchy_ucp;
//=========================================================================
HierarchyContentProvider::HierarchyContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rXSMgr )
: ::ucbhelper::ContentProviderImplHelper( rXSMgr )
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext )
{
}
@@ -90,7 +90,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
//
//=========================================================================
XSERVICEINFO_IMPL_1( HierarchyContentProvider,
XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider,
rtl::OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ),
rtl::OUString( HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME ) );
@@ -120,7 +120,7 @@ HierarchyContentProvider::queryContent(
// Encode URL and create new Id. This may "correct" user-typed-in URL's.
uno::Reference< ucb::XContentIdentifier > xCanonicId
= new ::ucbhelper::ContentIdentifier( m_xSMgr,
= new ::ucbhelper::ContentIdentifier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW),
::ucb_impl::urihelper::encodeURI(
aUri.getUri() ) );
osl::MutexGuard aGuard( m_aMutex );
@@ -132,7 +132,7 @@ HierarchyContentProvider::queryContent(
return xContent;
// Create a new content.
xContent = HierarchyContent::create( m_xSMgr, this, xCanonicId );
xContent = HierarchyContent::create( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xCanonicId );
registerNewContent( xContent );
if ( xContent.is() && !xContent->getIdentifier().is() )
@@ -176,7 +176,7 @@ HierarchyContentProvider::getConfigProvider(
ConfigProviderMapEntry aEntry;
aEntry.xConfigProvider
= uno::Reference< lang::XMultiServiceFactory >(
m_xSMgr->createInstance( rServiceSpecifier ),
m_xContext->getServiceManager()->createInstanceWithContext(rServiceSpecifier, m_xContext),
uno::UNO_QUERY );
if ( aEntry.xConfigProvider.is() )
@@ -268,12 +268,9 @@ HierarchyContentProvider::getOfficeInstallationDirectories()
osl::MutexGuard aGuard( m_aMutex );
if ( !m_xOfficeInstDirs.is() )
{
OSL_ENSURE( m_xSMgr.is(), "No service manager!" );
OSL_ENSURE( m_xContext.is(), "No service manager!" );
uno::Reference< uno::XComponentContext > xCtx(
comphelper::getComponentContext( m_xSMgr ) );
xCtx->getValueByName(
m_xContext->getValueByName(
rtl::OUString( "/singletons/com.sun.star.util.theOfficeInstallationDirectories" ) )
>>= m_xOfficeInstDirs;

2
ucb/source/ucp/hierarchy/hierarchyprovider.hxx
View File

@@ -101,7 +101,7 @@ class HierarchyContentProvider : public ::ucbhelper::ContentProviderImplHelper,
public:
HierarchyContentProvider(
const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory >& rXSMgr );
com::sun::star::uno::XComponentContext >& rxContext );
virtual ~HierarchyContentProvider();
// XInterface

16
ucb/source/ucp/package/pkgprovider.cxx
View File

@@ -26,6 +26,7 @@
#include <boost/unordered_map.hpp>
#include <osl/diagnose.h>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/weak.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -130,8 +131,8 @@ using namespace package_ucp;
//=========================================================================
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ),
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext ),
m_pPackages( 0 )
{
}
@@ -171,7 +172,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
//
//=========================================================================
XSERVICEINFO_IMPL_1( ContentProvider,
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
rtl::OUString( "com.sun.star.comp.ucb.PackageContentProvider" ),
rtl::OUString( PACKAGE_CONTENT_PROVIDER_SERVICE_NAME ) );
@@ -204,7 +205,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
// Create a new identifier for the mormalized URL returned by
// PackageUri::getUri().
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( m_xSMgr, aUri.getUri() );
= new ::ucbhelper::ContentIdentifier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), aUri.getUri() );
osl::MutexGuard aGuard( m_aMutex );
@@ -216,7 +217,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
// Create a new content.
xContent = Content::create( m_xSMgr, this, Identifier ); // not xId!!!
xContent = Content::create( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier ); // not xId!!!
registerNewContent( xContent );
if ( xContent.is() && !xContent->getIdentifier().is() )
@@ -263,9 +264,8 @@ ContentProvider::createPackage( const rtl::OUString & rName, const rtl::OUString
aArguments[ 0 ] <<= rURL;
uno::Reference< uno::XInterface > xIfc
= m_xSMgr->createInstanceWithArguments(
rtl::OUString( "com.sun.star.packages.comp.ZipPackage" ),
aArguments );
= m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.packages.comp.ZipPackage",
aArguments, m_xContext );
if ( xIfc.is() )
{

2
ucb/source/ucp/package/pkgprovider.hxx
View File

@@ -57,7 +57,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
public:
ContentProvider( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XInterface

10
ucb/source/ucp/tdoc/tdoc_provider.cxx
View File

@@ -51,7 +51,7 @@ using namespace tdoc_ucp;
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& xSMgr )
: ::ucbhelper::ContentProviderImplHelper( xSMgr ),
: ::ucbhelper::ContentProviderImplHelper( comphelper::getComponentContext(xSMgr) ),
m_xDocsMgr( new OfficeDocumentsManager( comphelper::getComponentContext(xSMgr), this ) ),
m_xStgElemFac( new StorageElementFactory( xSMgr, m_xDocsMgr ) )
{
@@ -130,7 +130,7 @@ ContentProvider::queryContent(
// Normalize URI.
uno::Reference< ucb::XContentIdentifier > xCanonicId
= new ::ucbhelper::ContentIdentifier( m_xSMgr, aUri.getUri() );
= new ::ucbhelper::ContentIdentifier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), aUri.getUri() );
osl::MutexGuard aGuard( m_aMutex );
@@ -141,7 +141,7 @@ ContentProvider::queryContent(
if ( !xContent.is() )
{
// Create a new content.
xContent = Content::create( m_xSMgr, this, xCanonicId );
xContent = Content::create( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xCanonicId );
registerNewContent( xContent );
}
@@ -172,7 +172,7 @@ ContentProvider::createDocumentContent(
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier(
m_xSMgr, aBuffer.makeStringAndClear() );
uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), aBuffer.makeStringAndClear() );
osl::MutexGuard aGuard( m_aMutex );
@@ -183,7 +183,7 @@ ContentProvider::createDocumentContent(
if ( !xContent.is() )
{
// Create a new content.
xContent = Content::create( m_xSMgr, this, xId );
xContent = Content::create( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xId );
}
if ( xContent.is() )

11
ucb/source/ucp/webdav-neon/webdavprovider.cxx
View File

@@ -32,6 +32,7 @@
**************************************************************************
*************************************************************************/
#include <comphelper/processfactory.hxx>
#include <ucbhelper/contentidentifier.hxx>
#include "webdavprovider.hxx"
#include "webdavcontent.hxx"
@@ -50,8 +51,8 @@ using namespace webdav_ucp;
//=========================================================================
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ),
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext ),
m_xDAVSessionFactory( new DAVSessionFactory() ),
m_pProps( 0 )
{
@@ -92,7 +93,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
//
//=========================================================================
XSERVICEINFO_IMPL_1( ContentProvider,
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
rtl::OUString( "com.sun.star.comp.WebDAVContentProvider" ),
rtl::OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) );
@@ -180,7 +181,7 @@ ContentProvider::queryContent(
}
if ( bNewId )
xCanonicId = new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL );
xCanonicId = new ::ucbhelper::ContentIdentifier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), aURL );
else
xCanonicId = Identifier;
@@ -197,7 +198,7 @@ ContentProvider::queryContent(
try
{
xContent = new ::webdav_ucp::Content(
m_xSMgr, this, xCanonicId, m_xDAVSessionFactory );
uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xCanonicId, m_xDAVSessionFactory );
registerNewContent( xContent );
}
catch ( ucb::ContentCreationException const & )

2
ucb/source/ucp/webdav-neon/webdavprovider.hxx
View File

@@ -84,7 +84,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
public:
ContentProvider( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();
// XInterface

13
ucbhelper/inc/ucbhelper/macros.hxx
View File

@@ -742,6 +742,19 @@ Class::getSupportedServiceNames_Static() \
return aSNS; \
}
// 1 service name
#define XSERVICEINFO_IMPL_1_CTX( Class, ImplName, Service1 ) \
XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \
\
com::sun::star::uno::Sequence< rtl::OUString > \
Class::getSupportedServiceNames_Static() \
{ \
com::sun::star::uno::Sequence< rtl::OUString > aSNS( 1 ); \
aSNS.getArray()[ 0 ] = Service1; \
return aSNS; \
}
#endif /* !_UCBHELPER_MACROS_HXX */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
ucbhelper/inc/ucbhelper/providerhelper.hxx
View File

@@ -76,8 +76,7 @@ class UCBHELPER_DLLPUBLIC ContentProviderImplHelper : public cppu::OWeakObject,
protected:
osl::Mutex m_aMutex;
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
private:
UCBHELPER_DLLPRIVATE void removeContent( ContentImplHelper* pContent );
@@ -140,7 +139,7 @@ public:
ContentProviderImplHelper(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& rXSMgr );
::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProviderImplHelper();
//////////////////////////////////////////////////////////////////////

18
ucbhelper/source/provider/providerhelper.cxx
View File

@@ -28,6 +28,7 @@
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/ucb/Store.hpp>
#include <com/sun/star/ucb/XPropertySetRegistryFactory.hpp>
#include <com/sun/star/ucb/XPropertySetRegistry.hpp>
@@ -102,9 +103,9 @@ struct ContentProviderImplHelper_Impl
namespace ucbhelper {
ContentProviderImplHelper::ContentProviderImplHelper(
const uno::Reference< lang::XMultiServiceFactory >& rXSMgr )
const uno::Reference< uno::XComponentContext >& rxContext )
: m_pImpl( new ucbhelper_impl::ContentProviderImplHelper_Impl ),
m_xSMgr( rXSMgr )
m_xContext( rxContext )
{
}
@@ -313,18 +314,8 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
if ( !m_pImpl->m_xPropertySetRegistry.is() )
{
uno::Reference< com::sun::star::ucb::XPropertySetRegistryFactory >
xRegFac(
m_xSMgr->createInstance(
rtl::OUString(
"com.sun.star.ucb.Store" ) ),
uno::UNO_QUERY );
xRegFac = com::sun::star::ucb::Store::create( m_xContext );
OSL_ENSURE( xRegFac.is(),
"ContentProviderImplHelper::getAdditionalPropertySet - "
"No UCB-Store service!" );
if ( xRegFac.is() )
{
// Open/create a registry.
m_pImpl->m_xPropertySetRegistry
= xRegFac->createPropertySetRegistry( rtl::OUString() );
@@ -333,7 +324,6 @@ ContentProviderImplHelper::getAdditionalPropertySetRegistry()
"ContentProviderImplHelper::getAdditionalPropertySet - "
"Error opening registry!" );
}
}
return m_pImpl->m_xPropertySetRegistry;
}

25
xmlhelp/source/cxxhelp/provider/provider.cxx
View File

@@ -65,8 +65,8 @@ using namespace chelp;
//=========================================================================
ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ),
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext ),
isInitialized( false ),
m_aScheme(MYUCP_URL_SCHEME),
m_pDatabases( 0 )
@@ -152,7 +152,7 @@ ContentProvider_CreateInstance(
throw( uno::Exception )
{
lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
new ContentProvider( rSMgr ) );
new ContentProvider( comphelper::getComponentContext(rSMgr) ) );
return uno::Reference< uno::XInterface >::query( pX );
}
@@ -216,7 +216,7 @@ ContentProvider::queryContent(
if ( xContent.is() )
return xContent;
xContent = new Content( m_xSMgr, this, xCanonicId, m_pDatabases );
xContent = new Content( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, xCanonicId, m_pDatabases );
// register new content
registerNewContent( xContent );
@@ -308,7 +308,7 @@ void ContentProvider::init()
try
{
uno::Reference< lang::XMultiServiceFactory > xConfigProvider =
configuration::theDefaultProvider::get( comphelper::getComponentContext(m_xSMgr) );
configuration::theDefaultProvider::get( m_xContext );
uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ;
@@ -346,9 +346,6 @@ void ContentProvider::init()
rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath;
uno::Reference< uno::XComponentContext > xContext(
comphelper::getComponentContext( m_xSMgr ) );
sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
m_pDatabases = new Databases( showBasic,
instPath,
@@ -356,18 +353,18 @@ void ContentProvider::init()
utl::ConfigManager::getProductName(),
productversion,
stylesheet,
xContext );
m_xContext );
}
uno::Reference< lang::XMultiServiceFactory >
ContentProvider::getConfiguration() const
{
uno::Reference< lang::XMultiServiceFactory > xProvider;
if( m_xSMgr.is() )
if( m_xContext.is() )
{
try
{
xProvider = configuration::theDefaultProvider::get( comphelper::getComponentContext(m_xSMgr) );
xProvider = configuration::theDefaultProvider::get( m_xContext );
}
catch( const uno::Exception& )
{
@@ -460,15 +457,13 @@ ContentProvider::getBooleanKey(
void ContentProvider::subst( rtl::OUString& instpath ) const
{
uno::Reference< frame::XConfigManager > xCfgMgr;
if( m_xSMgr.is() )
if( m_xContext.is() )
{
try
{
xCfgMgr =
uno::Reference< frame::XConfigManager >(
m_xSMgr->createInstance(
rtl::OUString(
"com.sun.star.config.SpecialConfigManager" ) ),
m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.config.SpecialConfigManager", m_xContext),
uno::UNO_QUERY );
}
catch( const uno::Exception&)

2
xmlhelp/source/cxxhelp/provider/provider.hxx
View File

@@ -63,7 +63,7 @@ namespace chelp {
{
public:
ContentProvider(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rSMgr );
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
virtual ~ContentProvider();