[Libreoffice-commits] core.git: sw/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Mar 6 10:48:00 UTC 2021


 sw/source/uibase/sidebar/PageFooterPanel.cxx |    2 +-
 sw/source/uibase/sidebar/PageHeaderPanel.cxx |    2 +-
 sw/source/uibase/sidebar/PageStylesPanel.cxx |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6fc73b528fb0203f2469a42928e75d1de77b2624
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 5 18:40:44 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Mar 6 11:47:10 2021 +0100

    check widget existance to detect we're disposed
    
    Change-Id: I0c925206a941e799e692cfae7dcd8efa0697a39e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112031
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index d4a909cbd88d..0cc1037a829f 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -195,7 +195,7 @@ void PageFooterPanel::NotifyItemUpdate(
     const SfxItemState eState,
     const SfxPoolItem* pState)
 {
-    if (IsDisposed())
+    if (!mxFooterToggle) //disposed
         return;
 
     switch(nSid)
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index ae3f4680d9a4..c47084d14371 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -197,7 +197,7 @@ void PageHeaderPanel::NotifyItemUpdate(
     const SfxItemState eState,
     const SfxPoolItem* pState)
 {
-    if (IsDisposed())
+    if (!mxHeaderToggle) //disposed
         return;
 
     switch(nSid)
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 071d56f2fbdd..8f4c8d88adb1 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -325,7 +325,7 @@ void PageStylesPanel::NotifyItemUpdate(
     const SfxItemState eState,
     const SfxPoolItem* pState)
 {
-    if(IsDisposed())
+    if (!mxColumnCount) //disposed
         return;
 
     switch(nSid)


More information about the Libreoffice-commits mailing list