diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:52:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:52:02 +0000 |
| commit | ec15a78b9bc2c17678f10b6d4aa1d44b54acec4b (patch) | |
| tree | 27f0ed0a7ca858286d5198f4ccf17ff6e10c16d3 /extensions | |
| parent | af0af67036baa5d3a0e67d9f5909af830bf61b55 (diff) | |
INTEGRATION: CWS dba201b (1.4.76); FILE MERGED
2005/09/21 08:01:00 oj 1.4.76.2: RESYNC: (1.4-1.5); FILE MERGED
2005/07/21 12:03:56 fs 1.4.76.1: refined connection handling in the course of #i52255#, where the semantics of ::dbtools::connectRowset was extended to also care for connections of the rowset is embedded in a database form document
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formlinkdialog.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index ecbe0a3347c4..18f49e8d5eb4 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formlinkdialog.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 20:12:45 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:52:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -486,11 +486,7 @@ namespace pcr if ( !_rxFormProps.is() ) return; - _rxConnection.clear(); - 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 ); + _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xORB, sal_True ); } //------------------------------------------------------------------------ |