diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
| commit | a3a19632f413a6fe8dee97f02d637e7197869b50 (patch) | |
| tree | b8a01b5b560e18bdb007ec5ff2fafd50a3c508a9 /stoc/source/corereflection/base.hxx | |
| parent | 999dce7d69e20561c3f39476e074043838eb7514 (diff) | |
| parent | 793a9a799346aebbf0a50d8d4f15081d9032d57c (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
bridges/source/remote/urp/urp_environment.cxx
bridges/source/remote/urp/urp_propertyobject.cxx
bridges/source/remote/urp/urp_reader.cxx
remotebridges/source/factory/bridgefactory.cxx
stoc/source/corereflection/crefl.cxx
stoc/source/javavm/javavm.cxx
stoc/source/simpleregistry/simpleregistry.cxx
Diffstat (limited to 'stoc/source/corereflection/base.hxx')
| -rw-r--r-- | stoc/source/corereflection/base.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 76ebee6d42ac..580b5b40c703 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -54,9 +54,6 @@ #include <com/sun/star/reflection/XIdlField2.hpp> #include <com/sun/star/reflection/XIdlMethod.hpp> -#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) - - using namespace std; using namespace osl; using namespace cppu; |