Tag: cws_src680_odbmacros2 User: fs Date: 2008-02-06 21:45:15+0000 Modified: dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: #i49133# some initialization-related re-factoring File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TableController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TableController.cxx?r1=1.114.20.2&r2=1.114.20.3 Delta lines: +3 -21 -------------------- --- TableController.cxx 2008-02-04 13:08:22+0000 1.114.20.2 +++ TableController.cxx 2008-02-06 21:45:11+0000 1.114.20.3 @@ -4,9 +4,9 @@ * * $RCSfile: TableController.cxx,v $ * - * $Revision: 1.114.20.2 $ + * $Revision: 1.114.20.3 $ * - * last change: $Author: fs $ $Date: 2008/02/04 13:08:22 $ + * last change: $Author: fs $ $Date: 2008/02/06 21:45:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -617,29 +617,11 @@ const NamedValueCollection& rArguments( getInitParams() ); - Reference< XConnection > xConnection; - xConnection = rArguments.getOrDefault( (::rtl::OUString)PROPERTY_ACTIVE_CONNECTION, xConnection ); - if ( xConnection.is() ) - initializeConnection( xConnection ); - rArguments.get_ensureType( (::rtl::OUString)PROPERTY_CURRENTTABLE, m_sName ); // read autoincrement value set in the datasource ::dbaui::fillAutoIncrementValue(getDataSource(),m_bAllowAutoIncrementValue,m_sAutoIncrementValue); - sal_Bool bFirstTry = sal_False; - if (!isConnected()) - { // whoever instantiated us did not give us a connection to share. Okay, create an own one - reconnect(sal_False); - bFirstTry = sal_True; - } - if (!isConnected()) // so what should otherwise - { - if(!bFirstTry) - connectionLostMessage(); - throw Exception(); - } - assignTable(); } catch(const SQLException&) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
