mib17: move VBA specific interfaces into vba subdir

4 files changed, 54 insertions, 52 deletions

diff --git a/offapi/com/sun/star/script/makefile.mk b/offapi/com/sun/star/script/makefile.mk
index b694a753f..4215ade1c 100644
--- a/offapi/com/sun/star/script/makefile.mk
+++ b/offapi/com/sun/star/script/makefile.mk
@@ -48,10 +48,8 @@ IDLFILES=\
     XPersistentLibraryContainer.idl\
     XStorageBasedLibraryContainer.idl\
     ModuleSizeExceededRequest.idl\
-    XVBACompat.idl\
-        XVBAModuleInfo.idl\
     ModuleInfo.idl\
-    ModuleType.idl\
+    ModuleType.idl
 
 # ------------------------------------------------------------------
 
diff --git a/offapi/com/sun/star/script/XVBACompat.idl b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
index e1b2d2820..c22460e6d 100644
--- a/offapi/com/sun/star/script/XVBACompat.idl
+++ b/offapi/com/sun/star/script/vba/XVBACompatibility.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -27,23 +24,27 @@
  * 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 
+#ifndef __com_sun_star_script_vba_XVBACompatibility_idl__
+#define __com_sun_star_script_vba_XVBACompatibility_idl__
  
-//============================================================================= 
+//=============================================================================
  
-module com {  module sun {  module star {  module script {  
+module com {  module sun {  module star {  module script { module vba {
  
-interface XVBACompat: com::sun::star::uno::XInterface
-{ 
+interface XVBACompatibility
+{
+    //-------------------------------------------------------------------------
+
+    [attribute] boolean VBACompatibilityMode;
+
+    //-------------------------------------------------------------------------
+};
+
+}; }; }; };
+  
+//=============================================================================
+
+};
 
-//============================================================================= 
-    [attribute ] boolean VBACompatModeOn;
- 
-}; }; }; };  
-}; 
 #endif 
diff --git a/offapi/com/sun/star/script/XVBAModuleInfo.idl b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
index 2d47fd29f..ec64dc521 100644
--- a/offapi/com/sun/star/script/XVBAModuleInfo.idl
+++ b/offapi/com/sun/star/script/vba/XVBAModuleInfo.idl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * 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
@@ -27,47 +24,51 @@
  * 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 
-#ifndef __com_sun_star_script_ModuleInfo_idl__ 
-#include <com/sun/star/script/ModuleInfo.idl> 
-#endif 
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ 
+#ifndef __com_sun_star_script_vba_XVBAModuleInfo_idl__
+#define __com_sun_star_script_vba_XVBAModuleInfo_idl__
+ 
+#include <com/sun/star/script/ModuleInfo.idl>
 #include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif 
-#ifndef __com_sun_star_container_ElementExistException_idl__ 
 #include <com/sun/star/container/ElementExistException.idl>
-#endif 
-#ifndef __com_sun_star_lang_WrappedTargetException_idl__ 
 #include <com/sun/star/lang/WrappedTargetException.idl>
-#endif 
-#ifndef __com_sun_star_container_NoSuchElementException_idl__ 
 #include <com/sun/star/container/NoSuchElementException.idl>
-#endif 
- 
+
 //============================================================================= 
  
-module com {  module sun {  module star {  module script {  
+module com {  module sun {  module star {  module script { module vba {
  
-interface XVBAModuleInfo: com::sun::star::uno::XInterface
+interface XVBAModuleInfo
 { 
-
-    com::sun::star::script::ModuleInfo  getModuleInfo( [in] string ModuleName ) 
+    //-------------------------------------------------------------------------
+    
+    com::sun::star::script::ModuleInfo getModuleInfo( [in] string ModuleName )
         raises( com::sun::star::container::NoSuchElementException, 
                 com::sun::star::lang::WrappedTargetException );
-    boolean  hasModuleInfo( [in] string ModuleName );
+
+    //-------------------------------------------------------------------------
+
+    boolean hasModuleInfo( [in] string ModuleName );
+
+    //-------------------------------------------------------------------------
+
     void insertModuleInfo( [in] string ModuleName, 
                            [in] com::sun::star::script::ModuleInfo ModuleInfo ) 
         raises( com::sun::star::lang::IllegalArgumentException,
                 com::sun::star::container::ElementExistException, 
                 com::sun::star::lang::WrappedTargetException );
-    void removeModuleInfo( [in] string ModuleName ) 
+
+    //-------------------------------------------------------------------------
+
+    void removeModuleInfo( [in] string ModuleName )
         raises( com::sun::star::container::NoSuchElementException, 
                 com::sun::star::lang::WrappedTargetException );
-}; }; }; };  
-}; 
-#endif 
+
+    //-------------------------------------------------------------------------
+};
+
+}; }; }; }; };
+
+//=============================================================================
+
+#endif
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index 2cb93401a..4657b587d 100755
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -42,7 +42,9 @@ IDLFILES=\
     VBAEventProcessor.idl \
     VBASpreadsheetEventProcessor.idl \
     VBATextEventProcessor.idl \
-    XVBAEventProcessor.idl
+    XVBACompatibility.idl \
+    XVBAEventProcessor.idl \
+    XVBAModuleInfo.idl
 
 # ------------------------------------------------------------------