Move BSTR wrapper to systools, and fix some wrong BSTR uses

BSTR is documented [1] to be prefixed by a 32-bit integer specifying
its length *in bytes* (not characters), so passing wchar_t* as BSTR
is wrong, and the length member of rtl_uString can't substitute the
proper BSTR length, since rtl_uString::length specifies length in
characters. Any code taking BSTR and using SysStringLen to get its
length would only get half of the passed OUString data.

In dbaccess/source/ui/dlg/adodatalinks.cxx, the abovementioned
error was implemented. OTOH, OLEVariant::getByteSequence() in
connectivity/source/drivers/ado/Aolevariant.cxx passed BSTR from
tagVARIANT to ctor of OLEString, which resulted in the BSTR being
freed in both dtors of OLEString and OLEVariant (the latter calls
VariantClear, which itself clears string when vtfield is VT_BSTR).

[1] https://docs.microsoft.com/en-us/previous-versions/windows/desktop/automat/bstr

Change-Id: Iedbd62b20133644258af3660616add7b63cac258
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131950
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

10 files changed, 131 insertions, 198 deletions

diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index c393d6a4dc3e..0287ee9e050f 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
+#include <systools/win32/oleauto.hxx>
 #include <strings.hrc>
 
 using namespace dbtools;
@@ -64,7 +65,7 @@ OConnection::OConnection(ODriver*   _pDriver)
         HRESULT hr = pIUnknown->CreateInstanceLic(nullptr,
                                             nullptr,
                                             ADOS::IID_ADOCONNECTION_21,
-                                            ADOS::GetKeyStr().asBSTR(),
+                                            ADOS::GetKeyStr(),
                                             reinterpret_cast<void**>(&m_aAdoConnection));
 
         if( !FAILED( hr ) )
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 037fdb6fe41d..b7872070603f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -29,6 +29,9 @@
 #include <ado/AIndex.hxx>
 #include <ado/AKey.hxx>
 #include <ado/ATable.hxx>
+
+#include <systools/win32/oleauto.hxx>
+
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ProcedureResult.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -505,10 +508,10 @@ OUString WpADOCatalog::GetObjectOwner(std::u16string_view _rName, ObjectTypeEnum
 {
     OLEVariant _rVar;
     _rVar.setNoArg();
-    OLEString aBSTR;
-    OLEString sStr1(_rName);
-    pInterface->GetObjectOwner(sStr1.asBSTR(),_eNum,_rVar,aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    sal::systools::BStr sStr1(_rName);
+    pInterface->GetObjectOwner(sStr1, _eNum, _rVar, &aBSTR);
+    return OUString(aBSTR);
 }
 
 void OAdoTable::fillPropertyValues()
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 9d0dab6e8d4c..4074330915a6 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -27,6 +27,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#include <systools/win32/oleauto.hxx>
 #include <strings.hrc>
 
 using namespace comphelper;
@@ -61,7 +62,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
         m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_USER_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
 
     ADOUsers* pUsers = m_aCollection;
-    pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()).asBSTR());
+    pUsers->Append(OLEVariant(pUser->getImpl()), sal::systools::BStr(pUser->getPassword()));
 
     return createObject( _rForName );
 }
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 15f6a5cc9a6d..3b88116bcf2e 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -23,6 +23,8 @@
 #include <ado/Awrapado.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
+#include <systools/win32/oleauto.hxx>
+
 #include <TConnection.hxx>
 
 
@@ -76,9 +78,9 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
                     if(!aVar.isNull() && !aVar.isEmpty())
                     {
                         ADOCommand* pCom = static_cast<ADOCommand*>(aVar.getIDispatch());
-                        OLEString aBSTR;
-                        pCom->get_CommandText(aBSTR.getAddress());
-                        rValue <<= aBSTR.asOUString();
+                        sal::systools::BStr aBSTR;
+                        pCom->get_CommandText(&aBSTR);
+                        rValue <<= OUString(aBSTR);
                     }
                 }
                 break;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index 4764833c8829..38f9ae4d7a36 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -28,6 +28,8 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <rtl/ref.hxx>
+#include <systools/win32/oleauto.hxx>
+
 #include <strings.hrc>
 
 using namespace ::comphelper;
