summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/ftp')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx24
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.hxx4
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.cxx2
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.cxx6
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetI.hxx2
5 files changed, 19 insertions, 19 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index a881b6e69644..7a791ede9093 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -91,11 +91,11 @@ using namespace com::sun::star::sdbc;
//=========================================================================
//=========================================================================
-FTPContent::FTPContent( const Reference< XMultiServiceFactory >& rxSMgr,
+FTPContent::FTPContent( const Reference< XComponentContext >& rxContext,
FTPContentProvider* pProvider,
const Reference< XContentIdentifier >& Identifier,
const FTPURL& aFTPURL)
- : ContentImplHelper(rxSMgr,pProvider,Identifier),
+ : ContentImplHelper(rxContext,pProvider,Identifier),
m_pFCP(pProvider),
m_aFTPURL(aFTPURL),
m_bInserted(false),
@@ -105,11 +105,11 @@ FTPContent::FTPContent( const Reference< XMultiServiceFactory >& rxSMgr,
-FTPContent::FTPContent( const Reference< XMultiServiceFactory >& rxSMgr,
+FTPContent::FTPContent( const Reference< XComponentContext >& rxContext,
FTPContentProvider* pProvider,
const Reference< XContentIdentifier >& Identifier,
const ContentInfo& Info)
- : ContentImplHelper(rxSMgr,pProvider,Identifier),
+ : ContentImplHelper(rxContext,pProvider,Identifier),
m_pFCP(pProvider),
m_aFTPURL(Identifier->getContentIdentifier(),
pProvider),
@@ -213,13 +213,13 @@ class ResultSetFactoryI
{
public:
- ResultSetFactoryI(const Reference<XMultiServiceFactory >& xSMgr,
+ ResultSetFactoryI(const Reference<XComponentContext >& rxContext,
const Reference<XContentProvider >& xProvider,
sal_Int32 nOpenMode,
const Sequence<Property>& seq,
const Sequence<NumberedSortingInfo>& seqSort,
const std::vector<FTPDirentry>& dirvec)
- : m_xSMgr(xSMgr),
+ : m_xContext(rxContext),
m_xProvider(xProvider),
m_nOpenMode(nOpenMode),
m_seq(seq),
@@ -230,7 +230,7 @@ public:
virtual ResultSetBase* createResultSet()
{
- return new ResultSetI(m_xSMgr,
+ return new ResultSetI(m_xContext,
m_xProvider,
m_nOpenMode,
m_seq,
@@ -240,7 +240,7 @@ public:
public:
- Reference< XMultiServiceFactory > m_xSMgr;
+ Reference< XComponentContext > m_xContext;
Reference< XContentProvider > m_xProvider;
sal_Int32 m_nOpenMode;
Sequence< Property > m_seq;
@@ -542,11 +542,11 @@ Any SAL_CALL FTPContent::execute(
m_aFTPURL.list(sal_Int16(aOpenCommand.Mode));
Reference< XDynamicResultSet > xSet
= new DynamicResultSet(
- comphelper::getComponentContext(m_xSMgr),
+ m_xContext,
this,
aOpenCommand,
Environment,
- new ResultSetFactoryI(m_xSMgr,
+ new ResultSetFactoryI(m_xContext,
m_xProvider.get(),
aOpenCommand.Mode,
aOpenCommand.Properties,
@@ -659,7 +659,7 @@ FTPContent::createNewContent( const ContentInfo& Info )
throw (RuntimeException)
{
if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" )
- return new FTPContent(m_xSMgr,
+ return new FTPContent(m_xContext,
m_pFCP,
m_xIdentifier,Info);
else
@@ -813,7 +813,7 @@ Reference< XRow > FTPContent::getPropertyValues(
)
{
rtl::Reference<ucbhelper::PropertyValueSet> xRow =
- new ucbhelper::PropertyValueSet(m_xSMgr);
+ new ucbhelper::PropertyValueSet(m_xContext);
FTPDirentry aDirEntry = m_aFTPURL.direntry();
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 2597393b5948..c4618ba3af7e 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -52,14 +52,14 @@ namespace ftp
public:
FTPContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ ::com::sun::star::uno::XComponentContext >& rxContext,
FTPContentProvider* pProvider,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
const FTPURL& FtpUrl);
FTPContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
+ ::com::sun::star::uno::XComponentContext >& rxContext,
FTPContentProvider* pProvider,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XContentIdentifier >& Identifier,
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 0f961ecaac8e..0f28bcb3bc4e 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -154,7 +154,7 @@ FTPContentProvider::queryContent(
aURL.host(),
aURL.port().toInt32()))
{
- xContent = new FTPContent( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), this,xCanonicId,aURL);
+ xContent = new FTPContent( m_xContext, this,xCanonicId,aURL);
registerNewContent(xContent);
}
else {
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx
index 524a6148292b..e812fc139521 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx
@@ -38,13 +38,13 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::sdbc;
-ResultSetI::ResultSetI(const Reference<XMultiServiceFactory>& xMSF,
+ResultSetI::ResultSetI(const Reference<XComponentContext>& rxContext,
const Reference<XContentProvider>& xProvider,
sal_Int32 nOpenMode,
const Sequence<Property>& seqProp,
const Sequence< NumberedSortingInfo >& seqSort,
const std::vector<FTPDirentry>& dirvec)
- : ResultSetBase(comphelper::getComponentContext(xMSF),xProvider,nOpenMode,seqProp,seqSort)
+ : ResultSetBase(rxContext,xProvider,nOpenMode,seqProp,seqSort)
{
for( unsigned int i = 0; i < dirvec.size(); ++i)
m_aPath.push_back(dirvec[i].m_aURL);
@@ -56,7 +56,7 @@ ResultSetI::ResultSetI(const Reference<XMultiServiceFactory>& xMSF,
for(unsigned n = 0; n < m_aItems.size(); ++n) {
rtl::Reference<ucbhelper::PropertyValueSet> xRow =
- new ucbhelper::PropertyValueSet(xMSF);
+ new ucbhelper::PropertyValueSet(rxContext);
for( int i = 0; i < seqProp.getLength(); ++i) {
const rtl::OUString& Name = seqProp[i].Name;
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index afba707f77b1..584738c7a8e0 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.hxx
@@ -36,7 +36,7 @@ namespace ftp {
ResultSetI(
const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory>& xMSF,
+ com::sun::star::uno::XComponentContext>& rxContext,
const com::sun::star::uno::Reference<
com::sun::star::ucb::XContentProvider>& xProvider,
sal_Int32 nOpenMode,
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 09:38:40 +0000