rpms/openoffice.org/F-7 openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch, NONE, 1.1 openoffice.org-2.3.1.ooo81307.sw.word2.patch, NONE, 1.1 openoffice.org.spec, 1.1200, 1.1201

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Nov 13 07:55:36 UTC 2007 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1475

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch 
	openoffice.org-2.3.1.ooo81307.sw.word2.patch 
Log Message:
openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch openoffice.org-2.3.1.ooo81307.sw.word2.patch

openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch:

--- NEW FILE openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch ---
Index: source/control/button.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/control/button.cxx,v
retrieving revision 1.54
diff -u -r1.54 button.cxx
--- openoffice.org.orig/vcl/source/control/button.cxx	24 Jul 2007 12:13:34 -0000	1.54
+++ openoffice.org/vcl/source/control/button.cxx	13 Nov 2007 07:32:33 -0000
@@ -3124,25 +3124,26 @@
 								 ImageList *pList, const ResId &rResId,
                                  USHORT nImages)
 {
-	Color pColorAry1[6];
-	Color pColorAry2[6];
-	pColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 );
-	pColorAry1[1] = Color( 0xFF, 0xFF, 0x00 );
-	pColorAry1[2] = Color( 0xFF, 0xFF, 0xFF );
-	pColorAry1[3] = Color( 0x80, 0x80, 0x80 );
-	pColorAry1[4] = Color( 0x00, 0x00, 0x00 );
-	pColorAry1[5] = Color( 0x00, 0xFF, 0x00 );
-	pColorAry2[0] = rStyleSettings.GetFaceColor();
-	pColorAry2[1] = rStyleSettings.GetWindowColor();
-	pColorAry2[2] = rStyleSettings.GetLightColor();
-	pColorAry2[3] = rStyleSettings.GetShadowColor();
-	pColorAry2[4] = rStyleSettings.GetDarkShadowColor();
-	pColorAry2[5] = rStyleSettings.GetWindowTextColor();
+	Color aColorAry1[6];
+	Color aColorAry2[6];
+	aColorAry1[0] = Color( 0xC0, 0xC0, 0xC0 );
+	aColorAry1[1] = Color( 0xFF, 0xFF, 0x00 );
+	aColorAry1[2] = Color( 0xFF, 0xFF, 0xFF );
+	aColorAry1[3] = Color( 0x80, 0x80, 0x80 );
+	aColorAry1[4] = Color( 0x00, 0x00, 0x00 );
+	aColorAry1[5] = Color( 0x00, 0xFF, 0x00 );
+	aColorAry2[0] = rStyleSettings.GetFaceColor();
+	aColorAry2[1] = rStyleSettings.GetWindowColor();
+	aColorAry2[2] = rStyleSettings.GetLightColor();
+	aColorAry2[3] = rStyleSettings.GetShadowColor();
+	aColorAry2[4] = rStyleSettings.GetDarkShadowColor();
+	aColorAry2[5] = rStyleSettings.GetWindowTextColor();
 
 	Color aMaskColor(0x00, 0x00, 0xFF );
+        DBG_ASSERT( sizeof(aColorAry1) == (aColorAry2), "aColorAry1 must match aColorAry2" );
 	// FIXME: do we want the mask for the checkbox ?
-	pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor,
-									   pColorAry1, pColorAry2, nImages);
+	pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor, 
+        aColorAry1, aColorAry2, sizeof(aColorAry1) / sizeof(Color));
 }
 
 Image RadioButton::GetRadioImage( const AllSettings& rSettings, USHORT nFlags )

openoffice.org-2.3.1.ooo81307.sw.word2.patch:

--- NEW FILE openoffice.org-2.3.1.ooo81307.sw.word2.patch ---
Index: source/filter/ww8/ww8par6.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8par6.cxx,v
retrieving revision 1.175
diff -u -r1.175 ww8par6.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8par6.cxx	18 Jul 2007 14:47:14 -0000	1.175
+++ openoffice.org/sw/source/filter/ww8/ww8par6.cxx	12 Nov 2007 17:12:13 -0000
@@ -4088,8 +4088,10 @@
             pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
         return;
     }
+
     short nSpace = SVBT16ToShort( pData );
-    short nMulti = SVBT16ToShort( pData + 2 );
+    ww::WordVersion eVersion = pWwFib->GetFIBVersion();
+    short nMulti = (eVersion <= ww::eWW2) ? 1 : SVBT16ToShort( pData + 2 );
 
     SvxLineSpace eLnSpc;
     if( 0 > nSpace )
