User: kz Date: 2008-06-25 12:54:52+0000 Modified: dba/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
Log: INTEGRATION: CWS dba30d (1.34.30); FILE MERGED 2008/05/29 11:30:22 fs 1.34.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableWindowListBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindowListBox.cxx?r1=1.34&r2=1.35 Delta lines: +5 -5 ------------------- --- TableWindowListBox.cxx 2008-04-10 16:26:45+0000 1.34 +++ TableWindowListBox.cxx 2008-06-25 12:54:50+0000 1.35 @@ -101,7 +101,7 @@ { m_bDragSource = sal_False; // first show the error msg when existing - m_pTabWin->getDesignView()->getController()->showError(m_pTabWin->getDesignView()->getController()->clearOccuredError()); + m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccuredError()); // second look for ui activities which should happen after d&d if (m_nUiEvent) Application::RemoveUserEvent(m_nUiEvent); @@ -129,12 +129,12 @@ SvTreeList* pTreeList = GetModel(); SvLBoxEntry* pEntry = (SvLBoxEntry*)pTreeList->First(); OJoinDesignView* pView = m_pTabWin->getDesignView(); - OJoinController* pController = pView->getController(); + OJoinController& rController = pView->getController(); BOOL bCase = FALSE; try { - Reference<XConnection> xConnection = pController->getConnection(); + Reference<XConnection> xConnection = rController.getConnection(); if(xConnection.is()) { Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); @@ -248,7 +248,7 @@ void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) { OJoinTableView* pCont = m_pTabWin->getTableView(); - if (!pCont->getDesignView()->getController()->isReadOnly() && pCont->getDesignView()->getController()->isConnected()) + if (!pCont->getDesignView()->getController().isReadOnly() && pCont->getDesignView()->getController().isConnected()) { // #100271# OJ asterix was not allowed to be copied to selection browsebox sal_Bool bFirstNotAllowed = FirstSelected() == First() && m_pTabWin->GetData()->IsShowAll(); @@ -352,7 +352,7 @@ catch(const SQLException& e) { // remember the exception so that we can show them later when d&d is finished - m_pTabWin->getDesignView()->getController()->setErrorOccured(::dbtools::SQLExceptionInfo(e)); + m_pTabWin->getDesignView()->getController().setErrorOccured(::dbtools::SQLExceptionInfo(e)); } return 0L; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
