Accepting request 818178 from home:badshah400:branches:LibreOffice:Factory

- Update libreoffice-stuck-widgets-in-sidebar.patch with an additional fix from upstream (tdf#134360).

OBS-URL: https://build.opensuse.org/request/show/818178
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=904
This commit is contained in:
Fridrich Strba 2020-07-02 06:15:02 +00:00 committed by Git OBS Bridge
parent 3b3fc7e503
commit d191b30890
2 changed files with 72 additions and 0 deletions

View File

@ -67,3 +67,69 @@ index 324a2e5..12a9eba 100644
{ {
mxTopDist->set_text(""); mxTopDist->set_text("");
mxBottomDist->set_text(""); mxBottomDist->set_text("");
From c4eb732bc38156d2d6c373c6ce3520eecf323d32 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 30 Jun 2020 20:05:30 +0100
Subject: [PATCH] Related: tdf#134360 table row/height widgets can get stuck insensitive
Change-Id: I1be53f33f60c510757c67f1da8f863539ecbffdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97573
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 4d76cc0..46f75cd 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -45,6 +45,9 @@
{
case SID_ATTR_TABLE_ROW_HEIGHT:
{
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ m_xRowHeightEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
@@ -55,18 +58,16 @@
m_xRowHeightEdit->set_value(nNewHeight, FieldUnit::TWIP);
}
}
- else if (eState == SfxItemState::DISABLED)
- {
- m_xRowHeightEdit->set_sensitive(false);
- }
- else
- {
+ else if (eState != SfxItemState::DISABLED)
m_xRowHeightEdit->set_text("");
- }
+
break;
}
case SID_ATTR_TABLE_COLUMN_WIDTH:
{
+ bool bDisabled = eState == SfxItemState::DISABLED;
+ m_xColumnWidthEdit->set_sensitive(!bDisabled);
+
if (pState && eState >= SfxItemState::DEFAULT)
{
const SfxUInt32Item* pItem = static_cast<const SfxUInt32Item*>(pState);
@@ -77,14 +78,9 @@
m_xColumnWidthEdit->set_value(nNewWidth, FieldUnit::TWIP);
}
}
- else if (eState == SfxItemState::DISABLED)
- {
- m_xColumnWidthEdit->set_sensitive(false);
- }
- else
- {
+ else if (eState != SfxItemState::DISABLED)
m_xColumnWidthEdit->set_text("");
- }
+
break;
}
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jul 1 20:15:15 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Update libreoffice-stuck-widgets-in-sidebar.patch with
an additional fix from upstream (tdf#134360).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 30 14:05:33 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com> Tue Jun 30 14:05:33 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>