diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-09-19 18:38:27 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-09-19 18:41:45 +0100 |
commit | e989d167485e1e15d0aedef600ee450f01382382 (patch) | |
tree | a336a2cbe260c7fed5e36104db1be225cb98b881 /ucbhelper | |
parent | a48d072f5c022fce4f5eec7bca3139c3673dbf49 (diff) |
dung out no longer needed initUCBHelper methods; thanks to sberg.
Diffstat (limited to 'ucbhelper')
-rw-r--r-- | ucbhelper/Library_ucbhelper.mk | 1 | ||||
-rw-r--r-- | ucbhelper/source/client/contentbroker.cxx | 58 |
2 files changed, 0 insertions, 59 deletions
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 0c761a659d3b..e5a61fd7a01b 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -30,7 +30,6 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\ ucbhelper/source/client/activedatastreamer \ ucbhelper/source/client/commandenvironment \ ucbhelper/source/client/content \ - ucbhelper/source/client/contentbroker \ ucbhelper/source/client/fileidentifierconverter \ ucbhelper/source/client/interceptedinteraction \ ucbhelper/source/client/proxydecider \ diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx deleted file mode 100644 index 4af05c672fe3..000000000000 --- a/ucbhelper/source/client/contentbroker.cxx +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- 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" - -#ifdef ANDROID - -#include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/bootstrap.hxx> - -using namespace com::sun::star::ucb; -using namespace com::sun::star::uno; - -//TODO: Is this relevant still? -extern "C" __attribute__ ((visibility("default"))) void -InitUCBHelper() -{ - Reference< XComponentContext > xCtx; - try - { - xCtx = ::cppu::defaultBootstrap_InitialComponentContext(); - } - catch( Exception& ) - { - } - - if( !xCtx.is() ) - { - fprintf( stderr, - "Could not bootstrap UNO, installation must be in disorder. Exiting.\n" ); - exit( 1 ); - } - - // Create UCB (for backwards compatibility, in case some code still uses - // plain createInstance w/o args directly to obtain an instance): - UniversalContentBroker::create( xCtx ); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |