From ec1c96a9b69a5a2546fe2564cd92fe9e33471fbc Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 1 Nov 2012 15:01:34 +0200 Subject: fdo#46808,remove unnecessary MSF field from ucbhelper::ContentIdentifier ...which has lots of nice knock-on effects. Change-Id: Icc93fdb70f24903b08702654db4e1105eb1d438e --- xmlhelp/source/cxxhelp/provider/content.cxx | 11 ++++++----- xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 9 ++++----- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 6 +++--- xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx | 3 ++- xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx | 4 ++-- xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) (limited to 'xmlhelp') diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 55ceac639727..d4fc1cb668a9 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -209,7 +210,7 @@ class ResultSetForRootFactory { private: - uno::Reference< lang::XMultiServiceFactory > m_xSMgr; + uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< ucb::XContentProvider > m_xProvider; sal_Int32 m_nOpenMode; uno::Sequence< beans::Property > m_seq; @@ -221,14 +222,14 @@ private: public: ResultSetForRootFactory( - const uno::Reference< lang::XMultiServiceFactory >& xSMgr, + const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort, URLParameter aURLParameter, Databases* pDatabases ) - : m_xSMgr( xSMgr ), + : m_xContext( xContext ), m_xProvider( xProvider ), m_nOpenMode( nOpenMode ), m_seq( seq ), @@ -240,7 +241,7 @@ public: ResultSetBase* createResultSet() { - return new ResultSetForRoot( m_xSMgr, + return new ResultSetForRoot( m_xContext, m_xProvider, m_nOpenMode, m_seq, @@ -401,7 +402,7 @@ uno::Any SAL_CALL Content::execute( aOpenCommand, Environment, new ResultSetForRootFactory( - m_xSMgr, + comphelper::getComponentContext(m_xSMgr), m_xProvider.get(), aOpenCommand.Mode, aOpenCommand.Properties, diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index eb124bfdc382..7a004fb62c4c 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -40,12 +40,12 @@ using namespace chelp; using namespace com::sun::star; -ResultSetBase::ResultSetBase( const uno::Reference< lang::XMultiServiceFactory >& xMSF, +ResultSetBase::ResultSetBase( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) - : m_xMSF( xMSF ), + : m_xContext( rxContext ), m_xProvider( xProvider ), m_nRow( -1 ), m_nWasNull( true ), @@ -413,7 +413,7 @@ ResultSetBase::queryContentIdentifier( rtl::OUString url = queryContentIdentifierString(); if( ! m_aIdents[m_nRow].is() && !url.isEmpty() ) m_aIdents[m_nRow] = uno::Reference< ucb::XContentIdentifier >( - new ::ucbhelper::ContentIdentifier( m_xMSF,url ) ); + new ::ucbhelper::ContentIdentifier( url ) ); return m_aIdents[m_nRow]; } @@ -648,8 +648,7 @@ ResultSetBase::getMetaData( uno::RuntimeException ) { ::ucbhelper::ResultSetMetaData* p = - new ::ucbhelper::ResultSetMetaData( - comphelper::getComponentContext(m_xMSF), m_sProperty ); + new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty ); return uno::Reference< sdbc::XResultSetMetaData >( p ); } diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx index f592d113047a..f74f023a2d5b 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include @@ -50,7 +50,7 @@ namespace chelp { { public: - ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF, + ResultSetBase( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, @@ -533,7 +533,7 @@ namespace chelp { protected: - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMSF; + com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > m_xProvider; sal_Int32 m_nRow; bool m_nWasNull; diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx index 7129b8407659..93f3e4dfced5 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include #include #include #include @@ -94,7 +95,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ), + : ResultSetBase( comphelper::getComponentContext(xMSF),xProvider,nOpenMode,seq,seqSort ), m_aURLParameter( aURLParameter ) { Reference< XTransliteration > xTrans( diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx index f5702566a410..b3dd5a6dd6bb 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx @@ -39,14 +39,14 @@ using namespace com::sun::star::ucb; -ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFactory >& xMSF, +ResultSetForRoot::ResultSetForRoot( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Reference< XContentProvider >& xProvider, sal_Int32 nOpenMode, const uno::Sequence< beans::Property >& seq, const uno::Sequence< NumberedSortingInfo >& seqSort, URLParameter& aURLParameter, Databases* pDatabases ) - : ResultSetBase( xMSF,xProvider,nOpenMode,seq,seqSort ), + : ResultSetBase( rxContext, xProvider,nOpenMode,seq,seqSort ), m_aURLParameter( aURLParameter ), m_pDatabases( pDatabases ) { diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx index b0e9f04f750b..83ae9b725534 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx @@ -19,7 +19,7 @@ #ifndef _RESULTSETFORROOT_HXX #define _RESULTSETFORROOT_HXX -#include +#include #include #include #include @@ -36,7 +36,7 @@ namespace chelp { { public: - ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMSF, + ResultSetForRoot( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& xProvider, sal_Int32 nOpenMode, const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& seq, -- cgit v1.2.3