From 3744d8506ef231d642785faf6da4926cea64c6a0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 17 Feb 2015 13:43:17 +0000 Subject: boost->std Change-Id: I8371b942d915f777a29ca01cd0aed674db0ca853 --- include/comphelper/scoped_disposing_ptr.hxx | 158 --------------------------- include/comphelper/unique_disposing_ptr.hxx | 160 ++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 158 deletions(-) delete mode 100644 include/comphelper/scoped_disposing_ptr.hxx create mode 100644 include/comphelper/unique_disposing_ptr.hxx (limited to 'include/comphelper') diff --git a/include/comphelper/scoped_disposing_ptr.hxx b/include/comphelper/scoped_disposing_ptr.hxx deleted file mode 100644 index 2625f40510b9..000000000000 --- a/include/comphelper/scoped_disposing_ptr.hxx +++ /dev/null @@ -1,158 +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/. - */ - -#ifndef INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX -#define INCLUDED_COMPHELPER_SCOPED_DISPOSING_PTR_HXX - -#include -#include - -#include -#include - -#include -#include - -namespace comphelper -{ -//Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported -template class scoped_disposing_ptr : private boost::noncopyable -{ -private: - std::unique_ptr m_xItem; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener; -public: - scoped_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) - : m_xItem(p) - { - m_xTerminateListener = new TerminateListener(rComponent, *this); - } - - virtual void reset(T * p = 0) - { - m_xItem.reset(p); - } - - T & operator*() const - { - return *m_xItem; - } - - T * get() const - { - return m_xItem.get(); - } - - T * operator->() const - { - return m_xItem.get(); - } - - operator bool () const - { - return static_cast< bool >(m_xItem); - } - - virtual ~scoped_disposing_ptr() - { - reset(); - } -private: - class TerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener > - { - private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; - scoped_disposing_ptr& m_rItem; - public: - TerminateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, - scoped_disposing_ptr& rItem) : m_xComponent(rComponent), m_rItem(rItem) - { - if (m_xComponent.is()) - { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); - if (xDesktop.is()) - xDesktop->addTerminateListener(this); - else - m_xComponent->addEventListener(this); - } - } - - virtual ~TerminateListener() - { - if ( m_xComponent.is() ) - { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); - if (xDesktop.is()) - xDesktop->removeTerminateListener(this); - else - m_xComponent->removeEventListener(this); - } - } - - private: - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { - bool shutDown = (rEvt.Source == m_xComponent); - - if (shutDown && m_xComponent.is()) - { - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); - if (xDesktop.is()) - xDesktop->removeTerminateListener(this); - else - m_xComponent->removeEventListener(this); - m_xComponent.clear(); - } - - if (shutDown) - m_rItem.reset(); - } - - // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& ) - throw(::com::sun::star::frame::TerminationVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { - } - - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEvt ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE - { - disposing(rEvt); - } - }; -}; - -//Something like an OutputDevice requires the SolarMutex to be taken before use -//for threadsafety. The user can ensure this, except in the case of its dtor -//being called from reset due to a terminate on the XComponent being called -//from an aribitrary thread -template class scoped_disposing_solar_mutex_reset_ptr - : public scoped_disposing_ptr -{ -public: - scoped_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) - : scoped_disposing_ptr(rComponent, p) - { - } - - virtual void reset(T * p = 0) - { - SolarMutexGuard aGuard; - scoped_disposing_ptr::reset(p); - } -}; - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/comphelper/unique_disposing_ptr.hxx b/include/comphelper/unique_disposing_ptr.hxx new file mode 100644 index 000000000000..1848639698c2 --- /dev/null +++ b/include/comphelper/unique_disposing_ptr.hxx @@ -0,0 +1,160 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX +#define INCLUDED_COMPHELPER_UNIQUE_DISPOSING_PTR_HXX + +#include + +#include +#include + +#include +#include + +namespace comphelper +{ +//Similar to std::unique_ptr, except additionally releases the ptr on XComponent::disposing and/or XTerminateListener::notifyTermination if supported +template class unique_disposing_ptr +{ +private: + std::unique_ptr m_xItem; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> m_xTerminateListener; + + unique_disposing_ptr(const unique_disposing_ptr&) SAL_DELETED_FUNCTION; + unique_disposing_ptr& operator=(const unique_disposing_ptr&) SAL_DELETED_FUNCTION; +public: + unique_disposing_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + : m_xItem(p) + { + m_xTerminateListener = new TerminateListener(rComponent, *this); + } + + virtual void reset(T * p = 0) + { + m_xItem.reset(p); + } + + T & operator*() const + { + return *m_xItem; + } + + T * get() const + { + return m_xItem.get(); + } + + T * operator->() const + { + return m_xItem.get(); + } + + operator bool () const + { + return static_cast< bool >(m_xItem); + } + + virtual ~unique_disposing_ptr() + { + reset(); + } +private: + class TerminateListener : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener > + { + private: + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; + unique_disposing_ptr& m_rItem; + public: + TerminateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, + unique_disposing_ptr& rItem) : m_xComponent(rComponent), m_rItem(rItem) + { + if (m_xComponent.is()) + { + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + if (xDesktop.is()) + xDesktop->addTerminateListener(this); + else + m_xComponent->addEventListener(this); + } + } + + virtual ~TerminateListener() + { + if ( m_xComponent.is() ) + { + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + if (xDesktop.is()) + xDesktop->removeTerminateListener(this); + else + m_xComponent->removeEventListener(this); + } + } + + private: + // XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvt ) + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + bool shutDown = (rEvt.Source == m_xComponent); + + if (shutDown && m_xComponent.is()) + { + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop> xDesktop(m_xComponent, ::com::sun::star::uno::UNO_QUERY); + if (xDesktop.is()) + xDesktop->removeTerminateListener(this); + else + m_xComponent->removeEventListener(this); + m_xComponent.clear(); + } + + if (shutDown) + m_rItem.reset(); + } + + // XTerminateListener + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& ) + throw(::com::sun::star::frame::TerminationVetoException, + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + } + + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEvt ) + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + disposing(rEvt); + } + }; +}; + +//Something like an OutputDevice requires the SolarMutex to be taken before use +//for threadsafety. The user can ensure this, except in the case of its dtor +//being called from reset due to a terminate on the XComponent being called +//from an aribitrary thread +template class unique_disposing_solar_mutex_reset_ptr + : public unique_disposing_ptr +{ +public: + unique_disposing_solar_mutex_reset_ptr( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > &rComponent, T * p = 0 ) + : unique_disposing_ptr(rComponent, p) + { + } + + virtual void reset(T * p = 0) + { + SolarMutexGuard aGuard; + unique_disposing_ptr::reset(p); + } +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit