mib17: #i112634# API changes

6 files changed, 31 insertions, 35 deletions

diff --git a/offapi/com/sun/star/script/vba/EventIdentifier.idl b/offapi/com/sun/star/script/vba/VBAEventId.idl
index f70a84d9ace8..fda83a18d495 100755
--- a/offapi/com/sun/star/script/vba/EventIdentifier.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventId.idl
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_vba_EventIdentifier_idl__
-#define __com_sun_star_script_vba_EventIdentifier_idl__
+#ifndef __com_sun_star_script_vba_VBAEventId_idl__
+#define __com_sun_star_script_vba_VBAEventId_idl__
 
 //=============================================================================
 
@@ -40,11 +40,11 @@ module com {  module sun {  module star { module script { module vba {
     document code module will be executed.</p>
 
     <p>Each event expects some specific arguments to be passed to
-    <member>XEventProcessor::processVbaEvent</member>.</p>
+    <member>XVBAEventProcessor::processVbaEvent</member>.</p>
 
-    @see XEventProcessor
+    @see XVBAEventProcessor
  */
-constants EventIdentifier
+constants VBAEventId
 {
     //=========================================================================
 
@@ -111,9 +111,9 @@ constants EventIdentifier
     const long WORKSHEET_ACTIVATE                   = 2101;
     /** Worksheet has been activated (made visible). Arguments: short nSheet. */
     const long WORKSHEET_DEACTIVATE                 = 2102;
-    /** Double click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange. [out] boolean bCancel. */
+    /** Double click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange, [out] boolean bCancel. */
     const long WORKSHEET_BEFOREDOUBLECLICK          = 2103;
-    /** Right click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange. [out] boolean bCancel. */
+    /** Right click in the sheet. Arguments: XRange/XSheetCellRangeContainer aRange, [out] boolean bCancel. */
     const long WORKSHEET_BEFORERIGHTCLICK           = 2104;
     /** Cells in sheet have been recalculated. Arguments: short nSheet. */
     const long WORKSHEET_CALCULATE                  = 2105;
diff --git a/offapi/com/sun/star/script/vba/TextEventProcessor.idl b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
index ae2d36a223c6..d993b37ae250 100755
--- a/offapi/com/sun/star/script/vba/TextEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBAEventProcessor.idl
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_vba_TextEventProcessor_idl__
-#define __com_sun_star_script_vba_TextEventProcessor_idl__
+#ifndef __com_sun_star_script_vba_VBAEventProcessor_idl__
+#define __com_sun_star_script_vba_VBAEventProcessor_idl__
 
-#include <com/sun/star/script/vba/EventProcessor.idl>
+#include <com/sun/star/script/vba/XVBAEventProcessor.idl>
 
 //=============================================================================
 
@@ -36,9 +36,8 @@ module com {  module sun {  module star { module script { module vba {
 
 //=============================================================================
 
-service TextEventProcessor
+service VBAEventProcessor : XVBAEventProcessor
 {
-    service EventProcessor;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/vba/EventProcessor.idl b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
index 78b2d9c23fdb..ce202da4f54c 100755
--- a/offapi/com/sun/star/script/vba/EventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBASpreadsheetEventProcessor.idl
@@ -25,12 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_vba_EventProcessor_idl__
-#define __com_sun_star_script_vba_EventProcessor_idl__
+#ifndef __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
+#define __com_sun_star_script_vba_VBASpreadsheetEventProcessor_idl__
 
-#include <com/sun/star/script/vba/XEventProcessor.idl>
-
-module com {  module sun {  module star { module frame { interface XModel; }; }; }; };
+#include <com/sun/star/script/vba/VBAEventProcessor.idl>
 
 //=============================================================================
 
@@ -38,8 +36,9 @@ module com {  module sun {  module star { module script { module vba {
 
 //=============================================================================
 
-service EventProcessor : XEventProcessor
+service VBASpreadsheetEventProcessor
 {
+    service VBAEventProcessor;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/vba/SpreadsheetEventProcessor.idl b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
index 680a0e1069aa..fd3c7f895d8d 100755
--- a/offapi/com/sun/star/script/vba/SpreadsheetEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/VBATextEventProcessor.idl
@@ -25,10 +25,10 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_vba_SpreadsheetEventProcessor_idl__
-#define __com_sun_star_script_vba_SpreadsheetEventProcessor_idl__
+#ifndef __com_sun_star_script_vba_VBATextEventProcessor_idl__
+#define __com_sun_star_script_vba_VBATextEventProcessor_idl__
 
-#include <com/sun/star/script/vba/EventProcessor.idl>
+#include <com/sun/star/script/vba/VBAEventProcessor.idl>
 
 //=============================================================================
 
@@ -36,9 +36,9 @@ module com {  module sun {  module star { module script { module vba {
 
 //=============================================================================
 
-service SpreadsheetEventProcessor
+service VBATextEventProcessor
 {
-    service EventProcessor;
+    service VBAEventProcessor;
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/script/vba/XEventProcessor.idl b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
index d856aeaa0a99..7853d71d65ac 100755
--- a/offapi/com/sun/star/script/vba/XEventProcessor.idl
+++ b/offapi/com/sun/star/script/vba/XVBAEventProcessor.idl
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef __com_sun_star_script_vba_XEventProcessor_idl__
-#define __com_sun_star_script_vba_XEventProcessor_idl__
+#ifndef __com_sun_star_script_vba_XVBAEventProcessor_idl__
+#define __com_sun_star_script_vba_XVBAEventProcessor_idl__
 
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.idl>
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module script { module vba {
 
 /** Executes VBA event handlers.
  */
-interface XEventProcessor
+interface XVBAEventProcessor
 {
     //-------------------------------------------------------------------------
 
@@ -53,8 +53,7 @@ interface XEventProcessor
     /** Returns whether a VBA event handler exists.
 
         @param nEventId
-            The identifier of the event. Must be a constant from <type>
-            EventIdentifier</type>.
+            The identifier of the event. Must be a constant from <type>VBAEventId</type>.
 
         @param aArgs
             Additional arguments needed to identify some event handlers, e.g. a
@@ -75,8 +74,7 @@ interface XEventProcessor
     /** Executes a VBA event handler.
 
         @param nEventId
-            The identifier of the event. Must be a constant from <type>
-            EventIdentifier</type>.
+            The identifier of the event. Must be a constant from <type>VBAEventId</type>.
 
         @param aArgs
             The input arguments needed to create the argument list of the VBA
diff --git a/offapi/com/sun/star/script/vba/makefile.mk b/offapi/com/sun/star/script/vba/makefile.mk
index c9526d86b070..857df4f9bf63 100755
--- a/offapi/com/sun/star/script/vba/makefile.mk
+++ b/offapi/com/sun/star/script/vba/makefile.mk
@@ -38,12 +38,12 @@ PACKAGE=com$/sun$/star$/script$/vba
 # ------------------------------------------------------------------------
 
 IDLFILES=\
-    EventIdentifier.idl \
-    EventProcessor.idl \
-    SpreadsheetEventProcessor.idl \
-    TextEventProcessor.idl \
+    VBAEventId.idl \
+    VBAEventProcessor.idl \
+    VBASpreadsheetEventProcessor.idl \
+    VBATextEventProcessor.idl \
     XCoreEventProcessor.idl \
-    XEventProcessor.idl
+    XVBAEventProcessor.idl
 
 # ------------------------------------------------------------------