User: rt Date: 2007-07-24 12:10:42+0000 Modified: dba/dbaccess/source/ui/uno/unoDirectSql.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [changed]: unoDirectSql.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/unoDirectSql.cxx?r1=1.6&r2=1.7 Delta lines: +5 -2 ------------------- --- unoDirectSql.cxx 2006-09-17 07:34:20+0000 1.6 +++ unoDirectSql.cxx 2007-07-24 12:10:39+0000 1.7 @@ -143,11 +143,14 @@ { 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
