Tag: cws_dev300_dba30d User: fs Date: 2008-05-29 11:27:05+0000 Modified: dba/dbaccess/source/ui/relationdesign/RelationController.cxx dba/dbaccess/source/ui/relationdesign/RelationDesignView.cxx dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx
Log: during #i80943#: refactoring: IController now passed around as reference, not as pointer 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.54&r2=1.54.8.1 Delta lines: +3 -3 ------------------- --- RelationController.cxx 2008-05-05 16:07:47+0000 1.54 +++ RelationController.cxx 2008-05-29 11:27:02+0000 1.54.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationController.cxx,v $ - * $Revision: 1.54 $ + * $Revision: 1.54.8.1 $ * * This file is part of OpenOffice.org. * @@ -346,7 +346,7 @@ // ----------------------------------------------------------------------------- sal_Bool ORelationController::Construct(Window* pParent) { - m_pView = new ORelationDesignView(pParent,this,getORB()); + m_pView = new ORelationDesignView( pParent, *this, getORB() ); OJoinController::Construct(pParent); // m_pView->Construct(); // m_pView->Show(); File [changed]: RelationDesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationDesignView.cxx?r1=1.15&r2=1.15.30.1 Delta lines: +4 -4 ------------------- --- RelationDesignView.cxx 2008-04-10 16:32:49+0000 1.15 +++ RelationDesignView.cxx 2008-05-29 11:27:02+0000 1.15.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationDesignView.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.30.1 $ * * This file is part of OpenOffice.org. * @@ -99,8 +99,8 @@ using namespace ::com::sun::star::container; DBG_NAME(ORelationDesignView) -ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController* _pController,const Reference< XMultiServiceFactory >& _rFactory) - :OJoinDesignView(_pParent,_pController,_rFactory) +ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XMultiServiceFactory >& _rFactory) + :OJoinDesignView( _pParent, _rController, _rFactory ) { DBG_CTOR(ORelationDesignView,NULL); } File [changed]: RelationTableView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/relationdesign/RelationTableView.cxx?r1=1.28&r2=1.28.30.1 Delta lines: +11 -11 --------------------- --- RelationTableView.cxx 2008-04-10 16:33:38+0000 1.28 +++ RelationTableView.cxx 2008-05-29 11:27:02+0000 1.28.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationTableView.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.30.1 $ * * This file is part of OpenOffice.org. * @@ -166,7 +166,7 @@ ////////////////////////////////////////////////////////////////////// // create and insert windows - TTableWindowData* pTabWinDataList = m_pView->getController()->getTableWindowData(); + TTableWindowData* pTabWinDataList = m_pView->getController().getTableWindowData(); TTableWindowData::reverse_iterator aIter = pTabWinDataList->rbegin(); for(;aIter != pTabWinDataList->rend();++aIter) { @@ -194,7 +194,7 @@ } // Verbindungen einfuegen - TTableConnectionData* pTabConnDataList = m_pView->getController()->getTableConnectionData(); + TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData(); TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin(); for(;aConIter != pTabConnDataList->rend();++aConIter) @@ -226,7 +226,7 @@ { DBG_CHKTHIS(ORelationTableView,NULL); - return !m_pView->getController()->isReadOnly(); + return !m_pView->getController().isReadOnly(); } //------------------------------------------------------------------------ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) @@ -349,7 +349,7 @@ } catch(SQLException& e) { - getDesignView()->getController()->showError(SQLExceptionInfo(e)); + getDesignView()->getController().showError(SQLExceptionInfo(e)); } catch(Exception&) { @@ -384,7 +384,7 @@ OTableWindow* pNewTabWin = createWindow( pNewTabWinData ); if(pNewTabWin->Init()) { - m_pView->getController()->getTableWindowData()->push_back( pNewTabWinData); + m_pView->getController().getTableWindowData()->push_back( pNewTabWinData); // when we already have a table with this name insert the full qualified one instead (*GetTabWinMap())[_rComposedName] = pNewTabWin; @@ -410,12 +410,12 @@ OSQLMessageBox aDlg(this,ModuleRes(STR_QUERY_REL_DELETE_WINDOW),String(),WB_YES_NO|WB_DEF_YES,OSQLMessageBox::Warning); if(aDlg.Execute() == RET_YES) { - m_pView->getController()->getUndoMgr()->Clear(); + m_pView->getController().getUndoMgr()->Clear(); OJoinTableView::RemoveTabWin( pTabWin ); - m_pView->getController()->InvalidateFeature(SID_RELATION_ADD_RELATION); - m_pView->getController()->InvalidateFeature(ID_BROWSER_UNDO); - m_pView->getController()->InvalidateFeature(ID_BROWSER_REDO); + m_pView->getController().InvalidateFeature(SID_RELATION_ADD_RELATION); + m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); + m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
