User: kz Date: 2008-06-25 12:54:23+0000 Modified: dba/dbaccess/source/ui/querydesign/TableWindow.cxx
Log: INTEGRATION: CWS dba30d (1.39.30); FILE MERGED 2008/06/10 06:41:41 fs 1.39.30.2: RESYNC: (1.39-1.40); FILE MERGED 2008/05/29 11:30:22 fs 1.39.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindow.cxx?r1=1.40&r2=1.41 Delta lines: +6 -6 ------------------- --- TableWindow.cxx 2008-06-06 14:13:34+0000 1.40 +++ TableWindow.cxx 2008-06-25 12:54:20+0000 1.41 @@ -334,7 +334,7 @@ //------------------------------------------------------------------------------ void OTableWindow::impl_updateImage() { - ImageProvider aImageProvider( getDesignView()->getController()->getConnection() ); + ImageProvider aImageProvider( getDesignView()->getController().getConnection() ); Image aImage, aImageHC; aImageProvider.getImages( GetComposedName(), m_pData->isQuery() ? DatabaseObject::QUERY : DatabaseObject::TABLE, aImage, aImageHC ); @@ -485,7 +485,7 @@ Window::MouseMove(rEvt); OJoinTableView* pCont = getTableView(); - if (pCont->getDesignView()->getController()->isReadOnly()) + if (pCont->getDesignView()->getController().isReadOnly()) return; Point aPos = rEvt.GetPosPixel(); @@ -680,8 +680,8 @@ { case COMMAND_CONTEXTMENU: { - OJoinController* pController = getDesignView()->getController(); - if(!pController->isReadOnly() && pController->isConnected()) + OJoinController& rController = getDesignView()->getController(); + if(!rController.isReadOnly() && rController.isConnected()) { Point ptWhere; if ( rEvt.IsMouseEvent() ) @@ -717,7 +717,7 @@ { case EVENT_KEYINPUT: { - if ( getDesignView()->getController()->isReadOnly() ) + if ( getDesignView()->getController().isReadOnly() ) break; const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); @@ -796,7 +796,7 @@ pView->EnsureVisible(GetData()->GetPosition(), GetData()->GetSize()); pView->TabWinMoved(this,aOldDataPoint); Invalidate(INVALIDATE_NOCHILDREN); - getDesignView()->getController()->setModified( sal_True ); + getDesignView()->getController().setModified( sal_True ); } else { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
