From 344fd7aaa967ae304f60def3ba92b25c4f0334f0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 18 May 2020 12:21:09 +0100 Subject: Resolves: tdf#129620 crash because there is no associated window only an outputdevice in this editeng-in-a-widget case Change-Id: Idf054872a48befba652012cd511e4f9df4437166 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94282 Tested-by: Jenkins Reviewed-by: Michael Stahl --- editeng/source/editeng/impedit2.cxx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'editeng') diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 607664c0f3d0..dc1730a72a94 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -496,13 +496,17 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) if ( nInputEnd > rLine.GetEnd() ) nInputEnd = rLine.GetEnd(); tools::Rectangle aR2 = PaMtoEditCursor( EditPaM( aPaM.GetNode(), nInputEnd ), GetCursorFlags::EndOfLine ); - tools::Rectangle aRect = pView->GetImpEditView()->GetWindowPos( aR1 ); - pView->GetWindow()->SetCursorRect( &aRect, aR2.Left()-aR1.Right() ); + if (vcl::Window* pWindow = pView->GetWindow()) + { + tools::Rectangle aRect = pView->GetImpEditView()->GetWindowPos( aR1 ); + pWindow->SetCursorRect( &aRect, aR2.Left()-aR1.Right() ); + } } } else { - pView->GetWindow()->SetCursorRect(); + if (vcl::Window* pWindow = pView->GetWindow()) + pWindow->SetCursorRect(); } } else if ( rCEvt.GetCommand() == CommandEventId::SelectionChange ) @@ -563,7 +567,8 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, EditView* pView ) tools::Rectangle aR2 = GetEditCursor( pParaPortion, nInputPos ); aRects[ i ] = pView->GetImpEditView()->GetWindowPos( aR2 ); } - pView->GetWindow()->SetCompositionCharRect( aRects.get(), mpIMEInfos->nLen ); + if (vcl::Window* pWindow = pView->GetWindow()) + pWindow->SetCompositionCharRect( aRects.get(), mpIMEInfos->nLen ); } } } -- cgit v1.2.3