sc/source/ui/cctrl/checklistmenu.cxx | 5 +----
sc/source/ui/dbgui/dapitype.cxx | 4 ++++
sc/source/ui/inc/checklistmenu.hxx | 1 -
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit dbcc736e6f7fd540c8edd7f73a2eb80525fcf17a
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Dec 4 12:29:39 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Dec 4 14:00:38 2020 +0100
Revert "Avoid crash while closing autofilter"
This reverts commit 8e75c42253d92a014baf24dda82d3379bd736978.
Fixed by other patch solving problem in DockingManager
during removing DockingWindows.
see "Avoid crash on closing docking window"
Change-Id: I1a2d0a18705ad497f3aef0edcf01e2b8d57b5cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107216
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 6798520f1ffb..deeb987ee806 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -400,8 +400,7 @@ void ScCheckListMenuControl::setSubMenuFocused(const
ScCheckListMenuControl* pSu
void ScCheckListMenuControl::EndPopupMode()
{
vcl::Window::GetDockingManager()->EndPopupMode(mxFrame);
- if (!mbDisposing)
- mxFrame->EnableDocking(false);
+ mxFrame->EnableDocking(false);
}
void ScCheckListMenuControl::StartPopupMode(const tools::Rectangle& rRect,
FloatWinPopupFlags eFlags)
@@ -466,7 +465,6 @@
ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v
, mbCanHaveSubMenu(bCanHaveSubMenu)
, maOpenTimer(this)
, maCloseTimer(this)
- , mbDisposing(false)
{
/*
tdf#136559 If we have no dates we don't need a tree
@@ -581,7 +579,6 @@ void ScCheckListMenuControl::GrabFocus()
ScCheckListMenuControl::~ScCheckListMenuControl()
{
- mbDisposing = true;
EndPopupMode();
for (auto& rMenuItem : maMenuItems)
rMenuItem.mxSubMenuWin.disposeAndClear();
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 74014e9ce80d..5d4d6a6abd33 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -293,7 +293,6 @@ private:
SubMenuItemData maOpenTimer;
SubMenuItemData maCloseTimer;
- bool mbDisposing;
};
/**
commit 13504aab04e01a14580b35c9f1a24db6fa6e720e
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Dec 4 13:42:19 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Dec 4 14:00:26 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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 411ff96872c0..15acb8c65553 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;
@@ -52,6 +53,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();
}
IMPL_LINK(ScDataPilotSourceTypeDlg, ResponseHdl, weld::Button&, rButton, void)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
