diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-01 13:25:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 16:43:14 +0100 |
| commit | 41a71413f4ebe69a48ee068fd5c785d6015c0cca (patch) | |
| tree | dc46caf73c60f9186e1ce28543715d79e747394e /ucb | |
| parent | b70a330d4f06daaeeff940b2f935c8089d8a7be6 (diff) | |
fdo#46808, use service constructor for ucb::PropertiesManager
Change-Id: Ib0c7375ac9f72647b10adcb2cea8a0f8e2fdcca0
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 5 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpresultsetbase.cxx | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index d343b1c5d802..86860da2a524 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -772,7 +772,7 @@ XResultSet_impl::getMetaData( ::ucbhelper::ResultSetMetaData* p = new ::ucbhelper::ResultSetMetaData( - uno::Reference<lang::XMultiServiceFactory>(m_pMyShell->m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), + m_pMyShell->m_xContext, m_sProperty, aColumnData ); return uno::Reference< sdbc::XResultSetMetaData >( p ); @@ -780,8 +780,7 @@ XResultSet_impl::getMetaData( } ::ucbhelper::ResultSetMetaData* p = - new ::ucbhelper::ResultSetMetaData( - uno::Reference<lang::XMultiServiceFactory>(m_pMyShell->m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_sProperty ); + new ::ucbhelper::ResultSetMetaData( m_pMyShell->m_xContext, m_sProperty ); return uno::Reference< sdbc::XResultSetMetaData >( p ); } diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 701c2e77f00f..b6e68d7d5e71 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/uno/Reference.h> @@ -641,7 +642,7 @@ ResultSetBase::getMetaData( { ::ucbhelper::ResultSetMetaData* p = new ::ucbhelper::ResultSetMetaData( - m_xMSF, m_sProperty ); + comphelper::getComponentContext(m_xMSF), m_sProperty ); return uno::Reference< sdbc::XResultSetMetaData >( p ); } |