summaryrefslogtreecommitdiff
path: root/uui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-04-03 10:34:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-04-17 10:27:33 +0200
commit33bd16b344e273c427091ee68e946bf67b371dd7 (patch)
tree85fb383ea8e3d30f393bb197b5c74f73f6ca247f /uui
parentfe597a337914decd62480d3eba84258333116db9 (diff)
loplugin:stringviewparam convert methods using copy()
which converts to std::string_view::substr() Change-Id: I3f42213b41a97e77ddcc79d84d512f49d68ca559 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132729 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'uui')
-rw-r--r--uui/source/iahndl-ssl.cxx14
-rw-r--r--uui/source/secmacrowarnings.cxx18
2 files changed, 16 insertions, 16 deletions
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index fa1b2a6a16e4..fce82e8de6c6 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -54,7 +54,7 @@ using namespace com::sun::star;
namespace {
OUString
-getContentPart( const OUString& _rRawString )
+getContentPart( std::u16string_view _rRawString )
{
// search over some parts to find a string
static char const * aIDs[] = { "CN=", "OU=", "O=", "E=", nullptr };
@@ -63,15 +63,15 @@ getContentPart( const OUString& _rRawString )
while ( aIDs[i] )
{
OUString sPartId = OUString::createFromAscii( aIDs[i++] );
- sal_Int32 nContStart = _rRawString.indexOf( sPartId );
- if ( nContStart != -1 )
+ size_t nContStart = _rRawString.find( sPartId );
+ if ( nContStart != std::u16string_view::npos )
{
nContStart += sPartId.getLength();
- sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart );
- if ( nContEnd != -1 )
- sPart = _rRawString.copy( nContStart, nContEnd - nContStart );
+ size_t nContEnd = _rRawString.find( ',', nContStart );
+ if ( nContEnd != std::u16string_view::npos )
+ sPart = _rRawString.substr( nContStart, nContEnd - nContStart );
else
- sPart = _rRawString.copy( nContStart );
+ sPart = _rRawString.substr( nContStart );
break;
}
}
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 8f8e222c99e8..164890efca69 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -38,22 +38,22 @@ using namespace ::com::sun::star;
namespace
{
- OUString GetContentPart( const OUString& _rRawString, const OUString& _rPartId )
+ std::u16string_view GetContentPart( std::u16string_view _rRawString, const OUString& _rPartId )
{
- OUString s;
+ std::u16string_view s;
- sal_Int32 nContStart = _rRawString.indexOf( _rPartId );
- if( nContStart != -1 )
+ size_t nContStart = _rRawString.find( _rPartId );
+ if( nContStart != std::u16string_view::npos )
{
nContStart = nContStart + _rPartId.getLength();
++nContStart; // now its start of content, directly after Id
- sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart );
+ size_t nContEnd = _rRawString.find( ',', nContStart );
- if ( nContEnd != -1 )
- s = _rRawString.copy( nContStart, nContEnd - nContStart );
+ if ( nContEnd != std::u16string_view::npos )
+ s = _rRawString.substr( nContStart, nContEnd - nContStart );
else
- s = _rRawString.copy( nContStart );
+ s = _rRawString.substr( nContStart );
}
return s;
@@ -195,7 +195,7 @@ void MacroWarning::SetCertificate( const css::uno::Reference< css::security::XCe
mxCert = _rxCert;
if( mxCert.is() )
{
- OUString s = GetContentPart( mxCert->getSubjectName(), "CN" );
+ OUString s( GetContentPart( mxCert->getSubjectName(), "CN" ) );
mxSignsFI->set_label(s);
mxViewSignsBtn->set_sensitive(true);
}