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 /include | |
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 'include')
-rw-r--r-- | include/avmedia/mediawindow.hxx | 2 | ||||
-rw-r--r-- | include/basic/basmgr.hxx | 4 | ||||
-rw-r--r-- | include/framework/titlehelper.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/docfile.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/doctempl.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/frmdescr.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/frmhtml.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sfxhtml.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/templatelocalview.hxx | 6 | ||||
-rw-r--r-- | include/svl/documentlockfile.hxx | 2 | ||||
-rw-r--r-- | include/svl/inethist.hxx | 2 | ||||
-rw-r--r-- | include/svl/lockfilecommon.hxx | 2 | ||||
-rw-r--r-- | include/svl/msodocumentlockfile.hxx | 6 | ||||
-rw-r--r-- | include/svl/sharecontrolfile.hxx | 2 | ||||
-rw-r--r-- | include/svtools/parhtml.hxx | 2 | ||||
-rw-r--r-- | include/svtools/place.hxx | 4 | ||||
-rw-r--r-- | include/svx/gallery.hxx | 4 | ||||
-rw-r--r-- | include/svx/gallery1.hxx | 4 | ||||
-rw-r--r-- | include/svx/langbox.hxx | 2 | ||||
-rw-r--r-- | include/svx/xtable.hxx | 2 | ||||
-rw-r--r-- | include/tools/urlobj.hxx | 32 | ||||
-rw-r--r-- | include/unotools/ucbhelper.hxx | 2 | ||||
-rw-r--r-- | include/vcl/graphicfilter.hxx | 10 |
24 files changed, 54 insertions, 54 deletions
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index e81630002fd0..f398f7e56427 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -129,7 +129,7 @@ namespace avmedia /// checkbox and store its state in *o_pbLink static bool executeMediaURLDialog(weld::Window* pParent, OUString& rURL, bool *const o_pbLink); static void executeFormatErrorBox(weld::Window* pParent); - static bool isMediaURL(const OUString& rURL, const OUString& rReferer, bool bDeep = false, + static bool isMediaURL(std::u16string_view rURL, const OUString& rReferer, bool bDeep = false, rtl::Reference<PlayerListener> xPreferredPixelSizeListener = nullptr); static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = nullptr ); diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index c0d2a77923bb..11c90fea1dfa 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -124,7 +124,7 @@ private: void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); void ImpMgrNotLoaded( const OUString& rStorageName ); BasicLibInfo* CreateLibInfo(); - void LoadBasicManager( SotStorage& rStorage, const OUString& rBaseURL ); + void LoadBasicManager( SotStorage& rStorage, std::u16string_view rBaseURL ); void LoadOldBasicManager( SotStorage& rStorage ); bool ImplLoadBasic( SvStream& rStrm, StarBASICRef& rOldBasic ) const; static bool ImplEncryptStream( SvStream& rStream ); @@ -132,7 +132,7 @@ private: static void CheckModules( StarBASIC* pBasic, bool bReference ); public: - BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString const * pLibPath = nullptr, bool bDocMgr = false ); + BasicManager( SotStorage& rStorage, std::u16string_view rBaseURL, StarBASIC* pParentFromStdLib = nullptr, OUString const * pLibPath = nullptr, bool bDocMgr = false ); BasicManager( StarBASIC* pStdLib, OUString const * pLibPath = nullptr, bool bDocMgr = false ); virtual ~BasicManager() override; diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 888a01e71fc7..d1eb175c88fc 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -140,7 +140,7 @@ class FWK_DLLPUBLIC TitleHelper final : private ::cppu::BaseMutex void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle); - OUString impl_convertURL2Title(const OUString& sURL); + OUString impl_convertURL2Title(std::u16string_view sURL); // member diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index d6c97879e2dd..bc6e0cf1e02c 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -290,7 +290,7 @@ public: static css::uno::Sequence < css::util::RevisionTag > GetVersionList( const css::uno::Reference< css::embed::XStorage >& xStorage ); - static OUString CreateTempCopyWithExt( const OUString& aURL ); + static OUString CreateTempCopyWithExt( std::u16string_view aURL ); static bool CallApproveHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler, const css::uno::Any& rRequest, bool bAllowAbort); static bool SetWritableForUserOnly( const OUString& aURL ); diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index d16c93988710..029c8e8b2790 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -94,12 +94,12 @@ public: */ bool SetName(const OUString &rName, sal_uInt16 nRegion, sal_uInt16 nIdx); - bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, const OUString &rName) const; + bool CopyTo(sal_uInt16 nRegion, sal_uInt16 nIdx, std::u16string_view rName) const; bool CopyFrom(sal_uInt16 nRegion, sal_uInt16 nIdx, OUString &rName); bool GetFull( std::u16string_view rRegion, std::u16string_view rName, OUString& rPath ); - bool GetLogicNames( const OUString& rPath, OUString& rRegion, OUString& rName ) const; + bool GetLogicNames( std::u16string_view rPath, OUString& rRegion, OUString& rName ) const; /** updates the configuration where the document templates structure is stored. diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 3901961fb639..67c0c7e38977 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -65,7 +65,7 @@ public: SfxItemSet* GetArgs(); const INetURLObject& GetURL() const { return aURL; } - void SetURL( const OUString& rURL ); + void SetURL( std::u16string_view rURL ); void SetActualURL(); // FrameName diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx index 6b6ff228b5c9..205c320fe820 100644 --- a/include/sfx2/frmhtml.hxx +++ b/include/sfx2/frmhtml.hxx @@ -30,7 +30,7 @@ class SfxFrameDescriptor; namespace SfxFrameHTMLParser { // These methods can also be used by other parsers. -SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, const OUString&); +SFX2_DLLPUBLIC void ParseFrameOptions(SfxFrameDescriptor*, const HTMLOptions&, std::u16string_view); }; #endif diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 49c2c2325eff..b7f9e1fa0688 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -742,7 +742,7 @@ public: PreDoSaveAs_Impl(const OUString& rFileName, const OUString& rFiltName, SfxItemSet const& rItemSet, const css::uno::Sequence<css::beans::PropertyValue>& rArgs); - SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet, + SAL_DLLPRIVATE bool APISaveAs_Impl(std::u16string_view aFileName, SfxItemSet& rItemSet, const css::uno::Sequence<css::beans::PropertyValue>& rArgs); SAL_DLLPRIVATE bool CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet, diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index af22df207b83..9f5a03f5b250 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -57,11 +57,11 @@ public: static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions); bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } - static bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, + static bool ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL, const HTMLOptions& rOptions, SvMacroItemId nEventMouseOver, SvMacroItemId nEventMouseOut ); - inline bool ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, + inline bool ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL, SvMacroItemId nEventMouseOver, SvMacroItemId nEventMouseOut); @@ -99,7 +99,7 @@ protected: const OUString& GetScriptTypeString( SvKeyValueIterator* ) const; }; -inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBaseURL, +inline bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, std::u16string_view rBaseURL, SvMacroItemId nEventMouseOver, SvMacroItemId nEventMouseOut) { diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 2ad81391e97d..020ad2ba37e6 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -55,7 +55,7 @@ public: bool operator () (const ThumbnailViewItem *pItem); static bool isFilteredExtension(FILTER_APPLICATION filter, std::u16string_view rExt); - bool isValid (const OUString& rPath) const; + bool isValid (std::u16string_view rPath) const; private: @@ -114,7 +114,7 @@ public: bool copyFrom(TemplateContainerItem *pItem, const OUString &rPath); - bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName); + bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, std::u16string_view rName); virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) override; @@ -152,7 +152,7 @@ public: static BitmapEx scaleImg (const BitmapEx &rImg, tools::Long width, tools::Long height); - static BitmapEx getDefaultThumbnail( const OUString& rPath ); + static BitmapEx getDefaultThumbnail( std::u16string_view rPath ); static BitmapEx fetchThumbnail (const OUString &msURL, tools::Long width, tools::Long height); diff --git a/include/svl/documentlockfile.hxx b/include/svl/documentlockfile.hxx index f35e8a765f13..b4f731db7fc8 100644 --- a/include/svl/documentlockfile.hxx +++ b/include/svl/documentlockfile.hxx @@ -56,7 +56,7 @@ class SVL_DLLPUBLIC DocumentLockFile final : public GenDocumentLockFile virtual void WriteEntryToStream( const LockFileEntry& aEntry, const css::uno::Reference< css::io::XOutputStream >& xStream ) override; public: - DocumentLockFile( const OUString& aOrigURL ); + DocumentLockFile( std::u16string_view aOrigURL ); virtual ~DocumentLockFile() override; virtual LockFileEntry GetLockData() override; diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index fe3398d43572..9f88fd84baa7 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -74,7 +74,7 @@ public: return false; } - bool QueryUrl (const OUString &rUrl) const; + bool QueryUrl (std::u16string_view rUrl) const; /** PutUrl. */ diff --git a/include/svl/lockfilecommon.hxx b/include/svl/lockfilecommon.hxx index f94e41b6cb20..054e723ee01d 100644 --- a/include/svl/lockfilecommon.hxx +++ b/include/svl/lockfilecommon.hxx @@ -50,7 +50,7 @@ protected: ::osl::Mutex m_aMutex; /// This method generates the URL of the lock file based on the document URL and the specified prefix. - static OUString GenerateOwnLockFileURL(const OUString& aOrigURL, std::u16string_view aPrefix); + static OUString GenerateOwnLockFileURL(std::u16string_view aOrigURL, std::u16string_view aPrefix); public: LockFileCommon(const OUString& aLockFileURL); diff --git a/include/svl/msodocumentlockfile.hxx b/include/svl/msodocumentlockfile.hxx index 904411cb01ac..f91c7ccffe44 100644 --- a/include/svl/msodocumentlockfile.hxx +++ b/include/svl/msodocumentlockfile.hxx @@ -29,7 +29,7 @@ private: Excel, PowerPoint }; - static AppType getAppType(const OUString& sOrigURL); + static AppType getAppType(std::u16string_view sOrigURL); AppType m_eAppType; virtual void @@ -39,14 +39,14 @@ private: virtual css::uno::Reference<css::io::XInputStream> OpenStream() override; public: - MSODocumentLockFile(const OUString& aOrigURL); + MSODocumentLockFile(std::u16string_view aOrigURL); virtual ~MSODocumentLockFile() override; virtual LockFileEntry GetLockData() override; virtual void RemoveFile() override; - static bool IsMSOSupportedFileFormat(const OUString& aURL); + static bool IsMSOSupportedFileFormat(std::u16string_view aURL); }; } diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx index 97c1c2e4729e..fe717131262b 100644 --- a/include/svl/sharecontrolfile.hxx +++ b/include/svl/sharecontrolfile.hxx @@ -52,7 +52,7 @@ class SVL_DLLPUBLIC ShareControlFile final : public LockFileCommon public: // The constructor will throw exception in case the stream can not be opened - ShareControlFile( const OUString& aOrigURL ); + ShareControlFile( std::u16string_view aOrigURL ); virtual ~ShareControlFile() override; std::vector< LockFileEntry > GetUsersData(); diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 02cdc2042645..d05a9e36cc5a 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -257,7 +257,7 @@ public: virtual bool ParseMetaOptions( const css::uno::Reference< css::document::XDocumentProperties>&, SvKeyValueIterator* ); - void ParseScriptOptions( OUString& rLangString, const OUString&, HTMLScriptLanguage& rLang, + void ParseScriptOptions( OUString& rLangString, std::u16string_view rBaseURL, HTMLScriptLanguage& rLang, OUString& rSrc, OUString& rLibrary, OUString& rModule ); // Remove a comment around the content of <SCRIPT> or <STYLE>. diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx index 2cae08bf2e7a..315621c6504a 100644 --- a/include/svtools/place.hxx +++ b/include/svtools/place.hxx @@ -21,13 +21,13 @@ private: public: - Place( const OUString& sName, const OUString& sUrl, bool bEditable = false ) : + Place( const OUString& sName, std::u16string_view sUrl, bool bEditable = false ) : msName( sName ), maUrl( sUrl ), mbEditable( bEditable ) {}; void SetName(const OUString& aName ) { msName = aName; } - void SetUrl(const OUString& aUrl ) { maUrl.SetURL( aUrl ); } + void SetUrl(std::u16string_view aUrl ) { maUrl.SetURL( aUrl ); } OUString& GetName( ) { return msName; } OUString GetUrl( ) const { return maUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index c4a51f4191db..d668bf9e668e 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -109,8 +109,8 @@ public: // FillObjTitleList is filling the rList with the title for each gallery object static bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList ); - static bool InsertURL( std::u16string_view rThemeName, const OUString& rURL ); - static bool InsertURL( sal_uInt32 nThemeId, const OUString& rURL ); + static bool InsertURL( std::u16string_view rThemeName, std::u16string_view rURL ); + static bool InsertURL( sal_uInt32 nThemeId, std::u16string_view rURL ); static bool GetGraphicObj( std::u16string_view rThemeName, sal_uInt32 nPos, Graphic* pGraphic ); diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index 8de817484bd2..708d6fa0d718 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -102,7 +102,7 @@ private: INetURLObject aUserURL; bool bMultiPath; - SAL_DLLPRIVATE void ImplLoad( const OUString& rMultiPath ); + SAL_DLLPRIVATE void ImplLoad( std::u16string_view rMultiPath ); SAL_DLLPRIVATE void ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly ); GalleryThemeEntry* ImplGetThemeEntry( std::u16string_view rThemeName ); @@ -115,7 +115,7 @@ private: public: // only for gengal utility! - Gallery( const OUString& rMultiPath ); + Gallery( std::u16string_view rMultiPath ); virtual ~Gallery() override; static Gallery* GetGalleryInstance(); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index ea94f1d78014..e3de9a1ad217 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -43,7 +43,7 @@ namespace o3tl } // load language strings from resource -SVXCORE_DLLPUBLIC OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bNeg ); +SVXCORE_DLLPUBLIC OUString GetDicInfoStr( std::u16string_view rName, const LanguageType nLang, bool bNeg ); class SVXCORE_DLLPUBLIC SvxLanguageBox { diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index c56c6d092688..cb3a4cca496d 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -215,7 +215,7 @@ public: const OUString& rReferer); // as above but initializes name as expected static XPropertyListRef CreatePropertyListFromURL(XPropertyListType t, - const OUString & rUrl); + std::u16string_view rUrl); // helper accessors static inline XDashListRef AsDashList( diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index cb135497bc88..b99187a1caa3 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -287,22 +287,22 @@ public: // Strict Parsing: inline explicit INetURLObject( - OUString const & rTheAbsURIRef, + std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); - inline bool SetURL(OUString const & rTheAbsURIRef, + inline bool SetURL(std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); bool ConcatData(INetProtocol eTheScheme, std::u16string_view rTheUser, std::u16string_view rThePassword, std::u16string_view rTheHost, sal_uInt32 nThePort, - OUString const & rThePath); + std::u16string_view rThePath); // Smart Parsing: - inline INetURLObject(OUString const & rTheAbsURIRef, + inline INetURLObject(std::u16string_view rTheAbsURIRef, INetProtocol eTheSmartScheme, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, @@ -312,7 +312,7 @@ public: { m_eSmartScheme = eTheSmartScheme; } inline bool - SetSmartURL(OUString const & rTheAbsURIRef, + SetSmartURL(std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8, FSysStyle eStyle = FSysStyle::Detect); @@ -341,14 +341,14 @@ public: is returned. */ static OUString - GetAbsURL(OUString const & rTheBaseURIRef, + GetAbsURL(std::u16string_view rTheBaseURIRef, OUString const & rTheRelURIRef, EncodeMechanism eEncodeMechanism = EncodeMechanism::WasEncoded, DecodeMechanism eDecodeMechanism = DecodeMechanism::ToIUri, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8); static inline OUString - GetRelURL(OUString const & rTheBaseURIRef, + GetRelURL(std::u16string_view rTheBaseURIRef, OUString const & rTheAbsURIRef, EncodeMechanism eEncodeMechanism = EncodeMechanism::WasEncoded, DecodeMechanism eDecodeMechanism = DecodeMechanism::ToIUri, @@ -458,7 +458,7 @@ public: = RTL_TEXTENCODING_UTF8) const { return decode(m_aPath, eMechanism, eCharset); } - bool SetURLPath(OUString const & rThePath, + bool SetURLPath(std::u16string_view rThePath, EncodeMechanism eMechanism = EncodeMechanism::WasEncoded, rtl_TextEncoding eCharset = RTL_TEXTENCODING_UTF8) { return setPath(rThePath, eMechanism, eCharset); } @@ -971,7 +971,7 @@ private: TOOLS_DLLPRIVATE void setInvalid(); bool setAbsURIRef( - OUString const & rTheAbsURIRef, + std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bSmart, FSysStyle eStyle); @@ -1058,7 +1058,7 @@ private: OUStringBuffer &rSynPath); bool setPath( - OUString const & rThePath, + std::u16string_view rThePath, EncodeMechanism eMechanism, rtl_TextEncoding eCharset); // Hierarchical Path: @@ -1140,16 +1140,16 @@ inline OUString INetURLObject::decode(SubString const & rSubString, OUString(); } -inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, +inline INetURLObject::INetURLObject(std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset): - m_aAbsURIRef(rTheAbsURIRef.getLength() * 2), m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) + m_aAbsURIRef(rTheAbsURIRef.size() * 2), m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) { setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, false, FSysStyle(0)); } -inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef, +inline bool INetURLObject::SetURL(std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { @@ -1157,7 +1157,7 @@ inline bool INetURLObject::SetURL(OUString const & rTheAbsURIRef, FSysStyle(0)); } -inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, +inline INetURLObject::INetURLObject(std::u16string_view rTheAbsURIRef, INetProtocol eTheSmartScheme, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, @@ -1167,7 +1167,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, setAbsURIRef(rTheAbsURIRef, eMechanism, eCharset, true, eStyle); } -inline bool INetURLObject::SetSmartURL(OUString const & rTheAbsURIRef, +inline bool INetURLObject::SetSmartURL(std::u16string_view rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle) @@ -1208,7 +1208,7 @@ inline bool INetURLObject::GetNewAbsURL(OUString const & rTheRelURIRef, } // static -inline OUString INetURLObject::GetRelURL(OUString const & rTheBaseURIRef, +inline OUString INetURLObject::GetRelURL(std::u16string_view rTheBaseURIRef, OUString const & rTheAbsURIRef, EncodeMechanism eEncodeMechanism, DecodeMechanism eDecodeMechanism, diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx index ed833580f9ba..76168e1f77d9 100644 --- a/include/unotools/ucbhelper.hxx +++ b/include/unotools/ucbhelper.hxx @@ -63,7 +63,7 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder( UNOTOOLS_DLLPUBLIC bool ensureFolder( const css::uno::Reference< css::uno::XComponentContext >& xCtx, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, - const OUString& rFolder, ucbhelper::Content & result) noexcept; + std::u16string_view rFolder, ucbhelper::Content & result) noexcept; UNOTOOLS_DLLPUBLIC bool IsYounger( OUString const & younger, OUString const & older); diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index e420d4dc61ce..7880d1c2e910 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -295,7 +295,7 @@ public: ErrCode ExportGraphic( const Graphic& rGraphic, const INetURLObject& rPath, sal_uInt16 nFormat, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr ); - ErrCode ExportGraphic( const Graphic& rGraphic, const OUString& rPath, + ErrCode ExportGraphic( const Graphic& rGraphic, std::u16string_view rPath, SvStream& rOStm, sal_uInt16 nFormat, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr ); @@ -307,11 +307,11 @@ public: sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE ); - ErrCode CanImportGraphic( const OUString& rPath, SvStream& rStream, + ErrCode CanImportGraphic( std::u16string_view rPath, SvStream& rStream, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat); - ErrCode ImportGraphic( Graphic& rGraphic, const OUString& rPath, + ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view rPath, SvStream& rStream, sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW, sal_uInt16 * pDeterminedFormat = nullptr, GraphicFilterImportFlags nImportFlags = GraphicFilterImportFlags::NONE, @@ -328,7 +328,7 @@ public: */ void MakeGraphicsAvailableThreaded(std::vector< Graphic* >& rGraphics); - ErrCode ImportGraphic( Graphic& rGraphic, const OUString& rPath, + ErrCode ImportGraphic( Graphic& rGraphic, std::u16string_view rPath, SvStream& rStream, sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags, @@ -387,7 +387,7 @@ private: void ImplInit(); ErrCode ImplSetError( ErrCode nError, const SvStream* pStm = nullptr ); - ErrCode ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat ); + ErrCode ImpTestOrFindFormat( std::u16string_view rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_DLLPRIVATE_LINK( FilterCallback, ConvertData&, bool ); |