rpms/openoffice.org/F-9 openoffice.org.spec, 1.1479, 1.1480 workspace.notes2.patch, 1.10, 1.11

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21121

Modified Files:
	openoffice.org.spec workspace.notes2.patch 
Log Message:
Resolves: rhbz#445318 fix notes related crash


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1479
retrieving revision 1.1480
diff -u -r1.1479 -r1.1480
--- openoffice.org.spec	4 May 2008 17:21:01 -0000	1.1479
+++ openoffice.org.spec	7 May 2008 07:29:41 -0000	1.1480
@@ -2908,8 +2908,9 @@
 
 
 %changelog
-* Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.9-UNRELEASED
+* Wed May 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.9-UNRELEASED
 - Resolves: rhbz#444571 add openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
+- Resolves: rhbz#445318 fix notes related crash
 - add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 
 * Sat Apr 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.8

workspace.notes2.patch:

Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- workspace.notes2.patch	4 Apr 2008 19:39:11 -0000	1.10
+++ workspace.notes2.patch	7 May 2008 07:29:41 -0000	1.11
@@ -5099,7 +5099,7 @@
 +			}
 +			mPages[aPageNum-1]->mList->push_back(*i);
 +			mPages[aPageNum-1]->mPageRect = (*i)->mPagePos;
-+			mPages[aPageNum-1]->bMarginSide = pPage->MarginSide();
++			mPages[aPageNum-1]->bMarginSide = pPage ? pPage->MarginSide() : false;
 +		}
 +
 +		if (!bChange && mpWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE))