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

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu May  8 16:37:25 2008
New Revision: 12493
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12493&view=rev

Log:
2008-05-08  Noel Power  <noel power novell com>

        * patches/dev300/apply:
        * patches/dev300/cws-ab48.diff: removed
        * patches/vba/vba-always-set-defaultprop.diff: fix for #n388049




Added:
   trunk/patches/vba/vba-always-set-defaultprop.diff
Removed:
   trunk/patches/dev300/cws-ab48.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu May  8 16:37:25 2008
@@ -1415,8 +1415,6 @@
 
 vba-brackets-params-fix.diff, i#79918, n#292861
 vba-negnumber-inparam-withoutbrackets.diff, n#294302
-# disabled because macros in hypcycloid don't compile
-#cws-ab48.diff
 
 # hack for when resolving a symbol in the module ThisWorkbook
 vba-symbol-searchhack-for-thisworkbook.diff
@@ -1476,7 +1474,8 @@
 #fix for n#309981
 vba-fixup-singlerange-sheetref.diff, n#309981, noelpwer
 vba-hyperlink-service.diff, Fong
-
+#always (try) to set the default property to an SbxUnoObject
+vba-always-set-defaultprop.diff, n#388049, noelpwer
 [ VBAUntested ]
 SectionOwner => noelpwer
 # total hack at the moment

Added: trunk/patches/vba/vba-always-set-defaultprop.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-always-set-defaultprop.diff	Thu May  8 16:37:25 2008
@@ -0,0 +1,15 @@
+--- basic/source/classes/sbunoobj.cxx	2008-04-30 14:45:37.000000000 +0100
++++ basic/source/classes/sbunoobj.cxx	2008-05-08 16:10:05.000000000 +0100
+@@ -786,7 +786,11 @@ void unoToSbxValue( SbxVariable* pVar, c
+ 			// SbUnoObject instanzieren
+ 			String aName;
+ 			SbUnoObject* pSbUnoObject = new SbUnoObject( aName, aValue );
+-			if ( SbiRuntime::isVBAEnabled() )
++//			If this is called externally e.g. from the scripting 
++//			framework then there is no 'active' runtime the default property will not be set up
++//			only a vba object will have XDefaultProp set anyway so... this
++//			test seems a bit of overkill
++//			if ( SbiRuntime::isVBAEnabled() )
+ 			{
+ 				String sDfltPropName;
+