diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-02-07 14:27:52 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-02-12 23:00:59 +0000 |
| commit | 608811c2cb507176530aad0e7e6da81335ecaf10 (patch) | |
| tree | 5a91691da6c297623726433361cc967215c96723 /chart2/source/inc/DisposeHelper.hxx | |
| parent | 8cc8ffdb04f9915c5b7dddd619ef89762c7a40c2 (diff) | |
chart2: simplify and/or clean-up and c++11 features
Change-Id: I4550d04ae4bf6e45f24e34dfb2babc0fdef8ba5a
Reviewed-on: https://gerrit.libreoffice.org/34006
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'chart2/source/inc/DisposeHelper.hxx')
| -rw-r--r-- | chart2/source/inc/DisposeHelper.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx index 72642a23121c..cd886c26a669 100644 --- a/chart2/source/inc/DisposeHelper.hxx +++ b/chart2/source/inc/DisposeHelper.hxx @@ -27,32 +27,32 @@ namespace chart namespace DisposeHelper { -template< class T > - void Dispose( const T & xIntf ) +template<class T> +void Dispose(const T & xInterface) { - css::uno::Reference< css::lang::XComponent > xComp( xIntf, css::uno::UNO_QUERY ); - if( xComp.is()) - xComp->dispose(); + css::uno::Reference<css::lang::XComponent> xComponent(xInterface, css::uno::UNO_QUERY); + if (xComponent.is()) + xComponent->dispose(); } -template< class Intf > - void DisposeAndClear( css::uno::Reference< Intf > & rIntf ) +template<class T> +void DisposeAndClear(css::uno::Reference<T> & rInterface) { - Dispose< css::uno::Reference< Intf > >( rIntf ); - rIntf.set( 0 ); + Dispose<css::uno::Reference<T>>(rInterface); + rInterface.set(nullptr); } -template< class Container > - void DisposeAllElements( Container & rContainer ) +template<class Container> +void DisposeAllElements(Container & rContainer) { - for( const auto& rElem : rContainer ) - Dispose< typename Container::value_type >( rElem ); + for (const auto & rElement : rContainer) + { + Dispose<typename Container::value_type>(rElement); + } } -} // namespace DisposeHelper -} // namespace chart +}} // namespace chart::DisposeHelper -// INCLUDED_CHART2_SOURCE_INC_DISPOSEHELPER_HXX -#endif +#endif // INCLUDED_CHART2_SOURCE_INC_DISPOSEHELPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |