diff options
Diffstat (limited to 'comphelper/source/misc/proxyaggregation.cxx')
| -rw-r--r-- | comphelper/source/misc/proxyaggregation.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index b24aa4407356..19307d794ff6 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -163,10 +163,10 @@ namespace comphelper // // if ( !m_rBHelper.bDisposed ) // { - // acquire(); // to prevent duplicate dtor calls + // acquire(); // to prevent duplicate dtor calls // dispose(); // } - + m_xInner.clear(); } @@ -174,9 +174,9 @@ namespace comphelper void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException) { if ( _rSource.Source == m_xInner ) - { // it's our inner context which is dying -> dispose ourself + { // it's our inner context which is dying -> dispose ourself if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose ) - { // (if necessary only, of course) + { // (if necessary only, of course) dispose(); } } @@ -243,7 +243,7 @@ namespace comphelper { if ( !rBHelper.bDisposed ) { - acquire(); // to prevent duplicate dtor calls + acquire(); // to prevent duplicate dtor calls dispose(); } } @@ -272,7 +272,7 @@ namespace comphelper //............................................................................. -} // namespace comphelper +} // namespace comphelper //............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |