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

[pflin svn gnome org]

Author: pflin
Date: Mon Aug  4 05:11:18 2008
New Revision: 13469
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13469&view=rev

Log:
	* patches/dev300/cws-npower11.diff: fixed build break. 
	* patches/vba/vbaevents-services-sources.diff:



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-npower11.diff
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Mon Aug  4 05:11:18 2008
@@ -920,10 +920,10 @@
 +		        $(SLO)$/vbaspinbutton.obj \
 +				$(SLO)$/service.obj
 +
-+.IF "$(VBA_OOBUILD_HACK)" != ""
++#.IF "$(VBA_OOBUILD_HACK)" != ""
 +SLOFILES +=	\
 +			$(SLO)$/vbaeventshelper.obj
-+.ENDIF
++#.ENDIF
  
  # --- Targets ------------------------------------------------------
  

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Mon Aug  4 05:11:18 2008
@@ -1269,15 +1269,16 @@
                      public com::sun::star::document::XDocumentEventCompatibleHelper,
  					public SvxFmMSFactory,	// derived from XMultiServiceFactory
                      public com::sun::star::lang::XServiceInfo
-@@ -349,6 +352,8 @@ public:
+@@ -300,6 +303,9 @@ public:
  								throw(::com::sun::star::uno::RuntimeException);
- 	virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ 	virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
  								throw(::com::sun::star::uno::RuntimeException);
++							// XCodeNameQuery
 + 	virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
 +								throw(::com::sun::star::uno::RuntimeException);
+                             // XVbaEventHelper
+     virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
  };
- 
- 
 diff -rup sc/inc/scextopt.hxx sc/inc/scextopt.hxx
 --- sc/inc/scextopt.hxx	2008-04-29 13:37:35.000000000 +0100
 +++ sc/inc/scextopt.hxx	2008-04-28 15:44:25.000000000 +0100