rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch, NONE, 1.1 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch, 1.1, 1.2 openoffice.org.spec, 1.1533, 1.1534

Thu Jun 12 09:46:26 UTC 2008

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5752

Modified Files:
	openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch 
Log Message:
Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch

openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch ---
Index: source/filter/ww8/ww8par6.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par6.cxx,v
retrieving revision 1.185
diff -u -r1.185 ww8par6.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8par6.cxx	6 Jun 2008 13:38:29 -0000	1.185
+++ openoffice.org/sw/source/filter/ww8/ww8par6.cxx	12 Jun 2008 09:41:28 -0000
@@ -910,7 +910,7 @@
     if (aNewSection.maSep.nfcPgn > 4)
         aNewSection.maSep.nfcPgn = 0;
 
-    aNewSection.maSep.fUnlocked = eVer <= ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
+    aNewSection.maSep.fUnlocked = eVer > ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
 
     // sprmSFBiDi
     aNewSection.maSep.fBiDi = eVer >= ww::eWW8 ? ReadBSprm(pSep, 0x3228, 0) : 0;

openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch:

Index: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch	3 Jun 2008 12:12:57 -0000	1.1
+++ openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch	12 Jun 2008 09:45:16 -0000	1.2
@@ -1,99 +1,12 @@
 diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
 --- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2008-05-26 15:17:03.000000000 +0100
 +++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2008-06-03 13:01:17.000000000 +0100
-@@ -522,7 +522,10 @@
- void* FreetypeServerFont::GetFtFace() const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     return maFaceFT;
- }
-@@ -742,6 +745,7 @@
-     {
-         pFTNewSize( maFaceFT, &maSizeFT );
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-     }
-     FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
-     if( rc != FT_Err_Ok )
-@@ -975,7 +979,10 @@
-     }
- 
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     rFactor = 0x100;
- 
-@@ -1294,7 +1304,10 @@
- void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
+@@ -2172,7 +2242,7 @@
      int nGlyphFlags;
      SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1382,7 +1395,10 @@
- bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     int nGlyphFlags;
-     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1542,7 +1558,10 @@
- bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     int nGlyphFlags;
-     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1796,7 +1815,10 @@
-     // when font faces of different sizes share the same maFaceFT
-     // then we have to make sure that it uses the correct maSizeFT
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     // use Freetype's kerning info
-     FT_Vector aKernVal;
-@@ -1831,7 +1853,10 @@
-     // when font faces of different sizes share the same maFaceFT
-     // then we have to make sure that it uses the correct maSizeFT
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     // first figure out which glyph pairs are involved in kerning
-     ULONG nKernLength = 0;
-@@ -2231,7 +2257,10 @@
-     ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+	FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
  
-     rB2DPolyPoly.clear();
+-    FT_Int nLoadFlags = FT_LOAD_DEFAULT;
++    FT_Int nLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM;
  
+ #ifdef FT_LOAD_TARGET_LIGHT
+     // enable "light hinting" if available


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1533
retrieving revision 1.1534
diff -u -r1.1533 -r1.1534
--- openoffice.org.spec	11 Jun 2008 16:32:22 -0000	1.1533
+++ openoffice.org.spec	12 Jun 2008 09:45:16 -0000	1.1534
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 19
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -133,6 +133,7 @@
 Patch57: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
 Patch58: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
 Patch59: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+Patch60: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1269,6 +1270,7 @@
 %patch57 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
 %patch58 -p1 -b .ooo82545.np_sdk.x86_64.patch
 %patch59 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
+%patch60 -p1 -b .ooo90306.sw.wrongprotection.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3453,6 +3455,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Thu Jun 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-2
+- Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+
 * Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
 - next version
 - add openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch


