summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/package
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/package')
-rw-r--r--ucb/source/ucp/package/pkgcontent.cxx34
-rw-r--r--ucb/source/ucp/package/pkgcontent.hxx12
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.cxx12
-rw-r--r--ucb/source/ucp/package/pkgdatasupplier.hxx2
-rw-r--r--ucb/source/ucp/package/pkgprovider.cxx2
-rw-r--r--ucb/source/ucp/package/pkgresultset.cxx4
6 files changed, 33 insertions, 33 deletions
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 5d920e0cfb32..389f67ca1690 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -147,7 +147,7 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const
// static ( "virtual" ctor )
Content* Content::create(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier )
{
@@ -170,7 +170,7 @@ Content* Content::create(
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( aURI.getUri() );
- return new Content( rxSMgr, pProvider, xId, xPackage, aURI, aProps );
+ return new Content( rxContext, pProvider, xId, xPackage, aURI, aProps );
}
else
{
@@ -192,14 +192,14 @@ Content* Content::create(
else
aInfo.Type = getContentType( aURI.getScheme(), sal_False );
- return new Content( rxSMgr, pProvider, xId, xPackage, aURI, aInfo );
+ return new Content( rxContext, pProvider, xId, xPackage, aURI, aInfo );
}
}
//=========================================================================
// static ( "virtual" ctor )
Content* Content::create(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier,
const ucb::ContentInfo& Info )
@@ -221,7 +221,7 @@ Content* Content::create(
uno::Reference< ucb::XContentIdentifier > xId
= new ::ucbhelper::ContentIdentifier( aURI.getUri() );
- return new Content( rxSMgr, pProvider, xId, xPackage, aURI, Info );
+ return new Content( rxContext, pProvider, xId, xPackage, aURI, Info );
}
//=========================================================================
@@ -238,13 +238,13 @@ Content* Content::create(
//=========================================================================
Content::Content(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier,
const uno::Reference< container::XHierarchicalNameAccess > & Package,
const PackageUri& rUri,
const ContentProperties& rProps )
-: ContentImplHelper( rxSMgr, pProvider, Identifier ),
+: ContentImplHelper( rxContext, pProvider, Identifier ),
m_aUri( rUri ),
m_aProps( rProps ),
m_eState( PERSISTENT ),
@@ -256,13 +256,13 @@ Content::Content(
//=========================================================================
Content::Content(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const uno::Reference< ucb::XContentIdentifier >& Identifier,
const uno::Reference< container::XHierarchicalNameAccess > & Package,
const PackageUri& rUri,
const ucb::ContentInfo& Info )
- : ContentImplHelper( rxSMgr, pProvider, Identifier ),
+ : ContentImplHelper( rxContext, pProvider, Identifier ),
m_aUri( rUri ),
m_aProps( Info.Type ),
m_eState( TRANSIENT ),
@@ -739,7 +739,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
uno::Reference< ucb::XContentIdentifier > xId(
new ::ucbhelper::ContentIdentifier( aURL ) );
- return create( m_xSMgr, m_pProvider, xId, Info );
+ return create( m_xContext, m_pProvider, xId, Info );
}
else
{
@@ -763,7 +763,7 @@ rtl::OUString Content::getParentURL()
//=========================================================================
// static
uno::Reference< sdbc::XRow > Content::getPropertyValues(
- const uno::Reference< lang::XMultiServiceFactory >& rSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Sequence< beans::Property >& rProperties,
ContentProvider* pProvider,
const rtl::OUString& rContentId )
@@ -772,7 +772,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
uno::Reference< container::XHierarchicalNameAccess > xPackage;
if ( loadData( pProvider, PackageUri( rContentId ), aData, xPackage ) )
{
- return getPropertyValues( rSMgr,
+ return getPropertyValues( rxContext,
rProperties,
aData,
rtl::Reference<
@@ -783,7 +783,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else
{
rtl::Reference< ::ucbhelper::PropertyValueSet > xRow
- = new ::ucbhelper::PropertyValueSet( rSMgr );
+ = new ::ucbhelper::PropertyValueSet( rxContext );
sal_Int32 nCount = rProperties.getLength();
if ( nCount )
@@ -800,7 +800,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
//=========================================================================
// static
uno::Reference< sdbc::XRow > Content::getPropertyValues(
- const uno::Reference< lang::XMultiServiceFactory >& rSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Sequence< beans::Property >& rProperties,
const ContentProperties& rData,
const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >&
@@ -810,7 +810,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
// Note: Empty sequence means "get values of all supported properties".
rtl::Reference< ::ucbhelper::PropertyValueSet > xRow
- = new ::ucbhelper::PropertyValueSet( rSMgr );
+ = new ::ucbhelper::PropertyValueSet( rxContext );
sal_Int32 nCount = rProperties.getLength();
if ( nCount )
@@ -1028,7 +1028,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Sequence< beans::Property >& rProperties )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
- return getPropertyValues( m_xSMgr,
+ return getPropertyValues( m_xContext,
rProperties,
m_aProps,
rtl::Reference<
@@ -1462,7 +1462,7 @@ uno::Any Content::open(
//////////////////////////////////////////////////////////////////
uno::Reference< ucb::XDynamicResultSet > xSet
- = new DynamicResultSet( comphelper::getComponentContext(m_xSMgr), this, rArg, xEnv );
+ = new DynamicResultSet( m_xContext, this, rArg, xEnv );
return uno::makeAny( xSet );
}
else
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index 9a3d3f49ac18..1d5db315f9a7 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -115,7 +115,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
private:
Content( const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ com::sun::star::uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& Identifier,
@@ -124,7 +124,7 @@ private:
const PackageUri& rUri,
const ContentProperties& rProps );
Content( const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ com::sun::star::uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& Identifier,
@@ -143,7 +143,7 @@ private:
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
+ ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProperties,
const ContentProperties& rData,
@@ -238,7 +238,7 @@ public:
// Create existing content. Fail, if not already exists.
static Content* create(
const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ com::sun::star::uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& Identifier );
@@ -246,7 +246,7 @@ public:
// Create new content. Fail, if already exists.
static Content* create(
const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ com::sun::star::uno::XComponentContext >& rxContext,
ContentProvider* pProvider,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentIdentifier >& Identifier,
@@ -307,7 +307,7 @@ public:
// Called from resultset data supplier.
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
getPropertyValues( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& rSMgr,
+ ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property >& rProperties,
ContentProvider* pProvider,
diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx
index e49b343053e6..74fbaa9f434a 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.cxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.cxx
@@ -77,17 +77,17 @@ struct DataSupplier_Impl
osl::Mutex m_aMutex;
ResultList m_aResults;
rtl::Reference< Content > m_xContent;
- uno::Reference< lang::XMultiServiceFactory > m_xSMgr;
+ uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< container::XEnumeration > m_xFolderEnum;
sal_Int32 m_nOpenMode;
sal_Bool m_bCountFinal;
sal_Bool m_bThrowException;
DataSupplier_Impl(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
const rtl::Reference< Content >& rContent,
sal_Int32 nOpenMode )
- : m_xContent( rContent ), m_xSMgr( rxSMgr ),
+ : m_xContent( rContent ), m_xContext( rxContext ),
m_xFolderEnum( rContent->getIterator() ), m_nOpenMode( nOpenMode ),
m_bCountFinal( !m_xFolderEnum.is() ), m_bThrowException( m_bCountFinal )
{}
@@ -118,10 +118,10 @@ DataSupplier_Impl::~DataSupplier_Impl()
//=========================================================================
DataSupplier::DataSupplier(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
+ const uno::Reference< uno::XComponentContext >& rxContext,
const rtl::Reference< Content >& rContent,
sal_Int32 nOpenMode )
-: m_pImpl( new DataSupplier_Impl( rxSMgr, rContent, nOpenMode ) )
+: m_pImpl( new DataSupplier_Impl( rxContext, rContent, nOpenMode ) )
{
}
@@ -413,7 +413,7 @@ uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues(
if ( getResult( nIndex ) )
{
uno::Reference< sdbc::XRow > xRow = Content::getPropertyValues(
- m_pImpl->m_xSMgr,
+ m_pImpl->m_xContext,
getResultSet()->getProperties(),
static_cast< ContentProvider * >(
m_pImpl->m_xContent->getProvider().get() ),
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index 189fb55672ed..871ca6e4cdc7 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -34,7 +34,7 @@ class DataSupplier : public ::ucbhelper::ResultSetDataSupplier
public:
DataSupplier( const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ com::sun::star::uno::XComponentContext >& rxContext,
const rtl::Reference< Content >& rContent,
sal_Int32 nOpenMode );
virtual ~DataSupplier();
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index c373d5408b98..605851a25869 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -216,7 +216,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
// Create a new content.
- xContent = Content::create( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), this, Identifier ); // not xId!!!
+ xContent = Content::create( m_xContext, this, Identifier ); // not xId!!!
registerNewContent( xContent );
if ( xContent.is() && !xContent->getIdentifier().is() )
diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx
index fb7357328f4e..e6f5b0e347d3 100644
--- a/ucb/source/ucp/package/pkgresultset.cxx
+++ b/ucb/source/ucp/package/pkgresultset.cxx
@@ -64,7 +64,7 @@ void DynamicResultSet::initStatic()
m_xResultSet1
= new ::ucbhelper::ResultSet( m_xContext,
m_aCommand.Properties,
- new DataSupplier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW),
+ new DataSupplier( m_xContext,
m_xContent,
m_aCommand.Mode ),
m_xEnv );
@@ -76,7 +76,7 @@ void DynamicResultSet::initDynamic()
m_xResultSet1
= new ::ucbhelper::ResultSet( m_xContext,
m_aCommand.Properties,
- new DataSupplier( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW),
+ new DataSupplier( m_xContext,
m_xContent,
m_aCommand.Mode ),
m_xEnv );
generated by cgit (git 2.34.1) at 2024-08-12 18:12:20 +0000