ooo-build r12967 - trunk/patches/test/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Thu Jun 26 07:23:52 2008
New Revision: 12967
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12967&view=rev

Log:
add missing and remove unused idl file


Modified:
   trunk/patches/test/vba/ObjectModule.diff

Modified: trunk/patches/test/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/test/vba/ObjectModule.diff	(original)
+++ trunk/patches/test/vba/ObjectModule.diff	Thu Jun 26 07:23:52 2008
@@ -10828,16 +10828,70 @@
      /**
          Execute VBA compatible event.
          VbaEvent: Compatible VBA event id.
+diff --git offapi/com/sun/star/script/XVBACompat.idl offapi/com/sun/star/script/XVBACompat.idl
+new file mode 100644
+index 0000000..e1b2d28
+--- /dev/null
++++ offapi/com/sun/star/script/XVBACompat.idl
+@@ -0,0 +1,49 @@
++/*************************************************************************
++ *
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ * 
++ * Copyright 2008 by Sun Microsystems, Inc.
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: XLibraryContainer.idl,v $
++ * $Revision: 1.4 $
++ *
++ * This file is part of OpenOffice.org.
++ *
++ * OpenOffice.org is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3
++ * only, as published by the Free Software Foundation.
++ *
++ * OpenOffice.org is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License version 3 for more details
++ * (a copy is included in the LICENSE file that accompanied this code).
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * version 3 along with OpenOffice.org.  If not, see
++ * <http://www.openoffice.org/license.html>
++ * for a copy of the LGPLv3 License.
++ *
++ ************************************************************************/
++#ifndef __com_sun_star_script_XVBACompat_idl__ 
++#define __com_sun_star_script_XVBACompat_idl__ 
++ 
++#ifndef __com_sun_star_uno_XInterface_idl__ 
++#include <com/sun/star/uno/XInterface.idl> 
++#endif 
++ 
++//============================================================================= 
++ 
++module com {  module sun {  module star {  module script {  
++ 
++interface XVBACompat: com::sun::star::uno::XInterface
++{ 
++
++//============================================================================= 
++    [attribute ] boolean VBACompatModeOn;
++ 
++}; }; }; };  
++}; 
++#endif 
 diff --git offapi/com/sun/star/script/makefile.mk offapi/com/sun/star/script/makefile.mk
-index feebf3b..bbe6347 100644
+index feebf3b..1dd0972 100644
 --- offapi/com/sun/star/script/makefile.mk
 +++ offapi/com/sun/star/script/makefile.mk
-@@ -52,6 +52,8 @@ IDLFILES=\
+@@ -52,6 +52,7 @@ IDLFILES=\
  	XPersistentLibraryContainer.idl\
  	XStorageBasedLibraryContainer.idl\
  	XLibraryQueryExecutable.idl \
 +	XVBACompat.idl\
-+	XCodeNameBinder.idl\
  	ModuleSizeExceededRequest.idl\
  
  # ------------------------------------------------------------------
@@ -10896,7 +10950,7 @@
  
  // --> PB 2004-08-23 #i33095# Security Options
 diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index f096e3f..79fb200 100644
+index f096e3f..8f087f9 100644
 --- sc/source/core/data/documen2.cxx
 +++ sc/source/core/data/documen2.cxx
 @@ -247,6 +247,7 @@ ScDocument::ScDocument( ScDocumentMode	e
@@ -10907,6 +10961,15 @@
  }
  
  
+@@ -1874,7 +1875,7 @@ ScDocument::GetVbaEventsHelper()
+         try
+         {
+             uno::Reference< lang::XMultiServiceFactory > xSF( comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
+-            uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY );
++            uno::Reference< frame::XModel > xModel( pShell ? pShell->GetModel() : NULL , uno::UNO_QUERY );
+             uno::Sequence< uno::Any > aArgs(1);
+             aArgs[0] = uno::Any( xModel );
+             uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.VbaEventsHelper" ) ), aArgs ), uno::UNO_QUERY );
 diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
 index a353d19..9f434f1 100644
 --- sc/source/core/data/document.cxx