@@ -74,7 +76,7 @@ sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Referen
     aCommand.put_Name(sName);
     aCommand.put_CommandText(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND))));
     ADOViews* pViews = m_aCollection;
-    if(FAILED(pViews->Append(OLEString(sName).asBSTR(),aCommand)))
+    if (FAILED(pViews->Append(sal::systools::BStr(sName), aCommand)))
         ADOS::ThrowException(m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
 
     OTables* pTables = static_cast<OTables*>(static_cast<OCatalog&>(m_rParent).getPrivateTables());
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 8b6ad10b4662..c082c1987ff0 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -37,64 +37,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace connectivity::ado;
 
-OLEString::OLEString()
-    :m_sStr(nullptr)
-{
-}
-OLEString::OLEString(const BSTR& _sBStr)
-    :m_sStr(_sBStr)
-{
-}
-OLEString::OLEString(std::u16string_view _sBStr)
-{
-    m_sStr = SysAllocStringLen(o3tl::toW(_sBStr.data()), _sBStr.length());
-}
-OLEString::~OLEString()
-{
-    if(m_sStr)
-        ::SysFreeString(m_sStr);
-}
-OLEString& OLEString::operator=(std::u16string_view _rSrc)
-{
-    if(m_sStr)
-        ::SysFreeString(m_sStr);
-    m_sStr = SysAllocStringLen(o3tl::toW(_rSrc.data()), _rSrc.length());
-    return *this;
-}
-OLEString& OLEString::operator=(const OLEString& _rSrc)
-{
-    if(this != &_rSrc)
-    {
-        if(m_sStr)
-            ::SysFreeString(m_sStr);
-        m_sStr = ::SysAllocString(_rSrc.m_sStr);
-    }
-    return *this;
-}
-OLEString& OLEString::operator=(const BSTR& _rSrc)
-{
-    if(m_sStr)
-        ::SysFreeString(m_sStr);
-    m_sStr = _rSrc;
-    return *this;
-}
-OUString OLEString::asOUString() const
-{
-    return (m_sStr != nullptr) ? OUString(o3tl::toU(m_sStr),::SysStringLen(m_sStr)) : OUString();
-}
-BSTR OLEString::asBSTR() const
-{
-    return m_sStr;
-}
-BSTR* OLEString::getAddress()
-{
-    return &m_sStr;
-}
-sal_Int32 OLEString::length() const
-{
-    return (m_sStr != nullptr) ? ::SysStringLen(m_sStr) : 0;
-}
-
 OLEVariant::OLEVariant()
 {
     VariantInit(this);
@@ -427,8 +369,8 @@ css::uno::Sequence< sal_Int8 > OLEVariant::getByteSequence() const
     css::uno::Sequence< sal_Int8 > aRet;
     if(V_VT(this) == VT_BSTR)
     {
-        OLEString sStr(V_BSTR(this));
-        aRet = css::uno::Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sStr.asBSTR()),sizeof(sal_Unicode)*sStr.length());
+        aRet = css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8*>(V_BSTR(this)),
+                                            ::SysStringByteLen(V_BSTR(this)));
     }
     else if(!isNull())
     {
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 44a38090b5d3..c4abecf1db4f 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -23,6 +23,7 @@
 #include <comphelper/types.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <systools/win32/oleauto.hxx>
 
 using namespace connectivity::ado;
 
@@ -42,16 +43,16 @@ WpADOProperties WpADOConnection::get_Properties() const
 OUString WpADOConnection::GetConnectionString() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_ConnectionString(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_ConnectionString(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOConnection::PutConnectionString(std::u16string_view aCon) const
 {
     assert(pInterface);
-    OLEString bstr(aCon);
-    bool bErg = SUCCEEDED(pInterface->put_ConnectionString(bstr.asBSTR()));
+    sal::systools::BStr bstr(aCon);
+    bool bErg = SUCCEEDED(pInterface->put_ConnectionString(bstr));
 
     return bErg;
 }
@@ -93,8 +94,8 @@ bool WpADOConnection::Close()
 bool WpADOConnection::Execute(std::u16string_view CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset)
 {
     assert(pInterface);
-    OLEString sStr1(CommandText);
-    bool bErg = SUCCEEDED(pInterface->Execute(sStr1.asBSTR(),&RecordsAffected,Options,reinterpret_cast<ADORecordset**>(ppiRset)));
+    sal::systools::BStr sStr1(CommandText);
+    bool bErg = SUCCEEDED(pInterface->Execute(sStr1,&RecordsAffected,Options,reinterpret_cast<ADORecordset**>(ppiRset)));
     return bErg;
 }
 
@@ -120,10 +121,10 @@ bool WpADOConnection::RollbackTrans( )
 bool WpADOConnection::Open(std::u16string_view ConnectionString, std::u16string_view UserID,std::u16string_view Password,long Options)
 {
     assert(pInterface);
-    OLEString sStr1(ConnectionString);
-    OLEString sStr2(UserID);
-    OLEString sStr3(Password);
-    bool bErg = SUCCEEDED(pInterface->Open(sStr1.asBSTR(),sStr2.asBSTR(),sStr3.asBSTR(),Options));
+    sal::systools::BStr sStr1(ConnectionString);
+    sal::systools::BStr sStr2(UserID);
+    sal::systools::BStr sStr3(Password);
+    bool bErg = SUCCEEDED(pInterface->Open(sStr1, sStr2, sStr3, Options));
     return bErg;
 }
 
@@ -136,15 +137,15 @@ bool WpADOConnection::GetErrors(ADOErrors** pErrors)
 OUString WpADOConnection::GetDefaultDatabase() const
 {
     assert(pInterface);
-    OLEString aBSTR; pInterface->get_DefaultDatabase(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR; pInterface->get_DefaultDatabase(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOConnection::PutDefaultDatabase(std::u16string_view _bstr)
 {
     assert(pInterface);
-    OLEString bstr(_bstr);
-    bool bErg = SUCCEEDED(pInterface->put_DefaultDatabase(bstr.asBSTR()));
+    sal::systools::BStr bstr(_bstr);
+    bool bErg = SUCCEEDED(pInterface->put_DefaultDatabase(bstr));
 
     return bErg;
 }
@@ -208,15 +209,15 @@ bool WpADOConnection::put_Mode(const ConnectModeEnum &eNum)
 OUString WpADOConnection::get_Provider() const
 {
     assert(pInterface);
-    OLEString aBSTR; pInterface->get_Provider(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR; pInterface->get_Provider(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOConnection::put_Provider(std::u16string_view _bstr)
 {
     assert(pInterface);
-    OLEString bstr(_bstr);
-    return SUCCEEDED(pInterface->put_Provider(bstr.asBSTR()));
+    sal::systools::BStr bstr(_bstr);
+    return SUCCEEDED(pInterface->put_Provider(bstr));
 }
 
 sal_Int32 WpADOConnection::get_State() const
@@ -236,9 +237,9 @@ bool WpADOConnection::OpenSchema(SchemaEnum eNum,OLEVariant const & Restrictions
 OUString WpADOConnection::get_Version() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Version(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Version(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOCommand::putref_ActiveConnection(const WpADOConnection& rCon)
@@ -263,7 +264,7 @@ void WpADOCommand::Create()
         HRESULT hr = pInterface2->CreateInstanceLic(nullptr,
                                             nullptr,
                                             ADOS::IID_ADOCOMMAND_21,
-                                            ADOS::GetKeyStr().asBSTR(),
+                                            ADOS::GetKeyStr(),
                                             reinterpret_cast<void**>(&pCommand));
 
         if( !FAILED( hr ) )
@@ -282,16 +283,16 @@ sal_Int32 WpADOCommand::get_State() const
 OUString WpADOCommand::get_CommandText() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_CommandText(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_CommandText(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOCommand::put_CommandText(std::u16string_view aCon)
 {
     assert(pInterface);
-    OLEString bstr(aCon);
-    bool bErg = SUCCEEDED(pInterface->put_CommandText(bstr.asBSTR()));
+    sal::systools::BStr bstr(aCon);
+    bool bErg = SUCCEEDED(pInterface->put_CommandText(bstr));
 
     return bErg;
 }
@@ -334,8 +335,8 @@ ADOParameter* WpADOCommand::CreateParameter(std::u16string_view _bstr,DataTypeEn
 {
     assert(pInterface);
     ADOParameter* pPara = nullptr;
-    OLEString bstr(_bstr);
-    bool bErg = SUCCEEDED(pInterface->CreateParameter(bstr.asBSTR(),Type,Direction,nSize,Value,&pPara));
+    sal::systools::BStr bstr(_bstr);
+    bool bErg = SUCCEEDED(pInterface->CreateParameter(bstr, Type, Direction, nSize, Value, &pPara));
 
     return bErg ? pPara : nullptr;
 }
@@ -366,16 +367,16 @@ CommandTypeEnum WpADOCommand::get_CommandType() const
 OUString WpADOCommand::GetName() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 bool WpADOCommand::put_Name(std::u16string_view Name)
 {
     assert(pInterface);
-    OLEString bstr(Name);
-    bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR()));
+    sal::systools::BStr bstr(Name);
+    bool bErg = SUCCEEDED(pInterface->put_Name(bstr));
 
     return bErg;
 }
@@ -388,17 +389,17 @@ bool WpADOCommand::Cancel()
 OUString WpADOError::GetDescription() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Description(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Description(&aBSTR);
+    return OUString(aBSTR);
 }
 
 OUString WpADOError::GetSource() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Source(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Source(&aBSTR);
+    return OUString(aBSTR);
 }
 
 sal_Int32 WpADOError::GetNumber() const
@@ -412,9 +413,9 @@ sal_Int32 WpADOError::GetNumber() const
 OUString WpADOError::GetSQLState() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_SQLState(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_SQLState(&aBSTR);
+    return OUString(aBSTR);
 }
 
 sal_Int32 WpADOError::GetNativeError() const
@@ -468,9 +469,9 @@ sal_Int32 WpADOField::GetDefinedSize() const
 OUString WpADOField::GetName() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 DataTypeEnum WpADOField::GetADOType() const
@@ -620,9 +621,9 @@ bool WpADOProperty::PutValue(const OLEVariant &aValVar)
 OUString WpADOProperty::GetName() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 DataTypeEnum WpADOProperty::GetADOType() const
@@ -655,7 +656,7 @@ bool WpADOProperty::PutAttributes(sal_Int32 _nDefSize)
         HRESULT hr = pInterface2->CreateInstanceLic(nullptr,
                                             nullptr,
                                             ADOS::IID_ADORECORDSET_21,
-                                            ADOS::GetKeyStr().asBSTR(),
+                                            ADOS::GetKeyStr(),
                                             reinterpret_cast<void**>(&pRec));
 
         if( !FAILED( hr ) )
@@ -892,9 +893,9 @@ bool WpADORecordset::UpdateBatch(AffectEnum AffectRecords)
 OUString WpADOParameter::GetName() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 DataTypeEnum WpADOParameter::GetADOType() const
@@ -976,30 +977,30 @@ bool WpADOParameter::put_Size(sal_Int32 _nSize)
 OUString WpADOColumn::get_Name() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 OUString WpADOColumn::get_RelatedColumn() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_RelatedColumn(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_RelatedColumn(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOColumn::put_Name(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 void WpADOColumn::put_RelatedColumn(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_RelatedColumn(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_RelatedColumn(bstr);
 }
 
 DataTypeEnum WpADOColumn::get_Type() const
@@ -1090,16 +1091,16 @@ WpADOProperties WpADOColumn::get_Properties() const
 OUString WpADOKey::get_Name() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOKey::put_Name(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 
 KeyTypeEnum WpADOKey::get_Type() const
@@ -1119,16 +1120,16 @@ void WpADOKey::put_Type(const KeyTypeEnum& _eNum)
 OUString WpADOKey::get_RelatedTable() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_RelatedTable(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_RelatedTable(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOKey::put_RelatedTable(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_RelatedTable(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_RelatedTable(bstr);
 }
 
 RuleEnum WpADOKey::get_DeleteRule() const
@@ -1170,16 +1171,16 @@ WpADOColumns WpADOKey::get_Columns() const
 OUString WpADOIndex::get_Name() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOIndex::put_Name(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 
 bool WpADOIndex::get_Clustered() const
@@ -1281,24 +1282,24 @@ ADOProcedures* WpADOCatalog::get_Procedures()
 OUString WpADOTable::get_Name() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOTable::put_Name(std::u16string_view _rName)
 {
     assert(pInterface);
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 
 OUString WpADOTable::get_Type() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Type(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Type(&aBSTR);
+    return OUString(aBSTR);
 }
 
 WpADOColumns WpADOTable::get_Columns() const
@@ -1344,9 +1345,9 @@ WpADOProperties WpADOTable::get_Properties() const
 OUString WpADOView::get_Name() const
 {
     assert(pInterface);
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOView::get_Command(OLEVariant& _rVar) const
@@ -1363,15 +1364,15 @@ void WpADOView::put_Command(OLEVariant const & _rVar)
 
 OUString WpADOGroup::get_Name() const
 {
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOGroup::put_Name(std::u16string_view _rName)
 {
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 
 RightsEnum WpADOGroup::GetPermissions(
@@ -1405,22 +1406,22 @@ WpADOUsers WpADOGroup::get_Users( )
 
 OUString WpADOUser::get_Name() const
 {
-    OLEString aBSTR;
-    pInterface->get_Name(aBSTR.getAddress());
-    return aBSTR.asOUString();
+    sal::systools::BStr aBSTR;
+    pInterface->get_Name(&aBSTR);
+    return OUString(aBSTR);
 }
 
 void WpADOUser::put_Name(std::u16string_view _rName)
 {
-    OLEString bstr(_rName);
-    pInterface->put_Name(bstr.asBSTR());
+    sal::systools::BStr bstr(_rName);
+    pInterface->put_Name(bstr);
 }
 
 bool WpADOUser::ChangePassword(std::u16string_view _rPwd,std::u16string_view _rNewPwd)
 {
-    OLEString sStr1(_rPwd);
-    OLEString sStr2(_rNewPwd);
-    bool bErg = SUCCEEDED(pInterface->ChangePassword(sStr1.asBSTR(),sStr2.asBSTR()));
+    sal::systools::BStr sStr1(_rPwd);
+    sal::systools::BStr sStr2(_rNewPwd);
+    bool bErg = SUCCEEDED(pInterface->ChangePassword(sStr1, sStr2));
     return bErg;
 }
 
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index bd01f36fc684..0f0d022681ea 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -23,6 +23,7 @@
 #include <ado/Awrapado.hxx>
 #include <ado/adoimp.hxx>
 #include <osl/diagnose.h>
+#include <systools/win32/oleauto.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 
 
@@ -67,9 +68,9 @@ const IID ADOS::IID_ADOUSER_25              =   MYADOID(0x00000619);
 const CLSID ADOS::CLSID_ADOVIEW_25          =   MYADOID(0x00000612);
 const IID ADOS::IID_ADOVIEW_25              =   MYADOID(0x00000613);
 
-OLEString& ADOS::GetKeyStr()
+sal::systools::BStr& ADOS::GetKeyStr()
 {
-    static OLEString sKeyStr(u"gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz");
+    static sal::systools::BStr sKeyStr(u"gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz");
     return sKeyStr;
 }
 
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index 256be7dd6c0d..ba0653156a94 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -33,27 +33,6 @@ namespace com::sun::star::util
 
 namespace connectivity::ado
 {
-        class OLEString
-        {
-            BSTR m_sStr;
-        public:
-            OLEString();
-            OLEString(const BSTR& _sBStr);
-            OLEString(std::u16string_view _sBStr);
-            OLEString(const OLEString& _rRh)
-            {
-                OLEString::operator=(_rRh);
-            }
-            ~OLEString();
-            OLEString& operator=(std::u16string_view _rSrc);
-            OLEString& operator=(const BSTR& _rSrc);
-            OLEString& operator=(const OLEString& _rSrc);
-            OUString asOUString() const;
-            BSTR asBSTR() const;
-            BSTR* getAddress();
-            sal_Int32 length() const;
-        };
-
         class OLEVariant    :   public ::tagVARIANT
         {
         public:
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index 58e268d9c68a..60c6fd313d77 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -24,16 +24,17 @@
 
 struct ADOConnection;
 
+namespace sal::systools { class BStr; };
+
 namespace connectivity::ado
 {
 
         class WpADOField;
-        class OLEString;
         class ADOS
         {
         public:
             // Also here: Free BSTR with SysFreeString()!
-            static OLEString& GetKeyStr();
+            static sal::systools::BStr& GetKeyStr();
 
             static const CLSID  CLSID_ADOCATALOG_25;
             static const IID    IID_ADOCATALOG_25;