rpms/openoffice.org/devel workspace.sw33bf03.patch, NONE, 1.1 openoffice.org.spec, 1.2160, 1.2161 openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.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-serv13801/devel

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.sw33bf03.patch 
Removed Files:
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch 
Log Message:
rename to accepted workspace

workspace.sw33bf03.patch:
 fntcache.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE workspace.sw33bf03.patch ---
diff -ru sw.orig/source/core/txtnode/fntcache.cxx sw/source/core/txtnode/fntcache.cxx
--- sw.orig/source/core/txtnode/fntcache.cxx	2009-12-21 10:33:36.000000000 +0000
+++ sw/source/core/txtnode/fntcache.cxx	2009-12-22 13:34:48.000000000 +0000
@@ -482,6 +482,11 @@
         pScrFont = pPrtFont;
 
         FontMetric aMet = pPrt->GetFontMetric( );
+        //Don't loose "faked" properties of the logical font that don't truly
+        //exist in the physical font metrics which vcl which fake up for us
+        aMet.SetWeight(pScrFont->GetWeight());
+        aMet.SetItalic(pScrFont->GetItalic());
+
         bSymbol = RTL_TEXTENCODING_SYMBOL == aMet.GetCharSet();
 
         if ( USHRT_MAX == nGuessedLeading )
@@ -521,6 +526,11 @@
 
 				pPrt->SetFont( aFnt2 );
 				aMet = pPrt->GetFontMetric( );
+				//Don't loose "faked" properties of the logical font that don't
+				//truly exist in the physical font metrics which vcl which fake
+				//up for us
+				aMet.SetWeight(aFnt2.GetWeight());
+				aMet.SetItalic(aFnt2.GetItalic());
 			}
 
             const XubString aStandardStr( sStandardString,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2160
retrieving revision 1.2161
diff -u -p -r1.2160 -r1.2161
--- openoffice.org.spec	25 Feb 2010 15:16:11 -0000	1.2160
+++ openoffice.org.spec	26 Feb 2010 14:51:46 -0000	1.2161
@@ -123,7 +123,7 @@ Patch47: workspace.vcl108.patch
 Patch48: workspace.pythonssldedux.patch
 Patch49: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch50: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch51: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
+Patch51: workspace.sw33bf03.patch
 Patch52: workspace.writerfilter07.patch
 Patch53: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
 Patch54: workspace.sw33bf02.patch
@@ -1692,7 +1692,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch48 -p1 -b .workspace.pythonssldedux.patch
 %patch49 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch50 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch51 -p0 -b .ooo107834.sw.pseudoattribs.patch
+%patch51 -p0 -b .workspace.sw33bf03.patch
 %patch52 -p1 -b .workspace.writerfilter07.patch
 %patch53 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
 %patch54 -p1 -b .workspace.sw33bf02.patch


--- openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch DELETED ---