diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-08 13:10:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:47 +0100 |
| commit | 3d4288c1c0b593421c7f6619c88584bdb7c53337 (patch) | |
| tree | f7f4e6e07007bed8c8b77758e61b61d9458cbc28 /xmlhelp/source/cxxhelp/provider/content.cxx | |
| parent | 2cf0f6ea36e1525193544258eef2828a54345510 (diff) | |
fdo#46808, remove some more XMultiServiceFactory fields
Change-Id: I8d039a933c9fde1a24b35954bb5a1f151e9aa160
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/content.cxx')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/content.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 6b30490cbc7d..2f83fb82608a 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -60,12 +60,12 @@ using namespace chelp; //========================================================================= //========================================================================= -Content::Content( const uno::Reference< lang::XMultiServiceFactory >& rxSMgr, +Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, Databases* pDatabases ) - : ContentImplHelper( rxSMgr, pProvider, Identifier ), + : ContentImplHelper( rxContext, pProvider, Identifier ), m_aURLParameter( Identifier->getContentIdentifier(),pDatabases ), m_pDatabases( pDatabases ) // not owner { @@ -360,8 +360,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand.Sink, uno::UNO_QUERY); if(xActiveDataSink.is()) - m_aURLParameter.open(m_xSMgr, - aCommand, + m_aURLParameter.open(aCommand, CommandId, Environment, xActiveDataSink); @@ -378,8 +377,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand.Sink, uno::UNO_QUERY); if(xOutputStream.is() ) - m_aURLParameter.open(m_xSMgr, - aCommand, + m_aURLParameter.open(aCommand, CommandId, Environment, xOutputStream); @@ -388,12 +386,12 @@ uno::Any SAL_CALL Content::execute( { uno::Reference< ucb::XDynamicResultSet > xSet = new DynamicResultSet( - comphelper::getComponentContext(m_xSMgr), + m_xContext, this, aOpenCommand, Environment, new ResultSetForRootFactory( - comphelper::getComponentContext(m_xSMgr), + m_xContext, m_xProvider.get(), aOpenCommand.Mode, aOpenCommand.Properties, @@ -406,12 +404,12 @@ uno::Any SAL_CALL Content::execute( { uno::Reference< ucb::XDynamicResultSet > xSet = new DynamicResultSet( - comphelper::getComponentContext(m_xSMgr), + m_xContext, this, aOpenCommand, Environment, new ResultSetForQueryFactory( - comphelper::getComponentContext(m_xSMgr), + m_xContext, m_xProvider.get(), aOpenCommand.Mode, aOpenCommand.Properties, @@ -443,7 +441,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( osl::MutexGuard aGuard( m_aMutex ); rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = - new ::ucbhelper::PropertyValueSet( m_xSMgr ); + new ::ucbhelper::PropertyValueSet( m_xContext ); for ( sal_Int32 n = 0; n < rProperties.getLength(); ++n ) { |