rpms/openoffice.org/F-10 workspace.vcl97.patch, NONE, 1.1 openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch, 1.1, 1.2 openoffice.org.spec, 1.1701, 1.1702

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch 
	openoffice.org.spec 
Added Files:
	workspace.vcl97.patch 
Log Message:
Resolves: rhbz#475795 same fallbacks for printing as screen

workspace.vcl97.patch:

--- NEW FILE workspace.vcl97.patch ---
Index: unx/source/gdi/pspgraphics.cxx
===================================================================
--- openoffice.org.orig/psprint/unx/source/gdi/pspgraphics.cxx	(revision 265133)
+++ openoffice.org/psprint/unx/source/gdi/pspgraphics.cxx	(working copy)
@@ -835,6 +835,8 @@
     return false;
 }
 
+void RegisterFontSubstitutors( ImplDevFontList* );
+
 void PspGraphics::GetDevFontList( ImplDevFontList *pList )
 {
     ::std::list< psp::fontID > aList;
@@ -846,6 +848,10 @@
     for (it = aList.begin(); it != aList.end(); ++it)
         if (rMgr.getFontFastInfo (*it, aInfo))
             AnnounceFonts( pList, aInfo );
+
+   // register platform specific font substitutions if available
+   if( rMgr.hasFontconfig() )
+	RegisterFontSubstitutors( pList );
 }
 
 void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
Index: unx/source/gdi/salgdi3.cxx
===================================================================
--- unx/source/gdi/salgdi3.cxx	(revision 265133)
+++ unx/source/gdi/salgdi3.cxx	(working copy)
@@ -1545,7 +1545,7 @@
 
 // ----------------------------------------------------------------------------
 
-static void RegisterFontSubstitutors( ImplDevFontList* );
+void RegisterFontSubstitutors( ImplDevFontList* );
 
 void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
 {
@@ -1806,7 +1806,7 @@
     bool FindFontSubstitute( ImplFontSelectData&, OUString& rMissingCodes ) const;
 };
 
-static void RegisterFontSubstitutors( ImplDevFontList* pList )
+void RegisterFontSubstitutors( ImplDevFontList* pList )
 {
     bool bDisableFC = false;
 #ifdef SOLARIS

openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch:

Index: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch	10 Dec 2008 09:20:39 -0000	1.1
+++ openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch	11 Dec 2008 09:52:03 -0000	1.2
@@ -1,5 +1,5 @@
---- openoffice.org.orig/sd/sd/uiconfig/simpress/accelerator/default.xml	2008-12-10 09:10:53.000000000 +0000
-+++ openoffice.org/sd/sd/uiconfig/simpress/accelerator/default.xml	1970-01-01 01:00:00.000000000 +0100
+--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/default.xml	2008-12-10 09:10:53.000000000 +0000
++++ openoffice.org/sd/uiconfig/simpress/accelerator/default.xml	1970-01-01 01:00:00.000000000 +0100
 @@ -1,142 +0,0 @@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -143,8 +143,8 @@
 -    <accel:item accel:code="KEY_LEFT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineLeft"/>
 -    <accel:item accel:code="KEY_RIGHT" accel:shift="true" accel:mod2="true" xlink:href=".uno:OutlineRight"/>
 -</accel:acceleratorlist>
---- openoffice.org.orig/sd/sd/uiconfig/simpress/accelerator/en-US/default.xml	1970-01-01 01:00:00.000000000 +0100
-+++ openoffice.org/sd/sd/uiconfig/simpress/accelerator/en-US/default.xml	2008-12-10 09:11:17.000000000 +0000
+--- openoffice.org.orig/sd/uiconfig/simpress/accelerator/en-US/default.xml	1970-01-01 01:00:00.000000000 +0100
++++ openoffice.org/sd/uiconfig/simpress/accelerator/en-US/default.xml	2008-12-10 09:11:17.000000000 +0000
 @@ -0,0 +1,71 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<accel:acceleratorlist xmlns:accel="http://openoffice.org/2001/accel" xmlns:xlink="http://www.w3.org/1999/xlink">


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1701
retrieving revision 1.1702
diff -u -r1.1701 -r1.1702
--- openoffice.org.spec	10 Dec 2008 13:56:27 -0000	1.1701
+++ openoffice.org.spec	11 Dec 2008 09:52:03 -0000	1.1702
@@ -135,6 +135,7 @@
 Patch62: workspace.impress161.patch
 Patch63: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch64: openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
+Patch65: workspace.vcl97.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1394,6 +1395,7 @@
 %patch62 -p1 -b .workspace.impress161.patch
 %patch63 -p1
 %patch64 -p1 -b .ooo97064.fpicker.honour-uilang-override.patch
+%patch65 -p1 -b .workspace.vcl97.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3760,7 +3762,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Wed Dec 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3775,6 +3777,8 @@
   openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 - Resolves: rhbz#475154 UI Language override doesn't affect system dialogs
   openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
+- Resolves: rhbz#475795 same fallbacks for printing as screen
+  workspace.vcl97.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred