summaryrefslogtreecommitdiff
path: root/extensions/test/ole
diff options
context:
space:
mode:
authorJoachim Lingner <jl@openoffice.org>2001-06-27 09:59:56 +0000
committerJoachim Lingner <jl@openoffice.org>2001-06-27 09:59:56 +0000
commit01b4c2b82f6cf5530f87617829059baf4a18971b (patch)
treecef03bd58e40a4d341a72314243426d423882e13 /extensions/test/ole
parent51e6e0ac8fb5e40cee19f423638be1059a0a9d37 (diff)
*** empty log message ***
Diffstat (limited to 'extensions/test/ole')
-rw-r--r--extensions/test/ole/AxTestComponents/StdAfx.h7
-rw-r--r--extensions/test/ole/OleClient/clientTest.cxx35
2 files changed, 30 insertions, 12 deletions
diff --git a/extensions/test/ole/AxTestComponents/StdAfx.h b/extensions/test/ole/AxTestComponents/StdAfx.h
index 3bfa08622668..cc0d30341938 100644
--- a/extensions/test/ole/AxTestComponents/StdAfx.h
+++ b/extensions/test/ole/AxTestComponents/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:55 $
+ * last change: $Author: jl $ $Date: 2001-06-27 10:59:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -80,6 +80,9 @@
//something, but do not change the name of _Module
extern CComModule _Module;
#include <atlcom.h>
+#include <stdio.h>
+#include <tchar.h>
+#include <string.h>
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 03d1c1c4ef66..2c53e29b52a5 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.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: jl $ $Date: 2000-10-16 12:48:37 $
+ * last change: $Author: jl $ $Date: 2001-06-27 10:59:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,14 +59,6 @@
*
************************************************************************/
-#include <windows.h>
-#include <comdef.h>
-#include <tchar.h>
-#include <atlbase.h>
-extern CComModule _Module;
-#include<atlcom.h>
-#include<atlimpl.cpp>
-
#include <com/sun/star/bridge/ModelDependent.hpp>
#include <com/sun/star/bridge/XBridgeSupplier2.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -78,6 +70,29 @@ extern CComModule _Module;
#include <rtl/string.h>
#pragma hdrstop
+
+//#include <windows.h>
+#include <comdef.h>
+//#include <tchar.h>
+#include <windef.h>
+#include <atlbase.h>
+
+// actually defined in windef.h but after altbase.h it is undefined
+// it is used in atlcom.h
+#ifndef max
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
+#ifndef min
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+
+extern CComModule _Module;
+
+
+#include<atlcom.h>
+#include<atlimpl.cpp>
+
#include "axhost.hxx"
CComModule _Module;