ooo-build r11895 - in trunk: . patches/src680

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Mar 13 17:28:49 2008
New Revision: 11895
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11895&view=rev

Log:
2008-03-13  Noel Power  <noel power novell com>

        * patches/src680/userform-scrollleftandtop.diff: fix MSO  Userform 
        controls import when scroll-left and scroll-top properties are set
        i#87007
        * patches/src680/apply:



Added:
   trunk/patches/src680/userform-scrollleftandtop.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Mar 13 17:28:49 2008
@@ -443,6 +443,9 @@
 # make path detection look for VC2005er dlls, too
 config_office-msvc8-compat.diff, thorsten
 
+# fix import of MSO Userform & Frame ( presence of scroll-top & scroll-left )
+# screws things up
+userform-scrollleftandtop.diff, i#87007, noelpwer
 
 [ SELinux ]
 # make OOo work under SELinux
@@ -1207,8 +1210,6 @@
 vba-attribute.diff, i#37347, noelpwer
 #basic depends on built and delivered ooovbaapi
 basic-prj-build_lst.diff
-#for NULL and IsNULL compatibility with MSO
-#vba-basic-null.diff i#85349, jjiao
 
 
 [ ArkOnly ]
@@ -1400,7 +1401,13 @@
 # end LCL hacks
 basic-source-classes-eventatt-cxx.diff, #no-upstream
 #ditto
+# null patch below was removed because it causes 
+# other problems, e.g. the current NULL behavour fails
+# for vba api
+#for NULL and IsNULL compatibility with MSO
+#vba-basic-null.diff i#85349, jjiao
 vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
+
 #must ask kendy about this ( noelp )
 vba-parallel-build.diff, #no-upstream
 #not so useful but perhaps we can build on it later

Added: trunk/patches/src680/userform-scrollleftandtop.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/userform-scrollleftandtop.diff	Thu Mar 13 17:28:49 2008
@@ -0,0 +1,77 @@
+Index: svx/inc/svx/msocximex.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/inc/svx/msocximex.hxx,v
+retrieving revision 1.4
+diff -u -p -r1.4 msocximex.hxx
+--- svx/inc/svx/msocximex.hxx	27 Sep 2007 13:00:53 -0000	1.4
++++ svx/inc/svx/msocximex.hxx	13 Mar 2008 17:13:53 -0000
+@@ -838,6 +838,8 @@ public:
+ 
+ 	sal_uInt32 	nScrollWidth;
+ 	sal_uInt32 	nScrollHeight;
++	sal_uInt32 	nScrollLeft;
++	sal_uInt32 	nScrollTop;
+ 
+ 
+ 	sal_uInt8 pIconHeader[20];
+@@ -919,7 +921,8 @@ public:
+ 
+ 	sal_uInt32 	nScrollWidth;
+ 	sal_uInt32 	nScrollHeight;
+-
++	sal_uInt32 	nScrollLeft;
++	sal_uInt32 	nScrollTop;
+ 
+ 	sal_uInt8 pIconHeader[20];
+ 	sal_uInt32  nIconLen;
+Index: svx/source/msfilter/msocximex.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msocximex.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 msocximex.cxx
+--- svx/source/msfilter/msocximex.cxx	27 Sep 2007 13:02:19 -0000	1.35
++++ svx/source/msfilter/msocximex.cxx	13 Mar 2008 17:14:21 -0000
+@@ -3910,7 +3910,7 @@ OCX_Frame::OCX_Frame( SotStorageRef& par
+ 		nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
+ 		nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
+ 		bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
+-		nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
++		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0),
+ 		pPicture(0)
+ {
+     msDialogType = C2U("com.sun.star.awt.UnoControlGroupBoxModel");
+@@ -4035,6 +4035,12 @@ sal_Bool OCX_Frame::Read(SvStorageStream
+     *pS >> nScrollWidth;
+     *pS >> nScrollHeight;
+ 
++    if (pBlockFlags[1] & 0x10)
++    {
++        *pS >> nScrollLeft;
++        *pS >> nScrollTop;
++    }
++
+     if ( bCaption )
+     {
+         lclReadCharArray( *pS, pCaption, nCaptionLen, pS->Tell() - nStart);
+@@ -4100,7 +4106,7 @@ OCX_UserForm::OCX_UserForm( SotStorageRe
+ 		nKeepScrollBarsVisible(3), nCycle(0), nBorderStyle(0), nSpecialEffect(0),
+ 		nPicture(0), nPictureAlignment(2), nPictureSizeMode(0),
+ 		bPictureTiling(FALSE), nAccelerator(0), nIcon(0), pCaption(0),
+-		nScrollWidth(0), nScrollHeight(0), nIconLen(0), pIcon(0), nPictureLen(0),
++		nScrollWidth(0), nScrollHeight(0), nScrollLeft(0), nScrollTop(0), nIconLen(0), pIcon(0), nPictureLen(0),
+ 		pPicture(0)
+ 	{
+             mnForeColor = 0x80000012;
+@@ -4217,6 +4223,12 @@ sal_Bool OCX_UserForm::Read(SvStorageStr
+     *pS >> nScrollWidth;
+     *pS >> nScrollHeight;
+ 
++    if (pBlockFlags[1] & 0x10)
++    {
++        *pS >> nScrollLeft;
++        *pS >> nScrollTop;
++    }
++
+ 	if (nIcon)
+ 	{
+ 		pS->Read(pIconHeader,20);