User: kz Date: 2008-03-06 18:30:27+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx
Log: INTEGRATION: CWS odbmacros2 (1.50.10); FILE MERGED 2008/02/20 13:28:04 fs 1.50.10.1.2.1: some DBG_UNHANDLED_EXCEPTIONs 2008/02/06 21:45:28 fs 1.50.10.1: #i49133# some initialization-related re-factoring File Changes: Directory: /dba/dbaccess/source/ui/relationdesign/ ================================================== File [changed]: RelationController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationController.cxx?r1=1.50&r2=1.51 Delta lines: +2 -16 -------------------- --- RelationController.cxx 2008-01-30 08:54:49+0000 1.50 +++ RelationController.cxx 2008-03-06 18:30:24+0000 1.51 @@ -293,21 +293,9 @@ // ----------------------------------------------------------------------------- void ORelationController::impl_initialize() { - const NamedValueCollection& rArguments( getInitParams() ); - - Reference< XConnection > xConnection; - xConnection = rArguments.getOrDefault( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); - if ( xConnection.is() ) - initializeConnection( xConnection ); + OJoinController::impl_initialize(); - if ( !ensureConnected( sal_False ) ) - { - setEditable(sal_False); - m_bRelationsPossible = sal_False; - connectionLostMessage(); - throw SQLException(); - } - else if( !getSdbMetaData().supportsRelations() ) + if( !getSdbMetaData().supportsRelations() ) {// check if this database supports relations setEditable(sal_False); @@ -322,8 +310,6 @@ throw SQLException(); } - OJoinController::impl_initialize(); - if(!m_bRelationsPossible) InvalidateAll(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
