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

[jiaojh svn gnome org]

Author: jiaojh
Date: Thu Jun  5 07:44:39 2008
New Revision: 12804
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12804&view=rev

Log:
    * patches/dev300/vba-workbook-worksheet-events-dev300.diff:
    * patches/dev300/vba-workbook-worksheet-events-servicefix-dev300.diff:
    * patches/dev300/apply:
    merge vba-workbook-worksheet-events-servicefix-dev300.diff into
    vba-workbook-worksheet-events-dev300.diff.
    and adjust patch stack in apply.



Removed:
   trunk/patches/vba/vba-workbook-worksheet-events-servicefix-dev300.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jun  5 07:44:39 2008
@@ -1428,10 +1428,6 @@
 
 vba-support-export-palette.diff, i#68900
 
-#merged into vba-workbook-worksheet-events-dev300.diff
-#vba-workbook-worksheet-events-buildfix.diff, 
-vba-workbook-worksheet-events-dev300.diff
-
 # superceeded by vbaevens-service-sources.diff
 # leave here for a while 'till we are sure all is ok
 #vba-keep-codenames-in-sync.diff
@@ -1481,10 +1477,6 @@
 api-application-caller.diff, n#339941, noelpwer
 default-autotext-and-form-name.diff, n#353687
 
-# add support for passing a caller to basic when calling a script
-# via the scripting framework - note depends on vbaevents-services-sources.diff
-basic-caller-support-dev300.diff
-
 # fix --disable-vba build
 oovbaapi-disable-vba.diff
 
@@ -1510,6 +1502,14 @@
 vba-userform.diff
 # another bug with event bindings for dialogs ( awaiting iz id from andreas )
 vba-dialogs-fixsmoketest.diff
+
+#merged into vba-workbook-worksheet-events-dev300.diff
+#vba-workbook-worksheet-events-buildfix.diff, 
+vba-workbook-worksheet-events-dev300.diff
+# add support for passing a caller to basic when calling a script
+# via the scripting framework - note depends on vbaevents-services-sources.diff
+basic-caller-support-dev300.diff
+
 # for the build fix, to add a new service.
 vba-workbook-worksheet-events-servicefix-dev300.diff, jianhua
 [ VBAUntested ]

Modified: trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff	(original)
+++ trunk/patches/vba/vba-workbook-worksheet-events-dev300.diff	Thu Jun  5 07:44:39 2008
@@ -2580,3 +2580,34 @@
  //------------------------------------------------------------------------
  
  struct BoolEnv_Impl
+--- sc/source/ui/vba/service.cxx.orig	2008-06-03 14:25:12.000000000 +0800
++++ sc/source/ui/vba/service.cxx	2008-06-03 14:25:19.000000000 +0800
+@@ -69,6 +69,10 @@ namespace hyperlink 
+ {
+ extern sdecl::ServiceDecl const serviceDecl;
+ }
++namespace vbaeventshelper
++{
++extern sdecl::ServiceDecl const serviceDecl;
++}
+ 
+ 
+ extern "C"
+@@ -87,7 +91,7 @@ extern "C"
+ 
+ 	// Component registration
+         if ( component_writeInfoHelper( pServiceManager, pRegistryKey, 
+-		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) )
++		range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl ) && component_writeInfoHelper( pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl ) )
+ 		{
+ 			// Singleton registration
+ 			try
+@@ -116,6 +120,8 @@ extern "C"
+ 		OSL_TRACE("In component_getFactory for %s", pImplName );
+ 	void* pRet =  component_getFactoryHelper(
+         	pImplName, pServiceManager, pRegistryKey, range::serviceDecl, workbook::serviceDecl, worksheet::serviceDecl, globals::serviceDecl, userform::serviceDecl, window::serviceDecl, hyperlink::serviceDecl );
++    if( !pRet )
++        pRet = component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, vbaeventshelper::serviceDecl );
+ 	OSL_TRACE("Ret is 0x%x", pRet);
+ 	return pRet;
+     }