rpms/openoffice.org/F-8 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch, NONE, 1.1 openoffice.org.spec, 1.1335, 1.1336

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch 
Log Message:
Resolves: rhbz#423371 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch

openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch:

--- NEW FILE openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch ---
Index: source/core/layout/paintfrm.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/layout/paintfrm.cxx,v
retrieving revision 1.105.2.2
diff -u -r1.105.2.2 paintfrm.cxx
--- openoffice.org.orig/sw/source/core/layout/paintfrm.cxx	24 Aug 2007 11:52:41 -0000	1.105.2.2
+++ openoffice.org/sw/source/core/layout/paintfrm.cxx	16 Dec 2007 13:38:26 -0000
@@ -2962,7 +2962,11 @@
             // OD 20.12.2002 #94627# - no paint of page border and shadow, if
             // writer is in place mode.
             if( pSh->GetWin() &&
-                !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() )
+               (
+                !pSh->GetDoc()->GetDocShell() ||
+                !pSh->GetDoc()->GetDocShell()->IsInPlaceActive()
+               )
+              )
             {
                 // OD 12.02.2003 #i9719#, #105645# - use new method
                 // <SwPageFrm::PaintBorderAndShadow(..)>.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1335
retrieving revision 1.1336
diff -u -r1.1335 -r1.1336
--- openoffice.org.spec	16 Dec 2007 12:37:57 -0000	1.1335
+++ openoffice.org.spec	16 Dec 2007 13:47:10 -0000	1.1336
@@ -156,6 +156,7 @@
 Patch74: workspace.hsql1808.patch
 Patch75: workspace.allowcurloldies.patch
 Patch76: workspace.locales24.patch
+Patch77: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1107,6 +1108,7 @@
 %patch74 -p1 -b .workspace.hsql1808.patch
 %patch75 -p1 -b .workspace.allowcurloldies.patch
 %patch76 -p1 -b .workspace.locales24.patch
+%patch77 -p1 -b .ooo84621.sw.insertexcel.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2809,6 +2811,7 @@
 %changelog
 * Sun Dec 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.8-UNRELEASED
 - Resolves: rhbz#425701 add workspace.locales24.patch
+- Resolves: rhbz#423371 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 
 * Wed Dec 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.7
 - Resolves: rhbz#303601 CVE-2007-4575 workspace.hsql1808.patch