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

[Jan-Marek Glogowski]

 chart2/source/controller/main/ChartWindow.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bbe5291ace311b9f0f311dbda7c19b82708ee227
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Aug 3 15:31:02 2017 +0200

    Fix JunitTest chart2 unoapi
    
    Change-Id: I41b8df11778570888cd6943d25d72ca33661c305
    Reviewed-on: https://gerrit.libreoffice.org/40723
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 3d8846a51acc509118a0af6ac16539c19109ff8d)
    Reviewed-on: https://gerrit.libreoffice.org/41171
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index d50a741cd001..58d6c291cb74 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -322,6 +322,9 @@ void ChartWindow::Invalidate( const vcl::Region& rRegion, InvalidateFlags nFlags
 
 void ChartWindow::LogicInvalidate(const Rectangle* pRectangle)
 {
+    SfxViewShell* pCurrentShell = SfxViewShell::Current();
+    if ( nullptr == pCurrentShell )
+        return;
     OString sRectangle;
     if (!pRectangle)
     {
@@ -366,7 +369,6 @@ void ChartWindow::LogicInvalidate(const Rectangle* pRectangle)
 
         sRectangle = aRectangle.toString();
     }
-    SfxViewShell* pCurrentShell = SfxViewShell::Current();
     SfxLokHelper::notifyInvalidation(pCurrentShell, sRectangle);
 }