Merge commit 'ooo/DEV300_m106' into integration/dev300_m106

Conflicts:
	avmedia/source/gstreamer/gstframegrabber.cxx
	avmedia/source/gstreamer/gstplayer.cxx
	avmedia/source/gstreamer/gstplayer.hxx
	basic/inc/basic/sbxdef.hxx
	basic/source/classes/sbxmod.cxx
	basic/source/comp/makefile.mk
	basic/source/comp/sbcomp.cxx
	basic/source/inc/namecont.hxx
	basic/source/inc/scriptcont.hxx
	basic/source/runtime/methods.cxx
	basic/source/runtime/runtime.cxx
	basic/source/runtime/stdobj.cxx
	basic/source/runtime/step1.cxx
	basic/source/uno/namecont.cxx
	basic/util/makefile.mk
	connectivity/source/commontools/predicateinput.cxx
	connectivity/source/drivers/dbase/DNoException.cxx
	connectivity/source/drivers/dbase/DTable.cxx
	connectivity/source/drivers/file/fcomp.cxx
	connectivity/source/drivers/jdbc/JConnection.cxx
	connectivity/source/drivers/odbcbase/OResultSet.cxx
	connectivity/source/drivers/odbcbase/OStatement.cxx
	connectivity/source/parse/sqlnode.cxx
	desktop/source/app/app.cxx
	drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
	drawinglayer/source/processor2d/vclprocessor2d.cxx
	formula/inc/formula/token.hxx
	formula/source/core/api/token.cxx
	fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
	fpicker/source/win32/filepicker/platform_vista.h
	framework/source/helper/persistentwindowstate.cxx
	framework/source/uielement/menubarmanager.cxx
	oovbaapi/ooo/vba/XFoundFiles.idl
	oovbaapi/ooo/vba/excel/XApplication.idl
	oovbaapi/ooo/vba/msforms/XCheckBox.idl
	oovbaapi/ooo/vba/msforms/XComboBox.idl
	oovbaapi/ooo/vba/msforms/XControl.idl
	oovbaapi/ooo/vba/msforms/XGroupBox.idl
	oovbaapi/ooo/vba/msforms/XLabel.idl
	oovbaapi/ooo/vba/msforms/XListBox.idl
	oovbaapi/ooo/vba/msforms/XNewFont.idl
	oovbaapi/ooo/vba/msforms/XRadioButton.idl
	oovbaapi/ooo/vba/msforms/XTextBox.idl
	oovbaapi/ooo/vba/msforms/XToggleButton.idl
	scripting/source/dlgprov/dlgevtatt.cxx
	sfx2/source/control/unoctitm.cxx
	sfx2/source/doc/objstor.cxx
	sfx2/source/doc/objxtor.cxx
	svx/inc/svx/svdograf.hxx
	svx/source/form/fmpage.cxx
	svx/source/form/fmpgeimp.cxx
	svx/source/svdraw/svdedtv.cxx
	svx/source/svdraw/svdfmtf.cxx
	svx/source/svdraw/svdograf.cxx
	svx/source/svdraw/svdouno.cxx
	svx/source/xml/xmlgrhlp.cxx
	uui/source/iahndl-ssl.cxx
	vbahelper/Library_msforms.mk
	vbahelper/Library_vbahelper.mk
	vbahelper/inc/vbahelper/vbahelper.hxx
	vbahelper/prj/build.lst
	vbahelper/source/msforms/vbacombobox.cxx
	vbahelper/source/msforms/vbacontrol.cxx
	vbahelper/source/msforms/vbacontrols.cxx
	vbahelper/source/msforms/vbaframe.cxx
	vbahelper/source/msforms/vbaframe.hxx
	vbahelper/source/msforms/vbalabel.cxx
	vbahelper/source/msforms/vbalabel.hxx
	vbahelper/source/msforms/vbalistbox.cxx
	vbahelper/source/msforms/vbalistbox.hxx
	vbahelper/source/msforms/vbamultipage.cxx
	vbahelper/source/msforms/vbatogglebutton.cxx
	vbahelper/source/msforms/vbauserform.cxx
	vbahelper/source/vbahelper/vbacommandbar.cxx
	vbahelper/source/vbahelper/vbacommandbarcontrol.cxx
	vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
	vbahelper/source/vbahelper/vbahelper.cxx
	vbahelper/source/vbahelper/vbawindowbase.cxx
	xmloff/source/meta/xmlmetai.cxx
	xmloff/source/style/PageMasterExportPropMapper.cxx
	xmloff/source/style/PageMasterStyleMap.cxx
	xmloff/source/text/txtexppr.cxx
	xmloff/source/text/txtprmap.cxx

1 files changed, 49 insertions, 19 deletions

diff --git a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
index a2a036b86236..3b158feb22e9 100644
--- a/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
+++ b/vbahelper/inc/vbahelper/vbaeventshelperbase.hxx
@@ -29,20 +29,26 @@
 #ifndef VBAHELPER_VBAEVENTSHELPERBASE_HXX
 #define VBAHELPER_VBAEVENTSHELPERBASE_HXX
 
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <map>
 #include <deque>
+#include <hash_map>
+#include <map>
+#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
+#include <com/sun/star/util/XChangesListener.hpp>
+#include <cppuhelper/implbase3.hxx>
 #include "vbahelper/vbahelper.hxx"
 
 namespace com { namespace sun { namespace star {
+    namespace script { namespace vba { class XVBAModuleInfo; } }
     namespace uno { class XComponentContext; }
 } } }
 
 // ============================================================================
 
