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

[Noel Grandin (via logerrit)]

 basctl/source/basicide/ObjectCatalog.cxx |    3 +--
 basctl/source/basicide/baside2b.cxx      |    6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit c83615f8c61b14bd842faffabc4c2965ca78571a
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 26 11:00:15 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 29 19:24:09 2021 +0200

    no need to check IsDisposed here
    
    the call site does that
    
    Change-Id: I8373eb4a6b87e96b211dd6bacea051d43b7ae8b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116178
    Tested-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/basctl/source/basicide/ObjectCatalog.cxx 
b/basctl/source/basicide/ObjectCatalog.cxx
index 5ad7913ae139..89b3f4e2b824 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -54,8 +54,7 @@ ObjectCatalog::~ObjectCatalog() { disposeOnce(); }
 
 void ObjectCatalog::dispose()
 {
-    if (!IsDisposed())
-        GetParent()->GetSystemWindow()->GetTaskPaneList()->RemoveWindow(this);
+    GetParent()->GetSystemWindow()->GetTaskPaneList()->RemoveWindow(this);
     m_xTitle.reset();
     m_xTree.reset();
     DockingWindow::dispose();
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 7d06e117d072..3335424583a0 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1679,8 +1679,7 @@ void WatchWindow::dispose()
     m_xRemoveWatchButton.reset();
     m_xTitleArea.reset();
     m_xTreeListBox.reset();
-    if (!IsDisposed())
-        GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
+    GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
     DockingWindow::dispose();
 }
 
@@ -1836,8 +1835,7 @@ StackWindow::~StackWindow()
 
 void StackWindow::dispose()
 {
-    if (!IsDisposed())
-        GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
+    GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
     m_xTitle.reset();
     m_xTreeListBox.reset();
     DockingWindow::dispose();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits