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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Jun 17 08:57:08 2008
New Revision: 12907
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12907&view=rev

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

        * patches/dev300/apply: re-enabled ObjectModule & UserForms.diff
        * patches/vba/ObjectModule.diff:
        * patches/vba/vba-brackets-params-fix.diff: removed lots of unused
        patches
        * patches/vba/vba-symbol-searchhack-for-thisworkbook.diff:
        * patches/vba/vba-workbook-worksheet-events.diff:
        * patches/vba/vba-static-behaviour.diff:
        * patches/vba/vba-format-function.diff:
        * patches/vba/vba-ccur-function.diff:
        * patches/vba/vba-strconv-function.diff:
        * patches/vba/vba-negnumber-inparam-withoutbrackets.diff:
        * patches/vba/vba-getattr-function.diff:
        * patches/vba/vba-is-behaviour.diff:
        * patches/vba/vba-stringtodouble.diff:
        * patches/vba/vba-bytearray-string.diff:
        * patches/vba/vba-error-function.diff:
        * patches/vba/vba-partition-function.diff:
        * patches/vba/vba-keep-codenames-in-sync.diff:
        * patches/vba/vba-replace-function.diff:


Removed:
   trunk/patches/vba/vba-brackets-params-fix.diff
   trunk/patches/vba/vba-bytearray-string.diff
   trunk/patches/vba/vba-ccur-function.diff
   trunk/patches/vba/vba-error-function.diff
   trunk/patches/vba/vba-format-function.diff
   trunk/patches/vba/vba-getattr-function.diff
   trunk/patches/vba/vba-is-behaviour.diff
   trunk/patches/vba/vba-keep-codenames-in-sync.diff
   trunk/patches/vba/vba-negnumber-inparam-withoutbrackets.diff
   trunk/patches/vba/vba-partition-function.diff
   trunk/patches/vba/vba-replace-function.diff
   trunk/patches/vba/vba-static-behaviour.diff
   trunk/patches/vba/vba-strconv-function.diff
   trunk/patches/vba/vba-stringtodouble.diff
   trunk/patches/vba/vba-symbol-searchhack-for-thisworkbook.diff
   trunk/patches/vba/vba-workbook-worksheet-events.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/ObjectModule.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jun 17 08:57:08 2008
@@ -1409,9 +1409,9 @@
 #also allow paramaters to be supported for Get properties
 vba-support-properties-inmodules.diff
 # object module support... getting there
-#FIXME dev300-m19: ObjectModule.diff
+ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
-#FIXME dev300-m19: vba-userform.diff
+vba-userform.diff
 # another bug with event bindings for dialogs ( awaiting iz id from andreas )
 vba-dialogs-fixsmoketest.diff
 
@@ -1426,19 +1426,7 @@
 vba-empty-comparison-fix.diff, n#397438, Fong
 [ VBAUntested ]
 SectionOwner => noelpwer
-# total hack at the moment, getting smaller
-UserFormObjectModuleEventsSuperBigPatch.diff
-# start LCL hacks
-# incomplete solution ( works for import of ocx radio buttons only )
-radiobutton-group-hack.diff, n#359937, jonp
-# 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-basic-null.diff i#85349, jjiao
 vba-support-stoc-typeprovider-xexactname.diff, #no-upstream
 
 #must ask kendy about this ( noelp )
@@ -1446,38 +1434,6 @@
 #not so useful but perhaps we can build on it later
 basic-speedup-fix.diff
 
-# the following patches are part of cws-npower10
-# keep them here until they are reviewed to save regenerating
-# the individual patches
-# support Replace function
-vba-replace-function.diff, n#226439, Fong
-# support StrConv function
-vba-strconv-function.diff, n#294187, Fong
-# Fix rounding problem in CCur function
-vba-ccur-function.diff, n#294187, Fong
-# Conversion between byte array and String
-## vba-bytearray-string.diff, Fong
-# support Partition function
-vba-partition-function.diff, n#294187, Fong
-# GetAttr function, using windows api to get file attributes in Win32.
-vba-getattr-function.diff, n#294187, Fong
-# Fomat function enhancement for VBA
-vba-format-function.diff, n#294187, Fong
-
-# the following patches are part of cws-pflin10
-# Error function compatible with VBA
-vba-error-function.diff, n#294187, Fong
-# fix for n#353254
-n353254-dateserial.diff, n#353254, Fong
-# fix for n#353260
-n353260-datevalue.diff, n#353260, Fong
-vba-stringtodouble.diff, n#359943, noelpwer
-
-# Is function only valid for objects
-#vba-is-behaviour.diff
-# support static keyword for procedures and local variables
-#vba-static-behaviour.diff, noelpwer, i#58089, n#306717
-
 [ Features ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian

Modified: trunk/patches/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/vba/ObjectModule.diff	(original)
+++ trunk/patches/vba/ObjectModule.diff	Tue Jun 17 08:57:08 2008
@@ -1951,33 +1951,32 @@
  
  # ------------------------------------------------------------------
  
---- basic/source/uno/scriptcont.cxx
-+++ basic/source/uno/scriptcont.cxx
-@@ -182,7 +182,11 @@ Any SAL_CALL SfxScriptLibraryContainer::
- sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid( Any aElement )
- {
- 	OUString aMod;
--	aElement >>= aMod;
-+    ::com::sun::star::script::ModuleInfo mInfo;
-+    if ( aElement >>= mInfo )
-+        aMod = mInfo.ModuleSource;
-+    else
-+	    aElement >>= aMod;
- 	sal_Bool bRet = (aMod.getLength() > 0);
- 	return bRet;
- }
-@@ -216,7 +220,12 @@ void SAL_CALL SfxScriptLibraryContainer:
+--- basic/source/uno/scriptcont.cxx	2008-06-16 17:14:58.000000000 +0100
++++ basic/source/uno//scriptcont.cxx	2008-06-16 17:25:42.000000000 +0100
+@@ -214,7 +214,12 @@ void SAL_CALL SfxScriptLibraryContainer:
  	xmlscript::ModuleDescriptor aMod;
  	aMod.aName = aElementName;
  	aMod.aLanguage = maScriptLanguage;
 -	aElement >>= aMod.aCode;
-+    // make sure we export source
-+    ::com::sun::star::script::ModuleInfo mInfo;
-+    if ( aElement >>= mInfo )
-+        aMod.aCode = mInfo.ModuleSource;
-+    else
-+	    aElement >>= aMod.aCode;
++	// make sure we export source
++	::com::sun::star::script::ModuleInfo mInfo;
++	if ( aElement >>= mInfo )
++		aMod.aCode = mInfo.ModuleSource;
++	else
++		aElement >>= aMod.aCode;
  	xmlscript::exportScriptModule( xHandler, aMod );
  }
  
-
+@@ -1171,7 +1176,11 @@ void SfxScriptLibrary::storeResourcesToS
+ bool SfxScriptLibrary::containsValidModule( const Any& aElement )
+ {
+ 	OUString sModuleText;
+-	aElement >>= sModuleText;
++	::com::sun::star::script::ModuleInfo mInfo;
++	if ( aElement >>= mInfo )
++		sModuleText = mInfo.ModuleSource;
++	else
++		aElement >>= sModuleText;
+ 	return ( sModuleText.getLength() > 0 );
+ }
+