Replace OLEString operators with proper functions, for clarity

Change-Id: I1fa309d034e1ec94f38d07ede07e691f1484a4f5
Reviewed-on: https://gerrit.libreoffice.org/29697Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

connectivity/source/drivers/ado/AConnection.cxx

@@ -71,7 +71,7 @@ OConnection::OConnection(ODriver*   _pDriver) throw(SQLException, RuntimeExcepti
         hr = pIUnknown->CreateInstanceLic(  pOuter,
                                             NULL,
                                             ADOS::IID_ADOCONNECTION_21,
-                                            ADOS::GetKeyStr(),
+                                            ADOS::GetKeyStr().asBSTR(),
                                             (void**) &pCon);
 
         if( !FAILED( hr ) )

connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx

@@ -549,8 +549,8 @@ OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eN
     _rVar.setNoArg();
     OLEString aBSTR;
     OLEString sStr1(_rName);
-    pInterface->GetObjectOwner(sStr1,_eNum,_rVar,&aBSTR);
-    return aBSTR;
+    pInterface->GetObjectOwner(sStr1.asBSTR(),_eNum,_rVar,aBSTR.getAddress());
+    return aBSTR.asOUString();
 }
 
 void OAdoTable::fillPropertyValues()

connectivity/source/drivers/ado/AUsers.cxx

@@ -60,7 +60,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 = (ADOUsers*)m_aCollection;
-    pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()));
+    pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()).asBSTR());
 
     return createObject( _rForName );
 }

connectivity/source/drivers/ado/AView.cxx

@@ -88,8 +88,8 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
                     {
                         ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch();
                         OLEString aBSTR;
-                        pCom->get_CommandText(&aBSTR);
-                        rValue <<= aBSTR.operator OUString();
+                        pCom->get_CommandText(aBSTR.getAddress());
+                        rValue <<= aBSTR.asOUString();
                     }
                 }
                 break;

connectivity/source/drivers/ado/AViews.cxx

@@ -72,7 +72,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 = (ADOViews*)m_aCollection;
-    if(FAILED(pViews->Append(OLEString(sName),aCommand)))
+    if(FAILED(pViews->Append(OLEString(sName).asBSTR(),aCommand)))
         ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
 
     OTables* pTables = static_cast<OTables*>(static_cast<OCatalog&>(m_rParent).getPrivateTables());

connectivity/source/drivers/ado/Aolevariant.cxx

@@ -77,15 +77,15 @@ OLEString& OLEString::operator=(const BSTR& _rSrc)
     m_sStr = _rSrc;
     return *this;
 }
-OLEString::operator OUString() const
+OUString OLEString::asOUString() const
 {
     return (m_sStr != NULL) ? OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString();
 }
-OLEString::operator BSTR() const
+BSTR OLEString::asBSTR() const
 {
     return m_sStr;
 }
-BSTR* OLEString::operator &()
+BSTR* OLEString::getAddress()
 {
     return &m_sStr;
 }
@@ -427,7 +427,7 @@ OLEVariant::operator css::uno::Sequence< sal_Int8 >() const
     if(V_VT(this) == VT_BSTR)
     {
         OLEString sStr(V_BSTR(this));
-        aRet = css::uno::Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>((const wchar_t*)sStr),sizeof(sal_Unicode)*sStr.length());
+        aRet = css::uno::Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sStr.asBSTR()),sizeof(sal_Unicode)*sStr.length());
     }
     else if(!isNull())
     {

connectivity/source/inc/ado/Aolevariant.hxx

@@ -64,9 +64,9 @@ namespace connectivity
             OLEString& operator=(const OUString& _rSrc);
             OLEString& operator=(const BSTR& _rSrc);
             OLEString& operator=(const OLEString& _rSrc);
-            operator OUString() const;
-            operator BSTR() const;
-            BSTR* operator &();
+            OUString asOUString() const;
+            BSTR asBSTR() const;
+            BSTR* getAddress();
             sal_Int32 length() const;
         };