ooo-build r12858 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Jun 11 11:39:23 2008
New Revision: 12858
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12858&view=rev

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

        * patches/vba/ObjectModule.diff: allow save of basic ( with  empty 
        modules to work )
        * patches/vba/vbaevents-services-sources.diff: ensure all  controls
        processed in the eventmanager.



Modified:
   trunk/ChangeLog
   trunk/patches/vba/ObjectModule.diff
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/patches/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/vba/ObjectModule.diff	(original)
+++ trunk/patches/vba/ObjectModule.diff	Wed Jun 11 11:39:23 2008
@@ -1951,3 +1951,33 @@
  
  # ------------------------------------------------------------------
  
+--- 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:
+ 	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;
+ 	xmlscript::exportScriptModule( xHandler, aMod );
+ }
+ 
+

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Wed Jun 11 11:39:23 2008
@@ -1718,7 +1718,7 @@
 +		if ( xMgr.is() )
 +		{ 
 +			OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() );
-+			sal_Int32 nLen = getCount();
++			sal_Int32 nLen = pIfcMgr->getCount();
 +			for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i )
 +			{	
 +				// add fake events to the control at index i