From 93c64a61f2c84e684050294a1391cd32425b7837 Mon Sep 17 00:00:00 2001 From: Noel Date: Fri, 6 Nov 2020 20:01:50 +0200 Subject: loplugin:stringview Add new methods "subView" to O(U)String to return substring views of the underlying data. Add a clang plugin to warn when replacing existing calls to copy() would be better to use subView(). Change-Id: I03a5732431ce60808946f2ce2c923b22845689ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105420 Tested-by: Jenkins Reviewed-by: Noel Grandin --- fpicker/source/office/RemoteFilesDialog.cxx | 2 +- fpicker/source/office/breadcrumb.cxx | 2 +- fpicker/source/office/iodlg.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index ea151bb9b8ff..d676cbae3e1b 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -392,7 +392,7 @@ void RemoteFilesDialog::AddFileExtension() if ( nDotPos == -1 ) { - sFileName += sExt.copy( 1 ); // without '*' + sFileName += sExt.subView( 1 ); // without '*' m_xName_ed->set_text( sFileName ); } } diff --git a/fpicker/source/office/breadcrumb.cxx b/fpicker/source/office/breadcrumb.cxx index a300a32cc1d0..d884d5b3fc8e 100644 --- a/fpicker/source/office/breadcrumb.cxx +++ b/fpicker/source/office/breadcrumb.cxx @@ -114,7 +114,7 @@ void Breadcrumb::SetURL( const OUString& rURL ) } m_aSegments[i]->m_xLink->set_label( sLabel ); - m_aUris[m_aSegments[i]->m_xLink.get()] = sRootPath + sPath.copy(0, nEnd); + m_aUris[m_aSegments[i]->m_xLink.get()] = sRootPath + sPath.subView(0, nEnd); m_aSegments[i]->m_xLink->hide(); m_aSegments[i]->m_xLink->set_sensitive(true); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index bfec874b9326..87e3170c8e4f 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -149,7 +149,7 @@ namespace if (nDotPos>=0) { if (!rExtension.isEmpty()) - rFile = rFile.copy(0, nDotPos) + rExtension; // replace old extension with new (not empty) one + rFile = rFile.subView(0, nDotPos) + rExtension; // replace old extension with new (not empty) one else if (nDotPos) rFile = rFile.copy(0, nDotPos-1); // truncate extension (new one is empty) else -- cgit