Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:46:41 Modified: dba/dbaccess/source/ui/app/AppView.cxx
Log: RESYNC: (1.12-1.14); FILE MERGED 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.11.4.2&r2=1.11.4.3 Delta lines: +6 -12 -------------------- --- AppView.cxx 20 Mar 2006 13:54:36 -0000 1.11.4.2 +++ AppView.cxx 4 Jul 2006 07:46:38 -0000 1.11.4.3 @@ -74,9 +74,6 @@ #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include <com/sun/star/sdb/XQueriesSupplier.hpp> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> -#endif #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #include <svtools/syslocale.hxx> #endif @@ -136,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); @@ -270,12 +268,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); @@ -375,12 +373,8 @@ IClipboardTest* OApplicationView::getActiveChild() const { IClipboardTest* pTest = NULL; - switch(m_eChildFocus) - { - case DETAIL: + if ( DETAIL == m_eChildFocus ) pTest = getDetailView(); - break; - } return pTest; } // ----------------------------------------------------------------------------- @@ -626,7 +620,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]
