ooo-build r14692 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Dec  2 18:50:32 2008
New Revision: 14692
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14692&view=rev

Log:
2008-12-02  Noel Power <noel power novell com>

        * patches/vba/userform-image-import-fix.diff: fix context,
        * should ensure correct hunk is applied in correct place and userforms
should
        work again ( hopefully )


Modified:
   trunk/ChangeLog
   trunk/patches/vba/userform-image-import-fix.diff

Modified: trunk/patches/vba/userform-image-import-fix.diff
==============================================================================
--- trunk/patches/vba/userform-image-import-fix.diff	(original)
+++ trunk/patches/vba/userform-image-import-fix.diff	Tue Dec  2 18:50:32 2008
@@ -1,31 +1,39 @@
---- svx/source/msfilter/msocximex.cxx	2008-09-17 18:22:32.000000000 +0100
-+++ svx/source/msfilter/msocximex.cxx	2008-09-17 18:24:52.000000000 +0100
-@@ -4279,6 +4279,18 @@ sal_Bool OCX_UserForm::Read(SvStorageStr
+diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
+index 164073d..b4a46ce 100644
+--- svx/source/msfilter/msocximex.cxx
++++ svx/source/msfilter/msocximex.cxx
+@@ -4449,32 +4449,31 @@ sal_Bool OCX_UserForm::Read(SvStorageStream *pS)
  		pS->Read(pIcon,nIconLen);
  	}
  
-+
-+
-+    ReadAlign( pS, pS->Tell() - nStart, 4);
-+
-+    if (pBlockFlags[2] & 0x10)
-+    {
-+        //Font Stuff..
-+        pS->SeekRel(0x1a);
-+        sal_uInt8 nFontLen;
-+        *pS >> nFontLen;
-+        pS->SeekRel(nFontLen);
-+    }
++	ReadAlign( pS, pS->Tell() - nStart, 4);
++	if (pBlockFlags[2] & 0x10)
++	{
++		//Font Stuff..
++		pS->SeekRel(0x1a);
++		sal_uInt8 nFontLen;
++		*pS >> nFontLen;
++		pS->SeekRel(nFontLen);
++	}
  	if (nPicture)
  	{
  		pS->Read(pPictureHeader,20);
-@@ -4293,18 +4305,6 @@ sal_Bool OCX_UserForm::Read(SvStorageStr
- 		// make sure the stream position should be pointing after the image
+ 		*pS >> nPictureLen;
+ 		long imagePos = pS->Tell();
++		// great embedded object
+ 		mxGrfObj = lcl_readGraphicObject( pS );
+ 		if( mxGrfObj.is() )
+ 		{
+ 			sImageUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( GRAPHOBJ_URLPREFIX ) );
+ 			sImageUrl = sImageUrl + mxGrfObj->getUniqueID();
+ 		}
+-		// make sure the stream position should be pointing after the image
++		// make sure the stream position should be pointing after the image.
  		pS->Seek( imagePos + nPictureLen );
  	}
--
--    ReadAlign( pS, pS->Tell() - nStart, 4);
--
+ 
+-     ReadAlign( pS, pS->Tell() - nStart, 4);
+- 
 -    if (pBlockFlags[2] & 0x10)
 -    {
 -        //Font Stuff..