Kaydet (Commit) 42dd5615 authored tarafından Caolán McNamara's avatar Caolán McNamara

Related: rhbz#1088625 PresenterPaintManager seen as NULL

Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
üst 8773d969
...@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea ( ...@@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
const awt::Rectangle& rRepaintBox, const awt::Rectangle& rRepaintBox,
const bool bSynchronous) const bool bSynchronous)
{ {
mpPresenterController->GetPaintManager()->Invalidate( ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
if (!xManager)
return;
xManager->Invalidate(
mxWindow, mxWindow,
rRepaintBox, rRepaintBox,
bSynchronous); bSynchronous);
...@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void) ...@@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
{ {
mbIsLayoutPending = true; mbIsLayoutPending = true;
mpPresenterController->GetPaintManager()->Invalidate(mxWindow); ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
if (!xManager)
return;
xManager->Invalidate(mxWindow);
} }
geometry::RealSize2D PresenterToolBar::GetMinimalSize (void) geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
...@@ -822,7 +829,10 @@ void PresenterToolBar::Layout ( ...@@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
} }
// The whole window has to be repainted. // 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 ( geometry::RealSize2D PresenterToolBar::CalculatePartSize (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment