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

[Shivam Kumar Singh (via logerrit)]

 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2f226d63e88f2c6ba6771b37a7039c82e3d0001
Author:     Shivam Kumar Singh <shivamhere247 at gmail.com>
AuthorDate: Tue Aug 11 18:25:39 2020 +0530
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed Aug 12 12:07:43 2020 +0200

    tdf#135528 tdf#135491 Fix LO crash when using macro with SI enabled
    
    WriterInspectorTextPanel.cxx tries to work on the current shell
    which might change everytime. This patch uses the original shell
    stored in m_pWrtShell to get the current DocShell.
    
    Change-Id: I243e7346b748ca81041016f526b6d4da7861f7bd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100493
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
index 7c10f757edbc..bbb018bfcc72 100644
--- a/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
+++ b/sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx
@@ -501,7 +501,7 @@ IMPL_LINK(WriterInspectorTextPanel, AttrChangedNotify, LinkParamNone*, pLink, vo
     if (m_oldLink.IsSet())
         m_oldLink.Call(pLink);
 
-    SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
+    SwDocShell* pDocSh = m_pShell->GetDoc()->GetDocShell();
     std::vector<svx::sidebar::TreeNode> aStore;
 
     if (pDocSh && pDocSh->GetDoc()->GetEditShell()->GetCursor()->GetNode().GetTextNode())