diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-19 15:10:17 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-20 16:38:53 +0200 |
commit | 63bd3f537793e83adccbccc6936ca730138d9aae (patch) | |
tree | 9ebfbb550807e8c2878860d0e022f6423599b99a | |
parent | 91ee802640453de271dac368ad22b315e2527905 (diff) |
callcatcher: cleanup Application::Foo
-rw-r--r-- | vcl/inc/vcl/svapp.hxx | 14 | ||||
-rw-r--r-- | vcl/source/app/svapp.cxx | 140 |
2 files changed, 0 insertions, 154 deletions
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index 20eec8a9811e..d0212fbc4d37 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -232,8 +232,6 @@ public: virtual void InitFinished(); virtual void DeInit(); - static void InitAppRes( const ResId& rResId ); - static sal_uInt16 GetCommandLineParamCount(); static XubString GetCommandLineParam( sal_uInt16 nParam ); static const XubString& GetAppFileName(); @@ -256,7 +254,6 @@ public: static sal_Bool IsInMain(); static sal_Bool IsInExecute(); - static sal_Bool IsShutDown(); static sal_Bool IsInModalMode(); static sal_uInt16 GetModalModeCount(); @@ -264,7 +261,6 @@ public: static sal_Bool AnyInput( sal_uInt16 nType = INPUT_ANY ); static sal_uLong GetLastInputInterval(); static sal_Bool IsUICaptured(); - static sal_Bool IsUserActive( sal_uInt16 nTest = USERACTIVE_ALL ); virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ); @@ -300,7 +296,6 @@ public: static void RemoveMouseAndKeyEvents( Window *pWin ); static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId ); - static sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); static sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); @@ -357,16 +352,11 @@ public: static sal_Bool InsertAccel( Accelerator* pAccel ); static void RemoveAccel( Accelerator* pAccel ); - static void FlushAccel(); static sal_Bool CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - static sal_uLong AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); - static void RemoveHotKey( sal_uLong nId ); static sal_uLong AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); static void RemoveEventHook( sal_uLong nId ); static long CallEventHooks( NotifyEvent& rEvt ); - static long CallPreNotify( NotifyEvent& rEvt ); - static long CallEvent( NotifyEvent& rEvt ); static void SetHelp( Help* pHelp = NULL ); static Help* GetHelp(); @@ -390,9 +380,7 @@ public: static sal_uInt16 GetSystemWindowMode(); static void SetDialogScaleX( short nScale ); - static short GetDialogScaleX(); - static void SetFontPath( const String& rPath ); static const String& GetFontPath(); static UniqueItemId CreateUniqueId(); @@ -407,8 +395,6 @@ public: static void SetFilterHdl( const Link& rLink ); static const Link& GetFilterHdl(); - static sal_Bool IsAccessibilityEnabled(); - static void EnableHeadlessMode( sal_Bool bEnable = sal_True ); static sal_Bool IsHeadlessModeEnabled(); diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e6619cbfd20b..dc63f172d87a 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -241,12 +241,6 @@ Application::~Application() // ----------------------------------------------------------------------- -void Application::InitAppRes( const ResId& ) -{ -} - -// ----------------------------------------------------------------------- - sal_Bool Application::QueryExit() { WorkWindow* pAppWin = ImplGetSVData()->maWinData.mpAppWin; @@ -549,13 +543,6 @@ sal_Bool Application::IsInExecute() // ----------------------------------------------------------------------- -sal_Bool Application::IsShutDown() -{ - return ImplGetSVData()->maAppData.mbAppQuit; -} - -// ----------------------------------------------------------------------- - sal_Bool Application::IsInModalMode() { return (ImplGetSVData()->maAppData.mnModalMode != 0); @@ -609,34 +596,6 @@ sal_Bool Application::IsUICaptured() // ----------------------------------------------------------------------- -sal_Bool Application::IsUserActive( sal_uInt16 nTest ) -{ - if ( nTest & (USERACTIVE_MOUSEDRAG | USERACTIVE_INPUT) ) - { - if ( IsUICaptured() ) - return sal_True; - } - - if ( nTest & USERACTIVE_INPUT ) - { - if ( GetLastInputInterval() < 500 ) - return sal_True; - - if ( AnyInput( INPUT_KEYBOARD ) ) - return sal_True; - } - - if ( nTest & USERACTIVE_MODALDIALOG ) - { - if ( ImplGetSVData()->maAppData.mnModalDialog ) - return sal_True; - } - - return sal_False; -} - -// ----------------------------------------------------------------------- - void Application::SystemSettingsChanging( AllSettings& /*rSettings*/, Window* /*pFrame*/ ) { @@ -1064,15 +1023,6 @@ sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uLong nEventId ) // ----------------------------------------------------------------------- -sal_uLong Application::PostUserEvent( sal_uLong nEvent, void* pEventData ) -{ - sal_uLong nEventId; - PostUserEvent( nEventId, nEvent, pEventData ); - return nEventId; -} - -// ----------------------------------------------------------------------- - sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller ) { sal_uLong nEventId; @@ -1453,16 +1403,6 @@ void Application::RemoveAccel( Accelerator* pAccel ) // ----------------------------------------------------------------------- -void Application::FlushAccel() -{ - ImplSVData* pSVData = ImplGetSVData(); - - if ( pSVData->maAppData.mpAccelMgr ) - pSVData->maAppData.mpAccelMgr->FlushAccel(); -} - -// ----------------------------------------------------------------------- - sal_Bool Application::CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1535,13 +1475,6 @@ void Application::SetDialogScaleX( short nScale ) // ----------------------------------------------------------------------- -short Application::GetDialogScaleX() -{ - return ImplGetSVData()->maAppData.mnDialogScaleX; -} - -// ----------------------------------------------------------------------- - void Application::SetDefDialogParent( Window* pWindow ) { ImplGetSVData()->maWinData.mpDefDialogParent = pWindow; @@ -1663,19 +1596,6 @@ const String& Application::GetFontPath() // ----------------------------------------------------------------------- -void Application::SetFontPath( const String& rPath ) -{ - ImplSVData* pSVData = ImplGetSVData(); - - // if it doesn't exist create a new one - if( !pSVData->maAppData.mpFontPath ) - pSVData->maAppData.mpFontPath = new String( rPath ); - else - *(pSVData->maAppData.mpFontPath) = rPath; -} - -// ----------------------------------------------------------------------- - UniqueItemId Application::CreateUniqueId() { ImplSVData* pSVData = ImplGetSVData(); @@ -1801,47 +1721,6 @@ void ImplFreeHotKeyData() // ----------------------------------------------------------------------- -sal_uIntPtr Application::AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData ) -{ - ImplSVData* pSVData = ImplGetSVData(); - ImplHotKey* pHotKeyData = new ImplHotKey; - pHotKeyData->mpUserData = pData; - pHotKeyData->maKeyCode = rKeyCode; - pHotKeyData->maLink = rLink; - pHotKeyData->mpNext = pSVData->maAppData.mpFirstHotKey; - pSVData->maAppData.mpFirstHotKey = pHotKeyData; - return (sal_uIntPtr)pHotKeyData; -} - -// ----------------------------------------------------------------------- - -void Application::RemoveHotKey( sal_uIntPtr nId ) -{ - ImplSVData* pSVData = ImplGetSVData(); - ImplHotKey* pFindHotKeyData = (ImplHotKey*)nId; - ImplHotKey* pPrevHotKeyData = NULL; - ImplHotKey* pHotKeyData = pSVData->maAppData.mpFirstHotKey; - while ( pHotKeyData ) - { - if ( pHotKeyData == pFindHotKeyData ) - { - if ( pPrevHotKeyData ) - pPrevHotKeyData->mpNext = pFindHotKeyData->mpNext; - else - pSVData->maAppData.mpFirstHotKey = pFindHotKeyData->mpNext; - delete pFindHotKeyData; - break; - } - - pPrevHotKeyData = pHotKeyData; - pHotKeyData = pHotKeyData->mpNext; - } - - DBG_ASSERT( pHotKeyData, "Application::RemoveHotKey() - HotKey is not added" ); -} - -// ----------------------------------------------------------------------- - void ImplFreeEventHookData() { ImplSVData* pSVData = ImplGetSVData(); @@ -1919,20 +1798,6 @@ long Application::CallEventHooks( NotifyEvent& rEvt ) // ----------------------------------------------------------------------- -long Application::CallPreNotify( NotifyEvent& rEvt ) -{ - return ImplCallPreNotify( rEvt ); -} - -// ----------------------------------------------------------------------- - -long Application::CallEvent( NotifyEvent& rEvt ) -{ - return ImplCallEvent( rEvt ); -} - -// ----------------------------------------------------------------------- - const LocaleDataWrapper& Application::GetAppLocaleDataWrapper() { return GetSettings().GetLocaleDataWrapper(); @@ -2008,11 +1873,6 @@ void Application::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r pSVData->mpDefInst->AddToRecentDocumentList(rFileUrl, rMimeType); } -sal_Bool Application::IsAccessibilityEnabled() -{ - return sal_False; -} - sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled ) { sal_Bool bRet = true; |