summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-03-23 16:49:05 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2022-03-24 04:21:37 +0100
commit11f22ac8526557c3340aa948da12ac3da81cda7e (patch)
tree5a53a100748bba878c58225f539fb0753809c87b
parente2dad1cb89179edabf54227240d2c7f5d9d1605f (diff)
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> (cherry picked from commit 323ff2749b6be5f6ef98c6250afce4fa89e3aa1c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131995 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sw/source/ui/config/optpage.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 3868c8b76246..442d42243273 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -608,9 +608,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);