rpms/openoffice.org/devel openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch, NONE, 1.1 openoffice.org.spec, 1.1173, 1.1174

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20824

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch 
Log Message:
ooo#77470 we need to set the msoffice fallbacks for liberation fonts

openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch:

--- NEW FILE openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch ---
Index: registry/data/org/openoffice/VCL.xcu
===================================================================
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
retrieving revision 1.55
diff -u -r1.55 VCL.xcu
--- openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu	24 Oct 2006 14:08:03 -0000	1.55
+++ openoffice.org/officecfg/registry/data/org/openoffice/VCL.xcu	17 May 2007 20:00:11 -0000
@@ -4450,6 +4450,75 @@
           <value>Normal,Fixed</value>
         </prop>
       </node>
+      <node oor:name="liberationsans" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>liberationsans;albanyamt;albany;arial;nimbussansl;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussans;andalesansui;arialunicodems;lucidaunicode</value>
+        </prop>
+        <prop oor:name="SubstFontsMS">
+          <value>Arial</value>
+        </prop>
+        <prop oor:name="SubstFontsPS">
+          <value>Helvetica</value>
+        </prop>
+        <prop oor:name="SubstFontsHTML">
+          <value>sans-serif</value>
+        </prop>
+        <prop oor:name="FontWeight">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontWidth">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontType">
+          <value>Default,Standard,Normal,SansSerif</value>
+        </prop>
+      </node>
+      <node oor:name="liberationserif" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>liberationserif;thorndaleamt;thorndale;timesnewroman;nimbusromanno9l;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino</value>
+        </prop>
+        <prop oor:name="SubstFontsMS">
+          <value>Times New Roman</value>
+        </prop>
+        <prop oor:name="SubstFontsPS">
+          <value>Times</value>
+        </prop>
+        <prop oor:name="SubstFontsHTML">
+          <value>serif</value>
+        </prop>
+        <prop oor:name="FontWeight">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontWidth">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontType">
+          <value>Default,Standard,Normal,Serif</value>
+        </prop>
+      </node>
+      <node oor:name="liberationmono" oor:op="replace">
+        <prop oor:name="SubstFonts">
+          <value>liberationmono;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>
+        </prop>
+        <prop oor:name="SubstFontsMS">
+          <value>Courier New</value>
+        </prop>
+        <prop oor:name="SubstFontsPS">
+          <value>Courier</value>
+        </prop>
+        <prop oor:name="SubstFontsHTML">
+          <value>monospace</value>
+        </prop>
+        <prop oor:name="FontWeight">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontWidth">
+          <value>Normal</value>
+        </prop>
+        <prop oor:name="FontType">
+          <value>Default,Standard,Normal,Fixed,Typewriter</value>
+        </prop>
+      </node>
       <node oor:name="linedraw" oor:op="replace">
         <prop oor:name="SubstFonts">
           <value>cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol</value>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1173
retrieving revision 1.1174
diff -u -r1.1173 -r1.1174
--- openoffice.org.spec	8 May 2007 08:41:15 -0000	1.1173
+++ openoffice.org.spec	17 May 2007 20:13:27 -0000	1.1174
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 14
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -2634,6 +2634,11 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu May 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.9
+- ooo#77470 Because Liberation fonts will be included in FC-7 we need
+  to set the ms font equivalents as their fallbacks in exported to 
+  msoffice format documents.
+ 
 * Fri May 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.8
 - Resolves: rhbz#203495 add some magic to allow native and OOo dialogs to
   interleave and keep parent child transient logic correct