svx/source/form/fmshell.cxx | 4 +++- sw/source/ui/frmdlg/wrap.cxx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 093e46c06c88b29d1a5262791bb007aa5d3ea62c Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 2 19:57:31 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Nov 3 11:41:18 2025 +0100 Resolves: tdf#144343 This isn't used to toggle navigator on/off but instead contains a SfxBoolItem which specifies if it should be shown or hidden and ChildWindowExecute takes care of deciding if that requires Toggling on or off. Change-Id: I2ad422041bb6f40f5b726111cf5ce35a32c39128 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193310 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index d88eb91fb3ec..d83899d301e5 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -597,7 +597,9 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_FILTER_NAVIGATOR: case SID_FM_SHOW_DATANAVIGATOR : { - GetViewShell()->GetViewFrame().ToggleChildWindow(nSlot); + // request may explicitly request to show/hide these + // so may or may not result in a ToggleChildWindow + GetViewShell()->GetViewFrame().ChildWindowExecute(rReq); rReq.Done(); } break; case SID_FM_SHOW_FMEXPLORER: commit 27925a3289730be9d06d83d3684848c3f2d24670 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Nov 2 14:48:28 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Nov 3 11:41:08 2025 +0100 cid#1667088 silence Overflowed constant Change-Id: I8996592e394cbd347519c2fbc276d622976eb777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193329 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index e12ebb47aa36..28a08d28aadb 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -576,7 +576,7 @@ IMPL_LINK(SwWrapTabPage, RangeModifyHdl, weld::MetricSpinButton&, rEdit, void) { auto nOpposite = pOpposite->get_value(FieldUnit::NONE); - if (nValue + nOpposite > std::max(rEdit.get_max(FieldUnit::NONE), pOpposite->get_max(FieldUnit::NONE))) + if (nValue > std::max(rEdit.get_max(FieldUnit::NONE), pOpposite->get_max(FieldUnit::NONE)) - nOpposite) pOpposite->set_value(pOpposite->get_max(FieldUnit::NONE) - nValue, FieldUnit::NONE); } }
