ooo-build r12746 - trunk/patches/test/vba
- From: jiaojh svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12746 - trunk/patches/test/vba
- Date: Mon, 2 Jun 2008 01:50:57 +0000 (UTC)
Author: jiaojh
Date: Mon Jun 2 01:50:57 2008
New Revision: 12746
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12746&view=rev
Log:
update for clearing up
Modified:
trunk/patches/test/vba/vbaevents.diff
Modified: trunk/patches/test/vba/vbaevents.diff
==============================================================================
--- trunk/patches/test/vba/vbaevents.diff (original)
+++ trunk/patches/test/vba/vbaevents.diff Mon Jun 2 01:50:57 2008
@@ -1,6 +1,6 @@
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ oovbaapi/org/openoffice/vba/VBAWorkbookEvent.idl 2008-05-15 14:43:15.000000000 +0800
-@@ -0,0 +1,78 @@
++++ offapi/com/sun/star/document/VbaEventId.idl 2008-05-28 15:37:18.000000000 +0800
+@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -35,65 +35,173 @@
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
-+#ifndef __org_openoffice_vba_VBAWorkbookEvent_idl__
-+#define __org_openoffice_vba_VBAWorkbookEvent_idl__
++#ifndef __org_openoffice_vba_VbaEventId_idl__
++#define __org_openoffice_vba_VbaEventId_idl__
++
++//=============================================================================
++
++module com { module sun { module star { module document {
++//=============================================================================
++
++constants VbaEventId
++{
++ // Worksheet
++ const long VBAEVENT_WORKSHEET_ACTIVATE = 1;
++ const long VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK = 2;
++ const long VBAEVENT_WORKSHEET_BEFORERIGHTCLICK = 3;
++ const long VBAEVENT_WORKSHEET_CALCULATE = 4;
++ const long VBAEVENT_WORKSHEET_CHANGE = 5;
++ const long VBAEVENT_WORKSHEET_DEACTIVATE = 6;
++ const long VBAEVENT_WORKSHEET_FOLLOWHYPERLINK = 7;
++ const long VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE = 8;
++ const long VBAEVENT_WORKSHEET_SELECTIONCHANGE = 9;
++ // Workbook
++ const long VBAEVENT_WORKBOOK_ACTIVATE = 20;
++ const long VBAEVENT_WORKBOOK_DEACTIVATE = 21;
++ const long VBAEVENT_WORKBOOK_OPEN = 22;
++ const long VBAEVENT_WORKBOOK_AUTOOPEN = 23;
++ const long VBAEVENT_WORKBOOK_BEFORECLOSE = 24;
++ const long VBAEVENT_WORKBOOK_BEFOREPRINT = 25;
++ const long VBAEVENT_WORKBOOK_BEFORESAVE = 26;
++ const long VBAEVENT_WORKBOOK_NEWSHEET = 27;
++ const long VBAEVENT_WORKBOOK_WINDOWACTIVATE = 28;
++ const long VBAEVENT_WORKBOOK_WINDOWDEACTIVATE = 29;
++ const long VBAEVENT_WORKBOOK_WINDOWRESIZE = 30;
++ const long VBAEVENT_WORKBOOK_WINDOWCOLSE = 31;
++ const long VBAEVENT_WORKBOOK_CLOSE = 32;
++ // Workbook_sheet
++ const long VBAEVENT_WORKBOOK_SHEET_ACTIVATE = 51;
++ const long VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK = 52;
++ const long VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK = 53;
++ const long VBAEVENT_WORKBOOK_SHEET_CALCULATE = 54;
++ const long VBAEVENT_WORKBOOK_SHEET_CHANGE = 55;
++ const long VBAEVENT_WORKBOOK_SHEET_DEACTIVATE = 56;
++ const long VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK = 57;
++ const long VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE = 58;
++ const long VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE = 59;
++};
++
++}; }; }; };
++
++#endif
+--- /dev/null 2007-05-04 18:54:36.000000000 +0800
++++ offapi/com/sun/star/document/XVbaEventsHelper.idl 2008-05-27 17:16:25.000000000 +0800
+@@ -0,0 +1,54 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_vba_XVbaEventsHelper_idl__
++#define __org_openoffice_vba_XVbaEventsHelper_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
++//=============================================================================
+
++module com { module sun { module star { module document {
+//=============================================================================
+
-+module org { module openoffice { module vba {
++interface XVbaEventsHelper
++{
++ // nTab -1 for workbook.
++ boolean ProcessCompatibleVbaEvent( [in] long VbaEvent, [in] sequence< any > aArgs );
++};
++
++}; }; }; };
++
++#endif
+--- /dev/null 2007-05-04 18:54:36.000000000 +0800
++++ offapi/com/sun/star/document/VbaEventsHelper.idl 2008-05-27 11:46:31.000000000 +0800
+@@ -0,0 +1,55 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++#ifndef __org_openoffice_vba_VbaEventsHelper_idl__
++#define __org_openoffice_vba_VbaEventsHelper_idl__
++
++#ifndef __com_sun_star_uno_XInterface_idl__
++#include <com/sun/star/uno/XInterface.idl>
++#endif
++#include <com/sun/star/frame/XModel.idl>
++#include <com/sun/star/document/XVbaEventsHelper.idl>
++//=============================================================================
++
++module com { module sun { module star { module document {
+//=============================================================================
+
-+published constants VBAWorkbookEvent
++service VbaEventsHelper : XVbaEventsHelper
+{
-+ const long SC_VBAEVENT_SHEET_START = 10000;
-+ // Worksheet
-+ const long SC_VBAEVENT_SHEET_ACTIVATE = 10001;
-+ const long SC_VBAEVENT_SHEET_BEFOREDOUBLECLICK = 10002;
-+ const long SC_VBAEVENT_SHEET_BEFORERIGHTCLICK = 10003;
-+ const long SC_VBAEVENT_SHEET_CALCULATE = 10004;
-+ const long SC_VBAEVENT_SHEET_CHANGE = 10005;
-+ const long SC_VBAEVENT_SHEET_DEACTIVATE = 10006;
-+ const long SC_VBAEVENT_SHEET_FOLLOWHYPERLINK = 10007;
-+ const long SC_VBAEVENT_SHEET_PIVOTTABLEUPDATE = 10008;
-+ const long SC_VBAEVENT_SHEET_SELECTIONCHANGE = 10009;
-+ // Workbook
-+ const long SC_VBAEVENT_WORKBOOK_ACTIVATE = 10020;
-+ const long SC_VBAEVENT_WORKBOOK_DEACTIVATE = 10021;
-+ const long SC_VBAEVENT_WORKBOOK_OPEN = 10022;
-+ const long SC_VBAEVENT_WORKBOOK_AUTOOPEN = 10023;
-+ const long SC_VBAEVENT_WORKBOOK_BEFORECLOSE = 10024;
-+ const long SC_VBAEVENT_WORKBOOK_BEFOREPRINT = 10025;
-+ const long SC_VBAEVENT_WORKBOOK_BEFORESAVE = 10026;
-+ const long SC_VBAEVENT_WORKBOOK_NEWSHEET = 10027;
-+ const long SC_VBAEVENT_WORKBOOK_WINDOWACTIVATE = 10028;
-+ const long SC_VBAEVENT_WORKBOOK_WINDOWDEACTIVATE = 10029;
-+ const long SC_VBAEVENT_WORKBOOK_WINDOWRESIZE = 10030;
-+ const long SC_VBAEVENT_WORKBOOK_WINDOWCOLSE = 10031;
-+ const long SC_VBAEVENT_WORKBOOK_CLOSE = 10032;
++ createVbaEventsHelper( [in] ::com::sun::star::frame::XModel xModel );
+};
+
-+}; }; };
++}; }; }; };
+
+#endif
---- oovbaapi/org/openoffice/vba/makefile.mk.orig 2008-05-19 16:54:01.000000000 +0800
-+++ oovbaapi/org/openoffice/vba/makefile.mk 2008-05-19 16:53:52.000000000 +0800
-@@ -52,6 +52,9 @@ IDLFILES=\
- XCommandBarControls.idl\
- XCommandBar.idl\
- XCommandBars.idl\
-+ VBAWorkbookEvent.idl\
-+ XVBAWorkbookEventsHelper.idl\
-+ VBAWorkbookEventsHelper.idl\
- Globals.idl\
-
- # ------------------------------------------------------------------
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ offapi/com/sun/star/document/XVbaEventHelper.idl 2008-05-16 16:16:16.000000000 +0800
-@@ -0,0 +1,48 @@
++++ offapi/com/sun/star/document/XDocumentEventCompatibleHelper.idl 2008-05-28 16:19:12.000000000 +0800
+@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -123,18 +231,17 @@
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
-+#ifndef __com_sun_star_document_XVbaEventHelper_idl__
-+#define __com_sun_star_document_XVbaEventHelper_idl__
++#ifndef __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
++#define __com_sun_star_document_XDocumentEventCompatibleHelper_idl__
+
+//=============================================================================
+
+module com { module sun { module star { module document {
+
+//=============================================================================
-+interface XVbaEventHelper
++interface XDocumentEventCompatibleHelper
+{
-+ //-------------------------------------------------------------------------
-+ boolean processVbaEvent( [in] short nStatus, [in] short nEventId );
++ boolean processCompatibleEvent( [in] short nStatus, [in] short nEventId );
+};
+
+//=============================================================================
@@ -143,18 +250,21 @@
+
+#endif
--- offapi/com/sun/star/document/makefile.mk.bak 2008-05-08 17:24:51.000000000 +0800
-+++ offapi/com/sun/star/document/makefile.mk 2008-05-08 17:33:09.000000000 +0800
-@@ -109,6 +109,7 @@ IDLFILES=\
++++ offapi/com/sun/star/document/makefile.mk 2008-05-27 11:44:41.000000000 +0800
+@@ -109,6 +109,10 @@ IDLFILES=\
DocumentRevisionListPersistence.idl \
XDocumentLanguages.idl \
XCodeNameQuery.idl \
-+ XVbaEventHelper.idl \
++ XDocumentEventCompatibleHelper.idl \
++ VbaEventId.idl \
++ XVbaEventsHelper.idl \
++ VbaEventsHelper.idl \
# ------------------------------------------------------------------
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.hxx 2008-05-19 12:42:35.000000000 +0800
-@@ -0,0 +1,105 @@
++++ sc/source/ui/vba/vbaeventshelper.hxx 2008-05-30 17:14:57.000000000 +0800
+@@ -0,0 +1,92 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -197,17 +307,18 @@
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/awt/XEnhancedMouseClickHandler.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
+#include "vbahelper.hxx"
+
+using namespace com::sun::star;
+
-+typedef ::cppu::WeakImplHelper1< org::openoffice::vba::XVBAWorkbookEventsHelper > VBAWorkbookEvent_BASE;
++typedef ::cppu::WeakImplHelper1< com::sun::star::document::XVbaEventsHelper > VBAWorkbookEvent_BASE;
+
+//class ScTablesHint;
+class VbaWindowListener;
+class SfxEventHint;
++class ImplVbaEventNameInfo;
+class ScVbaEventsHelper : public VBAWorkbookEvent_BASE
+{
+private:
@@ -216,34 +327,23 @@
+ VbaWindowListener* mpWindowListener;
+ sal_Bool mbOpened;
+
-+ String getWorkbookModuleName();
+ String getSheetModuleName( SCTAB nTab );
-+ sal_Bool addOpenDocEvent( const uno::Reference< container::XNameReplace >& xEvts, const String& sOpenMacro );
+ String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
+
+ uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
+ uno::Any createRange( const uno::Any& aRange );
+ uno::Any createHyperlink( const uno::Any& rCell );
-+ void getSheetEventName( USHORT nEvent, String& rSheetScript, String& rWorkbookScript );
++ uno::Any createWindow( SfxObjectShell* pShell );
+ sal_Bool executeWorkBookMacro( SfxObjectShell* pShell, const String& sMacroName, uno::Sequence< uno::Any >& aArgs, uno::Any& aRet );
-+ sal_Bool processDocOpenMacro( SfxObjectShell* pShell );
-+ sal_Bool processDocActivateMacro( SfxObjectShell* pShell );
-+ sal_Bool processDocDeactivateMacro( SfxObjectShell* pShell );
-+ void processDocNewSheetMacro( SfxObjectShell* pShell, uno::Any aElement );
-+ void processDocNewSheet( SCTAB nTab );
-+ uno::Any getVbaWindow( SfxObjectShell* pShell );
-+ sal_Bool addDocEvent( SfxObjectShell* pShell, const String& sEvt, const String& sOpenMacro );
-+ void processDocDeactivateMacroRun( SfxObjectShell* pShell );
-+ sal_Bool processDocBeforeCloseMacro();
-+ sal_Bool processDocBeforePrintMacro();
-+ sal_Bool processDocMacro();
++ sal_Bool processVbaEventWithCancel( const sal_Int32 nEventId );
+ sal_Bool processDocBeforeSaveMacro( sal_Bool bSaveAsUI );
-+ void processWorkbookMacro_noreturn( const rtl::OUString sMacroName );
-+ void WorkbookAutoOpen();
-+ void WorkbookOpen();
-+ void WorkbookActivate();
-+ void WorkbookDeactivate();
++ void processVbaEventMacro_noreturn( const sal_Int32 nEventId );
++ void processVbaEventMacroWithArgs( const sal_Int32 nEventId, uno::Sequence< uno::Any >& rArgs );
+ void WorkbookWindowMacro( const sal_Int32 nHint );
++ SCTAB getTabFromArgs( const uno::Sequence< uno::Any > aArgs, const sal_Int32 nPos );
++protected:
++ rtl::OUString GetEventName( const sal_Int32 nId );
++ rtl::OUString getMacroPath( const sal_Int32 nEventId, const SCTAB nTab );
+
+public:
+ ScVbaEventsHelper( ScDocument* pDocument ):pDoc( pDocument ), mpWindowListener( NULL ), mbOpened( sal_False ){};
@@ -251,18 +351,15 @@
+ ~ScVbaEventsHelper();
+ ScDocument* getDocument() { return pDoc; };
+ sal_Bool executeSheetMacro( USHORT nEvent, SCTAB nTab, uno::Sequence< uno::Any >& rArgs );
-+ //void processScTablesHint( USHORT nId, SCTAB nTab );
-+ //void processSfxEventHint( const SfxEventHint& rHint );
-+ void processWindowMacro( String sFuncName );
+ // XVBAWorkbookEventHelper
-+ virtual sal_Bool SAL_CALL ProcessWorkbookEvent( sal_Int32 VbaEvent, sal_Int32 nTab, uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException);
++ virtual sal_Bool SAL_CALL ProcessCompatibleVbaEvent( sal_Int32 VbaEvent, const uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException);
+};
+
+#endif
+
--- /dev/null 2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.cxx 2008-05-19 14:00:44.000000000 +0800
-@@ -0,0 +1,1163 @@
++++ sc/source/ui/vba/vbaeventshelper.cxx 2008-05-30 19:07:54.000000000 +0800
+@@ -0,0 +1,1066 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -311,25 +408,28 @@
+#include <toolkit/unohlp.hxx>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/implbase1.hxx>
-+#ifndef _COM_SUN_STAR_SHEET_XSHEETCELLRANGECONTAINER_HPP_
++#include <cppuhelper/implbase2.hxx>
+#include <com/sun/star/sheet/XSheetCellRangeContainer.hpp>
-+#endif
+#include <com/sun/star/document/XEventsSupplier.hpp>
-+#ifndef _COM_SUN_STAR_SHEET_XCELLRANGEREFERRER_HPP_
+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-+#endif
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/awt/XWindowListener.hpp>
+#include <com/sun/star/awt/WindowEvent.hpp>
++#include <com/sun/star/awt/XMouseListener.hpp>
++#include <com/sun/star/awt/MouseEvent.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/awt/MouseButton.hpp>
+#include "cellsuno.hxx"
++
++#include <map>
++
++using namespace std;
+using namespace com::sun::star;
+using namespace org::openoffice;
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++using namespace com::sun::star::document::VbaEventId;
+
+const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
+const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook"));
@@ -338,7 +438,9 @@
+const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
+const static rtl::OUString sUrlPart2 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
+
++//typedef ::cppu::WeakImplHelper2< awt::XWindowListener, awt::XMouseListener > WindowListener_BASE;
+typedef ::cppu::WeakImplHelper1< awt::XWindowListener > WindowListener_BASE;
++
+class VbaWindowListener : public WindowListener_BASE
+{
+ ScVbaEventsHelper* pVbaEventsHelper;
@@ -431,7 +533,7 @@
+{
+ const static String sWindowResize( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowResize") );
+ if( pVbaEventsHelper )
-+ pVbaEventsHelper->processWindowMacro( sWindowResize );
++ pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
+}
+IMPL_LINK( VbaWindowListener, fireResizeMacro, Timer*, pTimer )
+{
@@ -484,11 +586,91 @@
+VbaWindowListener::disposing( const lang::EventObject& /*aEvent*/ ) throw ( uno::RuntimeException )
+{
+ OSL_TRACE("\tVbaWindowListener::disposing");
-+ stopWindowLinstener();
-+ //m_xModel->dispose();
+ pVbaEventsHelper = NULL;
+}
+
++class ImplVbaEventNameInfo
++{
++private:
++ map< sal_Int32, rtl::OUString > m_aEventNameMap;
++
++protected:
++ static ImplVbaEventNameInfo* pImplVbaEventNameInfo;
++ ImplVbaEventNameInfo() { InitImplVbaEventNameInfo(); }
++private:
++ void insert( const sal_Int32 nId, const rtl::OUString sEventName )
++ {
++ m_aEventNameMap.insert( make_pair( nId, sEventName ) );
++ }
++ void InitImplVbaEventNameInfo();
++public:
++ virtual ~ImplVbaEventNameInfo();
++ rtl::OUString getEventName( const sal_Int32 nId )
++ {
++ map< sal_Int32, rtl::OUString >::iterator iter = m_aEventNameMap.find( nId );
++ if( iter != m_aEventNameMap.end() )
++ return iter->second;
++ return rtl::OUString();
++ }
++ static ImplVbaEventNameInfo* GetImplVbaEventNameInfo();
++};
++ImplVbaEventNameInfo* ImplVbaEventNameInfo::pImplVbaEventNameInfo = NULL;
++
++ImplVbaEventNameInfo::~ImplVbaEventNameInfo()
++{
++ if( pImplVbaEventNameInfo )
++ delete pImplVbaEventNameInfo;
++}
++
++ImplVbaEventNameInfo*
++ImplVbaEventNameInfo::GetImplVbaEventNameInfo()
++{
++ if( !pImplVbaEventNameInfo )
++ {
++ pImplVbaEventNameInfo = new ImplVbaEventNameInfo;
++ }
++ return pImplVbaEventNameInfo;
++}
++
++#define CREATEOUSTRING(asciistr) rtl::OUString::createFromAscii(asciistr)
++
++#define INSERT_EVENT_INFO( Object, Event, ObjectName, EventName ) \
++ insert( VBAEVENT_##Object##_##Event, ObjectName + CREATEOUSTRING( EventName ) )
++
++#define INSERT_WORKSHEET_EVENT_INFO( Event, EventName ) \
++ INSERT_EVENT_INFO( WORKSHEET, Event,CREATEOUSTRING("Worksheet_"), EventName ); \
++ INSERT_EVENT_INFO( WORKBOOK_SHEET, Event, CREATEOUSTRING("Workbook_Sheet"), EventName )
++
++#define INSERT_WORKBOOK_EVENT_INFO( Event, EventName ) \
++ INSERT_EVENT_INFO( WORKBOOK, Event, CREATEOUSTRING("Workbook_"), EventName )
++
++void ImplVbaEventNameInfo::InitImplVbaEventNameInfo()
++{
++ INSERT_WORKSHEET_EVENT_INFO( ACTIVATE, "Activate");
++ INSERT_WORKSHEET_EVENT_INFO( BEFOREDOUBLECLICK, "BeforeDoubleClick" );
++ INSERT_WORKSHEET_EVENT_INFO( BEFORERIGHTCLICK, "BeforeRightClick" );
++ INSERT_WORKSHEET_EVENT_INFO( CALCULATE, "Calculate" );
++ INSERT_WORKSHEET_EVENT_INFO( CHANGE, "Change" );
++ INSERT_WORKSHEET_EVENT_INFO( DEACTIVATE, "Deactivate" );
++ INSERT_WORKSHEET_EVENT_INFO( FOLLOWHYPERLINK, "FollowHyperlink" );
++ INSERT_WORKSHEET_EVENT_INFO( PIVOTTABLEUPDATE, "PivotTableUpdate" );
++ INSERT_WORKSHEET_EVENT_INFO( SELECTIONCHANGE, "SelectionChange" );
++
++ // Workbook
++ INSERT_WORKBOOK_EVENT_INFO( ACTIVATE, "Activate" );
++ INSERT_WORKBOOK_EVENT_INFO( DEACTIVATE, "Deactivate" );
++ INSERT_WORKBOOK_EVENT_INFO( OPEN, "Open" );
++ // AUTOOPEN doesn't be used. TODO, this should be "auto_open"
++ INSERT_WORKBOOK_EVENT_INFO( BEFORECLOSE, "BeforeClose" );
++ INSERT_WORKBOOK_EVENT_INFO( BEFOREPRINT, "BeforePrint" );
++ INSERT_WORKBOOK_EVENT_INFO( BEFORESAVE, "BeforeSave" );
++ INSERT_WORKBOOK_EVENT_INFO( NEWSHEET, "NewSheet" );
++ INSERT_WORKBOOK_EVENT_INFO( WINDOWACTIVATE, "WindowActivate" );
++ INSERT_WORKBOOK_EVENT_INFO( WINDOWDEACTIVATE, "WindowDeactivate" );
++ INSERT_WORKBOOK_EVENT_INFO( WINDOWRESIZE, "WindowResize" );
++ // VBAEVENT_WORKBOOK_WINDOWCOLSE and VBAEVENT_WORKBOOK_CLOSE doesn't be used
++}
++
+ScVbaEventsHelper::ScVbaEventsHelper( uno::Sequence< css::uno::Any > const& aArgs, uno::Reference< uno::XComponentContext > const& xContext )
+ : m_xContext( xContext ), mpWindowListener( NULL ), mbOpened( sal_False )
+{
@@ -508,15 +690,14 @@
+ }
+}
+
-+String ScVbaEventsHelper::getWorkbookModuleName()
++rtl::OUString
++ScVbaEventsHelper::GetEventName( const sal_Int32 nId )
+{
-+ String sCodeName( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook") );
-+ if ( ScExtDocOptions* pExtDocOpts = pDoc->GetExtDocOptions() )
-+ {
-+ if ( pExtDocOpts->GetDocSettings().maGlobCodeName.Len() > 0 )
-+ sCodeName = pExtDocOpts->GetDocSettings().maGlobCodeName;
-+ }
-+ return sCodeName;
++ rtl::OUString sEventName;
++ ImplVbaEventNameInfo* pEventInfo = ImplVbaEventNameInfo::GetImplVbaEventNameInfo();
++ if( pEventInfo )
++ sEventName = pEventInfo->getEventName( nId );
++ return sEventName;
+}
+
+// Treat the args as possible inouts ( convertion at bottom of method )
@@ -526,8 +707,6 @@
+ // document saved from XL then we won't be able to determine the codename for the Workbook
+ // Module, so... we have no choice but to search all modules for the moment, thus the macro
+ // passed in should be the fully specified name.
-+ //rtl::OUString sCodeName = getWorkbookModuleName( pShell );
-+ //rtl::OUString sUrl = sUrlPart1.concat( sCodeName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sMacroName ).concat( sUrlPart2 );
+ rtl::OUString sUrl = sUrlPart0.concat( sMacroName ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".") ) ).concat( sUrlPart2 ) ;
+ uno::Sequence< sal_Int16 > aOutArgsIndex;
+ uno::Sequence< uno::Any > aOutArgs;
@@ -601,60 +780,16 @@
+ return sFullName;
+}
+
-+sal_Bool ScVbaEventsHelper::processDocBeforeCloseMacro()
++sal_Bool ScVbaEventsHelper::processVbaEventWithCancel( const sal_Int32 nEventId )
+{
++ uno::Sequence< uno::Any > aArgs( 1 );
+ sal_Bool bCancel = sal_False;
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( pShell )
-+ {
-+ uno::Any aRet;
-+ uno::Sequence< uno::Any > aArgs( 1 );
-+ aArgs[ 0 ] <<= bCancel;
-+ const static String sBeforeClose( RTL_CONSTASCII_USTRINGPARAM("Workbook_BeforeClose") );
-+ String sFullClose = docMacroExists( pShell, String(), sBeforeClose );
-+ if ( sFullClose.Len() > 0 )
-+ {
-+ if ( !executeWorkBookMacro( pShell, sFullClose, aArgs, aRet ) )
-+ return sal_False;
-+ }
-+ aArgs[ 0 ] >>= bCancel;
-+ }
++ aArgs[ 0 ] <<= bCancel;
++ processVbaEventMacroWithArgs( nEventId, aArgs );
++ aArgs[ 0 ] >>= bCancel;
+ return bCancel;
+}
+
-+sal_Bool ScVbaEventsHelper::addOpenDocEvent( const uno::Reference< container::XNameReplace >& xEvts, const String& sOpenMacro )
-+{
-+ sal_Bool result = sal_False;
-+ const rtl::OUString sUrl = sUrlPart0.concat( sOpenMacro ).concat( sUrlPart2 );
-+ const static rtl::OUString sEvtType( RTL_CONSTASCII_USTRINGPARAM("EventType") );
-+ const static rtl::OUString sScript( RTL_CONSTASCII_USTRINGPARAM("Script") );
-+ const static rtl::OUString sEvt( RTL_CONSTASCII_USTRINGPARAM("OnLoad") );
-+ if ( xEvts.is() )
-+ {
-+ uno::Sequence< beans::PropertyValue > aEvents;
-+ xEvts->getByName( sEvt ) >>= aEvents;
-+ uno::Sequence< beans::PropertyValue > aOpenEvt( 2 );
-+ aOpenEvt[ 0 ].Name = sEvtType;
-+ aOpenEvt[ 0 ].Value = uno::makeAny(sScript);
-+ aOpenEvt[ 1 ].Name = sScript;
-+ aOpenEvt[ 1 ].Value = uno::makeAny(sUrl);
-+ sal_Int32 nPos = aEvents.getLength();
-+
-+ sal_Int32 nNewSize = aEvents.getLength() + aOpenEvt.getLength();
-+ if ( nNewSize > aEvents.getLength() )
-+ aEvents.realloc( nNewSize );
-+
-+ for ( sal_Int32 nIndex = nPos, nCpyIndex = 0; nIndex<nNewSize; nIndex++, nCpyIndex++ )
-+ aEvents[ nIndex ] = aOpenEvt[ nCpyIndex ];
-+
-+ uno::Any aParam = uno::makeAny( aEvents );
-+
-+ xEvts->replaceByName( sEvt, aParam );
-+ result = sal_True;
-+ }
-+ return result;
-+}
-+
+uno::Any ScVbaEventsHelper::createWorkSheet( SfxObjectShell* pShell, SCTAB nTab )
+{
+ uno::Any aRet;
@@ -736,7 +871,6 @@
+ uno::Sequence< uno::Any > aArgs(2);
+ aArgs[0] = uno::Any( uno::Reference< uno::XInterface >() ); // dummy parent
+ aArgs[1] <<= rCell;
-+ //aArgs[1] <<= uno::makeAny( rtl::OUString( aItem ) );
+
+ aRet <<= xSMgr->createInstanceWithArgumentsAndContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.excel.Hyperlink") ), aArgs, xCtx );
+ }
@@ -751,71 +885,6 @@
+ return aRet;
+}
+
-+void ScVbaEventsHelper::getSheetEventName( USHORT nEvent, String& rSheetScript, String& rWorkbookScript )
-+{
-+ switch( nEvent )
-+ {
-+ case SC_VBAEVENT_SHEET_ACTIVATE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_Activate") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetActivate") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_BEFOREDOUBLECLICK:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_BeforeDoubleClick") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetBeforeDoubleClick") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_BEFORERIGHTCLICK:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_BeforeRightClick") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetBeforeRightClick") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_CALCULATE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_Calculate") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetCalculate") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_CHANGE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_Change") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetChange") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_DEACTIVATE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_Deactivate") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetDeactivate") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_FOLLOWHYPERLINK:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_FollowHyperlink") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetFollowHyperlink") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_PIVOTTABLEUPDATE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_PivotTableUpdate") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetPivotTableUpdate") );
-+ break;
-+ }
-+ case SC_VBAEVENT_SHEET_SELECTIONCHANGE:
-+ {
-+ rSheetScript = String( RTL_CONSTASCII_USTRINGPARAM("Worksheet_SelectionChange") );
-+ rWorkbookScript = String( RTL_CONSTASCII_USTRINGPARAM("Workbook_SheetSelectionChange") );
-+ break;
-+ }
-+ default:
-+ break;
-+ }
-+
-+ return;
-+}
-+
+String ScVbaEventsHelper::getSheetModuleName( SCTAB nTab )
+{
+ ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
@@ -827,113 +896,169 @@
+ return aCodeName;
+}
+
++rtl::OUString
++ScVbaEventsHelper::getMacroPath( const sal_Int32 nEventId, const SCTAB nTab )
++{
++ SfxObjectShell* pShell = pDoc->GetDocumentShell();
++ rtl::OUString sMacroPath;
++ rtl::OUString sMacroName = GetEventName( nEventId );
++ switch( nEventId )
++ {
++ // Worksheet
++ case VBAEVENT_WORKSHEET_ACTIVATE :
++ case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK :
++ case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK :
++ case VBAEVENT_WORKSHEET_CALCULATE :
++ case VBAEVENT_WORKSHEET_CHANGE :
++ case VBAEVENT_WORKSHEET_DEACTIVATE :
++ case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK :
++ case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE :
++ case VBAEVENT_WORKSHEET_SELECTIONCHANGE :
++ {
++ rtl::OUString aSheetModuleName = getSheetModuleName( nTab );
++ sMacroPath = docMacroExists( pShell, aSheetModuleName, sMacroName );
++ break;
++ }
++ // Workbook
++ case VBAEVENT_WORKBOOK_ACTIVATE :
++ case VBAEVENT_WORKBOOK_DEACTIVATE :
++ case VBAEVENT_WORKBOOK_OPEN :
++ case VBAEVENT_WORKBOOK_AUTOOPEN :
++ case VBAEVENT_WORKBOOK_BEFORECLOSE :
++ case VBAEVENT_WORKBOOK_BEFOREPRINT :
++ case VBAEVENT_WORKBOOK_BEFORESAVE :
++ case VBAEVENT_WORKBOOK_NEWSHEET :
++ case VBAEVENT_WORKBOOK_WINDOWACTIVATE :
++ case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE :
++ case VBAEVENT_WORKBOOK_WINDOWRESIZE :
++ case VBAEVENT_WORKBOOK_WINDOWCOLSE :
++ case VBAEVENT_WORKBOOK_CLOSE :
++ // Workbook_sheet
++ case VBAEVENT_WORKBOOK_SHEET_ACTIVATE :
++ case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK :
++ case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK :
++ case VBAEVENT_WORKBOOK_SHEET_CALCULATE :
++ case VBAEVENT_WORKBOOK_SHEET_CHANGE :
++ case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE :
++ case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK :
++ case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE :
++ case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE :
++ {
++ ScExtDocOptions* pExtOptions = pDoc->GetExtDocOptions();
++ if( pExtOptions )
++ {
++ ScExtDocSettings aExtDocSettings = pExtOptions->GetDocSettings();
++ String sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
++ sMacroPath = docMacroExists( pShell, sWorkbookModuleName, sMacroName );
++ }
++ else
++ {
++ // TODO need this?
++ sMacroPath = docMacroExists( pShell, rtl::OUString(), sMacroName );
++ }
++ break;
++ }
++ default:
++ break;
++ }
++ return sMacroPath;
++}
++
+sal_Bool ScVbaEventsHelper::executeSheetMacro( USHORT nEvent, SCTAB nTab, uno::Sequence< uno::Any >& rArgs )
+{
+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( !pShell )
-+ return sal_False;
+
+ sal_Bool result = sal_False;
+ uno::Sequence< uno::Any > aArgs;
+ uno::Any aRet;
+
-+ String aSheetScript;
-+ String aWorkbookScript;
-+
-+ getSheetEventName( nEvent, aSheetScript, aWorkbookScript );
-+
-+ String aSheetModuleName = getSheetModuleName( nTab );
-+ String aSheetMacro = docMacroExists( pShell, aSheetModuleName, aSheetScript );
-+ String aWorkbookMacro = docMacroExists( pShell, String(), aWorkbookScript );
-+ if( aSheetMacro.Len() > 0 || aWorkbookMacro.Len() > 0 )
++ rtl::OUString sMacroPath = getMacroPath( nEvent, nTab );
++ if( sMacroPath.getLength() )
+ {
+ switch( nEvent )
+ {
-+ case SC_VBAEVENT_SHEET_ACTIVATE:
-+ case SC_VBAEVENT_SHEET_CALCULATE:
-+ case SC_VBAEVENT_SHEET_DEACTIVATE:
++ case VBAEVENT_WORKSHEET_ACTIVATE:
++ case VBAEVENT_WORKSHEET_CALCULATE:
++ case VBAEVENT_WORKSHEET_DEACTIVATE:
+ {
+ // no arguments
-+ if( aSheetMacro.Len() > 0 )
-+ result = executeWorkBookMacro( pShell, aSheetMacro, aArgs, aRet );
-+
-+ if( aWorkbookMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(1);
-+ aArgs[0] = createWorkSheet( pShell, nTab );
-+ result = executeWorkBookMacro( pShell, aWorkbookMacro, aArgs, aRet );
-+ }
-+
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
+ break;
+ }
-+ case SC_VBAEVENT_SHEET_CHANGE:
-+ case SC_VBAEVENT_SHEET_SELECTIONCHANGE:
++ case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE :
++ case VBAEVENT_WORKBOOK_SHEET_CALCULATE :
++ case VBAEVENT_WORKBOOK_SHEET_ACTIVATE :
++ {
++ aArgs = uno::Sequence< uno::Any >(1);
++ aArgs[0] = createWorkSheet( pShell, nTab );
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
++ break;
++ }
++ case VBAEVENT_WORKSHEET_CHANGE:
++ case VBAEVENT_WORKSHEET_SELECTIONCHANGE:
+ {
+ // one argument: range
+ uno::Any aRange = createRange( rArgs[0] );
-+ if( aSheetMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(1);
-+ aArgs[0] = aRange;
-+ result = executeWorkBookMacro( pShell, aSheetMacro, aArgs, aRet );
-+ }
-+
-+ if( aWorkbookMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(2);
-+ aArgs[0] = createWorkSheet( pShell, nTab );
-+ aArgs[1] = aRange;
-+ result = executeWorkBookMacro( pShell, aWorkbookMacro, aArgs, aRet );
-+ }
++ aArgs = uno::Sequence< uno::Any >(1);
++ aArgs[0] = aRange;
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
+ break;
+ }
-+ case SC_VBAEVENT_SHEET_BEFOREDOUBLECLICK:
-+ case SC_VBAEVENT_SHEET_BEFORERIGHTCLICK:
++ case VBAEVENT_WORKBOOK_SHEET_CHANGE :
++ case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE :
++ {
++ uno::Any aRange = createRange( rArgs[0] );
++ aArgs = uno::Sequence< uno::Any >(2);
++ aArgs[0] = createWorkSheet( pShell, nTab );
++ aArgs[1] = aRange;
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
++ break;
++ }
++ case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK:
++ case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK:
+ {
+ // two aruments: range and cancel
+ uno::Any aRange = createRange( rArgs[0] );
-+ if( aSheetMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(2);
-+ aArgs[0] = aRange;
-+ aArgs[1] = rArgs[1];
-+ result = executeWorkBookMacro( pShell, aSheetMacro, aArgs, aRet );
-+ // return the cancel value
-+ rArgs[1] = aArgs[1];
-+ }
-+
-+ if( aWorkbookMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(3);
-+ aArgs[0] = createWorkSheet( pShell, nTab );
-+ aArgs[1] = aRange;
-+ aArgs[2] = aArgs[1];
-+ result = executeWorkBookMacro( pShell, aWorkbookMacro, aArgs, aRet );
-+ rArgs[2] = aArgs[2];
-+ }
++ aArgs = uno::Sequence< uno::Any >(2);
++ aArgs[0] = aRange;
++ aArgs[1] = rArgs[1];
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
++ // return the cancel value
++ rArgs[1] = aArgs[1];
+ break;
+ }
-+ case SC_VBAEVENT_SHEET_FOLLOWHYPERLINK:
++ case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK :
++ case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK :
++ {
++ uno::Any aRange = createRange( rArgs[0] );
++ aArgs = uno::Sequence< uno::Any >(3);
++ aArgs[0] = createWorkSheet( pShell, nTab );
++ aArgs[1] = aRange;
++ aArgs[2] = aArgs[1];
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
++ rArgs[2] = aArgs[2];
++ break;
++ }
++ case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK:
+ {
+ // one argument: hyperlink
+ uno::Any aHyperlink = createHyperlink( rArgs[0] );
-+ if( aSheetMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(1);
-+ aArgs[0] = aHyperlink;
-+ result = executeWorkBookMacro( pShell, aSheetMacro, aArgs, aRet );
-+ }
-+
-+ if( aWorkbookMacro.Len() > 0 )
-+ {
-+ aArgs = uno::Sequence< uno::Any >(2);
-+ aArgs[0] = createWorkSheet( pShell, nTab );
-+ aArgs[1] = aHyperlink;
-+ result = executeWorkBookMacro( pShell, aWorkbookMacro, aArgs, aRet );
-+ }
++ aArgs = uno::Sequence< uno::Any >(1);
++ aArgs[0] = aHyperlink;
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
+ break;
+ }
-+ case SC_VBAEVENT_SHEET_PIVOTTABLEUPDATE:
++ case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK :
++ {
++ uno::Any aHyperlink = createHyperlink( rArgs[0] );
++ aArgs = uno::Sequence< uno::Any >(2);
++ aArgs[0] = createWorkSheet( pShell, nTab );
++ aArgs[1] = aHyperlink;
++ result = executeWorkBookMacro( pShell, sMacroPath, aArgs, aRet );
++ break;
++ }
++ case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE:
++ case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE :
+ {
+ // one argument: pivottable
+ break;
@@ -944,85 +1069,7 @@
+ return result;
+}
+
-+sal_Bool ScVbaEventsHelper::processDocBeforePrintMacro( )
-+{
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( !pShell )
-+ return sal_False;
-+
-+ uno::Any aRet;
-+ uno::Sequence< uno::Any > aArgs( 1 );
-+ sal_Bool bCancel = sal_False;
-+ aArgs[ 0 ] <<= bCancel;
-+ const static String sBeforeClose( RTL_CONSTASCII_USTRINGPARAM("Workbook_BeforePrint") );
-+ String sFullClose = docMacroExists( pShell, String(), sBeforeClose );
-+ if ( sFullClose.Len() > 0 )
-+ {
-+ if ( !executeWorkBookMacro( pShell, sFullClose, aArgs, aRet ) )
-+ return sal_False;
-+ }
-+ aArgs[ 0 ] >>= bCancel;
-+ return bCancel;
-+}
-+
-+void ScVbaEventsHelper::processDocNewSheetMacro( SfxObjectShell* pShell, uno::Any aElement )
-+{
-+ uno::Any aRet;
-+ if( aElement.hasValue() )
-+ {
-+ uno::Sequence< uno::Any > aArgs(1);
-+ aArgs[0] = aElement;
-+ const static String sNewSheet( RTL_CONSTASCII_USTRINGPARAM("Workbook_NewSheet") );
-+ String sFullClose = docMacroExists( pShell, String(), sNewSheet );
-+ if ( sFullClose.Len() > 0 )
-+ {
-+ executeWorkBookMacro( pShell, sFullClose, aArgs, aRet );
-+ }
-+ }
-+}
-+/*
-+#define SC_TAB_INSERTED 1
-+void ScVbaEventsHelper::processScTablesHint( USHORT nId, SCTAB nTab )
-+{
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( pShell )
-+ {
-+// USHORT nId = rHint.GetId();
-+// SCTAB nTab = rHint.GetTab1();
-+ if( nId == SC_TAB_INSERTED )
-+ {
-+ processDocNewSheetMacro( pShell, createWorkSheet( pShell, nTab ) );
-+ }
-+ }
-+}
-+*/
-+void ScVbaEventsHelper::processDocNewSheet( SCTAB nTab )
-+{
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( pShell )
-+ processDocNewSheetMacro( pShell, createWorkSheet( pShell, nTab ) );
-+}
-+
-+void ScVbaEventsHelper::processWindowMacro( String sFuncName )
-+{
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( !pShell )
-+ return;
-+ uno::Any aElement = getVbaWindow( pShell );
-+
-+ uno::Any aRet;
-+ if( aElement.hasValue() && ( sFuncName.Len() > 0 ) )
-+ {
-+ uno::Sequence< uno::Any > aArgs(1);
-+ aArgs[0] = aElement;
-+ String sMacro = docMacroExists( pShell, String(), sFuncName );
-+ if ( sMacro.Len() > 0 )
-+ {
-+ executeWorkBookMacro( pShell, sMacro, aArgs, aRet );
-+ }
-+ }
-+}
-+uno::Any ScVbaEventsHelper::getVbaWindow( SfxObjectShell* pShell )
++uno::Any ScVbaEventsHelper::createWindow( SfxObjectShell* pShell )
+{
+ try
+ {
@@ -1041,340 +1088,292 @@
+ return uno::Any();
+}
+
-+sal_Bool ScVbaEventsHelper::addDocEvent( SfxObjectShell* pShell, const String& sEvt, const String& sOpenMacro )
-+{
-+ sal_Bool result = sal_False;
-+ const rtl::OUString sUrl = sUrlPart0.concat( sOpenMacro ).concat( sUrlPart2 );
-+ const static rtl::OUString sEvtType( RTL_CONSTASCII_USTRINGPARAM("EventType") );
-+ const static rtl::OUString sScript( RTL_CONSTASCII_USTRINGPARAM("Script") );
-+ uno::Reference< document::XEventsSupplier > xEvtSupplier( pShell->GetModel(), uno::UNO_QUERY );
-+
-+ if ( xEvtSupplier.is() )
-+ {
-+ uno::Reference< container::XNameReplace > xEvts( xEvtSupplier->getEvents(), uno::UNO_QUERY );
-+ if ( xEvts.is() )
-+ {
-+ if( xEvts->hasByName( sEvt ) )
-+ {
-+ if( !xEvts->getByName( sEvt ).hasValue() )
-+ {
-+ uno::Sequence< beans::PropertyValue > aEvt( 2 );
-+ aEvt[ 0 ].Name = sEvtType;
-+ aEvt[ 0 ].Value = uno::makeAny(sScript);
-+ aEvt[ 1 ].Name = sScript;
-+ aEvt[ 1 ].Value = uno::makeAny(sUrl);
-+
-+ uno::Any aParam = uno::makeAny( aEvt );
-+ xEvts->replaceByName( sEvt, aParam );
-+ result = sal_True;
-+ }
-+ }
-+ }
-+ }
-+ return result;
-+}
-+
-+
-+sal_Bool ScVbaEventsHelper::processDocActivateMacro( SfxObjectShell* pShell )
-+{
-+ sal_Bool result = sal_True;
-+ const static rtl::OUString sAtctivateMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Activate") );
-+ const static rtl::OUString sOnFocusEvt( RTL_CONSTASCII_USTRINGPARAM("OnFocus") );
-+ rtl::OUString sWorkbookModule;
-+ String sFullOnFocus = docMacroExists( pShell, sWorkbookModule, sAtctivateMacro );
-+ if( sFullOnFocus.Len() > 0 )
-+ {
-+ if( !addDocEvent( pShell, sOnFocusEvt, sFullOnFocus ) )
-+ return sal_False;
-+ }
-+ return result;
-+}
-+
-+sal_Bool ScVbaEventsHelper::processDocDeactivateMacro( SfxObjectShell* pShell )
++void ScVbaEventsHelper::processVbaEventMacro_noreturn( const sal_Int32 nEventId )
+{
-+ sal_Bool result = sal_True;
-+ const static rtl::OUString sDeatctivateMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Deactivate") );
-+ const static rtl::OUString sOnFocusEvt( RTL_CONSTASCII_USTRINGPARAM("OnUnfocus") );
-+ rtl::OUString sWorkbookModule;
-+ String sFullUnOnfocus = docMacroExists( pShell, sWorkbookModule, sDeatctivateMacro );
-+ if( sFullUnOnfocus.Len() > 0 )
-+ {
-+ if( !addDocEvent( pShell, sOnFocusEvt, sFullUnOnfocus ) )
-+ return sal_False;
-+ }
-+ return result;
-+}
-+
-+void ScVbaEventsHelper::processDocDeactivateMacroRun( SfxObjectShell* pShell )
-+{
-+ uno::Any aRet;
+ uno::Sequence< uno::Any > aArgs;
-+ const static String sDeactivate( RTL_CONSTASCII_USTRINGPARAM("Workbook_Deactivate") );
-+ String sDeactivateMacro = docMacroExists( pShell, String(), sDeactivate );
-+ if ( sDeactivateMacro.Len() > 0 )
-+ {
-+ executeWorkBookMacro( pShell, sDeactivateMacro, aArgs, aRet );
-+ }
++ processVbaEventMacroWithArgs( nEventId, aArgs );
+}
+
-+void ScVbaEventsHelper::processWorkbookMacro_noreturn( const rtl::OUString sMacroName )
-+{
-+ uno::Any aRet;
-+ uno::Sequence< uno::Any > aArgs;
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ String sOpenMacro = docMacroExists( pShell, String(), sMacroName );
-+ if( pShell )
-+ {
-+ if ( sOpenMacro.Len() > 0 && pShell )
-+ {
-+ executeWorkBookMacro( pShell, sOpenMacro, aArgs, aRet );
-+ }
-+ }
-+}
-+
-+void ScVbaEventsHelper::WorkbookAutoOpen()
-+{
-+ const static rtl::OUString sAuto_OpenMacro( RTL_CONSTASCII_USTRINGPARAM("auto_open") );
-+ processWorkbookMacro_noreturn( sAuto_OpenMacro );
-+}
-+
-+void ScVbaEventsHelper::WorkbookOpen()
-+{
-+ const static rtl::OUString sOpenMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Open") );
-+ processWorkbookMacro_noreturn( sOpenMacro );
-+}
-+
-+void ScVbaEventsHelper::WorkbookActivate()
-+{
-+ const static rtl::OUString sAtctivateMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Activate") );
-+ processWorkbookMacro_noreturn( sAtctivateMacro );
-+}
-+
-+void ScVbaEventsHelper::WorkbookDeactivate()
-+{
-+ const static rtl::OUString sDeatctivateMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Deactivate") );
-+ processWorkbookMacro_noreturn( sDeatctivateMacro );
-+}
-+
-+/*
-+void ScVbaEventsHelper::processSfxEventHint( const SfxEventHint& rHint )
++void ScVbaEventsHelper::processVbaEventMacroWithArgs( const sal_Int32 nEventId, uno::Sequence< uno::Any >& rArgs )
+{
+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
+ if( !pShell )
+ return;
-+ ULONG nEventId = rHint.GetEventId();
-+ const static String sWindowActivate( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowActivate") );
-+ const static String sWindowDeactivate( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowDeactivate") );
-+ switch( nEventId )
++
++ String sMacroName = GetEventName( nEventId );
++ if( sMacroName.Len() > 0 )
+ {
-+ case SFX_EVENT_ACTIVATEDOC :
-+ processWindowMacro( sWindowActivate );
-+ break;
-+ case SFX_EVENT_DEACTIVATEDOC :
-+ // it will be called when close the doc. but will not launch the macro.
-+ processWindowMacro( sWindowDeactivate );
-+ break;
-+ case SFX_EVENT_CLOSEDOC :
-+ // the macro will not be called at this time, because of the doc has died.
-+ //processDocDeactivateMacroRun( pShell );
-+ break;
-+ case SFX_EVENT_CLOSEVIEW :
-+ processWindowMacro( sWindowDeactivate );
-+ // does Doc be closed surely?
-+ processDocDeactivateMacroRun( pShell );
-+ break;
-+ case SFX_EVENT_OPENDOC :
++ uno::Any aRet;
++ String sMacro = docMacroExists( pShell, String(), sMacroName );
++ if ( sMacro.Len() > 0 )
+ {
-+ VbaWindowListener* pListener = new VbaWindowListener( this );
-+ pListener->startWindowLinstener();
-+ break;
++ executeWorkBookMacro( pShell, sMacro, rArgs, aRet );
+ }
-+ default:
-+ break;
+ }
+}
-+*/
+
+void ScVbaEventsHelper::WorkbookWindowMacro( const sal_Int32 nHint )
+{
+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
+ if( !pShell )
+ return;
-+ const static String sWindowActivate( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowActivate") );
-+ const static String sWindowDeactivate( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowDeactivate") );
++ uno::Sequence< uno::Any > aArgs(1);
++ uno::Any aElement = createWindow( pShell );
++ aArgs[0] = aElement;
+ switch( nHint )
+ {
-+ case SC_VBAEVENT_WORKBOOK_WINDOWACTIVATE:
-+ processWindowMacro( sWindowActivate );
++ case VBAEVENT_WORKBOOK_WINDOWACTIVATE:
++ case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
++ case VBAEVENT_WORKBOOK_WINDOWRESIZE:
++ // it will be called when close the doc. but should not launch the macro.
++ processVbaEventMacroWithArgs( nHint, aArgs );
+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWDEACTIVATE:
-+ // it will be called when close the doc. but will not launch the macro.
-+ processWindowMacro( sWindowDeactivate );
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWCOLSE:
-+ processWindowMacro( sWindowDeactivate );
-+ // does Doc be closed surely?
-+ processDocDeactivateMacroRun( pShell );
++ case VBAEVENT_WORKBOOK_WINDOWCOLSE:
++ // ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWDEACTIVATE, uno::Sequence< uno::Any >() );
++ // does Doc be closed surely? if yes. should frie the workbook deactivate event.
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_DEACTIVATE, uno::Sequence< uno::Any >() );
+ break;
-+ default:
++ default:
+ break;
+ }
+}
+
+sal_Bool ScVbaEventsHelper::processDocBeforeSaveMacro( sal_Bool bSaveAsUI )
+{
-+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
-+ if( !pShell )
-+ return sal_False;
-+
-+ uno::Any aRet;
+ uno::Sequence< uno::Any > aArgs( 2 );
+ sal_Bool bCancel = sal_False;
+ aArgs[ 0 ] <<= bSaveAsUI;
+ aArgs[ 1 ] <<= bCancel;
-+ const static String sBeforeClose( RTL_CONSTASCII_USTRINGPARAM("Workbook_BeforeSave") );
-+ String sFullClose = docMacroExists( pShell, String(), sBeforeClose );
-+ if ( sFullClose.Len() > 0 )
-+ {
-+ if ( !executeWorkBookMacro( pShell, sFullClose, aArgs, aRet ) )
-+ return sal_False;
-+ }
++ processVbaEventMacroWithArgs( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
+ aArgs[ 1 ] >>= bCancel;
+ return bCancel;
+}
+
-+sal_Bool ScVbaEventsHelper::processDocOpenMacro( SfxObjectShell* pShell )
++SCTAB
++ScVbaEventsHelper::getTabFromArgs( const uno::Sequence< uno::Any > aArgs, const sal_Int32 nPos )
+{
-+ sal_Bool result = sal_True;
-+ // no point adding a handler for unless it exists
-+ // probably worth just doing this on import of xl document
-+
-+
-+ // Urk due to async nature, re-enterency and other horrors of the load
-+ // process, its seems the most sensible thing is to hook into the
-+ // document event broadcaster
-+ const static rtl::OUString sOpenMacro( RTL_CONSTASCII_USTRINGPARAM("Workbook_Open") );
-+ const static rtl::OUString sAuto_OpenMacro( RTL_CONSTASCII_USTRINGPARAM("auto_open") );
-+ const static rtl::OUString sOnLoadEvt( RTL_CONSTASCII_USTRINGPARAM("OnLoad") );
++ SCTAB nTab = -1;
++ uno::Reference< sheet::XCellRangeAddressable > xCellRangeAddressable( getXSomethingFromArgs< sheet::XCellRangeAddressable >( aArgs, nPos ), uno::UNO_QUERY );
++ if( xCellRangeAddressable.is() )
++ {
++ table::CellRangeAddress aAddress = xCellRangeAddressable->getRangeAddress();
++ nTab = aAddress.Sheet;
++ }
++ return nTab;
++}
+
-+ // until ObjectModules ( and persisting of codename ) are supported if this is a
-+ // document saved from XL then we won't be able to determine the codename for the Workbook
-+ // Module, so... we have no choice but to search all modules for the moment
-+ //rtl::OUString workbookModule = getWorkbookModuleName( pShell );
-+ rtl::OUString workbookModule; // no name means all modules will be searched
-+ String sFullOpen = docMacroExists( pShell, workbookModule, sOpenMacro );
-+ if ( sFullOpen.Len() > 0 )
-+ {
-+ if ( !addDocEvent( pShell, sOnLoadEvt, sFullOpen ) )
-+ return sal_False;
-+ }
-+ // deep sigh, you can only specify one event binding not multiple ones, thats crap
-+/*
-+ String sFullAuto = docMacroExists( pShell, workbookModule, sAuto_OpenMacro );
-+ if ( sFullAuto.Len() > 0 )
-+ {
-+ if ( !addOpenDocEvent( xEvts, sFullAuto ) )
-+ return sal_False;
-+ }
-+*/
++#define INVALID_TAB -1
+
-+ return result;
-+}
-+sal_Bool ScVbaEventsHelper::processDocMacro()
++sal_Bool SAL_CALL
++ScVbaEventsHelper::ProcessCompatibleVbaEvent( sal_Int32 VbaEvent, const uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException)
+{
+ SfxObjectShell* pShell = pDoc->GetDocumentShell();
+ if( !pShell )
+ return sal_False;
-+ sal_Bool result = sal_True;
-+ if ( !processDocOpenMacro( pShell ) )
-+ result = sal_False;
-+ if( !processDocActivateMacro( pShell ) )
-+ result = sal_False;
-+ if( !processDocDeactivateMacro( pShell ) )
-+ result = sal_False;
-+
-+ return result;
-+}
-+sal_Bool SAL_CALL
-+ScVbaEventsHelper::ProcessWorkbookEvent( sal_Int32 VbaEvent, sal_Int32 nTab, uno::Sequence< uno::Any >& aArgs ) throw (uno::RuntimeException)
-+{
++
++ sal_Int32 nTab = INVALID_TAB;
++ uno::Sequence< uno::Any > aTmpArgs( aArgs );
+ switch( VbaEvent )
+ {
+ // Worksheet
-+ case SC_VBAEVENT_SHEET_ACTIVATE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_BEFOREDOUBLECLICK :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_BEFORERIGHTCLICK :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_CALCULATE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_CHANGE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_DEACTIVATE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_FOLLOWHYPERLINK :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_PIVOTTABLEUPDATE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
-+ case SC_VBAEVENT_SHEET_SELECTIONCHANGE :
-+ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aArgs );
-+ break;
++ case VBAEVENT_WORKSHEET_ACTIVATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ // recursive call related workbook sheet event.
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_ACTIVATE, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_BEFORERIGHTCLICK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_CALCULATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CALCULATE, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_CHANGE :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_CHANGE, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_DEACTIVATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_DEACTIVATE, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_FOLLOWHYPERLINK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK, aArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKSHEET_PIVOTTABLEUPDATE :
++ // TODO
++ break;
++ case VBAEVENT_WORKSHEET_SELECTIONCHANGE :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE, aArgs );
++ }
++ break;
++ }
++ // Workbook_sheet
++ case VBAEVENT_WORKBOOK_SHEET_ACTIVATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_BEFOREDOUBLECLICK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_BEFORERIGHTCLICK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_CALCULATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_CHANGE :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_DEACTIVATE :
++ {
++ if( aArgs[0] >>= nTab )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_FOLLOWHYPERLINK :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_SHEET_PIVOTTABLEUPDATE :
++ // TODO
++ break;
++ case VBAEVENT_WORKBOOK_SHEET_SELECTIONCHANGE :
++ {
++ nTab = getTabFromArgs( aTmpArgs, 0 );
++ if( nTab > INVALID_TAB )
++ {
++ executeSheetMacro( (USHORT)VbaEvent, (SCTAB)nTab, aTmpArgs );
++ }
++ break;
++ }
+ // Workbook
-+ case SC_VBAEVENT_WORKBOOK_ACTIVATE :
++ case VBAEVENT_WORKBOOK_ACTIVATE :
+ {
+ // if workbook open event do not be fired. fired it before
+ // workbook activate event to compatible with MSO.
+ if( !mbOpened )
+ {
-+ WorkbookOpen();
-+ mbOpened = sal_True;
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_OPEN, aArgs );
+ }
-+ WorkbookActivate();
++ processVbaEventMacro_noreturn( VBAEVENT_WORKBOOK_ACTIVATE );
+ // workbook window activate event same as this one
-+ WorkbookWindowMacro( SC_VBAEVENT_WORKBOOK_WINDOWACTIVATE );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWACTIVATE, aArgs );
++ break;
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_DEACTIVATE :
++ case VBAEVENT_WORKBOOK_DEACTIVATE :
+ {
-+ WorkbookDeactivate();
++ processVbaEventMacro_noreturn( VBAEVENT_WORKBOOK_DEACTIVATE );
+ // same as workbook window deactivate
-+ WorkbookWindowMacro( SC_VBAEVENT_WORKBOOK_WINDOWDEACTIVATE );
++ ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWDEACTIVATE, aArgs );
++ break;
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_OPEN :
++ case VBAEVENT_WORKBOOK_OPEN :
+ {
-+ //processDocMacro();
+ // process workbook open macro
+ // does auto open work here?
+ //WorkbookAutoOpen();
+ if( !mbOpened )
+ {
-+ WorkbookOpen();
++ processVbaEventMacro_noreturn( VBAEVENT_WORKBOOK_OPEN );
+ mbOpened = sal_True;
+ }
+ // register the window listener.
-+ //VbaWindowListener* pListener = new VbaWindowListener( this );
+ if( !mpWindowListener )
+ {
+ mpWindowListener = new VbaWindowListener( this );
+ mpWindowListener->startWindowLinstener();
+ }
++ break;
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_AUTOOPEN :
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_BEFORECLOSE :
++ case VBAEVENT_WORKBOOK_AUTOOPEN :
++ break;
++ case VBAEVENT_WORKBOOK_BEFORECLOSE :
+ {
-+ sal_Bool bCancel = processDocBeforeCloseMacro();
++ sal_Bool bCancel = processVbaEventWithCancel( VbaEvent );
+ if( mpWindowListener && !bCancel )
+ {
+ mpWindowListener->stopWindowLinstener();
@@ -1382,34 +1381,35 @@
+ }
+ return bCancel;
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_BEFOREPRINT :
++ case VBAEVENT_WORKBOOK_BEFOREPRINT :
+ {
-+ sal_Bool bCancel = processDocBeforePrintMacro();
-+ return bCancel;
++ return processVbaEventWithCancel( VbaEvent );
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_BEFORESAVE :
++ case VBAEVENT_WORKBOOK_BEFORESAVE :
+ {
+ sal_Bool bUISave = sal_Bool();
-+ if( aArgs[0] >>= bUISave )
++ if( aArgs.getLength() && ( aArgs[0] >>= bUISave ) )
+ return processDocBeforeSaveMacro( bUISave );
+ }
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_NEWSHEET :
-+ processDocNewSheet( nTab );
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWACTIVATE :
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWDEACTIVATE :
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWRESIZE :
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_WINDOWCOLSE :
++ case VBAEVENT_WORKBOOK_NEWSHEET :
++ {
++ SCTAB nTabNum;
++ if( aArgs.getLength() && ( aArgs[0] >>= nTabNum ) )
++ {
++ uno::Sequence< uno::Any > rArgs(1);
++ rArgs[0] = createWorkSheet( pShell, nTabNum );
++ processVbaEventMacroWithArgs( VBAEVENT_WORKBOOK_NEWSHEET, rArgs );
++ }
++ break;
++ }
++ case VBAEVENT_WORKBOOK_WINDOWACTIVATE :
++ case VBAEVENT_WORKBOOK_WINDOWDEACTIVATE :
++ case VBAEVENT_WORKBOOK_WINDOWRESIZE :
++ case VBAEVENT_WORKBOOK_WINDOWCOLSE :
+ WorkbookWindowMacro( VbaEvent );
-+ break;
-+ case SC_VBAEVENT_WORKBOOK_CLOSE :
-+ break;
++ break;
++ case VBAEVENT_WORKBOOK_CLOSE :
++ break;
+ default:
+ OSL_TRACE( "Invalid Event" );
+ }
@@ -1424,7 +1424,7 @@
+extern sdecl::ServiceDecl const serviceDecl(
+ serviceImpl,
+ "ScVbaEventsHelper",
-+ "org.openoffice.vba.VbaWorkbookEventsHelper" );
++ "com.sun.star.document.VbaEventsHelper" );
+}
--- sc/source/ui/vba/service.cxx.orig 2008-05-13 16:48:00.000000000 +0800
+++ sc/source/ui/vba/service.cxx 2008-05-13 22:54:36.000000000 +0800
@@ -1458,7 +1458,7 @@
return pRet;
}
--- sc/inc/document.hxx.orig 2008-05-07 12:06:10.000000000 +0800
-+++ sc/inc/document.hxx 2008-05-14 12:06:34.000000000 +0800
++++ sc/inc/document.hxx 2008-05-27 12:15:49.000000000 +0800
@@ -42,6 +42,7 @@
#include "brdcst.hxx"
#include "tabopparams.hxx"
@@ -1479,9 +1479,9 @@
}
} } }
-+namespace org { namespace openoffice { namespace vba {
-+ class XVBAWorkbookEventsHelper;
-+} } }
++namespace com { namespace sun { namespace star { namespace document {
++ class XVbaEventsHelper;
++} } } }
#include <svtools/zforlist.hxx>
/*
#ifdef _ZFORLIST_DECLARE_TABLE
@@ -1490,29 +1490,28 @@
Timer aTrackTimer;
+ //ScVbaEventsHelper* pVbaEventsHelper;
-+ com::sun::star::uno::Reference< org::openoffice::vba::XVBAWorkbookEventsHelper > rVbaEventsHelper;
++ com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > rVbaEventsHelper;
+
public:
ScTabOpList aTableOpList; // list of ScInterpreterTableOpParams currently in use
ScInterpreterTableOpParams aLastTableOpParams; // remember last params
-@@ -1717,6 +1725,9 @@ public:
+@@ -1717,6 +1725,8 @@ public:
void GetSortParam( ScSortParam& rParam, SCTAB nTab );
void SetSortParam( ScSortParam& rParam, SCTAB nTab );
-+ //ScVbaEventsHelper* GetVbaEventsHelper();
-+ com::sun::star::uno::Reference< org::openoffice::vba::XVBAWorkbookEventsHelper > GetVbaEventsHelper();
++ com::sun::star::uno::Reference< com::sun::star::document::XVbaEventsHelper > GetVbaEventsHelper();
+
/** Should only be GRAM_PODF or GRAM_ODFF. */
void SetStorageGrammar( ScGrammar::Grammar eGrammar );
ScGrammar::Grammar GetStorageGrammar() const
--- sc/source/core/data/documen2.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/core/data/documen2.cxx 2008-05-15 15:29:26.000000000 +0800
++++ sc/source/core/data/documen2.cxx 2008-05-27 12:40:39.000000000 +0800
@@ -93,6 +93,8 @@
#include "listenercalls.hxx"
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
+//#include "vbaeventshelper.hxx"
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
// pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
// dtor is convenient.
@@ -1537,13 +1536,13 @@
DBG_ASSERT( !pAutoNameCache, "AutoNameCache still set in dtor" );
}
-@@ -1857,3 +1866,27 @@ void ScDocument::RemoveLookupCache( ScLo
+@@ -1857,3 +1866,26 @@ void ScDocument::RemoveLookupCache( ScLo
EndListeningArea( pCache->getRange(), &rCache);
}
}
+
+using namespace com::sun::star;
-+uno::Reference< org::openoffice::vba::XVBAWorkbookEventsHelper >
++uno::Reference< document::XVbaEventsHelper >
+ScDocument::GetVbaEventsHelper()
+{
+ if( !rVbaEventsHelper.is() )
@@ -1554,10 +1553,9 @@
+ uno::Reference< frame::XModel > xModel( pShell->GetModel(), uno::UNO_QUERY );
+ uno::Sequence< uno::Any > aArgs(1);
+ aArgs[0] = uno::Any( xModel );
-+ uno::Reference< org::openoffice::vba::XVBAWorkbookEventsHelper > xVBAWorkbookEventsHelper( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("org.openoffice.vba.VbaWorkbookEventsHelper" ) ), aArgs ), uno::UNO_QUERY );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( xSF->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.VbaEventsHelper" ) ), aArgs ), uno::UNO_QUERY );
+ // helper will always be created successfully.
-+ // if( xVBAWorkbookEventsHelper.is() )
-+ rVbaEventsHelper.set( xVBAWorkbookEventsHelper, uno::UNO_QUERY );
++ rVbaEventsHelper.set( xVbaEventsHelper, uno::UNO_QUERY );
+ }
+ catch( uno::Exception& e )
+ {
@@ -1566,7 +1564,7 @@
+ return rVbaEventsHelper;
+}
--- sc/source/core/data/documen7.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/core/data/documen7.cxx 2008-05-14 12:31:56.000000000 +0800
++++ sc/source/core/data/documen7.cxx 2008-05-30 12:26:31.000000000 +0800
@@ -59,7 +59,16 @@
@@ -1576,11 +1574,11 @@
+#include <vector>
+
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++
+using namespace com::sun::star;
-+using namespace org::openoffice;
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++using namespace com::sun::star::document::VbaEventId;
extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround
// STATIC DATA -----------------------------------------------------------
@@ -1605,7 +1603,7 @@
pTrack = pTrack->GetNextTrack();
} while ( pTrack );
pTrack = pFormulaTrack;
-@@ -480,6 +496,14 @@ void ScDocument::TrackFormulas( ULONG nH
+@@ -480,6 +496,18 @@ void ScDocument::TrackFormulas( ULONG nH
else
SetForcedFormulaPending( TRUE );
}
@@ -1613,9 +1611,13 @@
+ ::std::vector<SCTAB>::iterator iter;
+ for( iter = aTabs.begin(); iter != aTabs.end(); iter++ )
+ {
-+ SCTAB nTab = *iter;
-+ uno::Sequence< uno::Any > aArgs;
-+ GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_CALCULATE, nTab, aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= *iter;
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CALCULATE, aArgs );
++ }
+ }
}
DBG_ASSERT( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" );
@@ -1635,92 +1637,111 @@
+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+ echo $@
--- sc/source/ui/docshell/docsh.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/docshell/docsh.cxx 2008-05-19 17:05:08.000000000 +0800
-@@ -131,6 +131,13 @@
++++ sc/source/ui/docshell/docsh.cxx 2008-05-30 15:56:49.000000000 +0800
+@@ -131,6 +131,14 @@
#include <rtl/logfile.hxx>
#include <comphelper/processfactory.hxx>
+#include "uiitems.hxx"
+//#include "vbaeventshelper.hxx"
+#include "cellsuno.hxx"
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
-+using namespace org::openoffice;
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
++
++using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
using namespace com::sun::star;
-@@ -754,6 +761,17 @@ void __EXPORT ScDocShell::Notify( SfxBro
- pAutoStyleList = new ScAutoStyleList(this);
- pAutoStyleList->AddInitial( aRange, aName1, nTimeout, aName2 );
- }
-+ else if (rHint.ISA(ScTablesHint) )
+@@ -719,9 +727,70 @@ BOOL __EXPORT ScDocShell::Load( SfxMediu
+ return bRet;
+ }
+
++void lcl_processCompatibleSfxHint( uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper, const SfxHint& rHint )
++{
++ if (rHint.ISA(ScTablesHint) )
+ {
+ USHORT nId = ((ScTablesHint&)rHint).GetId();
+ SCTAB nTab = ((ScTablesHint&)rHint).GetTab1();
-+ //aDocument.GetVbaEventsHelper()->processScTablesHint( nId, nTab );
+ if( nId == SC_TAB_INSERTED )
+ {
-+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_NEWSHEET, nTab, aArgs );
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= nTab;
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_NEWSHEET, aArgs );
+ }
+ }
- else if ( rHint.ISA( SfxEventHint ) )
- {
- ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
-@@ -940,6 +958,38 @@ void __EXPORT ScDocShell::Notify( SfxBro
- }
- }
- break;
++ else if ( rHint.ISA( SfxEventHint ) )
++ {
++ ULONG nEventId = ((SfxEventHint&)rHint).GetEventId();
++ switch ( nEventId )
++ {
+ case SFX_EVENT_ACTIVATEDOC:
+ {
+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_ACTIVATE, (sal_Int32)-1, aArgs );
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_ACTIVATE, aArgs );
+ }
+ break;
+ case SFX_EVENT_DEACTIVATEDOC:
+ {
+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_DEACTIVATE, (sal_Int32)-1, aArgs );
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_DEACTIVATE, aArgs );
+ }
+ break;
+ case SFX_EVENT_CLOSEDOC :
+ {
+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_CLOSE, (sal_Int32)-1, aArgs );
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_CLOSE, aArgs );
+ }
+ break;
+ case SFX_EVENT_CLOSEVIEW :
+ {
+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_WINDOWCOLSE, (sal_Int32)-1, aArgs );
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWCOLSE, aArgs );
+ }
+ break;
+ case SFX_EVENT_OPENDOC:
+ {
-+ //aDocument.GetVbaEventsHelper()->processSfxEventHint( (SfxEventHint&)rHint );
+ // some later than workbook activate.
+ uno::Sequence< uno::Any > aArgs;
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_OPEN, (sal_Int32)-1, aArgs );
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_OPEN, aArgs );
+ }
+ break;
- default:
- {
- }
-@@ -2246,6 +2296,12 @@ USHORT __EXPORT ScDocShell::PrepareClose
++ default:
++ {
++ }
++ break;
++ }
++ }
++}
+
+ void __EXPORT ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
+ {
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
++ if ( xVbaEventsHelper.is() )
++ {
++ lcl_processCompatibleSfxHint( xVbaEventsHelper, rHint );
++ }
+ if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
+ {
+ ULONG nSlot = ((const SfxSimpleHint&)rHint).GetId();
+@@ -2246,6 +2315,16 @@ USHORT __EXPORT ScDocShell::PrepareClose
DoEnterHandler();
+ // start handler for possible veto from DocBefore_Close
+ uno::Sequence< uno::Any > aArgs;
-+ if ( !IsInPrepareClose() && aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_BEFORECLOSE, (sal_Int32)-1, aArgs ) )
-+ return sal_False;
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
++ if ( xVbaEventsHelper.is() )
++ {
++ if ( !IsInPrepareClose() && xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORECLOSE, aArgs ) )
++ return sal_False;
++ }
+ // end handler code
+
USHORT nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
if (nRet == TRUE) // TRUE = schliessen
aDocument.DisableIdle(TRUE); // nicht mehr drin rumpfuschen !!!
-@@ -2455,6 +2511,43 @@ void ScDocShell::SetModified( BOOL bModi
+@@ -2455,6 +2534,43 @@ void ScDocShell::SetModified( BOOL bModi
}
}
@@ -1757,9 +1778,9 @@
+ uno::Sequence< uno::Any > aArgs(1);
+ aArgs[0] = uno::makeAny(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj)));
+
-+ SCTAB nTab = rRange.aStart.Tab();
-+ //aDocument.GetVbaEventsHelper()->executeSheetMacro( SC_VBAEVENT_SHEET_CHANGE, nTab, aArgs );
-+ aDocument.GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_CHANGE, nTab, aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( aDocument.GetVbaEventsHelper(), uno::UNO_QUERY );
++ if ( xVbaEventsHelper.is() )
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_CHANGE, aArgs );
+}
void ScDocShell::SetDocumentModified( BOOL bIsModified /* = TRUE */ )
@@ -1783,193 +1804,240 @@
void UpdatePaintExt( USHORT& rExtFlags, SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab,
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab );
---- sc/source/ui/undo/undoblk3.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/undo/undoblk3.cxx 2008-05-07 12:09:21.000000000 +0800
-@@ -112,6 +112,15 @@ ScUndoDeleteContents::ScUndoDeleteConten
- if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) ) // keine Zelle markiert:
- aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
+--- sc/source/ui/undo/undoblk3.cxx.orig 2008-05-30 17:56:31.000000000 +0800
++++ sc/source/ui/undo/undoblk3.cxx 2008-05-30 17:57:03.000000000 +0800
+@@ -79,7 +79,17 @@ TYPEINIT1(ScUndoInsertAreaLink, SfxUndo
+ TYPEINIT1(ScUndoRemoveAreaLink, SfxUndoAction);
+ TYPEINIT1(ScUndoUpdateAreaLink, SfxUndoAction);
-+ if (aMarkData.IsMarked() || aMarkData.IsMultiMarked())
+-
++void lcl_PostContentChanged( ScDocShell* pDocShell, const ScMarkData& rMark, const ScRange& rRange )
++{
++ if (rMark.IsMarked() || rMark.IsMultiMarked())
+ {
+ ScRangeList aList;
-+ aMarkData.FillRangeListWithMarks(&aList, false);
++ rMark.FillRangeListWithMarks(&aList, false);
+ pDocShell->PostContentChanged(aList);
+ }
+ else
-+ pDocShell->PostContentChanged( aRange );
-+
++ pDocShell->PostContentChanged( rRange );
++}
+ // To Do:
+ /*A*/ // SetOptimalHeight auf Dokument, wenn keine View
+
+@@ -113,6 +123,8 @@ ScUndoDeleteContents::ScUndoDeleteConten
+ aMarkData.SetMarkArea( aRange ); // Zelle unter Cursor markieren
+
SetChangeTrack();
++
++ lcl_PostContentChanged( pDocShell, aMarkData, aRange );
}
-@@ -202,6 +211,15 @@ void ScUndoDeleteContents::DoChange( con
- if (pViewShell)
- pViewShell->CellContentChanged();
-+ if (aMarkData.IsMarked() || aMarkData.IsMultiMarked())
-+ {
-+ ScRangeList aList;
-+ aMarkData.FillRangeListWithMarks(&aList, false);
-+ pDocShell->PostContentChanged(aList);
-+ }
-+ else
-+ pDocShell->PostContentChanged( aRange );
-+
- ShowTable( aRange );
+@@ -213,6 +225,7 @@ void __EXPORT ScUndoDeleteContents::Undo
+ BeginUndo();
+ DoChange( TRUE );
+ EndUndo();
++ lcl_PostContentChanged( pDocShell, aMarkData, aRange );
+ }
+
+
+@@ -223,6 +236,7 @@ void __EXPORT ScUndoDeleteContents::Redo
+ BeginRedo();
+ DoChange( FALSE );
+ EndRedo();
++ lcl_PostContentChanged( pDocShell, aMarkData, aRange );
}
---- sc/source/ui/undo/undoblk.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/undo/undoblk.cxx 2008-05-07 12:09:21.000000000 +0800
-@@ -124,6 +124,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
- aEffRange.aEnd.SetRow(MAXROW);
+
+--- sc/source/ui/undo/undoblk.cxx.orig 2008-05-30 17:56:23.000000000 +0800
++++ sc/source/ui/undo/undoblk.cxx 2008-05-30 17:57:03.000000000 +0800
+@@ -125,6 +125,7 @@ ScUndoInsertCells::ScUndoInsertCells( Sc
}
-+ pDocShell->PostContentChanged( aEffRange );
SetChangeTrack();
++ pDocShell->PostContentChanged( aEffRange );
}
-@@ -259,6 +260,7 @@ void ScUndoInsertCells::DoChange( const
- if (pViewShell)
- pViewShell->CellContentChanged();
-
+ __EXPORT ScUndoInsertCells::~ScUndoInsertCells()
+@@ -271,6 +272,7 @@ void __EXPORT ScUndoInsertCells::Undo()
+ BeginUndo();
+ DoChange( TRUE );
+ EndUndo();
+ pDocShell->PostContentChanged( aEffRange );
- ShowTable( aEffRange.aStart.Tab() );
}
-@@ -332,6 +334,8 @@ ScUndoDeleteCells::ScUndoDeleteCells( Sc
- aEffRange.aEnd.SetRow(MAXROW);
+ void __EXPORT ScUndoInsertCells::Redo()
+@@ -279,6 +281,7 @@ void __EXPORT ScUndoInsertCells::Redo()
+ BeginRedo();
+ DoChange( FALSE );
+ EndRedo();
++ pDocShell->PostContentChanged( aEffRange );
+
+ if ( pPasteUndo )
+ pPasteUndo->Redo(); // redo paste last
+@@ -333,6 +336,7 @@ ScUndoDeleteCells::ScUndoDeleteCells( Sc
}
-+ pDocShell->PostContentChanged( aEffRange );
-+
SetChangeTrack();
++ pDocShell->PostContentChanged( aEffRange );
}
-@@ -464,6 +468,7 @@ void ScUndoDeleteCells::DoChange( const
+ __EXPORT ScUndoDeleteCells::~ScUndoDeleteCells()
+@@ -474,6 +478,7 @@ void __EXPORT ScUndoDeleteCells::Undo()
+ BeginUndo();
+ DoChange( TRUE );
+ EndUndo();
++ pDocShell->PostContentChanged( aEffRange );
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
- pDocShell->PostDataChanged();
- // CellContentChanged kommt mit der Markierung
-+ pDocShell->PostContentChanged( aWorkRange );
+ // Markierung erst nach EndUndo
+@@ -488,6 +493,7 @@ void __EXPORT ScUndoDeleteCells::Redo()
+ BeginRedo();
+ DoChange( FALSE);
+ EndRedo();
++ pDocShell->PostContentChanged( aEffRange );
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
- ShowTable( aEffRange.aStart.Tab() );
- }
-@@ -713,6 +718,7 @@ ScUndoCut::ScUndoCut( ScDocShell* pNewDo
- pUndoDoc( pNewUndoDoc ),
+ ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
+@@ -714,6 +720,7 @@ ScUndoCut::ScUndoCut( ScDocShell* pNewDo
aExtendedRange( aRange )
{
-+ pDocShell->PostContentChanged( aExtendedRange );
SetChangeTrack();
++ pDocShell->PostContentChanged( aExtendedRange );
}
-@@ -771,6 +777,7 @@ void ScUndoCut::DoChange( const BOOL bUn
- pDocShell->PostDataChanged();
- if (pViewShell)
- pViewShell->CellContentChanged();
+ __EXPORT ScUndoCut::~ScUndoCut()
+@@ -778,6 +785,7 @@ void __EXPORT ScUndoCut::Undo()
+ BeginUndo();
+ DoChange( TRUE );
+ EndUndo();
+ pDocShell->PostContentChanged( aExtendedRange );
}
- void __EXPORT ScUndoCut::Undo()
-@@ -837,6 +844,7 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pN
+ void __EXPORT ScUndoCut::Redo()
+@@ -788,6 +796,7 @@ void __EXPORT ScUndoCut::Redo()
+ DoChange( FALSE );
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EndRedo();
++ pDocShell->PostContentChanged( aExtendedRange );
+ }
- if ( pOptions )
+ void __EXPORT ScUndoCut::Repeat(SfxRepeatTarget& rTarget)
+@@ -839,6 +848,7 @@ ScUndoPaste::ScUndoPaste( ScDocShell* pN
aPasteOptions = *pOptions; // used only for Repeat
-+ pDocShell->PostContentChanged( aBlockRange );
SetChangeTrack();
++ pDocShell->PostContentChanged( aBlockRange );
+ }
+
+ __EXPORT ScUndoPaste::~ScUndoPaste()
+@@ -1020,6 +1030,7 @@ void __EXPORT ScUndoPaste::Undo()
+ DoChange( TRUE );
+ ShowTable( aBlockRange );
+ EndUndo();
++ pDocShell->PostContentChanged( aBlockRange );
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
}
-@@ -1012,6 +1020,7 @@ void ScUndoPaste::DoChange( const BOOL b
- pDocShell->PostDataChanged();
- if (pViewShell)
- pViewShell->CellContentChanged();
-+ pDocShell->PostContentChanged( aDrawRange );
+
+@@ -1031,6 +1042,7 @@ void __EXPORT ScUndoPaste::Redo()
+ DoChange( FALSE );
+ EnableDrawAdjust( pDoc, TRUE ); //! include in ScBlockUndo?
+ EndRedo();
++ pDocShell->PostContentChanged( aBlockRange );
+ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );
}
- void __EXPORT ScUndoPaste::Undo()
---- sc/source/ui/undo/undocell.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/undo/undocell.cxx 2008-05-07 12:09:21.000000000 +0800
-@@ -213,6 +213,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
- nTab( nNewTab ),
+--- sc/source/ui/undo/undocell.cxx.orig 2008-05-30 17:56:08.000000000 +0800
++++ sc/source/ui/undo/undocell.cxx 2008-05-30 17:57:03.000000000 +0800
+@@ -214,6 +214,7 @@ ScUndoEnterData::ScUndoEnterData( ScDocS
nCount( nNewCount )
{
-+ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
SetChangeTrack();
++ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
}
-@@ -249,6 +250,7 @@ void ScUndoEnterData::DoChange() const
- pViewShell->MoveCursorAbs( nCol, nRow, SC_FOLLOW_JUMP, FALSE, FALSE );
- }
+ __EXPORT ScUndoEnterData::~ScUndoEnterData()
+@@ -319,6 +320,7 @@ void __EXPORT ScUndoEnterData::Undo()
+ DoChange();
+ EndUndo();
+ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
- pDocShell->PostDataChanged();
}
-@@ -370,6 +372,7 @@ ScUndoEnterValue::ScUndoEnterValue( ScDo
- nValue ( nVal ),
+ void __EXPORT ScUndoEnterData::Redo()
+@@ -340,6 +342,7 @@ void __EXPORT ScUndoEnterData::Redo()
+
+ DoChange();
+ EndRedo();
++ pDocShell->PostContentChanged( ScRange( ScAddress( nCol, nRow, nTab ) ) );
+ }
+
+ void __EXPORT ScUndoEnterData::Repeat(SfxRepeatTarget& rTarget)
+@@ -371,6 +374,7 @@ ScUndoEnterValue::ScUndoEnterValue( ScDo
bNeedHeight ( bHeight )
{
-+ pDocShell->PostContentChanged( ScRange( aPos ) );
SetChangeTrack();
++ pDocShell->PostContentChanged( ScRange( aPos ) );
}
-@@ -420,6 +423,8 @@ void __EXPORT ScUndoEnterValue::Undo()
-
- pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
-
-+ pDocShell->PostContentChanged( ScRange( aPos ) );
-+
- ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
- if ( pChangeTrack )
+ __EXPORT ScUndoEnterValue::~ScUndoEnterValue()
+@@ -425,6 +429,7 @@ void __EXPORT ScUndoEnterValue::Undo()
pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
-@@ -435,6 +440,8 @@ void __EXPORT ScUndoEnterValue::Redo()
- pDoc->SetValue( aPos.Col(), aPos.Row(), aPos.Tab(), nValue );
- pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
+ EndUndo();
+ pDocShell->PostContentChanged( ScRange( aPos ) );
-+
+ }
+
+ void __EXPORT ScUndoEnterValue::Redo()
+@@ -438,6 +443,7 @@ void __EXPORT ScUndoEnterValue::Redo()
SetChangeTrack();
EndRedo();
-@@ -464,6 +471,7 @@ ScUndoPutCell::ScUndoPutCell( ScDocShell
- pEnteredCell( pRedoCell ),
++ pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
+
+ void __EXPORT ScUndoEnterValue::Repeat(SfxRepeatTarget& /* rTarget */)
+@@ -465,6 +471,7 @@ ScUndoPutCell::ScUndoPutCell( ScDocShell
bNeedHeight ( bHeight )
{
-+ pDocShell->PostContentChanged( ScRange( aPos ) );
SetChangeTrack();
++ pDocShell->PostContentChanged( ScRange( aPos ) );
}
-@@ -516,6 +524,8 @@ void __EXPORT ScUndoPutCell::Undo()
-
- pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
-
-+ pDocShell->PostContentChanged( ScRange( aPos ) );
-+
- ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack();
- if ( pChangeTrack )
+ __EXPORT ScUndoPutCell::~ScUndoPutCell()
+@@ -521,6 +528,7 @@ void __EXPORT ScUndoPutCell::Undo()
pChangeTrack->Undo( nEndChangeAction, nEndChangeAction );
-@@ -546,6 +556,8 @@ void __EXPORT ScUndoPutCell::Redo()
-
- pDocShell->PostPaintCell( aPos.Col(), aPos.Row(), aPos.Tab() );
+ EndUndo();
+ pDocShell->PostContentChanged( ScRange( aPos ) );
-+
+ }
+
+ void __EXPORT ScUndoPutCell::Redo()
+@@ -549,6 +557,7 @@ void __EXPORT ScUndoPutCell::Redo()
SetChangeTrack();
EndRedo();
++ pDocShell->PostContentChanged( ScRange( aPos ) );
+ }
+
+ void __EXPORT ScUndoPutCell::Repeat(SfxRepeatTarget& /* rTarget */)
--- sc/source/ui/unoobj/viewuno.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/unoobj/viewuno.cxx 2008-05-14 16:19:28.000000000 +0800
-@@ -71,6 +71,12 @@
++++ sc/source/ui/unoobj/viewuno.cxx 2008-05-30 16:07:06.000000000 +0800
+@@ -71,8 +71,12 @@
#include "gridwin.hxx"
#include <com/sun/star/view/DocumentZoomType.hpp>
#include "AccessibilityHints.hxx"
+#include <com/sun/star/awt/MouseButton.hpp>
-+//#include "vbaeventshelper.hxx"
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
-+using namespace org::openoffice;
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
-@@ -480,7 +486,6 @@ ScTabViewObj::ScTabViewObj( ScTabViewShe
+ //------------------------------------------------------------------------
+
+@@ -480,7 +484,6 @@ ScTabViewObj::ScTabViewObj( ScTabViewShe
aActivationListeners( 0 ),
bDrawSelModeSet(sal_False)
{
@@ -1977,16 +2045,20 @@
}
ScTabViewObj::~ScTabViewObj()
-@@ -1206,36 +1211,64 @@ sal_Bool ScTabViewObj::MousePressed( con
+@@ -1206,36 +1209,67 @@ sal_Bool ScTabViewObj::MousePressed( con
{
sal_Bool bReturn(sal_False);
- if (aMouseClickHandlers.Count())
+- {
+- uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y));
+ uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y));
-+
+
+- if (xTarget.is())
+- {
+- awt::EnhancedMouseEvent aMouseEvent;
+ if (xTarget.is())
- {
-- uno::Reference< uno::XInterface > xTarget = GetClickedObject(Point(e.X, e.Y));
++ {
+ // Handle BeforeDoubleClick and BeforeRightClick events
+ uno::Reference<table::XCell> xCell( xTarget, uno::UNO_QUERY );
+ if( xCell.is() )
@@ -1999,28 +2071,22 @@
+ {
+ if( e.ClickCount == 2 || e.Buttons == ::com::sun::star::awt::MouseButton::RIGHT )
+ {
-+ uno::Sequence< uno::Any > aArgs(2);
-+ sal_Bool bCancel = sal_False;
-+ aArgs[0] = getSelection();
-+ aArgs[1] <<= bCancel;
-+
-+ USHORT nEvent = SC_VBAEVENT_SHEET_BEFORERIGHTCLICK;
-+ if( e.ClickCount == 2 )
-+ nEvent = SC_VBAEVENT_SHEET_BEFOREDOUBLECLICK;
-
-- if (xTarget.is())
-- {
-- awt::EnhancedMouseEvent aMouseEvent;
-+ pViewData->GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( nEvent, pViewData->GetTabNo(), aArgs );
-
-- aMouseEvent.Buttons = e.Buttons;
-- aMouseEvent.X = e.X;
-- aMouseEvent.Y = e.Y;
-- aMouseEvent.ClickCount = e.ClickCount;
-- aMouseEvent.PopupTrigger = e.PopupTrigger;
-- aMouseEvent.Target = xTarget;
-+ // TODO... handle the cancel argument
-+ aArgs[1] >>= bCancel;
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ {
++ uno::Sequence< uno::Any > aArgs(2);
++ sal_Bool bCancel = sal_False;
++ aArgs[0] = getSelection();
++ aArgs[1] <<= bCancel;
++
++ USHORT nEvent = VBAEVENT_WORKSHEET_BEFORERIGHTCLICK;
++ if( e.ClickCount == 2 )
++ nEvent = VBAEVENT_WORKSHEET_BEFOREDOUBLECLICK;
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( nEvent, aArgs );
++
++ // TODO... handle the cancel argument
++ aArgs[1] >>= bCancel;
++ }
+ }
+ }
+ }
@@ -2028,14 +2094,20 @@
+
+ awt::EnhancedMouseEvent aMouseEvent;
-- for ( USHORT n=0; n<aMouseClickHandlers.Count(); n++ )
+- aMouseEvent.Buttons = e.Buttons;
+- aMouseEvent.X = e.X;
+- aMouseEvent.Y = e.Y;
+- aMouseEvent.ClickCount = e.ClickCount;
+- aMouseEvent.PopupTrigger = e.PopupTrigger;
+- aMouseEvent.Target = xTarget;
+ aMouseEvent.Buttons = e.Buttons;
+ aMouseEvent.X = e.X;
+ aMouseEvent.Y = e.Y;
+ aMouseEvent.ClickCount = e.ClickCount;
+ aMouseEvent.PopupTrigger = e.PopupTrigger;
+ aMouseEvent.Target = xTarget;
-+
+
+- for ( USHORT n=0; n<aMouseClickHandlers.Count(); n++ )
+ for ( USHORT n=0; n<aMouseClickHandlers.Count(); n++ )
+ {
+ try
@@ -2064,7 +2136,7 @@
return bReturn;
}
-@@ -1709,6 +1742,18 @@ void SAL_CALL ScTabViewObj::removeSelect
+@@ -1709,6 +1743,22 @@ void SAL_CALL ScTabViewObj::removeSelect
void ScTabViewObj::SelectionChanged()
{
@@ -2074,9 +2146,13 @@
+ ScViewData* pViewData = pViewSh->GetViewData();
+ if ( pViewData )
+ {
-+ uno::Sequence< uno::Any > aArgs(1);
-+ aArgs[0] = getSelection();
-+ pViewData->GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_SELECTIONCHANGE, pViewData->GetTabNo(), aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] = getSelection();
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_SELECTIONCHANGE, aArgs );
++ }
+ }
+ }
+
@@ -2084,29 +2160,29 @@
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
for ( USHORT n=0; n<aSelectionListeners.Count(); n++ )
--- sc/source/ui/unoobj/docuno.cxx.orig 2008-05-19 10:34:38.000000000 +0800
-+++ sc/source/ui/unoobj/docuno.cxx 2008-05-19 16:32:43.000000000 +0800
-@@ -92,6 +92,12 @@
++++ sc/source/ui/unoobj/docuno.cxx 2008-05-27 21:57:27.000000000 +0800
+@@ -92,7 +92,12 @@
#include "rangeutl.hxx"
#include "ViewSettingsSequenceDefines.hxx"
+#define BEFORE 0
+#define AFTER 1
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
-+using namespace org::openoffice;
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
//------------------------------------------------------------------------
-@@ -329,6 +335,7 @@ uno::Any SAL_CALL ScModelObj::queryInter
+
+@@ -329,6 +334,7 @@ uno::Any SAL_CALL ScModelObj::queryInter
SC_QUERYINTERFACE( document::XLinkTargetSupplier )
SC_QUERYINTERFACE( beans::XPropertySet )
SC_QUERYINTERFACE( document::XCodeNameQuery )
-+ SC_QUERYINTERFACE( document::XVbaEventHelper)
++ SC_QUERYINTERFACE( document::XDocumentEventCompatibleHelper)
SC_QUERYINTERFACE( lang::XMultiServiceFactory )
SC_QUERYINTERFACE( lang::XServiceInfo )
-@@ -1730,6 +1737,48 @@ ScModelObj::getCodeNameForObject( const
+@@ -1730,6 +1736,52 @@ ScModelObj::getCodeNameForObject( const
// Probably should throw here ( if !bMatched )
return sCodeName;
}
@@ -2114,54 +2190,58 @@
+// For Vba Event
+// status, 0 before, 1 done...
+sal_Bool SAL_CALL
-+ScModelObj::processVbaEvent( sal_Int16 nStatus, sal_Int16 nSlotId ) throw( ::com::sun::star::uno::RuntimeException )
++ScModelObj::processCompatibleEvent( sal_Int16 nStatus, sal_Int16 nSlotId ) throw( ::com::sun::star::uno::RuntimeException )
+{
+ USHORT nId = nSlotId;
-+ switch( nId )
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper( GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
+ {
-+ case SID_SAVEDOC:
++ switch( nId )
+ {
-+ if( nStatus == BEFORE )
++ case SID_SAVEDOC:
+ {
-+ uno::Sequence< uno::Any > aArgs(1);
-+ aArgs[0] <<= sal_False;
-+ return GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_BEFORESAVE, -1L, aArgs );
++ if( nStatus == BEFORE )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= sal_False;
++ return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
++ }
++ break;
+ }
-+ break;
-+ }
-+ case SID_SAVEASDOC:
-+ {
-+ if( nStatus == BEFORE )
++ case SID_SAVEASDOC:
+ {
-+ uno::Sequence< uno::Any > aArgs(1);
-+ aArgs[0] <<= sal_True;
-+ return GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_BEFORESAVE, (sal_Int32)-1, aArgs );
++ if( nStatus == BEFORE )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= sal_True;
++ return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFORESAVE, aArgs );
++ }
++ break;
+ }
-+ break;
-+ }
-+ case SID_PRINTDOC:
-+ case SID_PRINTDOCDIRECT:
-+ {
-+ if( nStatus == BEFORE )
++ case SID_PRINTDOC:
++ case SID_PRINTDOCDIRECT:
+ {
-+ uno::Sequence< uno::Any > aArgs;
-+ return GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_WORKBOOK_BEFOREPRINT, (sal_Int32)-1, aArgs );
++ if( nStatus == BEFORE )
++ {
++ uno::Sequence< uno::Any > aArgs;
++ return xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_BEFOREPRINT, aArgs );
++ }
++ break;
+ }
-+ break;
+ }
++ return sal_False;
+ }
-+ return sal_False;
+}
// XServiceInfo
rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
--- sc/inc/docuno.hxx.orig 2008-05-19 15:34:55.000000000 +0800
-+++ sc/inc/docuno.hxx 2008-05-19 15:47:20.000000000 +0800
++++ sc/inc/docuno.hxx 2008-05-27 15:29:50.000000000 +0800
@@ -55,6 +55,7 @@
#include <com/sun/star/sheet/XSheetAnnotations.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XCellRangesAccess.hpp>
-+#include <com/sun/star/document/XVbaEventHelper.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
@@ -2169,7 +2249,7 @@
public com::sun::star::document::XLinkTargetSupplier,
public com::sun::star::beans::XPropertySet,
public com::sun::star::document::XCodeNameQuery,
-+ public com::sun::star::document::XVbaEventHelper,
++ public com::sun::star::document::XDocumentEventCompatibleHelper,
public SvxFmMSFactory, // derived from XMultiServiceFactory
public com::sun::star::lang::XServiceInfo
{
@@ -2178,26 +2258,27 @@
virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
throw(::com::sun::star::uno::RuntimeException);
+ // XVbaEventHelper
-+ virtual sal_Bool SAL_CALL processVbaEvent( sal_Int16 nStatus, sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nStatus, sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
};
--- sc/source/ui/view/gridwin.cxx.orig 2008-05-07 12:06:10.000000000 +0800
-+++ sc/source/ui/view/gridwin.cxx 2008-05-14 12:10:39.000000000 +0800
-@@ -149,6 +149,13 @@
++++ sc/source/ui/view/gridwin.cxx 2008-05-30 16:11:00.000000000 +0800
+@@ -149,7 +149,14 @@
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <vcl/svapp.hxx>
+//#include "vbaeventshelper.hxx"
+#include "cellsuno.hxx"
+
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
+
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
using namespace com::sun::star;
++using namespace com::sun::star::document::VbaEventId;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
+
@@ -398,6 +405,32 @@ void lcl_UnLockComment( SdrView* pView,
}
@@ -2239,7 +2320,7 @@
ClickExtern(); // loescht FilterBox, wenn vorhanden
-@@ -2122,6 +2156,24 @@ void __EXPORT ScGridWindow::MouseButtonU
+@@ -2122,6 +2156,26 @@ void __EXPORT ScGridWindow::MouseButtonU
{
nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen
ScGlobal::OpenURL( aUrl, aTarget );
@@ -2259,12 +2340,14 @@
+ ScCellObj* pObj = new ScCellObj( pViewData->GetDocShell(), aCellPos );
+ uno::Sequence< uno::Any > aArgs(1);
+ aArgs[0] = uno::makeAny(uno::Reference<uno::XInterface>(static_cast<cppu::OWeakObject*>(pObj)));
-+ pViewData->GetDocument()->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_FOLLOWHYPERLINK, pViewData->GetTabNo(), aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pViewData->GetDocument()->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_FOLLOWHYPERLINK, aArgs );
+ }
return;
}
}
-@@ -2441,13 +2493,13 @@ long ScGridWindow::PreNotify( NotifyEven
+@@ -2441,13 +2495,13 @@ long ScGridWindow::PreNotify( NotifyEven
if (xController.is())
{
ScTabViewObj* pImp = ScTabViewObj::getImplementation( xController );
@@ -2280,7 +2363,7 @@
pImp->MousePressed( aEvent );
else
pImp->MouseReleased( aEvent );
-@@ -4857,26 +4909,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
+@@ -4857,26 +4911,9 @@ BOOL ScGridWindow::GetEditUrlOrError( BO
ScDocument* pDoc = pDocSh->GetDocument();
ScBaseCell* pCell = NULL;
@@ -2311,7 +2394,7 @@
ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed)
--- sc/source/ui/view/tabview3.cxx.orig 2008-05-07 12:09:09.000000000 +0800
-+++ sc/source/ui/view/tabview3.cxx 2008-05-14 12:07:38.000000000 +0800
++++ sc/source/ui/view/tabview3.cxx 2008-05-28 16:32:00.000000000 +0800
@@ -80,8 +80,13 @@
#include "rangeutl.hxx"
#include "client.hxx"
@@ -2319,27 +2402,32 @@
+//#include "vbaeventshelper.hxx"
#include <com/sun/star/chart2/data/HighlightedRange.hpp>
-+#include <org/openoffice/vba/XVBAWorkbookEventsHelper.hpp>
-+#include <org/openoffice/vba/VBAWorkbookEvent.hpp>
++#include <com/sun/star/document/XVbaEventsHelper.hpp>
++#include <com/sun/star/document/VbaEventId.hpp>
+
-+using namespace org::openoffice::vba::VBAWorkbookEvent;
++using namespace com::sun::star::document::VbaEventId;
namespace
{
-@@ -1684,6 +1689,12 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
+@@ -1684,6 +1689,17 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
// nicht InputEnterHandler wegen Referenzeingabe !
ScDocument* pDoc = aViewData.GetDocument();
+ if( !bNew )
+ {
-+ uno::Sequence< uno::Any > aArgs;
-+ pDoc->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_DEACTIVATE, aViewData.GetTabNo(), aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= aViewData.GetTabNo();
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_DEACTIVATE, aArgs );
++ }
+ }
+
pDoc->MakeTable( nTab );
SCTAB nTabCount = pDoc->GetTableCount();
-@@ -1782,7 +1793,13 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
+@@ -1782,7 +1798,18 @@ void ScTabView::SetTabNo( SCTAB nTab, BO
if ( pGridWin[i]->IsVisible() )
pGridWin[i]->UpdateEditViewPos();
}
@@ -2347,8 +2435,13 @@
+
+ if( !bNew )
+ {
-+ uno::Sequence< uno::Any > aArgs;
-+ pDoc->GetVbaEventsHelper()->ProcessWorkbookEvent( SC_VBAEVENT_SHEET_ACTIVATE, aViewData.GetTabNo(), aArgs );
++ uno::Reference< document::XVbaEventsHelper > xVbaEventsHelper ( pDoc->GetVbaEventsHelper(), uno::UNO_QUERY );
++ if( xVbaEventsHelper.is() )
++ {
++ uno::Sequence< uno::Any > aArgs(1);
++ aArgs[0] <<= aViewData.GetTabNo();
++ xVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKSHEET_ACTIVATE, aArgs );
++ }
+ }
+
TabChanged(); // DrawView
@@ -2364,62 +2457,6 @@
$(SLO)$/service.obj \
---- sc/source/ui/view/makefile.mk.orig 2008-05-13 11:46:02.000000000 +0800
-+++ sc/source/ui/view/makefile.mk 2008-05-13 11:47:14.000000000 +0800
-@@ -165,3 +165,11 @@ EXCEPTIONSFILES= \
-
- .INCLUDE : target.mk
-
-+ALLTAR : \
-+ $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+ echo $@
---- sc/source/core/data/makefile.mk.orig 2008-05-13 13:38:43.000000000 +0800
-+++ sc/source/core/data/makefile.mk 2008-05-13 13:42:43.000000000 +0800
-@@ -161,3 +161,11 @@ EXCEPTIONSFILES+= \
-
- .INCLUDE : target.mk
-
-+ALLTAR : \
-+ $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+ echo $@
---- sc/source/ui/docshell/makefile.mk.orig 2008-05-14 12:52:06.000000000 +0800
-+++ sc/source/ui/docshell/makefile.mk 2008-05-14 12:52:15.000000000 +0800
-@@ -136,3 +136,11 @@ LIB1OBJFILES = \
-
- .INCLUDE : target.mk
-
-+ALLTAR : \
-+ $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+ echo $@
---- sc/source/ui/unoobj/makefile.mk.orig 2008-05-14 16:15:34.000000000 +0800
-+++ sc/source/ui/unoobj/makefile.mk 2008-05-14 16:16:46.000000000 +0800
-@@ -113,3 +113,11 @@ NOOPTFILES= \
-
- .INCLUDE : target.mk
-
-+ALLTAR : \
-+ $(MISC)$/$(TARGET).don \
-+
-+$(SLOFILES) : $(MISC)$/$(TARGET).don
-+
-+$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-+ +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-+ echo $@
--- sfx2/inc/sfx2/objsh.hxx.orig 2008-05-07 12:09:29.000000000 +0800
+++ sfx2/inc/sfx2/objsh.hxx 2008-05-16 16:04:06.000000000 +0800
@@ -267,9 +267,6 @@ public:
@@ -2494,7 +2531,7 @@
//-------------------------------------------------------------------------
--- sfx2/source/doc/objserv.cxx.orig 2008-05-07 12:06:10.000000000 +0800
-+++ sfx2/source/doc/objserv.cxx 2008-05-19 16:22:07.000000000 +0800
++++ sfx2/source/doc/objserv.cxx 2008-05-29 20:02:09.000000000 +0800
@@ -28,6 +28,8 @@
*
************************************************************************/
@@ -2508,7 +2545,7 @@
#include <com/sun/star/document/XDocumentInfo.hpp>
#include <com/sun/star/document/XDocumentInfoSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XVbaEventHelper.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
#ifndef _SFX_HELPID_HRC
#include "helpid.hrc"
@@ -2518,10 +2555,10 @@
{
+ if( nId == SID_SAVEDOC || nId == SID_SAVEASDOC )
+ {
-+ uno::Reference< document::XVbaEventHelper > xVbaEventHelper( GetModel(), uno::UNO_QUERY );
++ uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( GetModel(), uno::UNO_QUERY );
+ if( xVbaEventHelper.is() )
+ {
-+ if( xVbaEventHelper->processVbaEvent( BEFORE, nId ) )
++ if( xVbaEventHelper->processCompatibleEvent( BEFORE, nId ) )
+ {
+ rReq.SetReturnValue( SfxBoolItem( 0, sal_True ) );
+ return;
@@ -2532,7 +2569,7 @@
SfxObjectShellRef xLock( this );
--- sfx2/source/view/viewprn.cxx.orig 2008-05-07 12:06:10.000000000 +0800
-+++ sfx2/source/view/viewprn.cxx 2008-05-19 16:19:58.000000000 +0800
++++ sfx2/source/view/viewprn.cxx 2008-05-27 15:31:06.000000000 +0800
@@ -28,10 +28,12 @@
*
************************************************************************/
@@ -2542,7 +2579,7 @@
#include "precompiled_sfx2.hxx"
#include <com/sun/star/document/XDocumentProperties.hpp>
-+#include <com/sun/star/document/XVbaEventHelper.hpp>
++#include <com/sun/star/document/XDocumentEventCompatibleHelper.hpp>
#include <com/sun/star/view/PrintableState.hpp>
#include <svtools/itempool.hxx>
#ifndef _MSGBOX_HXX //autogen
@@ -2564,10 +2601,10 @@
+ SfxObjectShell* pDoc = GetObjectShell();
+ if( pDoc )
+ {
-+ uno::Reference< document::XVbaEventHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
++ uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
+ if( xVbaEventHelper.is() )
+ {
-+ if( xVbaEventHelper->processVbaEvent( BEFORE, nId ) )
++ if( xVbaEventHelper->processCompatibleEvent( BEFORE, nId ) )
+ {
+ rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+ return;
@@ -2582,10 +2619,10 @@
if ( SID_PRINTDOCDIRECT == nId )
{
SfxObjectShell* pDoc = GetObjectShell();
-+ uno::Reference< document::XVbaEventHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
++ uno::Reference< document::XDocumentEventCompatibleHelper > xVbaEventHelper( pDoc->GetModel(), uno::UNO_QUERY );
+ if( xVbaEventHelper.is() )
+ {
-+ if( xVbaEventHelper->processVbaEvent( BEFORE, nId ) )
++ if( xVbaEventHelper->processCompatibleEvent( BEFORE, nId ) )
+ {
+ rReq.SetReturnValue(SfxBoolItem(0,FALSE));
+ return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
