diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:09:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:09:15 +0000 |
| commit | 7f038d0ded50568759304916b4e9dbd1ed2e1488 (patch) | |
| tree | 172dfaba8623f43c2b5988163260175686591f4e /extensions/source/ole | |
| parent | cf03a13f856a4c1503f80d6b4cb93672f267e218 (diff) | |
INTEGRATION: CWS mingwport03 (1.3.188); FILE MERGED
2006/11/07 17:59:07 vg 1.3.188.3: RESYNC: (1.3-1.4); FILE MERGED
2006/10/23 16:21:13 vg 1.3.188.2: #i53572# MinGW port
2006/09/06 14:08:45 vg 1.3.188.1: #i53572# MinGW port
Diffstat (limited to 'extensions/source/ole')
| -rw-r--r-- | extensions/source/ole/unotypewrapper.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx index de05ba9165b9..70eb1e9581be 100644 --- a/extensions/source/ole/unotypewrapper.cxx +++ b/extensions/source/ole/unotypewrapper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unotypewrapper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 13:05:31 $ + * last change: $Author: vg $ $Date: 2007-03-26 13:09:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,9 +49,17 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) { pObj->AddRef(); pVar->vt= VT_DISPATCH; +#ifdef __MINGW32__ + pVar->pdispVal= CComQIPtr<IDispatch, &__uuidof(IDispatch)>(pObj->GetUnknown()); +#else pVar->pdispVal= CComQIPtr<IDispatch>(pObj->GetUnknown()); +#endif //now set the value, e.i. the name of the type +#ifdef __MINGW32__ + CComQIPtr<IUnoTypeWrapper, &__uuidof(IUnoTypeWrapper)> spType(pVar->pdispVal); +#else CComQIPtr<IUnoTypeWrapper> spType(pVar->pdispVal); +#endif OSL_ASSERT(spType); if (SUCCEEDED(spType->put_Name(sTypeName))) { @@ -64,7 +72,7 @@ bool createUnoTypeWrapper(BSTR sTypeName, VARIANT * pVar) bool createUnoTypeWrapper(const rtl::OUString& sTypeName, VARIANT * pVar) { - CComBSTR bstr(sTypeName.getStr()); + CComBSTR bstr(reinterpret_cast<LPCOLESTR>(sTypeName.getStr())); return createUnoTypeWrapper(bstr, pVar); } |