[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Miklos Vajna (via logerrit)]

 vcl/source/window/window.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41e9b86e39e3bd9093bbefc7cf2d4ef2866390e2
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed May 31 15:28:16 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 31 21:32:08 2023 +0200

    vcl: one more nullptr check in Window::GetOutDev()
    
    As it was pointed out at
    
<https://gerrit.libreoffice.org/c/core/+/151857/2#message-ced4ba9ebaf5725ec06853682c146211824af158>,
    it makes little sense to have the nullptr check in the non-const version
    of Window::GetOutDev() but not have it in the const version, fix this.
    
    Change-Id: I2f97938a4015d3ce27e35b9971b65090f7289c11
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152429
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit dcc54c4c4bd3c938ba4b06e89f5688ae262b8507)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152436
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9ac6614b3a97..0b3b970d6750 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -566,7 +566,7 @@ Window::~Window()
 
 ::OutputDevice const* Window::GetOutDev() const
 {
-    return mpWindowImpl->mxOutDev.get();
+    return mpWindowImpl ? mpWindowImpl->mxOutDev.get() : nullptr;
 }
 
 ::OutputDevice* Window::GetOutDev()