diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-28 14:12:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-29 08:53:22 +0200 |
| commit | d3849255b76e92a42f653c266b88945708984c4f (patch) | |
| tree | ff1eab21b9e5a1ea00e1573db4b4595ba51b0098 /sd | |
| parent | f9b6bd6336b35de060f6f5bdd91517caf5e9a56e (diff) | |
use more string_view in INetURLObject
Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPageDescriptor.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPageDescriptor.hxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 1e7abd43bdfd..305e1813ae77 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1970,7 +1970,7 @@ OUString ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const aGalleryDir = SvtPathOptions().GetGalleryPath(); // Use last token delimited by ';'. copy(lastIndexOf+1) works whether // string is empty or not and whether ';' is there or not. - INetURLObject aGalleryUserSound( aGalleryDir.copy(aGalleryDir.lastIndexOf(';')+1) ); + INetURLObject aGalleryUserSound( aGalleryDir.subView(aGalleryDir.lastIndexOf(';')+1) ); aGalleryUserSound.Append( aRetval ); const auto nRemainingSize = rStCtrl.remainingSize(); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index b3e7ca647405..846f21c34cd3 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -275,7 +275,7 @@ private: // returns -1 if no object was found bool lcl_findSoundInList( const ::std::vector< OUString > & rSoundList, - const OUString & rFileName, + std::u16string_view rFileName, ::std::vector< OUString >::size_type & rOutPosition ) { INetURLObject aURL(rFileName); @@ -315,7 +315,7 @@ struct lcl_AppendSoundToListBox : mrListBox( rListBox ) {} - void operator() ( const OUString & rString ) const + void operator() ( std::u16string_view rString ) const { INetURLObject aURL( rString ); mrListBox.append_text( aURL.GetBase() ); diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 183ec29e4d1b..2c0c23eb780c 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -34,7 +34,7 @@ namespace sd::sidebar { MasterPageDescriptor::MasterPageDescriptor ( MasterPageContainer::Origin eOrigin, const sal_Int32 nTemplateIndex, - const OUString& rsURL, + std::u16string_view rsURL, const OUString& rsPageName, const OUString& rsStyleName, const bool bIsPrecious, diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index 4cf81ba32322..62717e528221 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -42,7 +42,7 @@ public: MasterPageDescriptor ( MasterPageContainer::Origin eOrigin, const sal_Int32 nTemplateIndex, - const OUString& rURL, + std::u16string_view rURL, const OUString& rPageName, const OUString& rStyleName, const bool bIsPrecious, |