From f834e4cdc608ab4bc46849fc6fe71c7df552bc5b Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Fri, 20 Oct 2000 14:42:00 +0000 Subject: *** empty log message *** --- extensions/test/ole/MfcControl/MfcControl.dsp | 8 ++++---- extensions/test/ole/callUnoToJava.htm | 22 ++++++++++++++++++++++ extensions/test/ole/cpnt/cpnt.cxx | 12 ++++++++++-- extensions/test/ole/idl/oletest.idl | 8 ++++++-- .../ole/unoTocomCalls/XCallback_Impl/Callback.cpp | 12 ++++++------ 5 files changed, 48 insertions(+), 14 deletions(-) (limited to 'extensions/test/ole') diff --git a/extensions/test/ole/MfcControl/MfcControl.dsp b/extensions/test/ole/MfcControl/MfcControl.dsp index 191f7ea1bace..8ecca0731a54 100644 --- a/extensions/test/ole/MfcControl/MfcControl.dsp +++ b/extensions/test/ole/MfcControl/MfcControl.dsp @@ -83,8 +83,8 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "Debug" # PROP Target_Ext "ocx" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" @@ -121,8 +121,8 @@ SOURCE="$(InputPath)" # PROP Intermediate_Dir "DebugU" # PROP Target_Ext "ocx" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm index c5ceabf152ce..fdc690d7ebfb 100644 --- a/extensions/test/ole/callUnoToJava.htm +++ b/extensions/test/ole/callUnoToJava.htm @@ -121,6 +121,16 @@ function callOleTest( id) oletest.testInterface( new XCallback_Impl, 200); break; + // Call a COM object that has not been passed as parameter to a UNO component and + // hence no type information are available in the COM wrapper +// case 300: + //################################################## + // Attributes + //################################################## + case 400: + oletest.testInterface( new XCallback_Impl, 400); + break; + case 1000: oletest.testInterface2(new MultiInterface(), 0); break; @@ -180,6 +190,12 @@ function XCallback_Impl() //################################################## this.inValues= XCallback_Impl_inValues; + // ################################################# + // Attributes + //################################################## + this.simple= new XSimple_Impl(); + + } @@ -501,6 +517,10 @@ Other test with out parameters

+

Attributes

+ +
+ Other tests with inout parameters

in parameters

@@ -510,6 +530,8 @@ Other tests with inout parameters
+ + diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index a3801b421dcb..081cf0b9ff74 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cpnt.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jl $ $Date: 2000-10-19 11:17:03 $ + * last change: $Author: jl $ $Date: 2000-10-20 15:40:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1517,6 +1517,14 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac break; } + // ############################################################################ + // Attributes + // ############################################################################ + + case 400: + Reference simple= xCallback->getsimple(); + simple->func(L"OleTest calls on XSimple"); + break; diff --git a/extensions/test/ole/idl/oletest.idl b/extensions/test/ole/idl/oletest.idl index 5e72e9e84c2f..9481d4023b40 100644 --- a/extensions/test/ole/idl/oletest.idl +++ b/extensions/test/ole/idl/oletest.idl @@ -2,9 +2,9 @@ * * $RCSfile: oletest.idl,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hjs $ $Date: 2000-09-18 23:52:13 $ + * last change: $Author: jl $ $Date: 2000-10-20 15:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -282,6 +282,10 @@ interface XCallback: com::sun::star::uno::XInterface void inValues( [in] char aChar, [in] long aLong, [in] string aString); void inSeqByte( [in] sequence val); + // Attributes + [attribute] oletest::XSimple simple; + + }; diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp index 28cd6b56a737..f3e926a58d60 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp @@ -2,9 +2,9 @@ * * $RCSfile: Callback.cpp,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:16:56 $ + * last change: $Author: jl $ $Date: 2000-10-20 15:41:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,11 +100,11 @@ STDMETHODIMP CCallback::outInterface(IDispatch **ppdisp) STDMETHODIMP CCallback::outValuesMixed(long val, long *pval, BSTR string) { - - TCHAR buff[1024]; + USES_CONVERSION; + char buff[1024]; *pval = val+1; - wsprintf( buff, _T("param1: %d, param2 out: %d, param3: %s"), val, *pval, string); - MessageBox( NULL, buff, _T(""), MB_OK); + sprintf( buff, "param1: %d, param2 out: %d, param3: %S", val, *pval, string); + MessageBox( NULL, buff, A2T("XCallback_Impl.Callback"), MB_OK); return S_OK; } -- cgit v1.2.3