summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2017-11-13 23:03:41 +0100
committerJulien Nabet <serval2412@yahoo.fr>2017-11-15 07:02:13 +0100
commit4283092eb219968870e23bd0d600e1ef521dab89 (patch)
treec924edc9263002aad8f83945e38a1802607ba25f /vcl/source
parent7e56dce9efa7184e522c83130dcf79d894488657 (diff)
Related tdf#113652: fix crash when closing Data provider
Test also mpScrollBar to know if should keep on with RecalcAll bt: 5 0x00007fffec06b6f0 in vcl::Window::Hide() (this=0x0) at /home/julien/lo/libreoffice/include/vcl/window.hxx:948 6 0x00007fffec2eb344 in ListControl::RecalcAll() (this=0x555558b25090) at /home/julien/lo/libreoffice/vcl/source/control/listctrl.cxx:76 7 0x00007fffec2eb6ec in ListControl::queue_resize(StateChangedType) (this=0x555558b25090, eReason=StateChangedType::Layout) at /home/julien/lo/libreoffice/vcl/source/control/listctrl.cxx:110 8 0x00007fffec24c6b0 in vcl::(anonymous namespace)::queue_ungrouped_resize(vcl::Window const*) (pOrigWindow=0x555558b06620) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343 9 0x00007fffec24c799 in vcl::Window::queue_resize(StateChangedType) (this=0x555558b06620, eReason=StateChangedType::Layout) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362 10 0x00007fffec14a701 in VclContainer::queue_resize(StateChangedType) (this=0x555558b06620, eReason=StateChangedType::Layout) at /home/julien/lo/libreoffice/vcl/source/window/layout.cxx:179 11 0x00007fffec24c6b0 in vcl::(anonymous namespace)::queue_ungrouped_resize(vcl::Window const*) (pOrigWindow=0x555558b287b0) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343 12 0x00007fffec24c799 in vcl::Window::queue_resize(StateChangedType) (this=0x555558b287b0, eReason=StateChangedType::Layout) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362 13 0x00007fffec14a701 in VclContainer::queue_resize(StateChangedType) (this=0x555558b287b0, eReason=StateChangedType::Layout) at /home/julien/lo/libreoffice/vcl/source/window/layout.cxx:179 14 0x00007fffec24c6b0 in vcl::(anonymous namespace)::queue_ungrouped_resize(vcl::Window const*) (pOrigWindow=0x555558b26fd0) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1343 15 0x00007fffec24c799 in vcl::Window::queue_resize(StateChangedType) (this=0x555558b26fd0, eReason=StateChangedType::Visible) at /home/julien/lo/libreoffice/vcl/source/window/window2.cxx:1362 16 0x00007fffec25f2d5 in vcl::Window::StateChanged(StateChangedType) (this=0x555558b26fd0, eType=StateChangedType::Visible) at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:1940 17 0x00007fffec2675ae in vcl::Window::CompatStateChanged(StateChangedType) (this=0x555558b26fd0, nStateChange=StateChangedType::Visible) at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:3696 18 0x00007fffec260548 in vcl::Window::Show(bool, ShowFlags) (this=0x555558b26fd0, bVisible=false, nFlags=ShowFlags::NONE) at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:2200 19 0x00007fffec06b6f0 in vcl::Window::Hide() (this=0x555558b26fd0) at /home/julien/lo/libreoffice/include/vcl/window.hxx:948 20 0x00007fffec256f11 in vcl::Window::dispose() (this=0x555558b26fd0) at /home/julien/lo/libreoffice/vcl/source/window/window.cxx:394 21 0x00007fffec2b1395 in Control::dispose() (this=0x555558b26fd0) at /home/julien/lo/libreoffice/vcl/source/control/ctrl.cxx:68 22 0x00007fffec289da8 in Button::dispose() (this=0x555558b26fd0) at /home/julien/lo/libreoffice/vcl/source/control/button.cxx:109 23 0x00007fffec3ef640 in VclReferenceBase::disposeOnce() (this=0x555558b27240) at /home/julien/lo/libreoffice/vcl/source/outdev/vclreferencebase.cxx:42 24 0x00007fffca047c8a in VclPtr<PushButton>::disposeAndClear() (this=0x555558b068c0) at /home/julien/lo/libreoffice/include/vcl/vclptr.hxx:208 25 0x00007fffca0432a6 in ScDataProviderBaseControl::dispose() (this=0x555558b06620) at /home/julien/lo/libreoffice/sc/source/ui/miscdlgs/dataproviderdlg.cxx:104 Change-Id: Ie1f2b156a5743354f39e95048e50bb0709095fd0 Reviewed-on: https://gerrit.libreoffice.org/44697 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/control/listctrl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index fd94a50abed1..50b03eddc918 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -48,7 +48,7 @@ void ListControl::RecalcAll()
// avoid recalculating while we are disposing
// children. This just leads to complex invalid memory
// access patterns that are not fixable.
- if (IsDisposed())
+ if (isDisposed())
return;
sal_Int32 nTotalHeight = 0;