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

[Libreoffice Gerrit user]

 sd/source/ui/view/sdwindow.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42fddc8766ae52f5abbcdff239734633f932dc44
Author:     Pranav Kant <pranavk at collabora.co.uk>
AuthorDate: Tue Jul 17 19:10:48 2018 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jul 18 17:57:57 2018 +0200

    fix CppunitTest_sd_tiledrendering
    
    Fallback from e5869e5f5da9c740469cd23bc4c70cc4b7ed3be2
    
    (partially cherry picked from commit ffb8a1fccf03ca3016c2e2153aa129df60120673)
    
    Change-Id: Ibabbdcd1ec3c89fe34bfa7993e767436a6c92579
    Reviewed-on: https://gerrit.libreoffice.org/57659
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index f5c747ec8fec..0eee0a3445e6 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1018,7 +1018,7 @@ Selection Window::GetSurroundingTextSelection() const
 void Window::LogicInvalidate(const ::tools::Rectangle* pRectangle)
 {
     DrawViewShell* pDrawViewShell = dynamic_cast<DrawViewShell*>(mpViewShell);
-    if (pDrawViewShell && pDrawViewShell->IsInSwitchPage())
+    if (!pDrawViewShell || pDrawViewShell->IsInSwitchPage())
         return;
 
     OString sRectangle;
@@ -1031,7 +1031,7 @@ void Window::LogicInvalidate(const ::tools::Rectangle* pRectangle)
             aRectangle = OutputDevice::LogicToLogic(aRectangle, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
         sRectangle = aRectangle.toString();
     }
-    SfxViewShell& rSfxViewShell = mpViewShell->GetViewShellBase();
+    SfxViewShell& rSfxViewShell = pDrawViewShell->GetViewShellBase();
     SfxLokHelper::notifyInvalidation(&rSfxViewShell, sRectangle);
 }