rpms/openoffice.org/devel workspace.gfbcrash.patch, NONE, 1.1 openoffice.org.spec, 1.1795, 1.1796 openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1850

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.gfbcrash.patch 
Removed Files:
	openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch 
Log Message:
rename to upstream workspace

workspace.gfbcrash.patch:

--- NEW FILE workspace.gfbcrash.patch ---
Index: vcl/source/gdi/outdev3.cxx
===================================================================
--- vcl/source/gdi/outdev3.cxx	(.../tags/DEV300_m40)	(revision 267734)
+++ vcl/source/gdi/outdev3.cxx	(.../cws/gfbcrash)	(revision 267734)
@@ -6519,6 +6519,11 @@
     for( int nFallbackLevel = 1; nFallbackLevel < MAX_FALLBACK; ++nFallbackLevel )
     {
         // find a font family suited for glyph fallback
+#ifndef FONTFALLBACK_HOOKS_DISABLED 
+        // GetGlyphFallbackFont() needs a valid aFontSelData.mpFontEntry
+        // if the system-specific glyph fallback is active
+        aFontSelData.mpFontEntry = mpFontEntry; // reset the fontentry to base-level
+#endif
         ImplFontEntry* pFallbackFont = mpFontCache->GetGlyphFallbackFont( mpFontList,
             aFontSelData, nFallbackLevel-nDevSpecificFallback, aMissingCodes );
         if( !pFallbackFont )
@@ -6564,7 +6569,10 @@
                     pMultiSalLayout->SetInComplete();
             }
             else
+            {
+                // there is no need for a font that couldn't resolve anything
                 pFallback->Release();
+            }
         }
 
         mpFontCache->Release( pFallbackFont );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1795
retrieving revision 1.1796
diff -u -r1.1795 -r1.1796
--- openoffice.org.spec	13 Feb 2009 09:47:24 -0000	1.1795
+++ openoffice.org.spec	13 Feb 2009 16:48:53 -0000	1.1796
@@ -119,7 +119,7 @@
 Patch46: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
 Patch47: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
 Patch48: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch49: openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch
+Patch49: workspace.gfbcrash.patch
 Patch50: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
@@ -1562,7 +1562,7 @@
 %patch46 -p1 -b .ooo98885.sw.safeindex.patch
 %patch47 -p1 -b .ooo98909.sfx2.missingplugins.patch
 %patch48 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch49 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
+%patch49 -p0 -b .workspace.gfbcrash.patch
 %patch50 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 
 %build


--- openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch DELETED ---