ooo-build r12747 - trunk/patches/test/vba

[jiaojh svn gnome org]

Author: jiaojh
Date: Mon Jun  2 05:09:21 2008
New Revision: 12747
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12747&view=rev

Log:
clear something


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 05:09:21 2008
@@ -263,7 +263,7 @@
  
  # ------------------------------------------------------------------
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.hxx	2008-05-30 17:14:57.000000000 +0800
++++ sc/source/ui/vba/vbaeventshelper.hxx	2008-06-02 13:03:05.000000000 +0800
 @@ -0,0 +1,92 @@
 +/*************************************************************************
 + *
@@ -328,7 +328,7 @@
 +    sal_Bool mbOpened;
 +
 +	String getSheetModuleName( SCTAB nTab );
-+	String docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
++	String workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro );
 +
 +	uno::Any createWorkSheet( SfxObjectShell* pShell, SCTAB nTab );
 +	uno::Any createRange( const uno::Any& aRange );
@@ -358,8 +358,8 @@
 +#endif
 +
 --- /dev/null	2007-05-04 18:54:36.000000000 +0800
-+++ sc/source/ui/vba/vbaeventshelper.cxx	2008-05-30 19:07:54.000000000 +0800
-@@ -0,0 +1,1066 @@
++++ sc/source/ui/vba/vbaeventshelper.cxx	2008-06-02 13:03:14.000000000 +0800
+@@ -0,0 +1,1063 @@
 +/*************************************************************************
 + *
 + *  OpenOffice.org - a multi-platform office productivity suite
@@ -432,7 +432,6 @@
 +using namespace com::sun::star::document::VbaEventId;
 +
 +const static String sLibrary( RTL_CONSTASCII_USTRINGPARAM("Standard"));
-+const static String sModule( RTL_CONSTASCII_USTRINGPARAM("ThisWorkbook"));
 +
 +const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
 +const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "vnd.sun.star.script:Standard.");
@@ -475,10 +474,9 @@
 +    {
 +        if( pVbaEventsHelper )
 +        {
-+            uno::Reference< frame::XModel > xModel( m_xModel, uno::UNO_QUERY );
-+            if( xModel.is() )
++            if( m_xModel.is() )
 +            {
-+                uno::Reference< frame::XController > xController( xModel->getCurrentController(), uno::UNO_QUERY );
++                uno::Reference< frame::XController > xController( m_xModel->getCurrentController(), uno::UNO_QUERY );
 +                if( xController.is() )
 +                {
 +                    uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY );
@@ -531,7 +529,6 @@
 +void
 +VbaWindowListener::processWindowResizeMacro()
 +{
-+    const static String sWindowResize( RTL_CONSTASCII_USTRINGPARAM("Workbook_WindowResize") );
 +    if( pVbaEventsHelper )
 +        pVbaEventsHelper->ProcessCompatibleVbaEvent( VBAEVENT_WORKBOOK_WINDOWRESIZE, uno::Sequence< uno::Any >() );
 +}
@@ -730,7 +727,7 @@
 +	}
 +	return sal_True;
 +}
-+String ScVbaEventsHelper::docMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
++String ScVbaEventsHelper::workbookMacroExists( SfxObjectShell* pShell, const String& sMod, const String& sMacro )
 +{
 +	String sFullName;	
 +	// would use the script provider to see if the macro exists but
@@ -916,7 +913,7 @@
 +    	case VBAEVENT_WORKSHEET_SELECTIONCHANGE               :
 +        {
 +            rtl::OUString  aSheetModuleName = getSheetModuleName( nTab );
-+            sMacroPath = docMacroExists( pShell, aSheetModuleName, sMacroName );
++            sMacroPath = workbookMacroExists( pShell, aSheetModuleName, sMacroName );
 +            break;
 +        }
 +        // Workbook
@@ -949,12 +946,12 @@
 +            {
 +                ScExtDocSettings aExtDocSettings = pExtOptions->GetDocSettings();
 +                String sWorkbookModuleName = aExtDocSettings.maGlobCodeName;
-+                sMacroPath = docMacroExists( pShell, sWorkbookModuleName, sMacroName );
++                sMacroPath = workbookMacroExists( pShell, sWorkbookModuleName, sMacroName );
 +            }
 +            else
 +            {
 +                // TODO need this?
-+                sMacroPath = docMacroExists( pShell, rtl::OUString(), sMacroName );
++                sMacroPath = workbookMacroExists( pShell, rtl::OUString(), sMacroName );
 +            }
 +            break;
 +        }
@@ -1104,7 +1101,7 @@
 +    if( sMacroName.Len() > 0 )
 +    {
 +        uno::Any aRet;
-+        String sMacro = docMacroExists( pShell, String(), sMacroName );
++        String sMacro = workbookMacroExists( pShell, String(), sMacroName );
 +        if ( sMacro.Len() > 0 )
 +        {
 +            executeWorkBookMacro( pShell, sMacro, rArgs, aRet );