From 14ee630a1740543a1e03cb23740d6db0adfb0f8f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 5 Nov 2012 18:04:43 +0100 Subject: fdo#46808: Work around cyclic comphelper use in ucbhelper ...by duplicating getComponentContext for now. Change-Id: Idad067b52e5ad9ed8a4f6676bc17db6c14807d56 --- ucbhelper/source/provider/getcomponentcontext.cxx | 41 +++++++++++++++++++++++ ucbhelper/source/provider/resultset.cxx | 4 +-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ucbhelper/source/provider/getcomponentcontext.cxx (limited to 'ucbhelper/source/provider') diff --git a/ucbhelper/source/provider/getcomponentcontext.cxx b/ucbhelper/source/provider/getcomponentcontext.cxx new file mode 100644 index 000000000000..41f3923988e8 --- /dev/null +++ b/ucbhelper/source/provider/getcomponentcontext.cxx @@ -0,0 +1,41 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "sal/config.h" + +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "ucbhelper/getcomponentcontext.hxx" + +namespace { namespace css = com::sun::star; } + +css::uno::Reference< css::uno::XComponentContext > +ucbhelper::getComponentContext( + css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) +{ + return css::uno::Reference< css::uno::XComponentContext >( + css::uno::Reference< css::beans::XPropertySet >( + factory, css::uno::UNO_QUERY_THROW)->getPropertyValue( + "DefaultContext"), + css::uno::UNO_QUERY_THROW); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 281434f08edc..b17494e5316e 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -23,9 +23,9 @@ ************************************************************************** *************************************************************************/ -#include #include #include +#include #include #include @@ -372,7 +372,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() osl::MutexGuard aGuard( m_pImpl->m_aMutex ); if ( !m_pImpl->m_xMetaData.is() ) - m_pImpl->m_xMetaData = new ResultSetMetaData( comphelper::getComponentContext(m_pImpl->m_xSMgr), + m_pImpl->m_xMetaData = new ResultSetMetaData( ucbhelper::getComponentContext(m_pImpl->m_xSMgr), m_pImpl->m_aProperties ); return m_pImpl->m_xMetaData; -- cgit