diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:55:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:55:11 +0000 |
| commit | e8e6241fe1d8f750d95212f4b4c8a3621b74e89b (patch) | |
| tree | c95658695f1c486287c85ffb993642cf895c92c5 /dbaccess/source | |
| parent | 7d188eb0d0f8d3d9aae2f17cd3150da7da3d4bc4 (diff) | |
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)
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index fb6e377935cd..b3a75c2af3e2 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AppView.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2006-04-07 14:12:32 $ + * last change: $Author: hr $ $Date: 2006-06-20 02:55:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,8 +133,9 @@ using namespace ::com::sun::star::container; 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 @@ OApplicationView::OApplicationView( Window* pParent ,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 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt ) IClipboardTest* OApplicationView::getActiveChild() const { IClipboardTest* pTest = NULL; - switch(m_eChildFocus) - { - case DETAIL: - pTest = getDetailView(); - break; - } + if ( DETAIL == m_eChildFocus ) + pTest = getDetailView(); return pTest; } // ----------------------------------------------------------------------------- @@ -617,7 +614,7 @@ void OApplicationView::disableControls(sal_Bool _bDisable) 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); |