[Libreoffice-commits] core.git: vcl/win

Samuel Mehrbrodt Samuel.Mehrbrodt at cib.de
Thu Dec 15 08:19:20 UTC 2016


 vcl/win/gdi/salnativewidgets-luna.cxx |   25 -------------------------
 1 file changed, 25 deletions(-)

New commits:
commit cd5b872632311b6c9fa6c5e89f23b8c5aedd62ca
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Thu Dec 15 08:14:25 2016 +0000

    Revert "tdf#54169 Don't show acclerators by default on Windows"
    
    Reverted because of issues mentioned in the bug report.
    
    This reverts commit 64889c9fb6c3e8e7b7a7349833f7a10236104168.
    
    Change-Id: I10fa0d0e55fd4c7c3624d9eb8a97e8c068b9db17
    Reviewed-on: https://gerrit.libreoffice.org/32032
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index bb053c6..23fa61a 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -188,31 +188,6 @@ BOOL VisualStylesAPI::IsThemeActive()
 void SalData::initNWF()
 {
     ImplSVData* pSVData = ImplGetSVData();
-    pSVData->maNWFData.mbEnableAccel = false; // Don't show accelerators all the time
-    pSVData->maNWFData.mbAutoAccel = true;    // Show accelerators only when alt is pressed
-
-    HKEY hkey;
-
-    if (ERROR_SUCCESS == RegOpenKey(HKEY_CURRENT_USER, "Control Panel\\Accessibility\\Keyboard Preference", &hkey))
-    {
-        DWORD dwType = 0;
-        sal_uInt8 Data[2]; // possible values: "1", "0"
-        DWORD cbData = sizeof(Data);
-
-        if (ERROR_SUCCESS == RegQueryValueEx(hkey, "On", nullptr, &dwType, Data, &cbData)) // Check whether "make keyboard easier to use" is turned on
-        {
-            if (dwType == REG_SZ)
-            {
-                bool bValue = ((0 == stricmp(reinterpret_cast<const char *>(Data), "1")));
-                if(bValue)
-                {
-                    pSVData->maNWFData.mbEnableAccel = true; // Always show accelerators
-                    pSVData->maNWFData.mbAutoAccel = false;
-                }
-            }
-        }
-        RegCloseKey(hkey);
-    }
 
     // the menu bar and the top docking area should have a common background (gradient)
     pSVData->maNWFData.mbMenuBarDockingAreaCommonBG = true;


More information about the Libreoffice-commits mailing list