[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/dbtablepreviewdialog.cxx |   53 +++++++++++++++++++++++------
 sw/source/ui/dbui/dbtablepreviewdialog.hxx |    4 +-
 2 files changed, 46 insertions(+), 11 deletions(-)

New commits:
commit a986db4b2d24669e502e447036851e118cc23036
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Nov 4 13:01:53 2020 +0000
Commit:     Michael Stahl <michael.st...@cib.de>
CommitDate: Thu Nov 5 10:45:26 2020 +0100

    tdf#137982 m_xFrame is already disposed
    
    move the frame cleanup into a helper that listens to see if it got
    disposed by the preview itself
    
    Change-Id: I523285268118300f18b0f0f0a10fab7a9cced9c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105221
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx 
b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
index be0178dddbc1..b8c755d83e46 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx
@@ -19,6 +19,8 @@
 
 #include "dbtablepreviewdialog.hxx"
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 
 using namespace ::com::sun::star;
@@ -28,6 +30,34 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
+class DBTablePreviewFrame
+    : public cppu::WeakImplHelper<lang::XEventListener>
+{
+private:
+    css::uno::Reference<css::frame::XFrame2> m_xFrame;
+
+    virtual void SAL_CALL disposing(const lang::EventObject& /*Source*/) 
override
+    {
+        m_xFrame.clear();
+    }
+
+public:
+    DBTablePreviewFrame(css::uno::Reference<css::frame::XFrame2>& rFrame)
+        : m_xFrame(rFrame)
+    {
+    }
+
+    void cleanup()
+    {
+        if (m_xFrame.is())
+        {
+            m_xFrame->setComponent(nullptr, nullptr);
+            m_xFrame->dispose();
+            m_xFrame.clear();
+        }
+    }
+};
+
 SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, 
uno::Sequence< beans::PropertyValue> const & rValues)
     : SfxDialogController(pParent, "modules/swriter/ui/tablepreviewdialog.ui", 
"TablePreviewDialog")
     , m_xDescriptionFI(m_xBuilder->weld_label("description"))
@@ -47,22 +77,26 @@ 
SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Seque
         m_xDescriptionFI->set_label(sDescription.replaceFirst("%1", sTemp));
     }
 
+    css::uno::Reference<css::frame::XFrame2> xFrame;
     try
     {
         // create a frame wrapper for myself
-        m_xFrame = frame::Frame::create( 
comphelper::getProcessComponentContext() );
-        m_xFrame->initialize(m_xBeamerWIN->CreateChildFrame());
+        xFrame = frame::Frame::create( 
comphelper::getProcessComponentContext() );
+        xFrame->initialize(m_xBeamerWIN->CreateChildFrame());
     }
     catch (uno::Exception const &)
     {
-        m_xFrame.clear();
+        xFrame.clear();
     }
-    if (m_xFrame.is())
+    if (xFrame.is())
     {
+        m_xFrameListener.set(new DBTablePreviewFrame(xFrame));
+        xFrame->addEventListener(m_xFrameListener.get());
+
         util::URL aURL;
         aURL.Complete = ".component:DB/DataSourceBrowser";
-        uno::Reference<frame::XDispatch> xD = m_xFrame->queryDispatch(aURL, 
"", 0x0C);
-        if(xD.is())
+        uno::Reference<frame::XDispatch> xD = xFrame->queryDispatch(aURL, "", 
0x0C);
+        if (xD.is())
         {
             xD->dispatch(aURL, rValues);
             m_xBeamerWIN->show();
@@ -72,11 +106,10 @@ 
SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Seque
 
 SwDBTablePreviewDialog::~SwDBTablePreviewDialog()
 {
-    if(m_xFrame.is())
+    if (m_xFrameListener)
     {
-        m_xFrame->setComponent(nullptr, nullptr);
-        m_xFrame->dispose();
-        m_xFrame.clear();
+        m_xFrameListener->cleanup();
+        m_xFrameListener.clear();
     }
 }
 
diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx 
b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
index f914ea2bde58..99315fa01771 100644
--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx
+++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx
@@ -27,12 +27,14 @@ namespace com::sun::star{
     namespace frame{ class XFrame2;     }
 }
 
+class DBTablePreviewFrame;
+
 class SwDBTablePreviewDialog : public SfxDialogController
 {
     std::unique_ptr<weld::Label> m_xDescriptionFI;
     std::unique_ptr<weld::Container> m_xBeamerWIN;
 
-    css::uno::Reference< css::frame::XFrame2 >         m_xFrame;
+    rtl::Reference<DBTablePreviewFrame> m_xFrameListener;
 public:
     SwDBTablePreviewDialog(weld::Window* pParent,
             css::uno::Sequence< css::beans::PropertyValue> const & rValues  );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits