diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-09 15:34:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-09 18:08:30 +0200 |
| commit | 7c9a40f7cf996ab2ad15d595a262698435be42e0 (patch) | |
| tree | 559289f009fa40cd2da5f00431845532f1fd58a4 /sc | |
| parent | 9b4bda5361f7ed06b07ab8dd59aeb77278c73195 (diff) | |
EditView may not have a Window
Change-Id: I0b1a87bab8fbabd24962efd6d42e12a2c922de54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104124
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/editsh.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 83e4adaf815f..e076c762be1d 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -298,8 +298,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTopView->Paste(); } - if (pTopView) - pTopView->GetWindow()->GrabFocus(); + if (vcl::Window* pViewWindow = pTopView ? pTopView->GetWindow() : nullptr) + pViewWindow->GrabFocus(); } break; @@ -310,7 +310,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) if (pTopView) { pTopView->Paste(); - pTopView->GetWindow()->GrabFocus(); + if (vcl::Window* pViewWindow = pTopView ? pTopView->GetWindow() : nullptr) + pViewWindow->GrabFocus(); } } break; @@ -458,8 +459,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) } - if (pTopView) - pTopView->GetWindow()->GrabFocus(); + if (vcl::Window* pViewWindow = pTopView ? pTopView->GetWindow() : nullptr) + pViewWindow->GrabFocus(); } break; @@ -492,8 +493,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) } pDlg.disposeAndClear(); - if (pTopView) - pTopView->GetWindow()->GrabFocus(); + if (vcl::Window* pViewWindow = pTopView ? pTopView->GetWindow() : nullptr) + pViewWindow->GrabFocus(); } break; |