rpms/openoffice.org/F-12 openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, NONE, 1.1 openoffice.org.spec, 1.2020, 1.2021

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20288/F-12

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch 
Log Message:
openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch

openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch:
 salnativewidgets-gtk.cxx |   13 -------------
 1 file changed, 13 deletions(-)

--- NEW FILE openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch ---
diff -ru vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- vcl.orig/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:02:42.000000000 +0100
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2009-10-19 10:04:37.000000000 +0100
@@ -3342,19 +3342,6 @@
         case PANGO_STRETCH_ULTRA_EXPANDED:	aInfo.m_eWidth = psp::width::UltraExpanded;break;
     }
 
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() );
-#endif
-
-    // match font to e.g. resolve "Sans"
-    psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() );
-
-#if OSL_DEBUG_LEVEL > 1
-    std::fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
-             aInfo.m_nID != 0 ? "succeeded" : "failed",
-             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
-#endif
-    
     sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B();
     int nPointHeight = 0;
     static gboolean(*pAbso)(const PangoFontDescription*) =


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2020
retrieving revision 1.2021
diff -u -p -r1.2020 -r1.2021
--- openoffice.org.spec	17 Oct 2009 15:45:54 -0000	1.2020
+++ openoffice.org.spec	19 Oct 2009 09:09:59 -0000	1.2021
@@ -164,6 +164,7 @@ Patch87: workspace.aw073.patch
 Patch88: workspace.vcl106.patch
 Patch89: openoffice.org-3.1.1.oooXXXXXX.vcl.sniffscriptforsubs.patch
 Patch90: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
+Patch91: openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1714,6 +1715,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .workspace.vcl106.patch
 %patch89 -p0 -b .oooXXXXXX.vcl.sniffscriptforsubs.patch
 %patch90 -p0 -b .ooo105988.svx.a11ycrash.patch
+%patch91 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4247,8 +4249,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Oct 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.13-UNBUILT
-- Resolves: ooo#105988 a11y crash in impress
+* Mon Oct 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.13
+- Resolves: ooo#105988 a11y crash in impress (caolanm)
+- Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+  (caolanm)
 
 * Thu Oct 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.12
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not