ooo-build r15477 - in trunk: . patches/dev300 patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Mar  5 14:46:44 2009
New Revision: 15477
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15477&view=rev

Log:
2009-03-05  Noel Power  <noel power novell com>

        * patches/dev300/redirect-extensions-m0.diff: fix for m2
        * patches/dev300/apply: add (initial )fix below for erroneous ( sometimes  core-ing )
         read of dir stream records
        * patches/vba/read-vba-dir-stream-fix.diff


Added:
   trunk/patches/vba/read-vba-dir-stream-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/redirect-extensions-m0.diff

Modified: trunk/patches/dev300/redirect-extensions-m0.diff
==============================================================================
--- trunk/patches/dev300/redirect-extensions-m0.diff	(original)
+++ trunk/patches/dev300/redirect-extensions-m0.diff	Thu Mar  5 14:46:44 2009
@@ -97,7 +97,7 @@
  	pImpl->aTitle = GetText();
  
      aMoreTemplatesLink.SetURL( String(
--        RTL_CONSTASCII_STRINGPARAM( "http://extensions.services.openoffice.org/templates?cid=923508"; ) ) );
+-        RTL_CONSTASCII_STRINGPARAM( "http://templates.services.openoffice.org/?cid=923508"; ) ) );
 +        RTL_CONSTASCII_STRINGPARAM( "http://extensions.go-oo.org/templates?cid=923508"; ) ) );
      aMoreTemplatesLink.SetClickHdl( LINK( this, SvtDocumentTemplateDialog, OpenLinkHdl_Impl ) );
  

Added: trunk/patches/vba/read-vba-dir-stream-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/read-vba-dir-stream-fix.diff	Thu Mar  5 14:46:44 2009
@@ -0,0 +1,39 @@
+diff --git svx/source/msfilter/msvbasic.cxx svx/source/msfilter/msvbasic.cxx
+index a8aac8a..9cec8e5 100644
+--- svx/source/msfilter/msvbasic.cxx
++++ svx/source/msfilter/msvbasic.cxx
+@@ -681,8 +681,7 @@ ReferenceRegisteredRecord::read( SvStream* pStream )
+     *pStream >> Id >> Size >> SizeOfLibid;
+     if ( SizeOfLibid )
+     {
+-        pLibid = new sal_uInt8[ SizeOfLibid ];
+-        OSL_TRACE("ReferenceRegisteredRecord about to read Libid [0x%x]", pStream->Tell() ); 
++        pLibid = new sal_uInt8[ SizeOfLibid];
+         pStream->Read( pLibid, SizeOfLibid );
+     }
+     *pStream >> Reserved1 >> Reserved2;
+@@ -758,7 +757,14 @@ ReferenceControlRecord() : Id( 0x2F ), SizeTwiddled( 0 ), SizeOfLibidTwiddled( 0
+ bool read( SvStream* pStream )
+ {
+     OSL_TRACE("ReferenceControlRecord [0x%x]", pStream->Tell() ); 
+-    OriginalRecord.read( pStream );
++    long nPos = pStream->Tell();
++
++    *pStream >> Id;
++    pStream->Seek( nPos ); // point before the peeked Id
++    if ( Id == 0x33 ) // we have an OriginalRecord
++    {
++        OriginalRecord.read( pStream );
++    }
+     *pStream >> Id >> SizeTwiddled >> SizeOfLibidTwiddled;
+ 
+     if ( SizeOfLibidTwiddled )
+@@ -769,7 +775,7 @@ bool read( SvStream* pStream )
+ 
+     *pStream >> Reserved1 >> Reserved2;
+ 
+-    long nPos = pStream->Tell();
++    nPos = pStream->Tell();
+     // peek at the id for optional NameRecord
+     sal_Int16 nTmpId;
+     *pStream >> nTmpId;