diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-01-28 12:38:01 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-01-28 17:32:18 +0100 |
| commit | 943060836339f9640c612e9724f20e79db616e6e (patch) | |
| tree | 3dc6e7748aef3ef0f2fca86979792162daa443fc /connectivity | |
| parent | d249bd5a3dfe13052ce9aa91bad94ec7d60604d4 (diff) | |
simplify code, use more subView()
Change-Id: I569c7f34acbdf8451cd5c9acf1abd334637072d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110051
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools2.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/Clob.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/PreparedStatement.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 01cdcc03aa76..ecc2f4f8f221 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -135,7 +135,7 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const } else { - aSql.append(std::u16string_view(sTypeName).substr(0, ++nParenPos)); + aSql.append(sTypeName.subView(0, ++nParenPos)); } if ( nPrecision > 0 && nDataType != DataType::TIMESTAMP ) @@ -152,7 +152,7 @@ OUString createStandardTypePart(const Reference< XPropertySet >& xColProp,const else { nParenPos = sTypeName.indexOf(')',nParenPos); - aSql.append(std::u16string_view(sTypeName).substr(nParenPos)); + aSql.append(sTypeName.subView(nParenPos)); } } else diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx index 2038dfc11350..64c231230884 100644 --- a/connectivity/source/drivers/firebird/Clob.cxx +++ b/connectivity/source/drivers/firebird/Clob.cxx @@ -101,7 +101,7 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, if( nCharsToCopy > nLength ) nCharsToCopy = nLength; // append relevant part of first segment - sSegmentBuffer.append( std::u16string_view(sSegment).substr(0, nCharsToCopy) ); + sSegmentBuffer.append( sSegment.subView(0, nCharsToCopy) ); nActLen += sSegmentBuffer.getLength(); } } @@ -117,7 +117,7 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, RTL_TEXTENCODING_UTF8 ); sal_Int32 nStrLen = sSegment.getLength(); if( nActLen + nStrLen > nLength ) - sSegmentBuffer.append(std::u16string_view(sSegment).substr(0, nLength - nActLen)); + sSegmentBuffer.append(sSegment.subView(0, nLength - nActLen)); else sSegmentBuffer.append(sSegment); nActLen += nStrLen; diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index e4510b758055..56fa1827bdad 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -374,9 +374,9 @@ sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource) OUStringBuffer sBuffer(15); if(nDotIndex > 0) { - sBuffer.append(std::u16string_view(sNumber).substr(0, nDotIndex)); + sBuffer.append(sNumber.subView(0, nDotIndex)); } - sBuffer.append(std::u16string_view(sNumber).substr(nDotIndex + 1)); + sBuffer.append(sNumber.subView(nDotIndex + 1)); return sBuffer.makeStringAndClear().toInt64(); } } |