summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2015-06-27 08:42:19 +0200
committerPhilippe Jung <phil.jung@free.fr>2015-06-29 15:41:31 +0000
commitdc1dd18d0650fb0e054791381062b33a5609c424 (patch)
treed937de28e3be607d8849152bc2359c2b3566fb20
parentGerman comments: i18npool and scaddins now complete. (diff)
downloadcore-dc1dd18d0650fb0e054791381062b33a5609c424.tar.gz
core-dc1dd18d0650fb0e054791381062b33a5609c424.zip
Related tdf#92322: fix crash with doCursor
0 0x00002aaaafaf3b0c in BrowseBox::DoShowCursor(char const*) (this=0x2f424e0) at /home/julien/compile-libreoffice/libreoffice/svtools/source/brwbox/brwbox1.cxx:182 1 0x00002aaaafafe392 in BrowseBox::GetFocus() (this=0x2f424e0) at /home/julien/compile-libreoffice/libreoffice/svtools/source/brwbox/brwbox1.cxx:2489 2 0x00002aaaafb27966 in svt::EditBrowseBox::GetFocus() (this=0x2f424e0) at /home/julien/compile-libreoffice/libreoffice/svtools/source/brwbox/editbrowsebox.cxx:237 3 0x00002aaab1b5706a in vcl::Window::CompatGetFocus() (this=0x2f424e0) at /home/julien/compile-libreoffice/libreoffice/vcl/source/window/window.cxx:3948 See https://bugs.documentfoundation.org/attachment.cgi?id=116859 Change-Id: I664884ee9333055707aecd7ad309c1a97596b71b Reviewed-on: https://gerrit.libreoffice.org/16538 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Philippe Jung <phil.jung@free.fr>
-rw-r--r--svtools/source/brwbox/brwbox1.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index d2da96c815f9..cb582cc49085 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -179,6 +179,8 @@ short BrowseBox::GetCursorHideCount() const
void BrowseBox::DoShowCursor( const char * )
{
+ if (!getDataWindow())
+ return;
short nHiddenCount = --getDataWindow()->nCursorHidden;
if (PaintCursorIfHiddenOnce())
{