diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 11:10:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 11:10:39 +0000 |
| commit | 17fcd6712b3783727376607b5bd16b887bac8b89 (patch) | |
| tree | 1e961a9c380fc5195f0a4eb3fb8863d6764687a7 /dbaccess | |
| parent | c1bd83edeebd4649581098a622fe5e8f4f2093eb (diff) | |
INTEGRATION: CWS dba23b (1.6.100); FILE MERGED
2007/07/09 18:57:25 fs 1.6.100.1: implInitialize: don't call base class if already handled
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/uno/unoDirectSql.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 161e09c272db..07a2c6e08750 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoDirectSql.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-17 07:34:20 $ + * last change: $Author: rt $ $Date: 2007-07-24 12:10:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -143,11 +143,14 @@ DBG_NAME(ODirectSQLDialog) { if (0 == aProperty.Name.compareToAscii("InitialSelection")) { - aProperty.Value >>= m_sInitialSelection; + OSL_VERIFY( aProperty.Value >>= m_sInitialSelection ); + return; } else if (0 == aProperty.Name.compareToAscii("ActiveConnection")) { - m_xActiveConnection.set(aProperty.Value,UNO_QUERY); + m_xActiveConnection.set( aProperty.Value, UNO_QUERY ); + OSL_ENSURE( m_xActiveConnection.is(), "ODirectSQLDialog::implInitialize: invalid connection!" ); + return; } } ODirectSQLDialog_BASE::implInitialize(_rValue); |