rpms/openoffice.org/F-12 openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch, NONE, 1.1 openoffice.org.spec, 1.2046, 1.2047

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch 
Log Message:
Resolves: rhbz#545824 bustage in writer with emboldened fonts

openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch:
 fntcache.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.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/F-12/openoffice.org.spec,v
retrieving revision 1.2046
retrieving revision 1.2047
diff -u -p -r1.2046 -r1.2047
--- openoffice.org.spec	18 Dec 2009 09:27:49 -0000	1.2046
+++ openoffice.org.spec	22 Dec 2009 14:07:35 -0000	1.2047
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 23
+%define rh_rpm_release 24
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -182,6 +182,7 @@ Patch105: workspace.vcl105.patch
 Patch106: workspace.fwk132.patch
 Patch107: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
 Patch108: workspace.ooo32gsl03.patch
+Patch109: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1750,6 +1751,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch106 -p1 -b .workspace.fwk132.patch
 %patch107 -p0 -b .ooo47279.sd.objectsave.safe.patch
 %patch108 -p0 -b .workspace.ooo32gsl03.patch
+%patch109 -p0 -b .ooo107834.sw.pseudoattribs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4283,6 +4285,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.24
+- Resolves: rhbz#545824 bustage in writer with emboldened fonts
+
 * Fri Dec 18 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.23
 - Resolves: rhbz#548512 workspace.ooo32gsl03.patch