sw/source/uibase/fldui/fldwrap.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1a84b1c3978c691b857d481826dbe160666eb3ea
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 25 13:41:58 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Mar 25 22:15:25 2019 +0100
Resolves: tdf#124319 crash on restoring redline SfxChildWin
Change-Id: I585ce6403e256652ebfc0ccb8ba25daa9c3e34e8
Reviewed-on: https://gerrit.libreoffice.org/69676
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/fldui/fldwrap.cxx
b/sw/source/uibase/fldui/fldwrap.cxx
index c65c1d1b17d0..69cb72de640a 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -45,7 +45,10 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window
*pParentWindow, sal_uInt16 nId)
IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl, Timer *, void)
{
- GetController()->Activate(); // update dialog
+ if (GetController())
+ GetController()->Activate(); // update dialog
+ else if (GetWindow())
+ GetWindow()->Activate(); // update dialog
}
// newly initialise dialog after Doc switch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
