mib17: #i112634# prepare loading VBA with document events from ODF and XLSM

2 files changed, 1 insertions, 15 deletions

diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
index f501b84672..b0dd184c1a 100755
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -52,8 +52,6 @@ public:
     virtual ~VbaEventsHelperBase();
 
     // XVBAEventProcessor
-    virtual void SAL_CALL setIgnoreEvents( sal_Bool bIgnoreEvents ) throw (css::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL getIgnoreEvents() throw (css::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
     virtual void SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::script::provider::ScriptFrameworkErrorException, css::util::VetoException, css::uno::RuntimeException);
 
@@ -156,7 +154,6 @@ private:
     typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerMap;
 
     EventHandlerMap maEvents;
-    bool mbIgnoreEvents;
     bool mbDisposed;
 };
 
diff --git a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
index edfe9e54c8..ee6eccbdd6 100755
--- a/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
+++ b/vbahelper/source/vbahelper/vbaeventshelperbase.cxx
@@ -35,7 +35,6 @@ using namespace ::ooo::vba;
 
 VbaEventsHelperBase::VbaEventsHelperBase( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& /*xContext*/ ) :
     mpShell( 0 ),
-    mbIgnoreEvents( false ),
     mbDisposed( false )
 {
     try
@@ -57,16 +56,6 @@ VbaEventsHelperBase::~VbaEventsHelperBase()
     stopListening();
 }
 
-void SAL_CALL VbaEventsHelperBase::setIgnoreEvents( sal_Bool bIgnoreEvents ) throw (uno::RuntimeException)
-{
-    mbIgnoreEvents = bIgnoreEvents;
-}
-
-sal_Bool SAL_CALL VbaEventsHelperBase::getIgnoreEvents() throw (uno::RuntimeException)
-{
-    return mbIgnoreEvents;
-}
-
 sal_Bool SAL_CALL VbaEventsHelperBase::hasVbaEventHandler( sal_Int32 nEventId, const uno::Sequence< uno::Any >& rArgs )
         throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
@@ -87,7 +76,7 @@ void SAL_CALL VbaEventsHelperBase::processVbaEvent( sal_Int32 nEventId, const un
     
     /*  bEnabled will track if event processing is enabled. Every event handler
         may disable handling of other events. */
-    bool bEnabled = !mbIgnoreEvents;
+    bool bEnabled = true;
     
     /*  bCancel will contain the current Cancel value. It is possible that
         multiple events will try to modify the Cancel value. Every event