rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch, NONE, 1.1 openoffice.org.spec, 1.1905, 1.1906

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch 
Log Message:
Resolves(partially): rhbz#495901 No default font-width for wmf export

openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch ---
diff -ru svtools.orig/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.cxx
--- svtools.orig/source/filter.vcl/wmf/wmfwr.cxx	2009-05-05 12:57:34.000000000 +0100
+++ svtools/source/filter.vcl/wmf/wmfwr.cxx	2009-05-05 13:55:47.000000000 +0100
@@ -439,14 +439,7 @@
 
 	WriteRecordHeader(0x00000000,W_META_CREATEFONTINDIRECT);
 
-    if ( !rFont.GetSize().Width() )
-    {
-        VirtualDevice aDev;
-        FontMetric aMetric( aDev.GetFontMetric( rFont ) );
-        WriteHeightWidth(Size(aMetric.GetWidth(),-rFont.GetSize().Height()));
-    }
-    else
-        WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
+	WriteHeightWidth(Size(rFont.GetSize().Width(),-rFont.GetSize().Height()));
 
 	*pWMF << (short)rFont.GetOrientation() << (short)rFont.GetOrientation();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1905
retrieving revision 1.1906
diff -u -p -r1.1905 -r1.1906
--- openoffice.org.spec	30 Apr 2009 14:33:31 -0000	1.1905
+++ openoffice.org.spec	5 May 2009 13:05:25 -0000	1.1906
@@ -139,6 +139,7 @@ Patch63: openoffice.org-3.1.0.ooo101355.
 Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch65: openoffice.org-3.1.0.ooo101439.connectivity.evodupl.patch
 Patch66: openoffice.org-3.1.0.ooo100469.sal.ia64_arm.patch
+Patch67: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1636,6 +1637,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch65 -p0 -b .ooo101439.connectivity.evodupl.patch
 %patch66 -p0 -b .ooo100469.sal.ia64_arm.patch
+%patch67 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4131,8 +4133,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Apr 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
+* Tue May 05 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.3
 - add in the ia64 and arm fixes for the secondary arch people
+- Resolves(partially): rhbz#495901 No default font-width for wmf export
 
 * Tue Apr 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.2
 - Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch