mib17: #i112634# API changes

4 files changed, 15 insertions, 15 deletions

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ff6a1f97709e..1e26b0f0e2bd 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -80,7 +80,7 @@ class SwList;
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #ifdef FUTURE_VBA
-#include <com/sun/star/script/vba/XEventProcessor.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #endif
 
 #include <hash_map>
@@ -409,7 +409,7 @@ class SW_DLLPUBLIC SwDoc :
     // table of forbidden characters of this document
     vos::ORef<SvxForbiddenCharactersTable>  xForbiddenCharsTable;
 #ifdef FUTURE_VBA
-    com::sun::star::uno::Reference< com::sun::star::script::vba::XEventProcessor > mxVbaEvents;
+    com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
 #endif
     // --> OD 2007-10-26 #i83479#
 public:
@@ -2134,7 +2134,7 @@ public:
         return n32DummyCompatabilityOptions2;
     }
 #ifdef FUTURE_VBA
-    com::sun::star::uno::Reference< com::sun::star::script::vba::XEventProcessor > GetVbaEventProcessor();
+    com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > GetVbaEventProcessor();
 #endif
     ::sfx2::IXmlIdRegistry& GetXmlIdRegistry();
     ::sw::MetaFieldManager & GetMetaFieldManager();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 6979d13fbb62..fd45279d4d13 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2725,7 +2725,7 @@ void SwDoc::ChkCondColls()
 }
 
 #ifdef FUTURE_VBA
-uno::Reference< script::vba::XEventProcessor >
+uno::Reference< script::vba::XVBAEventProcessor >
 SwDoc::GetVbaEventProcessor()
 {
     if( !mxVbaEvents.is() && pDocShell && ooo::vba::isAlienWordDoc( *pDocShell ) )
@@ -2735,7 +2735,7 @@ SwDoc::GetVbaEventProcessor()
             uno::Reference< frame::XModel > xModel( pDocShell->GetModel(), uno::UNO_SET_THROW );
             uno::Sequence< uno::Any > aArgs(1);
             aArgs[0] <<= xModel;
-            mxVbaEvents.set( ooo::vba::createVBAUnoAPIServiceWithArgs( pDocShell, "com.sun.star.script.vba.TextEventProcessor" , aArgs ), uno::UNO_QUERY_THROW );
+            mxVbaEvents.set( ooo::vba::createVBAUnoAPIServiceWithArgs( pDocShell, "com.sun.star.script.vba.VBATextEventProcessor" , aArgs ), uno::UNO_QUERY_THROW );
         }
         catch( uno::Exception& )
         {
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 501c070e6d6b..c84a0eb2d035 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -120,8 +120,8 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #ifdef FUTURE_VBA
-#include <com/sun/star/script/vba/XEventProcessor.hpp>
-#include <com/sun/star/script/vba/EventIdentifier.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
+#include <com/sun/star/script/vba/VBAEventId.hpp>
 #endif
 #include <editeng/acorrcfg.hxx>
 #include <SwStyleNameMapper.hxx>
@@ -191,9 +191,9 @@ void SwDocShell::DoFlushDocInfo()
 }
 
 #ifdef FUTURE_VBA
-void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XEventProcessor >& xVbaEvents, const SfxHint& rHint )
+void lcl_processCompatibleSfxHint( const uno::Reference< script::vba::XVBAEventProcessor >& xVbaEvents, const SfxHint& rHint )
 {
-    using namespace com::sun::star::script::vba::EventIdentifier;
+    using namespace com::sun::star::script::vba::VBAEventId;
     if ( rHint.ISA( SfxEventHint ) )
     {
         uno::Sequence< uno::Any > aArgs;
@@ -225,7 +225,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 
 #ifdef FUTURE_VBA
-    uno::Reference< script::vba::XEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor();
+    uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor();
     if( xVbaEvents.is() )
         lcl_processCompatibleSfxHint( xVbaEvents, rHint );
 #endif
@@ -314,10 +314,10 @@ USHORT SwDocShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
 #ifdef FUTURE_VBA
     if( pDoc && IsInPrepareClose() )
     {
-        uno::Reference< script::vba::XEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor();
+        uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor();
         if( xVbaEvents.is() )
         {
-            using namespace com::sun::star::script::vba::EventIdentifier;
+            using namespace com::sun::star::script::vba::VBAEventId;
             uno::Sequence< uno::Any > aArgs;
             xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
         }
diff --git a/sw/source/ui/vba/vbaeventshelper.cxx b/sw/source/ui/vba/vbaeventshelper.cxx
index 66d72315987e..abe4abb6e757 100755
--- a/sw/source/ui/vba/vbaeventshelper.cxx
+++ b/sw/source/ui/vba/vbaeventshelper.cxx
@@ -26,11 +26,11 @@
  ************************************************************************/
 
 #include "vbaeventshelper.hxx"
-#include <com/sun/star/script/vba/EventIdentifier.hpp>
+#include <com/sun/star/script/vba/VBAEventId.hpp>
 #include <vbahelper/helperdecl.hxx>
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::script::vba::EventIdentifier;
+using namespace ::com::sun::star::script::vba::VBAEventId;
 using namespace ::ooo::vba;
 
 // ============================================================================
@@ -102,7 +102,7 @@ sdecl::class_<SwVbaEventsHelper, sdecl::with_args<true> > serviceImpl;
 extern sdecl::ServiceDecl const serviceDecl(
     serviceImpl,
     "SwVbaEventsHelper",
-    "com.sun.star.document.vba.TextEventProcessor" );
+    "com.sun.star.document.vba.VBATextEventProcessor" );
 }
 
 // ============================================================================