diff options
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 3 | ||||
| -rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 30795285a12d..378ee9dc04c9 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2853,16 +2853,15 @@ void SAL_CALL ODatabaseForm::unload() // close the aggregate Reference<XCloseable> xCloseable; query_aggregation( m_xAggregate, xCloseable); - aGuard.clear(); if (xCloseable.is()) xCloseable->close(); } catch(const SQLException&) { } - aGuard.reset(); } + aGuard.reset(); m_bLoaded = false; // if the connection we used while we were loaded is only shared with our parent, we diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 36756bdfeae2..e4ddc4265113 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -855,7 +855,6 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper aEvt.Accessor <<= _nIndex; aEvt.Element = pElementMetaData->aElementTypeInterface; - aGuard.clear(); m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvt ); } } |