rpms/openoffice.org/devel openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch, NONE, 1.1 openoffice.org.spec, 1.2044, 1.2045

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.2044
retrieving revision 1.2045
diff -u -p -r1.2044 -r1.2045
--- openoffice.org.spec	19 Oct 2009 06:31:23 -0000	1.2044
+++ openoffice.org.spec	19 Oct 2009 09:10:00 -0000	1.2045
@@ -117,6 +117,7 @@ Patch43: openoffice.org-3.1.1.ooo105784.
 Patch44: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
 Patch45: openoffice.org-3.2.0.ooo105988.svx.a11ycrash.patch
 Patch46: openoffice.org-3.2.0.rhbz521460.svx.revert-paper-sizes-reordering.patch
+Patch47: 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}
@@ -1623,6 +1624,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch44 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
 %patch45 -p0 -b .ooo105988.svx.a11ycrash.patch
 %patch46 -p1 -b .rhbz521460.svx.revert-paper-sizes-reordering.patch
+%patch47 -p0 -b .oooXXXXXX.vcl.dontresolve.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,8 @@ fi
 %changelog
 * Mon Oct 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.3
 - Resolves: rhbz#521460 - wrong page size for A3/A5 (dtardon)
+- Related: rhbz#529521 add openoffice.org-3.2.0.oooXXXXXX.vcl.dontresolve.patch
+  (caolanm)
 
 * Sat Oct 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-2.2
 - Resolves: ooo#105988 a11y crash in impress (caolanm)