[ooo-build-commit] 2 commits - patches/vba

[Tor Lillqvist]

 patches/vba/vba-autotext-ole-read-fix.diff |  104 -----------------------------
 patches/vba/vba-templateobject.diff        |    6 -
 2 files changed, 2 insertions(+), 108 deletions(-)

New commits:
commit 7f12621241fee134cef2d8c9fd071b157defa6a9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 18:32:47 2009 +0300

    Adapt for dev300-m54
    
    * patches/vba/vba-autotext-ole-read-fix.diff: Change to
      sw/source/filter/ww8/ww8glsy.cxx is already in dev300-m54.

diff --git a/patches/vba/vba-autotext-ole-read-fix.diff b/patches/vba/vba-autotext-ole-read-fix.diff
index b20c2d2..caff8b9 100644
--- a/patches/vba/vba-autotext-ole-read-fix.diff
+++ b/patches/vba/vba-autotext-ole-read-fix.diff
@@ -32,107 +32,3 @@ index 14a0497..41e468f 100644
          }
          catch( uno::Exception& )
  		{
-diff --git sw/source/filter/ww8/ww8glsy.cxx sw/source/filter/ww8/ww8glsy.cxx
-index 77c6383..3585c30 100644
---- sw/source/filter/ww8/ww8glsy.cxx
-+++ sw/source/filter/ww8/ww8glsy.cxx
-@@ -258,92 +258,20 @@ 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)
- {
--    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: */
commit 66a62134e11821e4c083781b11fec802b0bfef19
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 18:29:49 2009 +0300

    Adapt vba-templateobject.diff for dev300-m54
    
    * patches/vba/vba-templateobject.diff: Adapt for dev300-m54.

diff --git a/patches/vba/vba-templateobject.diff b/patches/vba/vba-templateobject.diff
index ecc66fe..466906e 100644
--- a/patches/vba/vba-templateobject.diff
+++ b/patches/vba/vba-templateobject.diff
@@ -82,8 +82,6 @@ index 646e623..c638476 100644
  
  # ------------------------------------------------------------------
  
-diff --git sw/inc/docsh.hxx sw/inc/docsh.hxx
-index 8cc3a72..831b785 100644
 --- sw/inc/docsh.hxx
 +++ sw/inc/docsh.hxx
 @@ -85,6 +85,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
@@ -100,9 +98,9 @@ index 8cc3a72..831b785 100644
      SfxInPlaceClient* GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef );
 +    SW_DLLPRIVATE sal_Bool IsTemplate() { return bIsATemplate; }
 +    SW_DLLPRIVATE void SetIsTemplate( bool bValue ) { bIsATemplate = bValue; }
- };
  
- class Graphic;
+     virtual const ::sfx2::IXmlIdRegistry* GetXmlIdRegistry() const;
+ };
 diff --git sw/inc/unomap.hxx sw/inc/unomap.hxx
 index 92feb78..1e842ab 100644
 --- sw/inc/unomap.hxx