ooo-build r12492 - in branches/ooo-build-2-4: . patches/src680 patches/vba

[noelpwer svn gnome org]

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

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

        * patches/src680/apply:
        * patches/vba/vba-always-set-defaultprop.diff: fix for #n388049
        


Added:
   branches/ooo-build-2-4/patches/vba/vba-always-set-defaultprop.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Thu May  8 16:13:01 2008
@@ -1489,6 +1489,8 @@
 vba-stringtodouble.diff, n#359943, noelpwer
 #fix for n#309981
 vba-fixup-singlerange-sheetref.diff, n#309981, noelpwer
+#always (try) to set the default property to an SbxUnoObject
+vba-always-set-defaultprop.diff, n#388049, noelpwer
 [ VBAUntested ]
 SectionOwner => noelpwer
 basic-source-classes-eventatt-cxx.diff, #no-upstream

Added: branches/ooo-build-2-4/patches/vba/vba-always-set-defaultprop.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/vba/vba-always-set-defaultprop.diff	Thu May  8 16:13:01 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;
+