diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 16:13:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-23 16:13:28 +0000 |
| commit | ef921c5da3068970f9640cba4a322bf49f5dce8f (patch) | |
| tree | cf03dbfde1c1c0defead6229fde30b35205af248 /extensions | |
| parent | 625d05091cd79bc36c715675629713b6f4439ca9 (diff) | |
INTEGRATION: CWS uno2 (1.9.64); FILE MERGED
2003/04/02 10:05:42 jl 1.9.64.1: #108553#
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/test/ole/cpnt/cpnt.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 6cc691384979..c2cef5016c48 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.9 $ + * $Revision: 1.10 $ * - * last change: $Author: jl $ $Date: 2002-09-13 06:37:46 $ + * last change: $Author: rt $ $Date: 2003-04-23 17:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,9 @@ #include <osl/diagnose.h> #include <uno/environment.h> #include <cppuhelper/factory.hxx> +// OPTIONAL is a constant in com.sun.star.beans.PropertyAttributes but it must be +// undef'd in some header files +#define OPTIONAL OPTIONAL #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> @@ -99,6 +102,7 @@ using namespace com::sun::star::registry; using namespace com::sun::star::script; using namespace com::sun::star::reflection; + #define IMPL_NAME L"oletest.OleTestImpl" // oletest.OleTestImpl in applicat.rdb #define SERVICE_NAME L"oletest.OleTest" #define KEY1 L"/oletest.OleTestImpl/UNO/SERVICES" |