sc/source/ui/view/gridwin.cxx | 4 ++--
vcl/source/window/winproc.cxx | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 054b0df6ac77864146bab8654bcc99f049a39057
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 14 13:53:51 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Jun 28 10:57:40 2021 +0200
tdf#142393 crash on filter by color dropdownlist (gen)
the frame/window can become disposed during the early stages of this
method
Change-Id: I974cbeefa75a3b5274e397a6da70db8b7cf73528
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117157
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 3c0938c9bb63fa65ea44439b4e838ed0d9fa1260)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117550
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 424b8b6cdbfa..cb4c6cd35d9e 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -510,6 +510,8 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>&
xWindow, MouseNotifyEvent
pMouseDownWin->ImplGetFrameData()->mbStartDragCalled = true;
}
+ if (xWindow->isDisposed())
+ return true;
// test for mouseleave and mouseenter
VclPtr<vcl::Window> pMouseMoveWin = pWinFrameData->mpMouseMoveWin;
if ( pChild != pMouseMoveWin )
commit f9957621c060dbf1d35d913930419153d8ae7696
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed May 19 14:21:27 2021 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Mon Jun 28 10:57:26 2021 +0200
tdf#76258 Fix color filter popup position
Should be next to autofilter popup
Change-Id: I2ca00fd078d18f8f5c7318115789ffe633a87dc3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115803
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
(cherry picked from commit 950eb673b9ad4bc380b13281af577fc8c6842007)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116603
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b8d89317c271..02a8d9e8f370 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -904,8 +904,8 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode
eMode)
}
i++;
}
-
- sal_uInt16 nSelected = pColorMenu->Execute(this,
mpAutoFilterPopup->GetPosPixel());
+ Point pos(mpAutoFilterPopup->GetSizePixel().getWidth(), 150);
+ sal_uInt16 nSelected = pColorMenu->Execute(this, pos);
pColorMenu.disposeAndClear();
mpAutoFilterPopup->terminateAllPopupMenus();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
