diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 09:45:38 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-22 09:45:20 +0200 |
| commit | 99bf0a6a94b6a8c92b18390f863ac46b71815200 (patch) | |
| tree | a07f8872ac3fee0ce1af3705c9f050198c4a7329 /sdext | |
| parent | 6b56cf3ec870ecdf7e9a29b10473a6168b1cc94d (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 ( |