diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:59:46 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 14:59:46 +0000 |
| commit | 89c873e8d781c35d9a9d0388ce02de86e3082884 (patch) | |
| tree | 7a2598f7030e219e48c130ba9298a928dd0cd3a2 /forms/source/component/DatabaseForm.cxx | |
| parent | 24795c19735d7e2cdcee628f014145c929716bb7 (diff) | |
INTEGRATION: CWS dba24 (1.66.10); FILE MERGED
2005/02/21 12:03:35 oj 1.66.10.4: RESYNC: (1.66-1.68); FILE MERGED
2005/02/10 17:28:55 fs 1.66.10.3: removed setResultSetType - decided to do this in the RowSet
2005/02/10 17:08:26 fs 1.66.10.2: corrected setResultSetType
2005/02/10 17:00:53 fs 1.66.10.1: #i15113# when executing the row set, care for a data-source-setting which enables defensive usage of ResultSetType and ResultSetConcurrency - IBM's Universe database didn't like our previous aggressive behaviour
Diffstat (limited to 'forms/source/component/DatabaseForm.cxx')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 027f7e852..ac550668a 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DatabaseForm.cxx,v $ * - * $Revision: 1.68 $ + * $Revision: 1.69 $ * - * last change: $Author: vg $ $Date: 2005-02-17 10:41:30 $ + * last change: $Author: vg $ $Date: 2005-03-10 15:59:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1283,13 +1283,15 @@ sal_Bool ODatabaseForm::executeRowSet(ReusableMutexGuard& _rClearForNotifies, sa restoreInsertOnlyState( ); // ensure the aggregated row set has the correct properties - sal_Int32 nConcurrency; + sal_Int32 nConcurrency = ResultSetConcurrency::READ_ONLY; + // if we have a parent, who is not positioned on a valid row // we can't be updatable! if (m_bSubForm && !hasValidParent()) { - // don't use any parameters if we don't have a valid parent nConcurrency = ResultSetConcurrency::READ_ONLY; + + // don't use any parameters if we don't have a valid parent m_aParameterManager.setAllParametersNull(); // switch to "insert only" mode @@ -1301,10 +1303,8 @@ sal_Bool ODatabaseForm::executeRowSet(ReusableMutexGuard& _rClearForNotifies, sa else nConcurrency = ResultSetConcurrency::READ_ONLY; - m_xAggregateSet->setPropertyValue(PROPERTY_RESULTSET_CONCURRENCY, makeAny(nConcurrency)); - - sal_Int32 nResultSetType = ResultSetType::SCROLL_SENSITIVE; - m_xAggregateSet->setPropertyValue(PROPERTY_RESULTSET_TYPE, makeAny(nResultSetType)); + m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_CONCURRENCY, makeAny( (sal_Int32)nConcurrency ) ); + m_xAggregateSet->setPropertyValue( PROPERTY_RESULTSET_TYPE, makeAny( (sal_Int32)ResultSetType::SCROLL_SENSITIVE ) ); sal_Bool bSuccess = sal_False; try @@ -1417,7 +1417,7 @@ void ODatabaseForm::disposing() } //------------------------------------------------------------------------------ -Reference< XConnection > ODatabaseForm::getConnection() +Reference< XConnection > ODatabaseForm::getConnection() { Reference< XConnection > xConn; m_xAggregateSet->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConn; |