From 7cf6d38eb6c89f174b71f74cb06d5e54c9fa12d0 Mon Sep 17 00:00:00 2001 From: August Sodora Date: Thu, 8 Dec 2011 13:24:58 -0500 Subject: Remove unused code --- vcl/inc/vcl/svapp.hxx | 5 --- vcl/source/app/svapp.cxx | 83 ------------------------------------------------ 2 files changed, 88 deletions(-) diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index cfd46eddac6a..a994ff9ef3a4 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -206,7 +206,6 @@ public: static sal_Bool IsInMain(); static sal_Bool IsInExecute(); static sal_Bool IsInModalMode(); - static sal_uInt16 GetModalModeCount(); static sal_uInt16 GetDispatchLevel(); static sal_Bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY ); @@ -245,7 +244,6 @@ public: static sal_uLong PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); static sal_uLong PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); static void RemoveMouseAndKeyEvents( Window *pWin ); - static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId ); static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); @@ -302,10 +300,7 @@ public: static sal_Bool InsertAccel( Accelerator* pAccel ); static void RemoveAccel( Accelerator* pAccel ); - static sal_Bool CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - static sal_uLong AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); - static void RemoveEventHook( sal_uLong nId ); static long CallEventHooks( NotifyEvent& rEvt ); static void SetHelp( Help* pHelp = NULL ); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1f08f18cfc9d..bc1e7cc24db7 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ - -//#include "svsys.h" - #include "comphelper/processfactory.hxx" #include "osl/module.h" @@ -561,13 +558,6 @@ sal_Bool Application::IsInModalMode() // ----------------------------------------------------------------------- -sal_uInt16 Application::GetModalModeCount() -{ - return ImplGetSVData()->maAppData.mnModalMode; -} - -// ----------------------------------------------------------------------- - sal_uInt16 Application::GetDispatchLevel() { return ImplGetSVData()->maAppData.mnDispatchLevel; @@ -1014,24 +1004,6 @@ void Application::RemoveMouseAndKeyEvents( Window* pWin ) // ----------------------------------------------------------------------- -sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uLong nEventId ) -{ - const SolarMutexGuard aGuard; - - // find event - ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() ); - - while( aIter != aPostedEventList.end() ) - { - if( (*aIter).second->mnEventId == nEventId ) - return sal_False; - - else - ++aIter; - } - return sal_True; -} - sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -1390,21 +1362,6 @@ void Application::RemoveAccel( Accelerator* pAccel ) // ----------------------------------------------------------------------- -sal_Bool Application::CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) -{ - ImplSVData* pSVData = ImplGetSVData(); - - if ( pSVData->maAppData.mpAccelMgr ) - { - if ( pSVData->maAppData.mpAccelMgr->IsAccelKey( rKeyCode, nRepeat ) ) - return sal_True; - } - - return sal_False; -} - -// ----------------------------------------------------------------------- - void Application::SetHelp( Help* pHelp ) { ImplGetSVData()->maAppData.mpHelp = pHelp; @@ -1703,46 +1660,6 @@ void ImplFreeEventHookData() // ----------------------------------------------------------------------- -sal_uIntPtr Application::AddEventHook( VCLEventHookProc pProc, void* pData ) -{ - ImplSVData* pSVData = ImplGetSVData(); - ImplEventHook* pEventHookData = new ImplEventHook; - pEventHookData->mpUserData = pData; - pEventHookData->mpProc = pProc; - pEventHookData->mpNext = pSVData->maAppData.mpFirstEventHook; - pSVData->maAppData.mpFirstEventHook = pEventHookData; - return (sal_uIntPtr)pEventHookData; -} - -// ----------------------------------------------------------------------- - -void Application::RemoveEventHook( sal_uIntPtr nId ) -{ - ImplSVData* pSVData = ImplGetSVData(); - ImplEventHook* pFindEventHookData = (ImplEventHook*)nId; - ImplEventHook* pPrevEventHookData = NULL; - ImplEventHook* pEventHookData = pSVData->maAppData.mpFirstEventHook; - while ( pEventHookData ) - { - if ( pEventHookData == pFindEventHookData ) - { - if ( pPrevEventHookData ) - pPrevEventHookData->mpNext = pFindEventHookData->mpNext; - else - pSVData->maAppData.mpFirstEventHook = pFindEventHookData->mpNext; - delete pFindEventHookData; - break; - } - - pPrevEventHookData = pEventHookData; - pEventHookData = pEventHookData->mpNext; - } - - DBG_ASSERT( pEventHookData, "Application::RemoveEventHook() - EventHook is not added" ); -} - -// ----------------------------------------------------------------------- - long Application::CallEventHooks( NotifyEvent& rEvt ) { ImplSVData* pSVData = ImplGetSVData(); -- cgit v1.2.3