diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 18:04:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-05 18:05:00 +0100 |
commit | 14ee630a1740543a1e03cb23740d6db0adfb0f8f (patch) | |
tree | 56679e646c27a8a6406a2eff8dc7831650eceac3 /ucbhelper/inc | |
parent | 6eec9d651d875d64d11b63c2c2070475a17f8ce1 (diff) |
fdo#46808: Work around cyclic comphelper use in ucbhelper
...by duplicating getComponentContext for now.
Change-Id: Idad067b52e5ad9ed8a4f6676bc17db6c14807d56
Diffstat (limited to 'ucbhelper/inc')
-rw-r--r-- | ucbhelper/inc/ucbhelper/getcomponentcontext.hxx | 47 | ||||
-rw-r--r-- | ucbhelper/inc/ucbhelper/macros.hxx | 3 |
2 files changed, 49 insertions, 1 deletions
diff --git a/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx b/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx new file mode 100644 index 000000000000..5d25e6cf8e9b --- /dev/null +++ b/ucbhelper/inc/ucbhelper/getcomponentcontext.hxx @@ -0,0 +1,47 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX +#define INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX + +#include "sal/config.h" + +#include "com/sun/star/uno/Reference.hxx" +#include "ucbhelper/ucbhelperdllapi.h" + +namespace com { namespace sun { namespace star { + namespace lang { class XMultiServiceFactory; } + namespace uno { class XComponentContext; } +} } } + +namespace ucbhelper { + +//TODO: a duplicate of comphelper::getComponentContext +// (comphelper/processfactory.hxx) +UCBHELPER_DLLPUBLIC +com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > +getComponentContext( + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + const & factory); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx index 93f562f7fabb..386f8f1909ba 100644 --- a/ucbhelper/inc/ucbhelper/macros.hxx +++ b/ucbhelper/inc/ucbhelper/macros.hxx @@ -27,6 +27,7 @@ #include <cppuhelper/typeprovider.hxx> #include "osl/mutex.hxx" +#include "ucbhelper/getcomponentcontext.hxx" //========================================================================= @@ -664,7 +665,7 @@ Class##_CreateInstance( const com::sun::star::uno::Reference< \ throw( com::sun::star::uno::Exception ) \ { \ com::sun::star::lang::XServiceInfo* pX = \ - (com::sun::star::lang::XServiceInfo*)new Class( comphelper::getComponentContext(rSMgr) ); \ + (com::sun::star::lang::XServiceInfo*)new Class( ucbhelper::getComponentContext(rSMgr) ); \ return com::sun::star::uno::Reference< \ com::sun::star::uno::XInterface >::query( pX ); \ } |