-typedef ::cppu::WeakImplHelper2< css::script::vba::XVBAEventProcessor, css::lang::XEventListener > VbaEventsHelperBase_BASE;
+typedef ::cppu::WeakImplHelper3<
+    css::script::vba::XVBAEventProcessor,
+    css::document::XEventListener,
+    css::util::XChangesListener > VbaEventsHelperBase_BASE;
 
 class VBAHELPER_DLLPUBLIC VbaEventsHelperBase : public VbaEventsHelperBase_BASE
 {
@@ -52,15 +58,24 @@ public:
         const css::uno::Reference< css::uno::XComponentContext >& xContext );
     virtual ~VbaEventsHelperBase();
 
-    // XVBAEventProcessor
+    // script::vba::XVBAEventProcessor
     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);
+    virtual sal_Bool SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::util::VetoException, css::uno::RuntimeException);
 
-    // XEventListener
-    virtual void SAL_CALL disposing( const css::lang::EventObject& aSource ) throw (css::uno::RuntimeException);
+    // document::XEventListener
+    virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException);
+
+    // util::XChangesListener
+    virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& rEvent ) throw (css::uno::RuntimeException);
+
+    // lang::XEventListener
+    virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException);
 
     // little helpers ---------------------------------------------------------
 
+    /** Helper to execute event handlers without throwing any exceptions. */
+    void processVbaEventNoThrow( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs );
+
     /** Throws, if the passed sequence does not contain a value at the specified index. */
     static inline void checkArgument( const css::uno::Sequence< css::uno::Any >& rArgs, sal_Int32 nIndex ) throw (css::lang::IllegalArgumentException)
         { if( (nIndex < 0) || (nIndex >= rArgs.getLength()) ) throw css::lang::IllegalArgumentException(); }
@@ -73,12 +88,11 @@ public:
 protected:
     // ------------------------------------------------------------------------
 
-    enum EventHandlerType { EVENTHANDLER_GLOBAL, EVENTHANDLER_DOCUMENT };
     struct EventHandlerInfo
     {
         sal_Int32 mnEventId;
+        sal_Int32 mnModuleType;
         ::rtl::OUString maMacroName;
-        EventHandlerType meType;
         sal_Int32 mnCancelIndex;
         css::uno::Any maUserData;
     };
@@ -86,14 +100,14 @@ protected:
     /** Registers a supported event handler.
 
         @param nEventId  Event identifier from com.sun.star.script.vba.VBAEventId.
+        @param nModuleType  Type of the module containing the event handler.
         @param pcMacroName  Name of the associated VBA event handler macro.
-        @param eType  Document event or global event.
         @param nCancelIndex  0-based index of Cancel parameter, or -1.
         @param rUserData  User data for free usage in derived implementations. */
     void registerEventHandler(
             sal_Int32 nEventId,
+            sal_Int32 nModuleType,
             const sal_Char* pcMacroName,
-            EventHandlerType eType = EVENTHANDLER_DOCUMENT,
             sal_Int32 nCancelIndex = -1,
             const css::uno::Any& rUserData = css::uno::Any() );
 
@@ -125,7 +139,6 @@ protected:
     virtual void implPostProcessEvent(
         EventQueue& rEventQueue,
         const EventHandlerInfo& rInfo,
-        bool bSuccess,
         bool bCancel ) throw (css::uno::RuntimeException) = 0;
 
     /** Derived classes have to return the name of the Basic document module. */
@@ -134,25 +147,42 @@ protected:
         const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) = 0;
 
 private:
+    typedef ::std::map< sal_Int32, ::rtl::OUString > ModulePathMap;
+
+    /** Starts listening at the document model. */
+    void startListening();
+    /** Stops listening at the document model. */
+    void stopListening();
+
     /** Returns the event handler info struct for the specified event, or throws. */
     const EventHandlerInfo& getEventHandlerInfo( sal_Int32 nEventId ) const throw (css::lang::IllegalArgumentException);
 
     /** Searches the event handler in the document and returns its full script path. */
     ::rtl::OUString getEventHandlerPath(
         const EventHandlerInfo& rInfo,
-        const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException);
+        const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    /** Removes this instance from all broadcasters. */
-    void stopListening();
+    /** On first call, accesses the Basic library containing the VBA source code. */
+    void ensureVBALibrary() throw (css::uno::RuntimeException);
+
+    /** Returns the type of the Basic module with the specified name. */
+    sal_Int32 getModuleType( const ::rtl::OUString& rModuleName ) throw (css::uno::RuntimeException);
+
+    /** Updates the map containing paths to event handlers for a Basic module. */
+    ModulePathMap& updateModulePathMap( const ::rtl::OUString& rModuleName ) throw (css::uno::RuntimeException);
 
 protected:
     css::uno::Reference< css::frame::XModel > mxModel;
     SfxObjectShell* mpShell;
 
 private:
-    typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerMap;
+    typedef ::std::map< sal_Int32, EventHandlerInfo > EventHandlerInfoMap;
+    typedef ::std::hash_map< ::rtl::OUString, ModulePathMap, ::rtl::OUStringHash > EventHandlerPathMap;
 
-    EventHandlerMap maEvents;
+    EventHandlerInfoMap maEventInfos;
+    EventHandlerPathMap maEventPaths;
+    css::uno::Reference< css::script::vba::XVBAModuleInfo > mxModuleInfos;
+    ::rtl::OUString maLibraryName;
     bool mbDisposed;
 };