diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-06-27 20:34:39 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-06-28 11:08:49 +0200 |
commit | 0f11f30ea96fcec8d7c648089fc223a6fbed6aef (patch) | |
tree | 2e4d4023005b7c8ac5753bc5a4a35b37021c4a15 /cppu | |
parent | 8122fdb0d391f07be4a35ca87ed641745a9e4dc9 (diff) |
Remove unused header files
Those are unused too.
Change-Id: I09c9dbcdbc68131c7c54bf0762a23f1280e6e22a
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/Package_inc.mk | 3 | ||||
-rw-r--r-- | cppu/inc/cppu/FreeReference.hxx | 160 | ||||
-rw-r--r-- | cppu/inc/cppu/Shield.hxx | 84 | ||||
-rw-r--r-- | cppu/inc/uno/cuno.h | 43 |
4 files changed, 0 insertions, 290 deletions
diff --git a/cppu/Package_inc.mk b/cppu/Package_inc.mk index 85dd86a3a6a9..6e14e2235f71 100644 --- a/cppu/Package_inc.mk +++ b/cppu/Package_inc.mk @@ -41,10 +41,8 @@ $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/cppudllapi.h,cppu/cppudllapi $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvDcp.hxx,cppu/EnvDcp.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Enterable.hxx,cppu/Enterable.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/EnvGuards.hxx,cppu/EnvGuards.hxx)) -$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/FreeReference.hxx,cppu/FreeReference.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/macros.hxx,cppu/macros.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Map.hxx,cppu/Map.hxx)) -$(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/Shield.hxx,cppu/Shield.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/unotype.hxx,cppu/unotype.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Environment.hxx,cppu/helper/purpenv/Environment.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/cppu/helper/purpenv/Mapping.hxx,cppu/helper/purpenv/Mapping.hxx)) @@ -53,7 +51,6 @@ $(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.h,typelib $(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/typedescription.hxx,typelib/typedescription.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/typelib/uik.h,typelib/uik.h)) $(eval $(call gb_Package_add_file,cppu_inc,inc/uno/any2.h,uno/any2.h)) -$(eval $(call gb_Package_add_file,cppu_inc,inc/uno/cuno.h,uno/cuno.h)) $(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.h,uno/current_context.h)) $(eval $(call gb_Package_add_file,cppu_inc,inc/uno/current_context.hxx,uno/current_context.hxx)) $(eval $(call gb_Package_add_file,cppu_inc,inc/uno/data.h,uno/data.h)) diff --git a/cppu/inc/cppu/FreeReference.hxx b/cppu/inc/cppu/FreeReference.hxx deleted file mode 100644 index 26cd1fb212ed..000000000000 --- a/cppu/inc/cppu/FreeReference.hxx +++ /dev/null @@ -1,160 +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_cppu_FreeReference_hxx -#define INCLUDED_cppu_FreeReference_hxx - -#include "uno/environment.hxx" -#include "cppu/Map.hxx" -#include "com/sun/star/uno/Reference.h" - - -namespace cssuno = com::sun::star::uno; - - -namespace cppu -{ - /** Freely (environment independent) usable Reference. - (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/FreeReference) - - @since UDK 3.2.7 - */ - template< class T > - class FreeReference - { - cssuno::Environment m_env; - T * m_pObject; - - public: - FreeReference() : m_pObject(NULL) {} - - FreeReference(T * pObject, __sal_NoAcquire) - : m_env(cssuno::Environment::getCurrent()), - m_pObject(pObject) - { - } - - FreeReference(T * pObject) - : m_env(cssuno::Environment::getCurrent()), - m_pObject(pObject) - { - if (m_pObject) - m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); - } - - explicit FreeReference(cssuno::Reference<T> const & xRef) - : m_env(cssuno::Environment::getCurrent()), - m_pObject(xRef.get()) - { - if (m_pObject) - m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); - } - - FreeReference(FreeReference<T> const & rOther) - : m_env (rOther.m_env), - m_pObject(rOther.m_pObject) - { - if (m_pObject) - m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); - } - - - ~FreeReference() - { - clear(); - } - - cssuno::Environment getEnv() const throw (cssuno::RuntimeException) - { - return m_env; - } - - cssuno::Reference<T> get() const throw (cssuno::RuntimeException) - { - return cssuno::Reference<T>(cppu::mapIn(m_pObject, m_env), SAL_NO_ACQUIRE); - } - - operator cssuno::Reference<T> () const throw (cssuno::RuntimeException) - { - return get(); - } - - cssuno::Reference<T> operator -> () const throw (cssuno::RuntimeException) - { - return get(); - } - - bool is() const throw (cssuno::RuntimeException) - { - return m_pObject != NULL; - } - - void clear() - { - if (m_pObject) - { - - m_env.get()->pExtEnv->releaseInterface(m_env.get()->pExtEnv, m_pObject); - m_pObject = NULL; - m_env.clear(); - } - } - - FreeReference<T> & operator = (FreeReference<T> const & rOther) - { - clear(); - - m_pObject = rOther.m_pObject; - if (m_pObject) - { - m_env = rOther.m_env; - m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); - } - - return *this; - } - - void set(cssuno::Reference<T> const & xRef) - { - clear(); - - m_pObject = xRef.get(); - if (m_pObject) - { - m_env = cssuno::Environment::getCurrent(); - - m_env.get()->pExtEnv->acquireInterface(m_env.get()->pExtEnv, m_pObject); - } - } - - bool operator == (FreeReference const & rOther) const - { - return get() == rOther.get(); - } - - bool operator != (FreeReference const & rOther) const - { - return !operator==(rOther); - } - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/cppu/Shield.hxx b/cppu/inc/cppu/Shield.hxx deleted file mode 100644 index a381967abaee..000000000000 --- a/cppu/inc/cppu/Shield.hxx +++ /dev/null @@ -1,84 +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_cppu_Shield_hxx -#define INCLUDED_cppu_Shield_hxx - -#include <cppu/Map.hxx> - - -namespace cssu = com::sun::star::uno; - -namespace cppu -{ - /** Helpers for mapping objects relative to the thread-safe and current environments. - (http://wiki.services.openoffice.org/wiki/Uno/Cpp/Spec/Shield_Helpers) - */ - - - /** Maps an object from the current to the thread-safe Environment, returns mapped object. - - @param pT the object to be mapped - @return the mapped object - @since UDK 3.2.7 - */ - template<class T> inline T * shield(T * pT) - { - return mapOut(pT, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))))); - } - - /** Maps an object from the thread-safe Environment to the current one, returns mapped object. - - @param pT the object to be mapped - @return the mapped object - @since UDK 3.2.7 - */ - template<class T> inline T * unshield(T * pT) - { - return mapIn(pT, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))))); - } - - - /** Maps an any from the current to the thread-safe Environment, fills the passed any. - - @param any the any to be mapped - @param res the target any - @since UDK 3.2.7 - */ - inline void shieldAny(cssu::Any const & any, cssu::Any * res) - { - mapOutAny(any, res, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))))); - } - - - /** Maps an any from the thread-safe Environment to the current one, fills the passed any. - - @param any the any to be mapped - @param res the target any - @since UDK 3.2.7 - */ - inline void unshieldAny(cssu::Any const & any, cssu::Any * res) - { - mapInAny(any, res, cssu::Environment(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))))); - } -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cppu/inc/uno/cuno.h b/cppu/inc/uno/cuno.h deleted file mode 100644 index 24ee56c8cb54..000000000000 --- a/cppu/inc/uno/cuno.h +++ /dev/null @@ -1,43 +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 _UNO_CUNO_H_ -#define _UNO_CUNO_H_ - -#include <sal/types.h> - -#define CUNO_ERROR_NONE 0 -#define CUNO_ERROR_CALL_FAILED (1 << 31) -#define CUNO_ERROR_EXCEPTION (1 | CUNO_ERROR_CALL_FAILED) - -/** macro to call on a C interface - - @param interface_pointer interface pointer -*/ -#define CUNO_CALL( interface_pointer ) (*interface_pointer) -/** macro to test if an exception was signalled. - - @param return_code return code of call -*/ -#define CUNO_EXCEPTION_OCCURRED( return_code ) (0 != ((return_code) & CUNO_ERROR_EXCEPTION)) - -typedef sal_Int32 cuno_ErrorCode; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |