ooo-build r15195 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 04:49:10 2009
New Revision: 15195
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15195&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/vba/api-application-caller-m39.diff:
	* patches/vba/api-application-caller.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/vba/api-application-caller-m39.diff   (props changed)
      - copied unchanged from r15184, /trunk/patches/vba/api-application-caller.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/api-application-caller.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 04:49:10 2009
@@ -1961,7 +1961,11 @@
 # used for the control in the binary format
 sc-vbaimport-override-controlname.diff, n#359933, noelpwer
 
+[ VBAObjects <= dev300-m39 ]
+# Application.Caller
+api-application-caller-m39.diff, n#339941, noelpwer
 
+[ VBAObjects > dev300-m39 ]
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
 

Modified: trunk/patches/vba/api-application-caller.diff
==============================================================================
--- trunk/patches/vba/api-application-caller.diff	(original)
+++ trunk/patches/vba/api-application-caller.diff	Wed Jan 28 04:49:10 2009
@@ -1,6 +1,8 @@
---- oovbaapi/ooo/vba/excel/XApplication.idl	2007-12-07 11:21:12.000000000 +0000
-+++ oovbaapi/ooo/vba/excel/XApplication.idl	2008-01-11 12:10:02.000000000 +0000
-@@ -103,6 +103,7 @@ interface XApplication
+diff --git oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XApplication.idl
+index 8b0bde9..82533a5 100644
+--- oovbaapi/ooo/vba/excel/XApplication.idl
++++ oovbaapi/ooo/vba/excel/XApplication.idl
+@@ -110,6 +110,7 @@ interface XApplication
          raises(com::sun::star::script::BasicErrorException);
  	void Volatile([in] any Volatile);
  	void DoEvents();
@@ -8,51 +10,54 @@
  };
  
  }; }; };
---- sc/source/ui/vba/vbaapplication.hxx	2007-12-07 10:43:17.000000000 +0000
-+++ sc/source/ui/vba/vbaapplication.hxx	2008-01-11 12:14:50.000000000 +0000
-@@ -105,6 +105,7 @@ public:
- 	virtual css::uno::Reference< oo::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< oo::excel::XRange >& Arg1, const css::uno::Reference< oo::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorEx
 ception, css::uno::RuntimeException);
+diff --git sc/source/ui/vba/vbaapplication.cxx sc/source/ui/vba/vbaapplication.cxx
+index 431090c..c554faa 100644
+--- sc/source/ui/vba/vbaapplication.cxx
++++ sc/source/ui/vba/vbaapplication.cxx
+@@ -110,6 +110,8 @@ using ::rtl::OUString;
+ 
+ #define EXCELVERSION "11.0"
+ 
++uno::Any sbxToUnoValue( SbxVariable* pVar );
++
+ class ActiveWorkbook : public ScVbaWorkbook
+ {
+ protected:
+@@ -1302,6 +1304,25 @@ ScVbaApplication::setDisplayFormulaBar( ::sal_Bool _displayformulabar ) throw (
+ 	}	
+ }
+ 
++uno::Any SAL_CALL 
++ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
++{
++	StarBASIC* pBasic = SFX_APP()->GetBasic();
++	SFX_APP()->EnterBasicCall();
++	SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
++	uno::Any aRet;	
++	if ( pMeth )
++	{
++		SbxVariableRef refTemp = pMeth;
++		// forces a broadcast
++		SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
++                OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() );
++		aRet = sbxToUnoValue( pNew );
++	}
++	SFX_APP()->LeaveBasicCall();
++	return aRet;
++}
++
+ rtl::OUString& 
+ ScVbaApplication::getServiceImplName()
+ {
+diff --git sc/source/ui/vba/vbaapplication.hxx sc/source/ui/vba/vbaapplication.hxx
+index 1c2631e..754885e 100644
+--- sc/source/ui/vba/vbaapplication.hxx
++++ sc/source/ui/vba/vbaapplication.hxx
+@@ -103,6 +103,7 @@ public:
+ 	virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorExcept
 ion, css::uno::RuntimeException);
  	virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException );
  	virtual void SAL_CALL DoEvents() throw (css::uno::RuntimeException);
 +	virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException);
  	// XHelperInterface
  	virtual rtl::OUString& getServiceImplName();
  	virtual css::uno::Sequence<rtl::OUString> getServiceNames();
---- sc/source/ui/vba/vbaapplication.cxx	2007-12-07 10:43:04.000000000 +0000
-+++ sc/source/ui/vba/vbaapplication.cxx	2008-01-11 12:34:20.000000000 +0000
-@@ -95,6 +95,8 @@ using namespace ::com::sun::star;
- 
- #define EXCELVERSION "11.0"
- 
-+uno::Any sbxToUnoValue( SbxVariable* pVar );
-+
- class ActiveWorkbook : public ScVbaWorkbook
- {
- protected:
-@@ -904,6 +906,26 @@ ScVbaApplication::setDisplayFormulaBar( 
- 	}	
- }
- 
-+
-+uno::Any SAL_CALL 
-+ScVbaApplication::Caller( const uno::Any& /*aIndex*/ ) throw ( uno::RuntimeException )
-+{
-+	StarBASIC* pBasic = SFX_APP()->GetBasic();
-+	SFX_APP()->EnterBasicCall();
-+	SbMethod* pMeth = (SbMethod*)pBasic->GetRtl()->Find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("FuncCaller") ), SbxCLASS_METHOD );
-+	uno::Any aRet;	
-+	if ( pMeth )
-+	{
-+		SbxVariableRef refTemp = pMeth;
-+		// forces a broadcast
-+		SbxVariableRef pNew = new  SbxMethod( *((SbxMethod*)pMeth));
-+                OSL_TRACE("pNew has type %d and string value %s", pNew->GetType(), rtl::OUStringToOString( pNew->GetString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-+		aRet = sbxToUnoValue( pNew );
-+	}
-+	SFX_APP()->LeaveBasicCall();
-+	return aRet;
-+}
-+
- rtl::OUString& 
- ScVbaApplication::getServiceImplName()
- {