officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 13 ++++++++++ starmath/source/edit.cxx | 5 ++- 2 files changed, 16 insertions(+), 2 deletions(-)
New commits: commit 7db006c1b1601533bfc7c361af69800a8b17979e Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Thu May 27 11:28:21 2021 +0200 Commit: László Németh <nem...@numbertext.org> CommitDate: Mon May 31 09:47:32 2021 +0200 tdf#142257 (related) Replace Ctrl+[] shortcuts in Calc for Hungarian To mimic Excel shortcuts and make them work on Windows+HU keyboard layout Change-Id: I3525a8c9e370ff240105c8f1495f1abde539eee3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116242 Tested-by: Jenkins Tested-by: László Németh <nem...@numbertext.org> Reviewed-by: László Németh <nem...@numbertext.org> diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index dee162fb7036..7e540357387b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1301,12 +1301,16 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:MarkPrecedents</value> + <!-- tdf#142257 Replace Ctrl-[ with Shift-Alt-U for Hungarian --> + <value xml:lang="hu"></value> </prop> </node> <node oor:name="BRACKETRIGHT_MOD1" oor:op="replace"> <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="en-US">.uno:MarkDependents</value> + <!-- tdf#142257 Replace Ctrl-[ with Shift-Ctrl-U for Hungarian --> + <value xml:lang="hu"></value> </prop> </node> <node oor:name="SPACE_MOD1" oor:op="replace"> @@ -1408,6 +1412,15 @@ Ctrl+Shift+e aka E_SHIFT_MOD1 under GTK/IBUS is for some emoji thing <prop oor:name="Command"> <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> <value xml:lang="de">.uno:Underline</value> + <!-- tdf#142257 Replace Ctrl-[ with Shift-Ctrl-U for Hungarian --> + <value xml:lang="hu">.uno:MarkDependents</value> + </prop> + </node> + <node oor:name="U_SHIFT_MOD2" oor:op="replace"> + <prop oor:name="Command"> + <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value> + <!-- tdf#142257 Replace Ctrl-[ with Shift-Alt-U for Hungarian --> + <value xml:lang="hu">.uno:MarkPrecedents</value> </prop> </node> <node oor:name="V_SHIFT_MOD1" oor:op="replace"> commit 50fa8ea7406c5ac94f54c497e43f2489a7af24c8 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sun May 30 15:10:42 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon May 31 09:47:20 2021 +0200 cid#1476301 Dereference null return value Change-Id: Ibbaa99c28bee97b5194f1a8d396730b7fcc02930 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116407 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 079be31c88ae..2588e9f60325 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -711,8 +711,9 @@ void SmEditTextWindow::UpdateStatus(bool bSetDocModified) SmModule *pMod = SM_MOD(); if (pMod && pMod->GetConfig()->IsAutoRedraw()) Flush(); - if (bSetDocModified) - mrEditWindow.GetDoc()->SetModified(); + + if (SmDocShell *pModifyDoc = bSetDocModified ? mrEditWindow.GetDoc() : nullptr) + pModifyDoc->SetModified(); static_cast<SmEditEngine*>(GetEditEngine())->executeZoom(GetEditView()); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits