summaryrefslogtreecommitdiff
path: root/extensions/test/ole
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2001-12-06 13:51:58 +0000
committerJoachim Lingner <jl@openoffice.org>2001-12-06 13:51:58 +0000
commit6ba351a7485d0fec9dde4b02529f8b4befd7783f (patch)
treeb38a113afa35b5c38d239aa2e60fcb15f80ca084 /extensions/test/ole
parentbf2e363ba4dbd8f573cbeecccd1833f22384485b (diff)
*** empty log message ***
Diffstat (limited to 'extensions/test/ole')
-rw-r--r--extensions/test/ole/EventListenerSample/VBEventListener/VBasicEventListener.vbw2
-rw-r--r--extensions/test/ole/OleClient/axhost.hxx8
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx30
-rw-r--r--extensions/test/ole/OleClient/makefile.mk13
-rw-r--r--extensions/test/ole/OleClient/readme.txt7
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp6
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h5
-rw-r--r--extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.dsp2
8 files changed, 36 insertions, 37 deletions
diff --git a/extensions/test/ole/EventListenerSample/VBEventListener/VBasicEventListener.vbw b/extensions/test/ole/EventListenerSample/VBEventListener/VBasicEventListener.vbw
index c209db6d6ccc..3fad49ae422f 100644
--- a/extensions/test/ole/EventListenerSample/VBEventListener/VBasicEventListener.vbw
+++ b/extensions/test/ole/EventListenerSample/VBEventListener/VBasicEventListener.vbw
@@ -1,2 +1,2 @@
-VBEventListener = 81, -23, 822, 733,
+VBEventListener = 74, 32, 815, 788, Z
Module1 = 169, 194, 954, 691,
diff --git a/extensions/test/ole/OleClient/axhost.hxx b/extensions/test/ole/OleClient/axhost.hxx
index c52a2b66d307..c62ff19deb02 100644
--- a/extensions/test/ole/OleClient/axhost.hxx
+++ b/extensions/test/ole/OleClient/axhost.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: axhost.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: jl $ $Date: 2000-10-13 15:35:00 $
+ * last change: $Author: jl $ $Date: 2001-12-06 14:46:47 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,7 +64,7 @@
#include <atlbase.h>
extern CComModule _Module;
-#include <atlwin.h>
+//#include <atlwin.h>
#include <atlcom.h>
#include <atlhost.h>
@@ -90,4 +90,4 @@ public:
LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
};
-#endif \ No newline at end of file
+#endif
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 668554311dfc..a84c6da48cd9 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: clientTest.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: hr $ $Date: 2001-10-12 15:36:42 $
+ * last change: $Author: jl $ $Date: 2001-12-06 14:46:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,6 +59,13 @@
*
************************************************************************/
+#include <atlbase.h>
+
+CComModule _Module;
+#include<atlcom.h>
+#include <comdef.h>
+
+#include "axhost.hxx"
#include <com/sun/star/bridge/ModelDependent.hpp>
#include <com/sun/star/bridge/XBridgeSupplier2.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -68,24 +75,7 @@
#include <com/sun/star/uno/Reference.h>
#include <cppuhelper/servicefactory.hxx>
#include <rtl/string.h>
-#pragma hdrstop
-
-
-//#include <windows.h>
-#include <comdef.h>
-//#include <tchar.h>
-#include <windef.h>
-#include <atlbase.h>
-
-extern CComModule _Module;
-
-#include<atlcom.h>
-#include<atlimpl.cpp>
-
-#include "axhost.hxx"
-
-CComModule _Module;
BEGIN_OBJECT_MAP(ObjectMap)
END_OBJECT_MAP()
@@ -109,7 +99,7 @@ void printSequence( Sequence<Any>& val);
Reference< XMultiServiceFactory > objectFactory;// OleObjectFactory;
-int __cdecl _tmain( int argc, _TCHAR * argv[] )
+int __cdecl main( int argc, char * argv[] )
{
HRESULT hr;
if( FAILED( hr=CoInitialize(NULL)))
diff --git a/extensions/test/ole/OleClient/makefile.mk b/extensions/test/ole/OleClient/makefile.mk
index 7aecca1545e1..ee04fd56c5f5 100644
--- a/extensions/test/ole/OleClient/makefile.mk
+++ b/extensions/test/ole/OleClient/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: jl $ $Date: 2000-10-13 15:29:06 $
+# last change: $Author: jl $ $Date: 2001-12-06 14:46:11 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -91,7 +91,8 @@ INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl
UNOTYPES= com.sun.star.bridge.XBridgeSupplier2 \
com.sun.star.lang.XMultiServiceFactory \
com.sun.star.script.XInvocation \
- oletest.XCallback
+ oletest.XCallback \
+ oletest.XSimple
@@ -100,8 +101,10 @@ UNOTYPES= com.sun.star.bridge.XBridgeSupplier2 \
.ENDIF # depend
APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJ)$/clientTest.obj \
- $(OBJ)$/axhost.obj
+APP1OBJS=
+
+#$(OBJ)$/clientTest.obj \
+# $(OBJ)$/axhost.obj
LIBCMT=msvcrtd.lib
diff --git a/extensions/test/ole/OleClient/readme.txt b/extensions/test/ole/OleClient/readme.txt
index 09830859428c..26052775c982 100644
--- a/extensions/test/ole/OleClient/readme.txt
+++ b/extensions/test/ole/OleClient/readme.txt
@@ -6,4 +6,9 @@ Requirements:
applicat.rdb has to be next to the executable.
COM component: XCallback_Impl.Simple ( extensions/test/ole/unotocomcalls/XCallback_Impl )
ActiveX controls: AxTestComponent.Basic ( extensions/test/ole/AxTestComponents)
- MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl) \ No newline at end of file
+ MFCCONTROL.MfcControlCtrl.1 (extensions/test/ole/MfcControl)
+
+The project cannot be build in our environment therefore it must be an MSDEV project.
+Reason: ATL uses min and max macros defined in windef.h. Our stl header undef min and max.
+To generate the uno header use the make file. Then Set the include path directories to
+the inc directory in the build tree. \ No newline at end of file
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/Callback.cpp
index f3e926a58d60..e6c388b10546 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.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jl $ $Date: 2000-10-20 15:41:01 $
+ * last change: $Author: jl $ $Date: 2001-12-06 14:49:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -104,7 +104,7 @@ STDMETHODIMP CCallback::outValuesMixed(long val, long *pval, BSTR string)
char buff[1024];
*pval = val+1;
sprintf( buff, "param1: %d, param2 out: %d, param3: %S", val, *pval, string);
- MessageBox( NULL, buff, A2T("XCallback_Impl.Callback"), MB_OK);
+ MessageBox( NULL, A2T(buff), A2T("XCallback_Impl.Callback"), MB_OK);
return S_OK;
}
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
index 7d6946580cdc..56fe586883e4 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/StdAfx.h
@@ -2,9 +2,9 @@
*
* $RCSfile: StdAfx.h,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: 2001-12-06 14:49:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -82,6 +82,7 @@
extern CComModule _Module;
#include <atlcom.h>
#include <stdio.h>
+#include <tchar.h>
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.dsp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.dsp
index 871b32942b26..327068251f28 100644
--- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.dsp
+++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.dsp
@@ -228,7 +228,7 @@ SOURCE="$(InputPath)"
# PROP Intermediate_Dir "ReleaseUMinDependency"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
+# ADD CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /Yu"stdafx.h" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe