summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-10-05 09:49:17 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2022-10-05 14:04:52 +0200
commit713b19bde2dcd0a65e04bb99681e35cbfd2f25e9 (patch)
tree1eb648e7f5398aefcf87b8a91d759e7998240b72
parenttdf#138625 DOCX import: fix superscript footnote numbering in l10n (diff)
downloadcore-713b19bde2dcd0a65e04bb99681e35cbfd2f25e9.tar.gz
core-713b19bde2dcd0a65e04bb99681e35cbfd2f25e9.zip
tdf#151316 recalc what dependencies should be sensitive
Change-Id: I40f78ec151c3d5901209b8587f6152ab76d04e88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140960 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 17612ee10f89a6bf5447a324a02eb0a73d7b27e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140961
-rw-r--r--sw/source/ui/misc/pggrid.cxx17
1 files changed, 12 insertions, 5 deletions
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 46f78140a927..e59e4112f439 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -460,15 +460,18 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v
IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
{
- bool bEnable = m_xNoGridRB.get() != &rButton;
- m_xLayoutFL->set_sensitive(bEnable);
- m_xDisplayFL->set_sensitive(bEnable);
+ if (!rButton.get_active())
+ return;
+
+ const bool bNoGrid = m_xNoGridRB.get() == &rButton;
+ m_xLayoutFL->set_sensitive(!bNoGrid);
+ m_xDisplayFL->set_sensitive(!bNoGrid);
//one special case
- if (bEnable)
+ if (!bNoGrid)
DisplayGridHdl(*m_xDisplayCB);
- bEnable = m_xCharsGridRB.get() == &rButton;
+ bool bEnable = m_xCharsGridRB.get() == &rButton;
m_xSnapToCharsCB->set_sensitive(bEnable);
bEnable = m_xLinesGridRB.get() == &rButton;
@@ -481,6 +484,10 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
m_xCharWidthMF->set_sensitive(false);
}
+ //recalc which dependencies are sensitive
+ if (!bNoGrid)
+ TextSizeChangedHdl(*m_xTextSizeMF);
+
GridModifyHdl();
}