From eeaa2ecd1e1f6e0f468854b891de0caa28c470e6 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 10 Apr 2013 16:29:45 +0200 Subject: remove unused component_canUnload functions Change-Id: Id3f41e2a620c47bb848718d0fc994739be2d64fc --- bridges/source/cpp_uno/shared/bridge.cxx | 7 ------ bridges/source/cpp_uno/shared/component.cxx | 19 ----------------- bridges/source/cpp_uno/shared/component.hxx | 33 ----------------------------- bridges/source/jni_uno/jni_bridge.cxx | 18 ---------------- 4 files changed, 77 deletions(-) delete mode 100644 bridges/source/cpp_uno/shared/component.hxx (limited to 'bridges') diff --git a/bridges/source/cpp_uno/shared/bridge.cxx b/bridges/source/cpp_uno/shared/bridge.cxx index cefb62ef3453..964899325611 100644 --- a/bridges/source/cpp_uno/shared/bridge.cxx +++ b/bridges/source/cpp_uno/shared/bridge.cxx @@ -20,8 +20,6 @@ #include "bridges/cpp_uno/shared/bridge.hxx" -#include "component.hxx" - #include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx" #include "bridges/cpp_uno/shared/unointerfaceproxy.hxx" @@ -188,9 +186,6 @@ Bridge::Bridge( , pUnoEnv( pUnoEnv_ ) , bExportCpp2Uno( bExportCpp2Uno_ ) { - bridges::cpp_uno::shared::g_moduleCount.modCnt.acquire( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); - aCpp2Uno.pBridge = this; aCpp2Uno.acquire = acquireMapping; aCpp2Uno.release = releaseMapping; @@ -209,8 +204,6 @@ Bridge::~Bridge() SAL_THROW(()) { (*((uno_Environment *)pUnoEnv)->release)( (uno_Environment *)pUnoEnv ); (*((uno_Environment *)pCppEnv)->release)( (uno_Environment *)pCppEnv ); - bridges::cpp_uno::shared::g_moduleCount.modCnt.release( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); } } } } diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 89422eb50983..a7d2e22d133f 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#include "component.hxx" - #include "bridges/cpp_uno/shared/bridge.hxx" #include "com/sun/star/uno/Reference.hxx" @@ -29,7 +26,6 @@ #include "osl/mutex.hxx" #include "osl/time.h" #include "rtl/process.h" -#include "rtl/unload.h" #include "rtl/ustrbuf.hxx" #include "rtl/ustring.h" #include "rtl/ustring.hxx" @@ -41,8 +37,6 @@ namespace bridges { namespace cpp_uno { namespace shared { -rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; - } } } namespace { @@ -183,19 +177,8 @@ static void SAL_CALL releaseInterface( uno_ExtEnvironment * pExtEnv, void * pCpp static void SAL_CALL environmentDisposing( SAL_UNUSED_PARAMETER uno_Environment * ) SAL_THROW(()) { - bridges::cpp_uno::shared::g_moduleCount.modCnt.release( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); -} - -#ifndef DISABLE_DYNLOADING - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() { - return bridges::cpp_uno::shared::g_moduleCount.canUnload( - &bridges::cpp_uno::shared::g_moduleCount, pTime); } -#endif - #ifdef DISABLE_DYNLOADING #define uno_initEnvironment CPPU_ENV_uno_initEnvironment #endif @@ -209,8 +192,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv pCppEnv->pTypeName->buffer, rtl_str_getLength(CPPU_CURRENT_LANGUAGE_BINDING_NAME), CPPU_CURRENT_LANGUAGE_BINDING_NAME ) == 0, "### wrong environment type!" ); - bridges::cpp_uno::shared::g_moduleCount.modCnt.acquire( - &bridges::cpp_uno::shared::g_moduleCount.modCnt ); ((uno_ExtEnvironment *)pCppEnv)->computeObjectIdentifier = computeObjectIdentifier; ((uno_ExtEnvironment *)pCppEnv)->acquireInterface = acquireInterface; diff --git a/bridges/source/cpp_uno/shared/component.hxx b/bridges/source/cpp_uno/shared/component.hxx deleted file mode 100644 index c95a6f97b75d..000000000000 --- a/bridges/source/cpp_uno/shared/component.hxx +++ /dev/null @@ -1,33 +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 . - */ - -#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_SHARED_COMPONENT_HXX -#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_SHARED_COMPONENT_HXX - -#include "rtl/unload.h" - -namespace bridges { namespace cpp_uno { namespace shared { - -extern rtl_StandardModuleCount g_moduleCount; - -} } } - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx index a8bef0c0b8b7..8f77ad52393a 100644 --- a/bridges/source/jni_uno/jni_bridge.cxx +++ b/bridges/source/jni_uno/jni_bridge.cxx @@ -22,7 +22,6 @@ #include "jvmaccess/unovirtualmachine.hxx" #include "rtl/ref.hxx" -#include "rtl/unload.h" #include "rtl/strbuf.hxx" #include "uno/lbnames.h" @@ -195,8 +194,6 @@ void SAL_CALL Bridge_free( uno_Mapping * mapping ) } -rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT; - } namespace jni_uno @@ -264,8 +261,6 @@ Bridge::Bridge( m_uno2java.release = Mapping_release; m_uno2java.mapInterface = Mapping_map_to_java; m_uno2java.m_bridge = this; - - (*g_moduleCount.modCnt.acquire)( &g_moduleCount.modCnt ); } //______________________________________________________________________________ @@ -273,8 +268,6 @@ Bridge::~Bridge() SAL_THROW(()) { (*m_java_env->release)( m_java_env ); (*((uno_Environment *)m_uno_env)->release)( (uno_Environment *)m_uno_env ); - - (*g_moduleCount.modCnt.release)( &g_moduleCount.modCnt ); } @@ -553,17 +546,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_ext_getMapping( } } -#ifndef DISABLE_DYNLOADING - -//------------------------------------------------------------------------------ -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) - SAL_THROW_EXTERN_C() -{ - return (*g_moduleCount.canUnload)( &g_moduleCount, pTime ); -} - -#endif - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3