User: hr Date: 06/06/19 19:55:13 Modified: /dba/dbaccess/source/ui/app/ AppView.cxx
Log: INTEGRATION: CWS warnings01 (1.12.22); FILE MERGED 2006/05/23 23:48:00 sb 1.12.22.2: RESYNC: (1.12-1.13); FILE MERGED 2006/03/24 15:36:00 fs 1.12.22.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.13&r2=1.14 Delta lines: +6 -9 ------------------- --- AppView.cxx 7 Apr 2006 14:12:32 -0000 1.13 +++ AppView.cxx 20 Jun 2006 02:55:11 -0000 1.14 @@ -133,8 +133,9 @@ DBG_NAME(OAppBorderWindow) //================================================================== OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) - ,m_pView(_pParent) ,m_pPanel(NULL) + ,m_pDetailView(NULL) + ,m_pView(_pParent) { DBG_CTOR(OAppBorderWindow,NULL); @@ -264,12 +265,12 @@ ,PreviewMode _ePreviewMode ) : ODataView( pParent ,_pIController,_rxOrb,WB_DIALOGCONTROL ) + ,m_xController(_xController) ,m_pElementNotification( _pController ) ,m_pActonListener(_pActonListener) ,m_pContainerListener(_pContainerListener) ,m_pViewChangeListener(_pViewChangeListener) ,m_eChildFocus(NONE) - ,m_xController(_xController) { DBG_CTOR(OApplicationView,NULL); @@ -366,12 +367,8 @@ IClipboardTest* OApplicationView::getActiveChild() const { IClipboardTest* pTest = NULL; - switch(m_eChildFocus) - { - case DETAIL: + if ( DETAIL == m_eChildFocus ) pTest = getDetailView(); - break; - } return pTest; } // ----------------------------------------------------------------------------- @@ -617,7 +614,7 @@ getDetailView()->disableControls(_bDisable); } // ----------------------------------------------------------------------------- -void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& _rSource ) +void OApplicationView::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) { if ( m_pWin && getDetailView() ) showPreview(NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
