rpms/openoffice.org/devel openoffice.org-2.3.1.ooo81307.sw.word2.patch, 1.1, 1.2 openoffice.org.spec, 1.1392, 1.1393
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Jan 16 16:11:59 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1522
Modified Files:
openoffice.org-2.3.1.ooo81307.sw.word2.patch
openoffice.org.spec
Log Message:
Lithuanian has translated help now
openoffice.org-2.3.1.ooo81307.sw.word2.patch:
Index: openoffice.org-2.3.1.ooo81307.sw.word2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo81307.sw.word2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.1.ooo81307.sw.word2.patch 12 Nov 2007 17:31:22 -0000 1.1
+++ openoffice.org-2.3.1.ooo81307.sw.word2.patch 16 Jan 2008 16:11:02 -0000 1.2
@@ -1,11 +1,410 @@
+Index: source/filter/ww8/ww8par2.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/ww8/ww8par2.cxx,v
+retrieving revision 1.135
+diff -u -r1.135 ww8par2.cxx
+--- openoffice.org.orig/sw/source/filter/ww8/ww8par2.cxx 4 Jan 2008 13:23:39 -0000 1.135
++++ openoffice.org/sw/source/filter/ww8/ww8par2.cxx 16 Jan 2008 15:48:11 -0000
+@@ -4608,6 +4608,8 @@
+ stcp++;
+ }
+
++ USHORT nStyles=stcp;
++
+ std::vector<pxoffset> aCHPXOffsets(stcp);
+ sal_uInt16 cbChpx;
+ rSt >> cbChpx;
+@@ -4633,12 +4635,17 @@
+ aCHPXOffsets[stcp].mnSize);
+ aConvertedChpx.push_back( ChpxToSprms(aChpx) );
+
+- nByteCount = nByteCount+ nRemainder;
++ nByteCount += nRemainder;
+ }
+ else
+ aConvertedChpx.push_back( std::vector<BYTE>() );
+
+ stcp++;
++ if (stcp == nStyles)
++ {
++ rSt.SeekRel(cbChpx-nByteCount);
++ nByteCount += cbChpx-nByteCount;
++ }
+ }
+
+ std::vector<pxoffset> aPAPXOffsets(stcp);
+@@ -4666,15 +4673,23 @@
+ aPAPXOffsets[stcp].mnSize = nRemainder;
+
+ rSt.SeekRel(nRemainder);
+- nByteCount = nByteCount + nRemainder;
++ nByteCount += nRemainder;
+ }
+
+ stcp++;
++
++ if (stcp == nStyles)
++ {
++ rSt.SeekRel(cbPapx-nByteCount);
++ nByteCount += cbPapx-nByteCount;
++ }
+ }
+
+ sal_uInt16 iMac;
+ rSt >> iMac;
+
++ if (iMac > nStyles) iMac = nStyles;
++
+ for (stcp = 0; stcp < iMac; ++stcp)
+ {
+ sal_uInt8 stcNext, stcBase;
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 @@
+retrieving revision 1.177
+diff -u -r1.177 ww8par6.cxx
+--- openoffice.org.orig/sw/source/filter/ww8/ww8par6.cxx 26 Nov 2007 17:31:48 -0000 1.177
++++ openoffice.org/sw/source/filter/ww8/ww8par6.cxx 16 Jan 2008 15:48:19 -0000
+@@ -972,7 +972,7 @@
+ if (!pSep)
+ return;
+
+- bool bVer67(mrReader.bVer67);
++ ww::WordVersion eVer = mrReader.GetFib().GetFIBVersion();
+
+ // M.M. Create a linked section if the WkbPLCF
+ // has an entry for one at this cp
+@@ -1003,6 +1003,38 @@
+ //BEGIN read section values
+ wwSection aNewSection(*mrReader.pPaM->GetPoint());
+
++ static const USHORT aVer2Ids0[] =
++ {
++ /*sprmSBkc*/ 117,
++ /*sprmSFTitlePage*/ 118,
++ /*sprmSNfcPgn*/ 122,
++ /*sprmSCcolumns*/ 119,
++ /*sprmSDxaColumns*/ 120,
++ /*sprmSLBetween*/ 133
++ };
++
++ static const USHORT aVer67Ids0[] =
++ {
++ /*sprmSBkc*/ 142,
++ /*sprmSFTitlePage*/ 143,
++ /*sprmSNfcPgn*/ 147,
++ /*sprmSCcolumns*/ 144,
++ /*sprmSDxaColumns*/ 145,
++ /*sprmSLBetween*/ 158
++ };
++
++ static const USHORT aVer8Ids0[] =
++ {
++ /*sprmSBkc*/ 0x3009,
++ /*sprmSFTitlePage*/ 0x300A,
++ /*sprmSNfcPgn*/ 0x300E,
++ /*sprmSCcolumns*/ 0x500B,
++ /*sprmSDxaColumns*/ 0x900C,
++ /*sprmSLBetween*/ 0x3019
++ };
++
++ const USHORT* pIds = eVer <= ww::eWW2 ? aVer2Ids0 : eVer <= ww::eWW7 ? aVer67Ids0 : aVer8Ids0;
++
+ if (!maSegments.empty())
+ {
+ // Type of break: break codes are:
+@@ -1011,91 +1043,112 @@
+ // 2 New page
+ // 3 Even page
+ // 4 Odd page
+- if (const BYTE* pSprmBkc = pSep->HasSprm(bVer67 ? 142 : 0x3009))
++ if (const BYTE* pSprmBkc = pSep->HasSprm(pIds[0]))
+ aNewSection.maSep.bkc = *pSprmBkc;
+ }
+
+ // Has a table page
+ aNewSection.maSep.fTitlePage =
+- (0 != ReadBSprm( pSep, bVer67 ? 143 : 0x300A, 0 ));
++ (0 != ReadBSprm( pSep, pIds[1], 0 ));
+
+ // sprmSNfcPgn
+- aNewSection.maSep.nfcPgn = ReadBSprm( pSep, (bVer67 ? 147 : 0x300E), 0 );
++ aNewSection.maSep.nfcPgn = ReadBSprm( pSep, pIds[2], 0 );
+ if (aNewSection.maSep.nfcPgn > 4)
+ aNewSection.maSep.nfcPgn = 0;
+
+- aNewSection.maSep.fUnlocked = ReadBSprm(pSep, (bVer67 ? 139 : 0x3006), 0 );
++ aNewSection.maSep.fUnlocked = eVer <= ww::eWW2 ? ReadBSprm(pSep, (eVer <= ww::eWW7 ? 139 : 0x3006), 0 ) : 0;
+
+ // sprmSFBiDi
+- if (!bVer67)
+- aNewSection.maSep.fBiDi = ReadBSprm(pSep, 0x3228, 0);
++ aNewSection.maSep.fBiDi = eVer >= ww::eWW8 ? ReadBSprm(pSep, 0x3228, 0) : 0;
+
+- aNewSection.maSep.ccolM1 = ReadSprm(pSep, (bVer67 ? 144 : 0x500B), 0 );
++ aNewSection.maSep.ccolM1 = ReadSprm(pSep, pIds[3], 0 );
+
+ //sprmSDxaColumns - Default-Abstand 1.25 cm
+- aNewSection.maSep.dxaColumns =
+- ReadUSprm( pSep, (bVer67 ? 145 : 0x900C), 708 );
++ aNewSection.maSep.dxaColumns = ReadUSprm( pSep, pIds[4], 708 );
+
+ // sprmSLBetween
+- aNewSection.maSep.fLBetween = ReadBSprm(pSep, (bVer67 ? 158 : 0x3019), 0 );
++ aNewSection.maSep.fLBetween = ReadBSprm(pSep, pIds[5], 0 );
+
+- // sprmSFEvenlySpaced
+- aNewSection.maSep.fEvenlySpaced =
+- ReadBSprm(pSep, (bVer67 ? 138 : 0x3005), 1) ? true : false;
+-
+- if (aNewSection.maSep.ccolM1 > 0 && !aNewSection.maSep.fEvenlySpaced)
++ if (eVer >= ww::eWW6)
+ {
+- aNewSection.maSep.rgdxaColumnWidthSpacing[0] = 0;
+- int nCols = aNewSection.maSep.ccolM1 + 1;
+- int nIdx = 0;
+- for (int i = 0; i < nCols; ++i)
+- {
+- //sprmSDxaColWidth
+- const BYTE* pSW =
+- pSep->HasSprm( (bVer67 ? 136 : 0xF203), BYTE( i ) );
+-
+- ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" );
+- sal_uInt16 nWidth = pSW ? SVBT16ToShort(pSW + 1) : 1440;
+-
+- aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth;
+-
+- if (i < nCols-1)
+- {
+- //sprmSDxaColSpacing
+- const BYTE* pSD =
+- pSep->HasSprm( (bVer67 ? 137 : 0xF204), BYTE( i ) );
+-
+- ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" );
+- if( pSD )
+- {
+- nWidth = SVBT16ToShort(pSD + 1);
+- aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth;
+- }
+- }
+- }
+- }
++ // sprmSFEvenlySpaced
++ aNewSection.maSep.fEvenlySpaced =
++ ReadBSprm(pSep, (eVer <= ww::eWW7 ? 138 : 0x3005), 1) ? true : false;
++
++ if (aNewSection.maSep.ccolM1 > 0 && !aNewSection.maSep.fEvenlySpaced)
++ {
++ aNewSection.maSep.rgdxaColumnWidthSpacing[0] = 0;
++ int nCols = aNewSection.maSep.ccolM1 + 1;
++ int nIdx = 0;
++ for (int i = 0; i < nCols; ++i)
++ {
++ //sprmSDxaColWidth
++ const BYTE* pSW = pSep->HasSprm( (eVer <= ww::eWW7 ? 136 : 0xF203), BYTE( i ) );
++
++ ASSERT( pSW, "+Sprm 136 (bzw. 0xF203) (ColWidth) fehlt" );
++ sal_uInt16 nWidth = pSW ? SVBT16ToShort(pSW + 1) : 1440;
++
++ aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth;
++
++ if (i < nCols-1)
++ {
++ //sprmSDxaColSpacing
++ const BYTE* pSD = pSep->HasSprm( (eVer <= ww::eWW7 ? 137 : 0xF204), BYTE( i ) );
++
++ ASSERT( pSD, "+Sprm 137 (bzw. 0xF204) (Colspacing) fehlt" );
++ if( pSD )
++ {
++ nWidth = SVBT16ToShort(pSD + 1);
++ aNewSection.maSep.rgdxaColumnWidthSpacing[++nIdx] = nWidth;
++ }
++ }
++ }
++ }
++ }
++
++ static const USHORT aVer2Ids1[] =
++ {
++ /*sprmSBOrientation*/ 137,
++ /*sprmSXaPage*/ 139,
++ /*sprmSYaPage*/ 140,
++ /*sprmSDxaLeft*/ 141,
++ /*sprmSDxaRight*/ 142,
++ /*sprmSDzaGutter*/ 145,
++ /*sprmSFPgnRestart*/ 125,
++ /*sprmSPgnStart*/ 136,
++ /*sprmSDmBinFirst*/ 115,
++ /*sprmSDmBinOther*/ 116
++ };
+
+- static const USHORT aVer67Ids[] =
++ static const USHORT aVer67Ids1[] =
+ {
+ /*sprmSBOrientation*/ 162,
+ /*sprmSXaPage*/ 164,
+ /*sprmSYaPage*/ 165,
+ /*sprmSDxaLeft*/ 166,
+ /*sprmSDxaRight*/ 167,
+- /*sprmSDzaGutter*/ 170
++ /*sprmSDzaGutter*/ 170,
++ /*sprmSFPgnRestart*/ 150,
++ /*sprmSPgnStart*/ 161,
++ /*sprmSDmBinFirst*/ 140,
++ /*sprmSDmBinOther*/ 141
+ };
+
+- static const USHORT aVer8Ids[] =
++ static const USHORT aVer8Ids1[] =
+ {
+ /*sprmSBOrientation*/ 0x301d,
+ /*sprmSXaPage*/ 0xB01F,
+ /*sprmSYaPage*/ 0xB020,
+ /*sprmSDxaLeft*/ 0xB021,
+ /*sprmSDxaRight*/ 0xB022,
+- /*sprmSDzaGutter*/ 0xB025
++ /*sprmSDzaGutter*/ 0xB025,
++ /*sprmSFPgnRestart*/ 0x3011,
++ /*sprmSPgnStart*/ 0x501C,
++ /*sprmSDmBinFirst*/ 0x5007,
++ /*sprmSDmBinOther*/ 0x5008
+ };
+
+- const USHORT* pIds = bVer67 ? aVer67Ids : aVer8Ids;
++ pIds = eVer <= ww::eWW2 ? aVer2Ids1 : eVer <= ww::eWW7 ? aVer67Ids1 : aVer8Ids1;
+
+ // 1. Orientierung
+ aNewSection.maSep.dmOrientPage = ReadBSprm(pSep, pIds[0], 0);
+@@ -1124,51 +1177,74 @@
+
+ aNewSection.maSep.dzaGutter = ReadUSprm( pSep, pIds[5], 0);
+
+- aNewSection.maSep.fRTLGutter = static_cast< sal_uInt8 >(!bVer67 ? ReadUSprm( pSep, 0x322A, 0 ) : 0);
++ aNewSection.maSep.fRTLGutter = static_cast< sal_uInt8 >(eVer >= ww::eWW8 ? ReadUSprm( pSep, 0x322A, 0 ) : 0);
+
+ // Page Number Restarts - sprmSFPgnRestart
+- aNewSection.maSep.fPgnRestart = ReadBSprm(pSep, (bVer67 ? 150 : 0x3011), 0);
++ aNewSection.maSep.fPgnRestart = ReadBSprm(pSep, pIds[6], 0);
+
+- aNewSection.maSep.pgnStart = ReadBSprm( pSep, (bVer67 ? 161 : 0x501C), 0 );
++ aNewSection.maSep.pgnStart = ReadBSprm( pSep, pIds[7], 0 );
+
+- if (const BYTE* p = pSep->HasSprm( bVer67 ? 132 : 0x3001 ))
+- aNewSection.maSep.iHeadingPgn = *p;
++ if (eVer >= ww::eWW6)
++ {
++ if (const BYTE* p = pSep->HasSprm( (eVer <= ww::eWW7 ? 132 : 0x3001) ))
++ aNewSection.maSep.iHeadingPgn = *p;
+
+- if (const BYTE* p = pSep->HasSprm( bVer67 ? 131 : 0x3000 ))
+- aNewSection.maSep.cnsPgn = *p;
++ if (const BYTE* p = pSep->HasSprm( (eVer <= ww::eWW7 ? 131 : 0x3000) ))
++ aNewSection.maSep.cnsPgn = *p;
++ }
+
+- if(const BYTE* pSprmSDmBinFirst = pSep->HasSprm( bVer67 ? 140 : 0x5007 ))
++ if(const BYTE* pSprmSDmBinFirst = pSep->HasSprm( pIds[8] ))
+ aNewSection.maSep.dmBinFirst = *pSprmSDmBinFirst;
+
+- if (const BYTE* pSprmSDmBinOther = pSep->HasSprm( bVer67 ? 141 : 0x5008))
++ if (const BYTE* pSprmSDmBinOther = pSep->HasSprm( pIds[9] ))
+ aNewSection.maSep.dmBinOther = *pSprmSDmBinOther;
+
+ static const USHORT nTop[] = { MM_250, 1440 };
+ static const USHORT nBot[] = { MM_200, 1440 };
+
++ static const USHORT aVer2Ids2[] =
++ {
++ /*sprmSDyaTop*/ 143,
++ /*sprmSDyaBottom*/ 144,
++ /*sprmSDyaHdrTop*/ 131,
++ /*sprmSDyaHdrBottom*/ 132,
++ /*sprmSNLnnMod*/ 129,
++ /*sprmSLnc*/ 127,
++ /*sprmSDxaLnn*/ 130,
++ /*sprmSLnnMin*/ 135
++ };
++
+ static const USHORT aVer67Ids2[] =
+ {
+ /*sprmSDyaTop*/ 168,
+ /*sprmSDyaBottom*/ 169,
+ /*sprmSDyaHdrTop*/ 156,
+- /*sprmSDyaHdrBottom*/ 157
++ /*sprmSDyaHdrBottom*/ 157,
++ /*sprmSNLnnMod*/ 154,
++ /*sprmSLnc*/ 152,
++ /*sprmSDxaLnn*/ 155,
++ /*sprmSLnnMin*/ 160
+ };
+ static const USHORT aVer8Ids2[] =
+ {
+ /*sprmSDyaTop*/ 0x9023,
+ /*sprmSDyaBottom*/ 0x9024,
+ /*sprmSDyaHdrTop*/ 0xB017,
+- /*sprmSDyaHdrBottom*/ 0xB018
++ /*sprmSDyaHdrBottom*/ 0xB018,
++ /*sprmSNLnnMod*/ 0x5015,
++ /*sprmSLnc*/ 0x3013,
++ /*sprmSDxaLnn*/ 0x9016,
++ /*sprmSLnnMin*/ 0x501B
+ };
+
+- pIds = bVer67 ? aVer67Ids2 : aVer8Ids2;
++ pIds = eVer <= ww::eWW2 ? aVer2Ids2 : eVer <= ww::eWW7 ? aVer67Ids2 : aVer8Ids2;
+
+ aNewSection.maSep.dyaTop = ReadSprm( pSep, pIds[0], nTop[nLIdx] );
+ aNewSection.maSep.dyaBottom = ReadSprm( pSep, pIds[1], nBot[nLIdx] );
+ aNewSection.maSep.dyaHdrTop = ReadUSprm( pSep, pIds[2], 720 );
+ aNewSection.maSep.dyaHdrBottom = ReadUSprm( pSep, pIds[3], 720 );
+
+- if (!bVer67)
++ if (eVer >= ww::eWW8)
+ {
+ aNewSection.maSep.wTextFlow = ReadUSprm(pSep, 0x5033, 0);
+ aNewSection.maSep.clm = ReadUSprm( pSep, 0x5032, 0 );
+@@ -1183,24 +1259,24 @@
+ aNewSection.maSep.pgbOffsetFrom = (pgbProp & 0x00E0) >> 5;
+
+ aNewSection.mnBorders =
+- ::lcl_ReadBorders(bVer67, aNewSection.brc, 0, 0, pSep);
++ ::lcl_ReadBorders(eVer <= ww::eWW7, aNewSection.brc, 0, 0, pSep);
+ }
+
+ // check if Line Numbering must be activated or resetted
+- if (const BYTE* pSprmSNLnnMod = pSep->HasSprm( bVer67 ? 154 : 0x5015 ))
++ if (const BYTE* pSprmSNLnnMod = pSep->HasSprm( pIds[4] ))
+ aNewSection.maSep.nLnnMod = *pSprmSNLnnMod;
+
+- if (const BYTE* pSprmSLnc = pSep->HasSprm( bVer67 ? 152 : 0x3013 ))
++ if (const BYTE* pSprmSLnc = pSep->HasSprm( pIds[5] ))
+ aNewSection.maSep.lnc = *pSprmSLnc;
+
+- if (const BYTE* pSprmSDxaLnn = pSep->HasSprm( bVer67 ? 155:0x9016 ))
++ if (const BYTE* pSprmSDxaLnn = pSep->HasSprm( pIds[6] ))
+ aNewSection.maSep.dxaLnn = SVBT16ToShort( pSprmSDxaLnn );
+
+- if (const BYTE* pSprmSLnnMin = pSep->HasSprm( bVer67 ? 160:0x501B ))
++ if (const BYTE* pSprmSLnnMin = pSep->HasSprm( pIds[7] ))
+ aNewSection.maSep.lnnMin = *pSprmSLnnMin;
+
+- if (bVer67)
+- aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, 153, 0);
++ if (eVer <= ww::eWW7)
++ aNewSection.maSep.grpfIhdt = ReadBSprm(pSep, eVer <= ww::eWW2 ? 128 : 153, 0);
+ else if (mrReader.pHdFt)
+ {
+ aNewSection.maSep.grpfIhdt = WW8_HEADER_ODD | WW8_FOOTER_ODD;
+@@ -1239,7 +1315,7 @@
+ SetLeftRight(aNewSection);
+ //END read section values
+
+- if (!bVer67)
++ if (eVer >= ww::eWW8)
+ aNewSection.SetDirection();
+
+ mrReader.HandleLineNumbering(aNewSection);
+@@ -4093,8 +4169,10 @@
pCtrlStck->SetAttr( *pPaM->GetPoint(), RES_UL_SPACE );
return;
}
@@ -20,11 +419,32 @@
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 @@
+retrieving revision 1.134
+diff -u -r1.134 ww8scan.cxx
+--- openoffice.org.orig/sw/source/filter/ww8/ww8scan.cxx 27 Sep 2007 10:06:31 -0000 1.134
++++ openoffice.org/sw/source/filter/ww8/ww8scan.cxx 16 Jan 2008 15:48:23 -0000
+@@ -3405,7 +3405,8 @@
+ pStrm(pSt), nArrMax(256), nSprmSiz(0)
+ {
+ pPLCF = rFib.lcbPlcfsed
+- ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed, 12, nStartCp)
++ ? new WW8PLCF(pTblSt, rFib.fcPlcfsed, rFib.lcbPlcfsed,
++ GetFIBVersion() <= ww::eWW2 ? 6 : 12, nStartCp)
+ : 0;
+
+ pSprms = new BYTE[nArrMax]; // maximum length
+@@ -3452,8 +3453,8 @@
+ }
+ else
+ {
+- long nPo = SVBT32ToUInt32( (BYTE*)pData+2 );
+- if (nPo == -1L)
++ sal_uInt32 nPo = SVBT32ToUInt32( (BYTE*)pData+2 );
++ if (nPo == 0xFFFFFFFF)
+ {
+ p->nStartPos = p->nEndPos = WW8_CP_MAX; // Sepx empty
+ p->pMemPos = 0;
+@@ -3462,7 +3463,16 @@
else
{
pStrm->Seek( nPo );
@@ -42,7 +462,7 @@
if( nSprmSiz > nArrMax )
{ // passt nicht
-@@ -6086,15 +6095,15 @@
+@@ -6085,15 +6095,15 @@
return;
}
@@ -61,7 +481,7 @@
{
// bVer8: read the count of strings in nMax
rSt >> nMax;
-@@ -6108,7 +6117,7 @@
+@@ -6107,7 +6117,7 @@
// read all font information
rSt.Read( pA, rFib.lcbSttbfffn - 2 );
@@ -70,7 +490,7 @@
{
// try to figure out how many fonts are defined here
nMax = 0;
-@@ -6135,7 +6144,34 @@
+@@ -6134,7 +6144,33 @@
pFontA = new WW8_FFN[ nMax ];
p = pFontA;
@@ -78,7 +498,6 @@
+ 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;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1392
retrieving revision 1.1393
diff -u -r1.1392 -r1.1393
--- openoffice.org.spec 16 Jan 2008 11:34:46 -0000 1.1392
+++ openoffice.org.spec 16 Jan 2008 16:11:02 -0000 1.1393
@@ -1390,7 +1390,7 @@
hi-IN help noacor ctl hu help acor_hu-HU.dat western \
hr nohelp noacor western it help acor_it-*.dat western \
ja help acor_ja-JP.dat cjk ko help acor_ko-KR.dat cjk \
-lt nohelp noacor western ms nohelp noacor western \
+lt help noacor western ms nohelp noacor western \
nb help noacor western nl help acor_nl-*.dat western \
nn help noacor western pl help acor_pl-PL.dat western \
pt help acor_pt-PT.dat western pt-BR help acor_pt-BR.dat western \
@@ -2869,6 +2869,8 @@
* Wed Jan 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-3.1
- Resolves: rhbz#428655 workspace.sw8u10bf04.patch
- Resolves: rhbz#428655 workspace.impress132.patch
+- fix word2 import
+- Lithuanian help content
* Tue Jan 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-2.2
- fix hyphenation
More information about the fedora-extras-commits
mailing list