User: kz Date: 2008-03-06 18:30:42+0000 Modified: dba/dbaccess/source/ui/tabledesign/TableController.cxx
Log: INTEGRATION: CWS odbmacros2 (1.114.20); FILE MERGED 2008/02/20 13:28:05 fs 1.114.20.3.2.1: some DBG_UNHANDLED_EXCEPTIONs 2008/02/06 21:45:11 fs 1.114.20.3: #i49133# some initialization-related re-factoring 2008/02/04 13:08:22 fs 1.114.20.2: RESYNC: (1.114-1.116); FILE MERGED 2007/12/13 11:22:40 fs 1.114.20.1: #i49133# some refactoring, mostly related to the m_xCurrentFrame->m_aCurrentFrame change 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.116&r2=1.117 Delta lines: +3 -21 -------------------- --- TableController.cxx 2008-01-30 08:55:30+0000 1.116 +++ TableController.cxx 2008-03-06 18:30:39+0000 1.117 @@ -326,13 +326,13 @@ break; case ID_BROWSER_CUT: - aReturn.bEnabled = isEditable() && m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed(); + aReturn.bEnabled = isEditable() && m_aCurrentFrame.isActive() && getView() && static_cast<OTableDesignView*>(getView())->isCutAllowed(); break; case ID_BROWSER_COPY: - aReturn.bEnabled = m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isCopyAllowed(); + aReturn.bEnabled = m_aCurrentFrame.isActive() && getView() && static_cast<OTableDesignView*>(getView())->isCopyAllowed(); break; case ID_BROWSER_PASTE: - aReturn.bEnabled = isEditable() && m_bFrameUiActive && getView() && static_cast<OTableDesignView*>(getView())->isPasteAllowed(); + aReturn.bEnabled = isEditable() && m_aCurrentFrame.isActive() && getView() && static_cast<OTableDesignView*>(getView())->isPasteAllowed(); break; case SID_INDEXDESIGN: aReturn.bEnabled = @@ -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]
