diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 09:45:38 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-19 13:13:35 +0000 |
commit | a5cc073852a57adf62fa83b29e1259a35169b10c (patch) | |
tree | 915346e31c03cf3c8105586b9194375268527ca6 /sdext | |
parent | 5a7d3debc2dcd483a691afcb6fd6ece6c73beeaf (diff) |
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@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sdext')
-rw-r--r-- | sdext/source/presenter/PresenterToolBar.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 69fb531b9a1b..53263b55013c 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 ( |