[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - sdext/source

[Caolán McNamara]

 sdext/source/presenter/PresenterToolBar.cxx |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 527d8d77ac0ef3954bee54cf3e7bedb3302b0517
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 18 09:45:38 2014 +0100

    Related: rhbz#1088625 PresenterPaintManager seen as NULL
    
    Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
    (cherry picked from commit 42dd5615429e6273e9169a4bd941ad56fec1e6f6)
    Reviewed-on: https://gerrit.libreoffice.org/9094
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit a5cc073852a57adf62fa83b29e1259a35169b10c)
    Reviewed-on: https://gerrit.libreoffice.org/9119
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 69fb531..53263b5 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
     const awt::Rectangle& rRepaintBox,
     const bool bSynchronous)
 {
-    mpPresenterController->GetPaintManager()->Invalidate(
+    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    if (!xManager)
+        return;
+    xManager->Invalidate(
         mxWindow,
         rRepaintBox,
         bSynchronous);
@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
 {
     mbIsLayoutPending = true;
 
-    mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
+    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    if (!xManager)
+        return;
+
+    xManager->Invalidate(mxWindow);
 }
 
 geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
@@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
     }
 
     // The whole window has to be repainted.
-    mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
+    ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
+    if (!xManager)
+        return;
+    xManager->Invalidate(mxWindow);
 }
 
 geometry::RealSize2D PresenterToolBar::CalculatePartSize (