CWS-TOOLING: integrate CWS hb18

2009-06-24 18:01:53 +0200 hbrinkm  r273360 : CWS-TOOLING: rebase CWS hb18 to trunk@272827 (milestone: DEV300:m50)
2009-05-18 14:42:16 +0200 hbrinkm  r272021 : bailout changes for 159836, wrong CWS
2009-05-18 14:35:51 +0200 hbrinkm  r272019 : #159836# applied patch
2009-05-15 15:50:30 +0200 hbrinkm  r271943 : #i99790# removed warning
2009-05-14 17:45:32 +0200 hbrinkm  r271912 : CWS-TOOLING: rebase CWS hb18 to trunk@271830 (milestone: DEV300:m48)
2009-05-14 13:33:46 +0200 hbrinkm  r271886 : #i101390# applied patch
2009-04-24 10:26:45 +0200 hbrinkm  r271201 : #101105# applied patch
2009-04-22 11:38:38 +0200 hbrinkm  r271087 : #i101159# applied patch
2009-04-17 13:46:21 +0200 hbrinkm  r270938 : #i99790# applied patch
2009-04-16 16:46:51 +0200 hbrinkm  r270894 : #i98292# applied patch
2009-04-01 16:37:56 +0200 hbrinkm  r270339 : #i100358# applied patch
2009-03-31 10:12:57 +0200 hbrinkm  r270263 : CWS-TOOLING: rebase CWS hb18 to trunk@270033 (milestone: DEV300:m45)
2009-03-18 16:14:25 +0100 hbrinkm  r269685 : #100264# applied patch
2009-02-17 15:41:21 +0100 hbrinkm  r268175 : i97247# applied patch
2009-02-17 11:19:30 +0100 hbrinkm  r267855 : #i98885# applied patch

1 files changed, 10 insertions, 81 deletions

diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 90bd25b489a3..df036b03318c 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -258,92 +258,21 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile )
 
 bool WW8GlossaryFib::IsGlossaryFib()
 {
-    if (!nFibError)
-    {
-        INT16 nFibMin;
-        INT16 nFibMax;
-        switch(nVersion)
-        {
-            case 6:
-                nFibMin = 0x0065;   // von 101 WinWord 6.0
-                //     102    "
-                // und 103 WinWord 6.0 fuer Macintosh
-                //     104    "
-                nFibMax = 0x0069;   // bis 105 WinWord 95
-                break;
-            case 7:
-                nFibMin = 0x0069;   // von 105 WinWord 95
-                nFibMax = 0x0069;   // bis 105 WinWord 95
-                break;
-            case 8:
-                nFibMin = 0x006A;   // von 106 WinWord 97
-                nFibMax = 0x00c2;   // bis 194 WinWord 2000
-                break;
-            default:
-                nFibMin = 0;            // Programm-Fehler!
-                nFibMax = 0;
-                nFib = nFibBack = 1;
-                break;
-        }
-        if ( (nFibBack < nFibMin) || (nFibBack > nFibMax) )
-            nFibError = ERR_SWG_READ_ERROR; // Error melden
-    }
-    return !nFibError;
+    // fGlsy will indicate whether this has AutoText or not
+    return fGlsy;
 }
 
-UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream &rTableStrm,
-        SvStream &rStrm, const WW8Fib &rFib)
+UINT32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */,
+                                             SvStream & /* rStrm */,
+                                             const WW8Fib &rFib)
 {
-    WW8PLCF aPlc( &rTableStrm, rFib.fcPlcfsed, rFib.lcbPlcfsed, 12 );
-    WW8_CP start,ende;
-    void *pData;
-    aPlc.Get(start,ende,pData);
-    UINT32 nPo = SVBT32ToUInt32((BYTE *)pData+2);
-    //*pOut << hex << "Offset of last SEPX is " << nPo << endl;
-
-    UINT16 nLen;
-    if (nPo != 0xFFFFFFFF)
-    {
-        rStrm.Seek(nPo);
-        rStrm >> nLen;
-    }
-    else
-    {
-        nPo=0;
-        nLen=0;
-    }
-
-//  *pOut << hex << "Ends at " << nPo+len << endl;
-    nPo+=nLen;
-    UINT32 nEndLastPage;
-    if (nPo%512)
+    UINT32 nGlossaryFibOffset = 0;
+    if ( rFib.fDot ) // its a template
     {
-        nEndLastPage = (nPo)/512;
-        nEndLastPage = (nEndLastPage+1)*512;
+        if ( rFib.pnNext  )
+            nGlossaryFibOffset = ( rFib.pnNext * 512 );
     }
-    else
-        nEndLastPage = nPo;
-
-    //*pOut << hex << "SECOND FIB SHOULD BE FOUND at " << k << endl;
-
-    WW8PLCF xcPLCF( &rTableStrm, rFib.fcPlcfbteChpx,
-            rFib.lcbPlcfbteChpx, (8 > rFib.nVersion) ? 2 : 4);
-
-    xcPLCF.Get(start,ende,pData);
-
-    nPo = SVBT32ToUInt32((BYTE *)pData);
-    //*pOut << hex << "Offset of last CHPX is " << (nPo+1) *512<< endl;
-    if (((nPo+1)*512) > nEndLastPage) nEndLastPage = (nPo+1)*512;
-
-    WW8PLCF xpPLCF( &rTableStrm, rFib.fcPlcfbtePapx,
-            rFib.lcbPlcfbtePapx, (8 > rFib.nVersion) ? 2 : 4);
-    xpPLCF.Get(start,ende,pData);
-    nPo = SVBT32ToUInt32((BYTE *)pData);
-    //*pOut << hex << "Offset of last PAPX is " << nPo *512 << endl;
-    if (((nPo+1)*512) > nEndLastPage) nEndLastPage = (nPo+1)*512;
-
-    //*pOut << hex << "SECOND FIB SHOULD BE FOUND at " << nEndLastPage << endl;
-    return nEndLastPage;
+    return nGlossaryFibOffset;
 }
 
 /* vi:set tabstop=4 shiftwidth=4 expandtab: */