diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-09-11 08:41:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-09-11 08:41:12 +0000 |
| commit | 4a4514eb625146d51818df234138b752b0ec3f7e (patch) | |
| tree | fdcc4722d81638902b8ef422d82044c42b95b33f /sw/source/ui/shells/textsh2.cxx | |
| parent | 00bf1cf13a97e38236f242493016ca5ef5d85183 (diff) | |
INTEGRATION: CWS OS18 (1.15.178); FILE MERGED
2003/08/29 13:16:45 os 1.15.178.2: RESYNC: (1.15-1.16); FILE MERGED
2003/08/29 09:05:44 os 1.15.178.1: #111987# catch exception in getDataSourceAsParent()
Diffstat (limited to 'sw/source/ui/shells/textsh2.cxx')
| -rw-r--r-- | sw/source/ui/shells/textsh2.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 56ec6786c8e5..821df527277e 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh2.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hjs $ $Date: 2003-08-19 12:29:04 $ + * last change: $Author: kz $ $Date: 2003-09-11 09:41:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -351,8 +351,11 @@ IMPL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) sal_Bool bDispose = sal_False; Reference< sdbc::XConnection> xConnection = pDBStruct->xConnection; Reference<XDataSource> xSource = SwNewDBMgr::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource); + // #111987# the connection is disposed an so no parent has been found + if(xConnection.is() && !xSource.is()) + return 0; - if ( !xConnection.is() ) + if ( !xConnection.is() ) { xConnection = SwNewDBMgr::GetConnection(pDBStruct->aDBData.sDataSource, xSource); bDispose = sal_True; |