User: kz Date: 2008-06-25 12:53:51+0000 Modified: dba/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
Log: INTEGRATION: CWS dba30d (1.31.30); FILE MERGED 2008/05/29 11:30:22 fs 1.31.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: QueryViewSwitch.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx?r1=1.31&r2=1.32 Delta lines: +8 -10 -------------------- --- QueryViewSwitch.cxx 2008-04-10 16:23:29+0000 1.31 +++ QueryViewSwitch.cxx 2008-06-25 12:53:48+0000 1.32 @@ -66,13 +66,13 @@ using namespace ::com::sun::star::lang; DBG_NAME(OQueryViewSwitch) -OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController* _pController,const Reference< XMultiServiceFactory >& _rFactory) +OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory) : m_bAddTableDialogWasVisible(sal_False) { DBG_CTOR(OQueryViewSwitch,NULL); m_pTextView = new OQueryTextView(_pParent); - m_pDesignView = new OQueryDesignView(_pParent,_pController,_rFactory); + m_pDesignView = new OQueryDesignView( _pParent, _rController, _rFactory ); } // ----------------------------------------------------------------------------- OQueryViewSwitch::~OQueryViewSwitch() @@ -211,7 +211,7 @@ sal_Bool OQueryViewSwitch::switchView() { sal_Bool bRet = sal_True; - sal_Bool bGraphicalDesign = static_cast<OQueryController*>(m_pDesignView->getController())->isGraphicalDesign(); + sal_Bool bGraphicalDesign = static_cast<OQueryController&>(m_pDesignView->getController()).isGraphicalDesign(); OAddTableDlg* pAddTabDialog( getAddTableDialog() ); @@ -229,11 +229,11 @@ m_pTextView->getSqlEdit()->startTimer(); m_pTextView->clear(); - m_pTextView->setStatement(static_cast<OQueryController*>(m_pDesignView->getController())->getStatement()); + m_pTextView->setStatement(static_cast<OQueryController&>(m_pDesignView->getController()).getStatement()); } else { - ::rtl::OUString sOldStatement = static_cast<OQueryController*>(m_pDesignView->getController())->getStatement(); + ::rtl::OUString sOldStatement = static_cast<OQueryController&>(m_pDesignView->getController()).getStatement(); // we have to stop the sqledit from our textview m_pTextView->getSqlEdit()->stopTimer(); @@ -258,8 +258,8 @@ if ( pContainer ) pContainer->Resize(); - m_pDesignView->getController()->getUndoMgr()->Clear(); - m_pDesignView->getController()->InvalidateAll(); + m_pDesignView->getController().getUndoMgr()->Clear(); + m_pDesignView->getController().InvalidateAll(); return bRet; } @@ -268,9 +268,7 @@ { if ( !m_pDesignView ) return NULL; - if ( !m_pDesignView->getController() ) - return NULL; - return m_pDesignView->getController()->getAddTableDialog(); + return m_pDesignView->getController().getAddTableDialog(); } // ----------------------------------------------------------------------------- sal_Bool OQueryViewSwitch::isSlotEnabled(sal_Int32 _nSlotId) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
