vcl/win/app/salinst.cxx | 2 ++ vcl/win/window/salframe.cxx | 3 +++ 2 files changed, 5 insertions(+)
New commits: commit 0761614ccf5beb9051fb132c5f1990198f32967f Author: Juergen Funk <juergen.funk...@cib.de> Date: Sat Mar 26 22:46:51 2016 +0100 tdf#98924 In windows, change the keyboard layout per application reint the key maps when in windows change the language for the application Change-Id: I71045386b4fe4d6db5572effa07a2f01ce79e74f Reviewed-on: https://gerrit.libreoffice.org/23556 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 1f2d22c..906129f 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -299,6 +299,8 @@ void SalData::initKeyCodeMap() if( nKey < 0xffff )\ maVKMap[ nKey ] = b; + maVKMap.clear(); + initKey( '+', KEY_ADD ); initKey( '-', KEY_SUBTRACT ); initKey( '*', KEY_MULTIPLY ); diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index fd5d207..a716898 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -4917,6 +4917,9 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam ) if( nLang != pFrame->mnInputLang ) pFrame->CallCallback( SalEvent::InputLanguageChange, 0 ); + // reinit spec. keys + GetSalData()->initKeyCodeMap(); + ImplSalYieldMutexRelease(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits