diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 16:00:40 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 16:00:40 +0000 |
| commit | 96feef6d37f2c2b526a87b193cf85eb4d2c2dac0 (patch) | |
| tree | 6aed441996705f9d7673975b926793bf2afff4bb /extensions | |
| parent | e49522acc59cd7447f365f1f31a2839cc34930b0 (diff) | |
INTEGRATION: CWS dba24 (1.3.90); FILE MERGED
2005/02/10 12:54:59 fs 1.3.90.1: #i42407# care for forms embedded in DB documents
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index b797d4889ecb..6b28706f27fd 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formlinkdialog.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-09-08 14:05:11 $ + * last change: $Author: vg $ $Date: 2005-03-10 17:00:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -513,13 +513,10 @@ namespace pcr return; _rxConnection.clear(); - _rxFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= _rxConnection; + if ( !::dbtools::isEmbeddedInDatabase( _rxFormProps, _rxConnection ) ) + _rxFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= _rxConnection; if ( !_rxConnection.is() ) - { _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xORB, sal_True ); - // TODO: this now is a resource leak: we just created this connection ourself, - // and nobody will ever dispose it - } } //------------------------------------------------------------------------ @@ -528,7 +525,8 @@ namespace pcr if ( _rxFormProps.is() ) { Reference< XConnection > xConnection; - _rxFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection; + if ( !::dbtools::isEmbeddedInDatabase( _rxFormProps, xConnection ) ) + _rxFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection; if ( xConnection.is() ) _rxMeta = xConnection->getMetaData(); } |