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

[Michael Meeks (via logerrit)]

 sw/source/uibase/docvw/AnnotationWin2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbbdc809b41c705d732e06c69c348ab6d1977e46
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Jan 9 09:58:11 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Jan 9 18:27:17 2020 +0100

    sw: tolerate null ShadowOverlay object as the rest of the code does.
    
    Change-Id: I552c0f11b22212d36bcaee33432e2a10d4df58ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86472
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 48db11fdd37e..c9ba97fd5adc 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -766,7 +766,7 @@ void SwAnnotationWin::SetPosAndSize()
         }
     }
 
-    if (bChange)
+    if (mpShadow && bChange)
     {
         Point aStart = EditWin().PixelToLogic(GetPosPixel()+Point(0,GetSizePixel().Height()));
         Point aEnd = EditWin().PixelToLogic(GetPosPixel()+Point(GetSizePixel().Width()-1,GetSizePixel().Height()));