Index: source/filter/ww8/ww8scan.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8scan.cxx,v
retrieving revision 1.132
diff -u -r1.132 ww8scan.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8scan.cxx	25 May 2007 13:03:35 -0000	1.132
+++ openoffice.org/sw/source/filter/ww8/ww8scan.cxx	12 Nov 2007 17:12:17 -0000
@@ -3463,7 +3463,16 @@
         else
         {
             pStrm->Seek( nPo );
-            *pStrm >> nSprmSiz; // read len
+
+            // read len
+            if (GetFIBVersion() <= ww::eWW2)	// eWW6 ?, docs say yes, but...
+            {
+                BYTE nSiz(0);
+                *pStrm >> nSiz;
+                nSprmSiz = nSiz;
+            }
+            else 
+                *pStrm >> nSprmSiz;
 
             if( nSprmSiz > nArrMax )
             {               // passt nicht
@@ -6086,15 +6095,15 @@
         return;
     }
 
-    bool bVer67 = (8 > rFib.nVersion);
-
     rSt.Seek( rFib.fcSttbfffn );
 
     // allocate Font Array
     BYTE* pA   = new BYTE[ rFib.lcbSttbfffn - 2 ];
     WW8_FFN* p = (WW8_FFN*)pA;
 
-    if( !bVer67 )
+    ww::WordVersion eVersion = rFib.GetFIBVersion();
+
+    if( eVersion >= ww::eWW8 )
     {
         // bVer8: read the count of strings in nMax
         rSt >> nMax;
@@ -6108,7 +6117,7 @@
     // read all font information
     rSt.Read( pA, rFib.lcbSttbfffn - 2 );
 
-    if( bVer67 )
+    if( eVersion < ww::eWW8 )
     {
         // try to figure out how many fonts are defined here
         nMax = 0;
@@ -6135,7 +6144,34 @@
         pFontA = new WW8_FFN[ nMax ];
         p = pFontA;
 
-        if( bVer67 )
+	if( eVersion <= ww::eWW2 )
+	{
+            WW8_FFN_BASE* pVer2 = (WW8_FFN_BASE*)pA;
+            BYTE c2;
+            for(USHORT i=0; i<nMax; ++i, ++p)
+            {
+                p->cbFfnM1   = pVer2->cbFfnM1;
+
+                p->prg       =  0;
+                p->fTrueType = 0;
+                p->ff        = 0;
+
+                p->wWeight   = ( *(((BYTE*)pVer2) + 1) );
+                p->chs   = ( *(((BYTE*)pVer2) + 2) );
+        	/*
+                 #i8726# 7- seems to encode the name in the same encoding as
+                 the font, e.g load the doc in 97 and save to see the unicode
+                 ver of the asian fontnames in that example to confirm.
+                */
+                rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(p->chs);
+                if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc == RTL_TEXTENCODING_DONTKNOW))
+                    eEnc = RTL_TEXTENCODING_MS_1252;
+
+                p->sFontname = String ( (((const sal_Char*)pVer2) + 1 + 2), eEnc);
+                pVer2 = (WW8_FFN_BASE*)( ((BYTE*)pVer2) + pVer2->cbFfnM1 + 1 );
+            }
+	}
+        else if( eVersion < ww::eWW8 )
         {
             WW8_FFN_Ver6* pVer6 = (WW8_FFN_Ver6*)pA;
             BYTE c2;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1200
retrieving revision 1.1201
diff -u -r1.1200 -r1.1201
--- openoffice.org.spec	31 Oct 2007 16:29:55 -0000	1.1200
+++ openoffice.org.spec	13 Nov 2007 07:55:01 -0000	1.1201
@@ -134,6 +134,8 @@
 Patch67: openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch
 Patch68: openoffice.org.ooo82608.vcl.gtkbadfree.patch
 Patch69: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
+Patch70: openoffice.org-2.3.1.ooo81307.sw.word2.patch
+Patch71: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1066,6 +1068,8 @@
 %patch67 -p1 -b .ooo82458.libtextcat.rpath.patch
 %patch68 -p1 -b .ooo82608.vcl.gtkbadfree.patch
 %patch69 -p1 -b .ooo83169.colordialog.crash.patch
+%patch70 -p1 -b .ooo81307.sw.word2.patch
+%patch71 -p1 -b .ooo83591.vcl.checkboxes.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2767,6 +2771,8 @@
 %changelog
 * Wed Oct 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.5-unreleased
 - Resolves: rhbz#360461 openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
+- Resolves: openoffice.org-2.3.0.ooo83591.vcl.checkboxes.patch
+- Resolves: openoffice.org-2.3.1.ooo81307.sw.word2.patch
 
 * Thu Oct 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch

More information about the fedora-extras-commits mailing list