[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Ashod Nakashian (via logerrit)]

 vcl/source/window/floatwin.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 65685bac09a4320602f4dda5151d247c5a83a75c
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Wed Dec 18 07:30:14 2019 -0500
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Wed Dec 18 16:26:15 2019 +0100

    vcl: don't use null window in FloatingWindow HitTest
    
    Change-Id: I551f31cf30c7a58642becebe0256684055d0703a
    Reviewed-on: https://gerrit.libreoffice.org/85383
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 9de1efdaf221..6c27982ae74f 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -521,6 +521,8 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const
 
         // use the border window to have the exact position
         vcl::Window *pBorderWin = pWin->GetWindow( GetWindowType::Border );
+        if (!pBorderWin)
+            break;
 
         // the top-left corner in output coordinates ie (0,0)
         tools::Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle( Point(), pBorderWin->GetSizePixel()) ) ) ;