Revert "tdf#54169 Don't show acclerators by default on Windows"

Reverted because of issues mentioned in the bug report.

This reverts commit 64889c9fb6.

Change-Id: I10fa0d0e55fd4c7c3624d9eb8a97e8c068b9db17
Reviewed-on: https://gerrit.libreoffice.org/32032
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2016-12-15 08:14:25 +00:00
parent ee3f793a2d
commit cd5b872632

View File

@@ -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;