strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba30d (1.15.8); FILE MERGED

Browse source 
2008/06/01 21:02:33 fs 1.15.8.2: #i80943# more preparations for context menu interception, including some re-factoring
2008/05/28 08:49:06 oj 1.15.8.1: #i90016# setCursor already calls onContainerSelected
This commit is contained in:
Kurt Zenker 2008-06-25 11:38:02 +00:00
parent b20a765fc9
commit 2c804441a8
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dbaccess/source/ui/app/AppSwapWindow.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: AppSwapWindow.cxx,v $
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* This file is part of OpenOffice.org.
*
@ -45,9 +45,6 @@
#ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
#endif
#ifndef DBAUI_IAPPELEMENTNOTIFICATION_HXX
#include "IAppElementNotification.hxx"
#endif
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
@ -60,6 +57,7 @@
#ifndef _SV_MNEMONIC_HXX
#include <vcl/mnemonic.hxx>
#endif
#include "IApplicationController.hxx"
#include <memory>
@ -85,7 +83,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
ImplInitSettings( sal_True, sal_True, sal_True );
m_aIconControl.SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl));
m_aIconControl.setControlActionListener( m_rBorderWin.getView()->getActionListener());
m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() );
m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
m_aIconControl.Show();
//m_aIconControl.Enable(TRUE);
@ -186,12 +184,12 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
if ( m_eLastType == _eType )
return true;
if ( m_rBorderWin.getView()->getElementNotification()->onContainerSelect( _eType ) )
if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) )
{
if ( _eType != E_NONE )
m_eLastType = _eType;
return true;
}
} // if ( m_rBorderWin.getView()->getAppController().onContainerSelect( _eType ) )
PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ) );
return false;
@ -231,7 +229,7 @@ void OApplicationSwapWindow::selectContainer(ElementType _eType)
}
if ( pEntry )
m_aIconControl.SetCursor(pEntry);
onContainerSelected( _eType );
m_aIconControl.SetCursor(pEntry); // this call also initiates a onContainerSelected call
else
onContainerSelected( _eType );
}