[Libreoffice-commits] core.git: 2 commits - sc/source vcl/source

[Szymon KÅ‚os (via logerrit)]

 sc/source/ui/dbgui/dapitype.cxx |    4 ++++
 vcl/source/window/dockmgr.cxx   |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 29f2e1543089c3caadeb5e0f6f69624566810044
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Dec 4 13:42:19 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Dec 8 13:22:23 2020 +0100

    pivot table: hide database source in online
    
    Change-Id: Ifc9fdb6010f9a998ffd2d6eeaa562528563f0666
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107219
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107404
    Tested-by: Jenkins

diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index d4e817b2404d..9ce2626bb8c4 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -20,6 +20,7 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <dapitype.hxx>
+#include <comphelper/lok.hxx>
 
 using namespace com::sun::star;
 
@@ -47,6 +48,9 @@ ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
 
     // Intentionally hide this button to see if anyone complains.
     m_xBtnExternal->hide();
+
+    if (comphelper::LibreOfficeKit::isActive())
+        m_xBtnDatabase->hide();
 }
 
 ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg()
commit 02708dab4eb244061133059f6c37bb070d9c826b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Dec 4 12:24:27 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Dec 8 13:22:12 2020 +0100

    Avoid crash on closing docking window
    
    Change-Id: I9f5ac4fae9e37e3eece8ad8bd2d6505514517d9f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107215
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107403
    Tested-by: Jenkins

diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 1307ffa9234d..8c2367e96736 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -388,6 +388,10 @@ void DockingManager::RemoveWindow( const vcl::Window *pWindow )
         const auto& xWrapper = *it;
         if (xWrapper && xWrapper->mpDockingWindow == pWindow)
         {
+            // deleting wrappers calls set of actions which may want to use
+            // wrapper we want to delete - avoid crash using temporary owner
+            // while erasing
+            auto pTemporaryOwner = std::move(*it);
             mvDockingWindows.erase( it );
             break;
         }