User: vg Date: 2007/03/26 06:59:04 Modified: dba/connectivity/source/drivers/ado/Aolevariant.cxx
Log: INTEGRATION: CWS mingwport03 (1.12.60); FILE MERGED 2006/11/07 12:32:34 vg 1.12.60.3: RESYNC: (1.12-1.13); FILE MERGED 2006/10/25 12:11:36 vg 1.12.60.2: #i53572# MinGW port 2006/09/07 10:22:04 vg 1.12.60.1: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: Aolevariant.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Aolevariant.cxx?r1=1.13&r2=1.14 Delta lines: +11 -8 -------------------- --- Aolevariant.cxx 17 Sep 2006 02:17:08 -0000 1.13 +++ Aolevariant.cxx 26 Mar 2007 13:59:01 -0000 1.14 @@ -69,7 +69,7 @@ } OLEString::OLEString(const ::rtl::OUString& _sBStr) { - m_sStr = ::SysAllocString(_sBStr); + m_sStr = ::SysAllocString(reinterpret_cast<LPCOLESTR>(_sBStr.getStr())); } OLEString::~OLEString() { @@ -80,7 +80,7 @@ { if(m_sStr) ::SysFreeString(m_sStr); - m_sStr = ::SysAllocString(_rSrc); + m_sStr = ::SysAllocString(reinterpret_cast<LPCOLESTR>(_rSrc.getStr())); return *this; } OLEString& OLEString::operator=(const OLEString& _rSrc) @@ -102,7 +102,7 @@ } OLEString::operator ::rtl::OUString() const { - return (m_sStr != NULL) ? ::rtl::OUString(m_sStr,::SysStringLen(m_sStr)) : ::rtl::OUString(); + return (m_sStr != NULL) ? ::rtl::OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : ::rtl::OUString(); } OLEString::operator BSTR() const { @@ -146,7 +146,7 @@ { ::VariantInit(this); vt = VT_BSTR; - bstrVal = SysAllocString(us); + bstrVal = SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } OLEVariant::~OLEVariant() { @@ -321,7 +321,7 @@ OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); OSL_UNUSED(eRet); vt = VT_BSTR; - bstrVal = ::SysAllocString(us); + bstrVal = ::SysAllocString(reinterpret_cast<LPCOLESTR>(us.getStr())); } void OLEVariant::setNoArg() { @@ -427,7 +427,7 @@ OLEVariant::operator rtl::OUString() const { if (V_VT(this) == VT_BSTR) - return V_BSTR(this); + return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(this))); if(isNull()) return ::rtl::OUString(); @@ -436,7 +436,7 @@ varDest.ChangeType(VT_BSTR, this); - return V_BSTR(&varDest); + return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(&varDest))); } // ----------------------------------------------------------------------------- @@ -512,7 +512,10 @@ // ----------------------------------------------------------------------------- ::rtl::OUString OLEVariant::getString() const { - return isNull() ? ::rtl::OUString() : (rtl::OUString)*this; + if(isNull()) + return ::rtl::OUString(); + else + return *this; } // ----------------------------------------------------------------------------- sal_Bool OLEVariant::getBool() const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
