/[packages]/cauldron/libreoffice/current/SOURCES/0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch
ViewVC logotype

Contents of /cauldron/libreoffice/current/SOURCES/0001-Related-rhbz-1088625-PresenterPaintManager-seen-as-N.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 618518 - (show annotations) (download)
Sun Apr 27 21:53:48 2014 UTC (9 years, 11 months ago) by tv
File size: 1916 byte(s)
- 4.2.4 rc1
- sync patches with FC
- install man pages
1 From b2e9afcdfb0d9cd4d5c1b1073ad325403a13ef32 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3 Date: Fri, 18 Apr 2014 09:45:38 +0100
4 Subject: [PATCH] Related: rhbz#1088625 PresenterPaintManager seen as NULL
5
6 Change-Id: I3b7ba51d48ebc5f9304f6125de0595d41d50ad4d
7 ---
8 sdext/source/presenter/PresenterToolBar.cxx | 16 +++++++++++++---
9 1 file changed, 13 insertions(+), 3 deletions(-)
10
11 diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
12 index dd0ca91..4c825ed 100644
13 --- a/sdext/source/presenter/PresenterToolBar.cxx
14 +++ b/sdext/source/presenter/PresenterToolBar.cxx
15 @@ -457,7 +457,10 @@ void PresenterToolBar::InvalidateArea (
16 const awt::Rectangle& rRepaintBox,
17 const bool bSynchronous)
18 {
19 - mpPresenterController->GetPaintManager()->Invalidate(
20 + ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
21 + if (!xManager)
22 + return;
23 + xManager->Invalidate(
24 mxWindow,
25 rRepaintBox,
26 bSynchronous);
27 @@ -467,7 +470,11 @@ void PresenterToolBar::RequestLayout (void)
28 {
29 mbIsLayoutPending = true;
30
31 - mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
32 + ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
33 + if (!xManager)
34 + return;
35 +
36 + xManager->Invalidate(mxWindow);
37 }
38
39 geometry::RealSize2D PresenterToolBar::GetMinimalSize (void)
40 @@ -822,7 +829,10 @@ void PresenterToolBar::Layout (
41 }
42
43 // The whole window has to be repainted.
44 - mpPresenterController->GetPaintManager()->Invalidate(mxWindow);
45 + ::boost::shared_ptr<PresenterPaintManager> xManager(mpPresenterController->GetPaintManager());
46 + if (!xManager)
47 + return;
48 + xManager->Invalidate(mxWindow);
49 }
50
51 geometry::RealSize2D PresenterToolBar::CalculatePartSize (
52 --
53 1.9.0
54

  ViewVC Help
Powered by ViewVC 1.1.30