svtools/source/control/valueset.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e397c3775303fc2eb850ae8d1cb1ab2cc271a446
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Sep 17 12:38:41 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Sep 29 12:00:41 2020 +0200
tdf#136737 grid in change icon dialog ends up oversized
Change-Id: Ib3d28fc967bf5e1b95d71ebe42e1fc540ea91ac3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102927
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit d9ae83e596e94c4d4967c5de653c2060b0648c78)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102929
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index dde904d2b9a2..4070630fe44a 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -541,6 +541,8 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
void ValueSet::TurnOffScrollBar()
{
+ if (mxScrolledWindow->get_vpolicy() == VclPolicyType::NEVER)
+ return;
mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
weld::DrawingArea* pDrawingArea = GetDrawingArea();
Size aPrefSize(pDrawingArea->get_preferred_size());
@@ -549,6 +551,8 @@ void ValueSet::TurnOffScrollBar()
void ValueSet::TurnOnScrollBar()
{
+ if (mxScrolledWindow->get_vpolicy() == VclPolicyType::ALWAYS)
+ return;
mxScrolledWindow->set_vpolicy(VclPolicyType::ALWAYS);
weld::DrawingArea* pDrawingArea = GetDrawingArea();
Size aPrefSize(pDrawingArea->get_preferred_size());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
