[Libreoffice-commits] core.git: sw/source

Miklos Vajna vmiklos at collabora.co.uk
Wed Aug 12 07:44:28 PDT 2015


 sw/source/core/view/viewsh.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 89bd30cf426ca54fc9e46295a60551b5bb2d3232
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Aug 12 14:40:21 2015 +0200

    sw: check 0 paint window in RenderContextGuard
    
    As seen by Norbert during CppunitTest_sw_globalfilter.
    
    Change-Id: I02dfab78b3cdcc65187f04e86cce7b7432c0a138
    Reviewed-on: https://gerrit.libreoffice.org/17677
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 436fbf7..80aa194 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1677,8 +1677,8 @@ public:
             rtl::Reference<sdr::overlay::OverlayManager> xOldManager = pOldPaintWindow->GetOverlayManager();
             if (xOldManager.is())
             {
-                SdrPaintWindow* pNewPaintWindow = m_pShell->Imp()->GetDrawView()->FindPaintWindow(*m_pRef);
-                xOldManager->completeRedraw(pNewPaintWindow->GetRedrawRegion(), m_pRef);
+                if (SdrPaintWindow* pNewPaintWindow = m_pShell->Imp()->GetDrawView()->FindPaintWindow(*m_pRef))
+                    xOldManager->completeRedraw(pNewPaintWindow->GetRedrawRegion(), m_pRef);
             }
 
             m_pShell->Imp()->GetDrawView()->DeleteWindowFromPaintView(m_pRef);


More information about the Libreoffice-commits mailing list