mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stringviewparam

Browse Source 
Not sure if the given url is guaranteed to be of a form so that neither of the
two url.find(':') could return npos, but lets mimic the original code faithfully
for now.

Change-Id: Ib525b42ccb5b19b4bc13729f973248cf1c8713de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133192
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-04-20 08:09:00 +02:00
parent d9b3374b13
commit ed4627a868
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
connectivity/source/drivers/ado/AConnection.cxx
View File

@@ -19,6 +19,7 @@
#include <sal/config.h>
#include <cstddef>
#include <string_view>
#include <ado/AConnection.hxx>
@@ -34,6 +35,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/servicehelper.hxx>
#include <connectivity/dbexception.hxx>
#include <o3tl/string_view.hxx>
#include <osl/file.hxx>
#include <systools/win32/oleauto.hxx>
#include <strings.hrc>
@@ -81,17 +83,18 @@ OConnection::~OConnection()
{
}
void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
void OConnection::construct(std::u16string_view url,const Sequence< PropertyValue >& info)
{
osl_atomic_increment( &m_refCount );
setConnectionInfo(info);
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
OUString aDSN(url.copy(nLen+1)),aUID,aPWD;
if ( aDSN.startsWith("access:") )
aDSN = aDSN.copy(7);
std::size_t nLen = url.find(':');
nLen = url.find(':',nLen == std::u16string_view::npos ? 0 : nLen+1);
std::u16string_view aDSN(url.substr(nLen == std::u16string_view::npos ? 0 : nLen+1));
OUString aUID,aPWD;
if ( o3tl::starts_with(aDSN, u"access:") )
aDSN.remove_prefix(7);
sal_Int32 nTimeout = 20;
const PropertyValue *pIter = info.getConstArray();

3
connectivity/source/inc/ado/AConnection.hxx
View File

@@ -22,6 +22,7 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <map>
#include <string_view>
#include <connectivity/CommonTools.hxx>
#include <OTypeInfo.hxx>
#include <TConnection.hxx>
@@ -71,7 +72,7 @@ namespace connectivity::ado
OConnection(ODriver* _pDriver);
// OConnection(const SQLHANDLE _pConnectionHandle);
~OConnection() override;
void construct(const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info);
void construct(std::u16string_view url,const css::uno::Sequence< css::beans::PropertyValue >& info);
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;