resyncing to master

1 files changed, 0 insertions, 147 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index fe536addac98..9d54803f7f3b 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;
@@ -417,18 +411,6 @@ const KeyCode*  Application::GetReservedKeyCode( sal_uLong i )
         return &ImplReservedKeys::get()->first[i].mKeyCode;
 }
 
-String Application::GetReservedKeyCodeDescription( sal_uLong i )
-{
-    ResMgr* pResMgr = ImplGetResMgr();
-    if( ! pResMgr )
-        return String();
-    ImplReservedKey *pImplReservedKeys = ImplReservedKeys::get()->first;
-    if( i >= GetReservedKeyCodeCount() || ! pImplReservedKeys[i].mnResId )
-        return String();
-    else
-        return String( ResId( pImplReservedKeys[i].mnResId, *pResMgr ) );
-}
-
 // -----------------------------------------------------------------------
 
 void Application::Execute()
@@ -561,13 +543,6 @@ sal_Bool Application::IsInExecute()
 
 // -----------------------------------------------------------------------
 
-sal_Bool Application::IsShutDown()
-{
-    return ImplGetSVData()->maAppData.mbAppQuit;
-}
-
-// -----------------------------------------------------------------------
-
 sal_Bool Application::IsInModalMode()
 {
     return (ImplGetSVData()->maAppData.mnModalMode != 0);
@@ -621,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*/ )
 {
@@ -1465,16 +1412,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();
@@ -1547,13 +1484,6 @@ void Application::SetDialogScaleX( short nScale )
 
 // -----------------------------------------------------------------------
 
-short Application::GetDialogScaleX()
-{
-    return ImplGetSVData()->maAppData.mnDialogScaleX;
-}
-
-// -----------------------------------------------------------------------
-
 void Application::SetDefDialogParent( Window* pWindow )
 {
     ImplGetSVData()->maWinData.mpDefDialogParent = pWindow;
@@ -1675,19 +1605,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();
@@ -1813,47 +1730,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();
@@ -1931,20 +1807,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();
@@ -2020,11 +1882,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;
@@ -2067,13 +1924,9 @@ void Application::Property( ApplicationProperty& rProp )
 
 void Application::SetPropertyHandler( PropertyHandler* p )
 {
-    if ( pHandler )
-        delete pHandler;
     pHandler = p;
 }
 
-
-
 void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ )
 {
 }