summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorFrank Schönheit <fs@openoffice.org>2001-01-23 09:15:25 +0000
committerFrank Schönheit <fs@openoffice.org>2001-01-23 09:15:25 +0000
commit23f7a5935b87d36365bb3775622cea047b632f57 (patch)
tree324c053a17048c0dba8ec9447d2ab24ae8bb8d85 /forms
parent5d8eab87572bbd49ddb01837946f4e0f10f48fde (diff)
slightly optimized disposing()
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/DatabaseForm.cxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 1704393bf5c4..ce4c4ec5dedd 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DatabaseForm.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: fs $ $Date: 2001-01-18 16:43:15 $
+ * last change: $Author: fs $ $Date: 2001-01-23 10:15:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1901,12 +1901,10 @@ void ODatabaseForm::disposing()
if (m_xAggregateAsRowSet.is())
m_xAggregateAsRowSet->removeRowSetListener(this);
- Reference<XPropertySet> xProp(m_xAggregate,UNO_QUERY);
- OSL_ENSHURE(xProp.is(),"No PropSet!");
-
// dispose the active connection
Reference<XComponent> xConnection;
- xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION) >>= xConnection;
+ if (m_xAggregateSet.is())
+ ::cppu::extractInterface(xConnection, m_xAggregateSet->getPropertyValue(PROPERTY_ACTIVE_CONNECTION));
Reference<XComponent> xAggregationComponent;
if (query_aggregation(m_xAggregate, xAggregationComponent))