Tag: cws_dev300_dba30d User: oj Date: 2008-05-28 08:49:09+0000 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/app/AppController.hxx dba/dbaccess/source/ui/app/AppSwapWindow.cxx
Log: #i90016# setCursor already calls onContainerSelected File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.60&r2=1.60.10.1 Delta lines: +14 -6 -------------------- --- AppController.cxx 2008-05-05 15:51:14+0000 1.60 +++ AppController.cxx 2008-05-28 08:49:06+0000 1.60.10.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppController.cxx,v $ - * $Revision: 1.60 $ + * $Revision: 1.60.10.1 $ * * This file is part of OpenOffice.org. * @@ -1346,16 +1346,17 @@ impl_migrateScripts_nothrow(); break; case SID_DB_APP_VIEW_TABLES: - getContainer()->selectContainer(E_TABLE); + getContainer()->PostUserEvent( LINK( this, OApplicationController, OnSelectContainer ), reinterpret_cast< void* >( E_TABLE ) ); + // getContainer()->selectContainer(E_TABLE); break; case SID_DB_APP_VIEW_QUERIES: - getContainer()->selectContainer(E_QUERY); + getContainer()->PostUserEvent( LINK( this, OApplicationController, OnSelectContainer ), reinterpret_cast< void* >( E_QUERY ) ); break; case SID_DB_APP_VIEW_FORMS: - getContainer()->selectContainer(E_FORM); + getContainer()->PostUserEvent( LINK( this, OApplicationController, OnSelectContainer ), reinterpret_cast< void* >( E_FORM ) ); break; case SID_DB_APP_VIEW_REPORTS: - getContainer()->selectContainer(E_REPORT); + getContainer()->PostUserEvent( LINK( this, OApplicationController, OnSelectContainer ), reinterpret_cast< void* >( E_REPORT ) ); break; case SID_DB_APP_DISABLE_PREVIEW: m_ePreviewMode = E_PREVIEWNONE; @@ -1861,6 +1862,13 @@ return xRet; } // ----------------------------------------------------------------------------- +IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType ) +{ + ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); + getContainer()->selectContainer(eType); + return 0L; +} +// ----------------------------------------------------------------------------- IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); File [changed]: AppController.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.hxx?r1=1.28&r2=1.28.10.1 Delta lines: +3 -2 ------------------- --- AppController.hxx 2008-05-05 15:51:28+0000 1.28 +++ AppController.hxx 2008-05-28 08:49:06+0000 1.28.10.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppController.hxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.10.1 $ * * This file is part of OpenOffice.org. * @@ -549,6 +549,7 @@ DECL_LINK( OnClipboardChanged, void* ); DECL_LINK( OnAsyncDrop, void* ); DECL_LINK( OnCreateWithPilot, void* ); + DECL_LINK( OnSelectContainer, void* ); DECL_LINK( OnFirstControllerConnected, void* ); // IContainerFoundListener File [changed]: AppSwapWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppSwapWindow.cxx?r1=1.15&r2=1.15.8.1 Delta lines: +6 -6 ------------------- --- AppSwapWindow.cxx 2008-05-05 14:53:47+0000 1.15 +++ AppSwapWindow.cxx 2008-05-28 08:49:06+0000 1.15.8.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AppSwapWindow.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.8.1 $ * * This file is part of OpenOffice.org. * @@ -191,7 +191,7 @@ if ( _eType != E_NONE ) m_eLastType = _eType; return true; - } + } // if ( m_rBorderWin.getView()->getElementNotification()->onContainerSelect( _eType ) ) PostUserEvent( LINK( this, OApplicationSwapWindow, ChangeToLastSelected ) ); return false; @@ -231,7 +231,7 @@ } if ( pEntry ) - m_aIconControl.SetCursor(pEntry); - + m_aIconControl.SetCursor(pEntry); // this call also initiates a onContainerSelected call + else onContainerSelected( _eType ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
