vcl/source/window/window.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 3ec78de2322f781a98802acc77cfb3e71a08eb3d Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Fri Jul 16 16:03:49 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Fri Jul 16 21:53:05 2021 +0200 tdf#142923 Deleting comment in Writer leaves visual artifact behind Change-Id: Ia2e55886513e81847dd0ac6c697e7cea34e01bdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119075 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3a960cf76984..72dd9d17b424 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2176,7 +2176,7 @@ vcl::Font Window::GetPointFont(vcl::RenderContext const & rRenderContext) const void Window::Show(bool bVisible, ShowFlags nFlags) { - if ( isDisposed() || mpWindowImpl->mbVisible == bVisible ) + if ( !mpWindowImpl || mpWindowImpl->mbVisible == bVisible ) return; VclPtr<vcl::Window> xWindow(this); @@ -2187,7 +2187,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags) if ( !bVisible ) { ImplHideAllOverlaps(); - if( xWindow->isDisposed() ) + if( !xWindow->mpWindowImpl ) return; if ( mpWindowImpl->mpBorderWindow ) @@ -2213,7 +2213,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags) vcl::Region aInvRegion = mpWindowImpl->maWinClipRegion; - if( xWindow->isDisposed() ) + if( !xWindow->mpWindowImpl ) return; bRealVisibilityChanged = mpWindowImpl->mbReallyVisible; @@ -2349,7 +2349,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags) bool bNoActivate(nFlags & (ShowFlags::NoActivate|ShowFlags::NoFocusChange)); mpWindowImpl->mpFrame->Show( true, bNoActivate ); } - if( xWindow->isDisposed() ) + if( !xWindow->mpWindowImpl ) return; // Query the correct size of the window, if we are waiting for @@ -2367,13 +2367,13 @@ void Window::Show(bool bVisible, ShowFlags nFlags) mpWindowImpl->mpFrameData->mpBuffer->SetOutputSizePixel(GetOutputSizePixel()); } - if( xWindow->isDisposed() ) + if( !xWindow->mpWindowImpl ) return; ImplShowAllOverlaps(); } - if( xWindow->isDisposed() ) + if( !xWindow->mpWindowImpl ) return; // the SHOW/HIDE events also serve as indicators to send child creation/destroy events to the access bridge _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits