diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 09:41:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-17 09:41:30 +0000 |
| commit | e674a2c1ea8970447da225cc26b2470a2345ddf4 (patch) | |
| tree | 7c22717a5f2cba889af096b920a37cc44412becb /forms | |
| parent | 552d6905b4834255189439e080bdf3aba0142558 (diff) | |
INTEGRATION: CWS dba23 (1.66.4); FILE MERGED
2005/01/17 14:44:10 fs 1.66.4.1: #i40463# calcConnection superseded by connectRowset
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/DatabaseForm.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index e3f38cffa513..1676bfa0d728 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DatabaseForm.cxx,v $ * - * $Revision: 1.67 $ + * $Revision: 1.68 $ * - * last change: $Author: vg $ $Date: 2005-02-16 17:49:57 $ + * last change: $Author: vg $ $Date: 2005-02-17 10:41:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2839,10 +2839,11 @@ sal_Bool ODatabaseForm::implEnsureConnection() { // do we have a connection in the hierarchy than take that connection // this overwrites all the other connnections - Reference< XConnection > xConnection = calcConnection( + Reference< XConnection > xConnection = connectRowset( Reference<XRowSet> (m_xAggregate, UNO_QUERY), - m_xServiceFactory - ); // will set a calculated connection implicitly + m_xServiceFactory, + sal_True // set a calculated connection as ActiveConnection + ); return xConnection.is(); } } @@ -2850,6 +2851,10 @@ sal_Bool ODatabaseForm::implEnsureConnection() { onError(eDB, FRM_RES_STRING(RID_STR_CONNECTERROR)); } + catch( Exception ) + { + DBG_ERROR( "ODatabaseForm::implEnsureConnection: caught an exception which I cannot handle!" ); + } return sal_False; } |