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

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Sep 17 17:29:31 2008
New Revision: 13922
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13922&view=rev

Log:
2008-09-17  Noel Power  <noel power novell com>

        * patches/dev300/apply: add patch
        * patches/vba/userform-image-import-fix.diff: fix import problem
        with images ( for userform )


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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep 17 17:29:31 2008
@@ -1627,6 +1627,9 @@
 vba-variant-fix.diff, Fong
 # fix for variant get/set properties
 variant-property.diff, i#93214
+# fix for image import for userform 
+userform-image-import-fix.diff
+
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao

Added: trunk/patches/vba/userform-image-import-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/userform-image-import-fix.diff	Wed Sep 17 17:29:31 2008
@@ -0,0 +1,40 @@
+--- 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
+ 		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);
++    }
+ 	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->Seek( imagePos + nPictureLen );
+ 	}
+-
+-    ReadAlign( pS, pS->Tell() - nStart, 4);
+-
+-    if (pBlockFlags[2] & 0x10)
+-    {
+-        //Font Stuff..
+-        pS->SeekRel(0x1a);
+-        sal_uInt8 nFontLen;
+-        *pS >> nFontLen;
+-        pS->SeekRel(nFontLen);
+-    }
+-
+     sal_Int16 numTrailingRecs = 0;
+     *pS >> numTrailingRecs;
+     // seems to be no. of trailing records,