rpms/openoffice.org/devel openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch, NONE, 1.1 openoffice.org.spec, 1.2106, 1.2107

[Caolan McNamara]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.2106
retrieving revision 1.2107
diff -u -p -r1.2106 -r1.2107
--- openoffice.org.spec	21 Dec 2009 12:36:51 -0000	1.2106
+++ openoffice.org.spec	22 Dec 2009 14:07:36 -0000	1.2107
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 8
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -130,6 +130,7 @@ Patch52: workspace.vcl108.patch
 Patch53: workspace.pythonssldedux.patch
 Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
 Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch56: 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}
@@ -1657,6 +1658,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch53 -p1 -b .workspace.pythonssldedux.patch
 %patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
 %patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch56 -p0 -b .ooo107834.sw.pseudoattribs.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4159,6 +4161,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.2
+- Resolves: rhbz#545824 bustage in writer with emboldened fonts
+
 * Thu Dec 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.1
 - latest milestone
 - drop integrated openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch