rpms/openoffice.org/devel workspace.impress174.patch, NONE, 1.1 openoffice.org.spec, 1.1958, 1.1959 openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.impress174.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch 
Log Message:
rename to track upstream workspace

workspace.impress174.patch:

--- NEW FILE workspace.impress174.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/devel/openoffice.org.spec,v
retrieving revision 1.1958
retrieving revision 1.1959
diff -u -p -r1.1958 -r1.1959
--- openoffice.org.spec	3 Jul 2009 15:38:27 -0000	1.1958
+++ openoffice.org.spec	8 Jul 2009 13:14:47 -0000	1.1959
@@ -139,7 +139,7 @@ Patch61: openoffice.org-3.1.0.ooo101355.
 Patch62: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
 Patch63: workspace.evoab2def.patch
 Patch64: workspace.cmcfixes59.patch
-Patch65: openoffice.org-3.1.0.ooo101566.svtools.nodefaultwmfwidth.patch
+Patch65: workspace.impress174.patch
 Patch66: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
 Patch67: workspace.unifypaper01.patch
 Patch68: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
@@ -1649,7 +1649,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch62 -p0 -b .ooo101379.vcl.qstart.SM.patch
 %patch63 -p0 -b .workspace.evoab2def.patch
 %patch64 -p0 -b .workspace.cmcfixes59.patch
-%patch65 -p0 -b .ooo101566.svtools.nodefaultwmfwidth.patch
+%patch65 -p0 -b .workspace.impress174.patch
 %patch66 -p0 -b .ooo101567.i18npool.mailocaledata.patch
 %patch67 -p1
 %patch68 -p0 -b .ooo102061.sc.cellanchoring.patch


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