[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/win

[Michael Stahl]

 vcl/win/source/window/salframe.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit bbaa97a79a72391aaa3dda1a55d92938ab3ea466
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Jan 15 15:00:51 2014 +0100

    fdo#72397: vcl: do not enable A11y in Win32 message handler
    
    On the libreoffice-4-2 branch, IA2 is experimental so it must be enabled
    by user explicitly; the automatic enabling when a WM_GETOBJECT is
    received will effectively enable the JAB which can be annoying.
    
    Change-Id: I16bd8d77657567ad29f3538cd3ab1de8145d531e
    Reviewed-on: https://gerrit.libreoffice.org/7443
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index f7c3086..d9f57b8 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -5487,12 +5487,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
 static bool
 ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
 {
-    // IA2 should be enabled automatically
-    AllSettings aSettings = Application::GetSettings();
-    MiscSettings aMisc = aSettings.GetMiscSettings();
-    aMisc.SetEnableATToolSupport( sal_True );
-    aSettings.SetMiscSettings( aMisc );
-    Application::SetSettings( aSettings );
+    // IA2 should not be enabled automatically since it's experimental
 
     if (!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
         return false; // locked down somehow ?