summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-04-28 14:12:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-04-29 08:53:22 +0200
commitd3849255b76e92a42f653c266b88945708984c4f (patch)
treeff1eab21b9e5a1ea00e1573db4b4595ba51b0098 /include/sfx2
parentf9b6bd6336b35de060f6f5bdd91517caf5e9a56e (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/sfx2')
-rw-r--r--include/sfx2/docfile.hxx2
-rw-r--r--include/sfx2/doctempl.hxx4
-rw-r--r--include/sfx2/frmdescr.hxx2
-rw-r--r--include/sfx2/frmhtml.hxx2
-rw-r--r--include/sfx2/objsh.hxx2
-rw-r--r--include/sfx2/sfxhtml.hxx6
-rw-r--r--include/sfx2/templatelocalview.hxx6
7 files changed, 12 insertions, 12 deletions
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);