diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-25 13:41:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-25 22:15:25 +0100 |
| commit | 1a84b1c3978c691b857d481826dbe160666eb3ea (patch) | |
| tree | 5c3cf1e58b1e0a8a18c0c2149642e4e7c678f21b /sw | |
| parent | 8fb0a3dd9f3dc68bdd5670d2d071e6f225111dc7 (diff) | |
Resolves: tdf#124319 crash on restoring redline SfxChildWin
Change-Id: I585ce6403e256652ebfc0ccb8ba25daa9c3e34e8
Reviewed-on: https://gerrit.libreoffice.org/69676
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/fldui/fldwrap.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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 |