commit 323ff2749b6be5f6ef98c6250afce4fa89e3aa1c
author Noel Grandin <noel.grandin@collabora.co.uk> Wed Mar 23 16:49:05 2022 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Wed Mar 23 18:18:54 2022 +0100
tree 7de057a42f391b18e818a6def721059abb12573a
parent 8a967b566603225d2719735c0d27bf6c91a49bd2

tdf#147641 default font size for captions always reset

regression from
    commit 65d2d2647ead42e5bbb7800f14c047f383fe450b
    Author: Noel Grandin <noel.grandin@collabora.co.uk>
    Date:   Thu Nov 8 16:10:51 2018 +0200
    loplugin:singlevalfields in sw
where I incorrectly reduced a boolean expression

Change-Id: I7f3b4552dc27dcd5e118233b5c0ca75e4eb06fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131980
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

sw/source/ui/config/optpage.cxx

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index f46bf5f..374ba9c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -599,9 +599,9 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet* )

    bool bStandardHeightChanged = m_xStandardHeightLB->get_value_changed_from_saved();
    bool bTitleHeightChanged = m_xTitleHeightLB->get_value_changed_from_saved();
    bool bListHeightChanged = m_xListHeightLB->get_value_changed_from_saved() && !m_bListHeightDefault;
    bool bLabelHeightChanged = m_xLabelHeightLB->get_value_changed_from_saved() && !m_bLabelHeightDefault;
    bool bIndexHeightChanged = m_xIndexHeightLB->get_value_changed_from_saved() && !m_bIndexHeightDefault;
    bool bListHeightChanged = m_xListHeightLB->get_value_changed_from_saved();
    bool bLabelHeightChanged = m_xLabelHeightLB->get_value_changed_from_saved();
    bool bIndexHeightChanged = m_xIndexHeightLB->get_value_changed_from_saved();

    m_pFontConfig->SetFontStandard(sStandard, m_nFontGroup);
    m_pFontConfig->SetFontOutline(sTitle, m_nFontGroup);