summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-04-26 14:03:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-04-27 20:31:14 +0200
commit48e279c6748bf023fba12fdc3f4cee402f611c6e (patch)
tree2e1b3a20ccd71f47a66938f882c1fe9d5e947bb4 /sc
parentf3665d2a42b39814764f3eb9e20498b8a4be1d00 (diff)
use string_view in INetURLObject::decode
Change-Id: I10e04970ceac33c9c3fbfd0182dd2140e06cb80b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114658 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/tool/compiler.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx4
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/inc/xestream.hxx2
-rw-r--r--sc/source/filter/xcl97/XclExpChangeTrack.cxx4
6 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 488e5ab1fd9f..9e8f8929dc12 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1184,7 +1184,7 @@ struct ConventionXL
return lcl_makeExternalNameStr( rFile, rName, '!', false);
}
- static void makeExternalDocStr( OUStringBuffer& rBuffer, const OUString& rFullName )
+ static void makeExternalDocStr( OUStringBuffer& rBuffer, std::u16string_view rFullName )
{
// Format that is easier to deal with inside OOo, because we use file
// URL, and all characters are allowed. Check if it makes sense to do
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index f505968d6373..cf0c3777f39f 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -209,7 +209,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream(
"xl/sharedStrings.xml",
- "sharedStrings.xml",
+ u"sharedStrings.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
oox::getRelationship(Relationship::SHAREDSTRINGS));
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 18647bbd3c02..f98d81601f41 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -939,7 +939,7 @@ void XclExpXmlStream::WriteAttribute(sal_Int32 nAttr, std::u16string_view sVal)
sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream (
const OUString& sFullStream,
- const OUString& sRelativeStream,
+ std::u16string_view sRelativeStream,
const uno::Reference< XOutputStream >& xParentRelation,
const char* sContentType,
std::u16string_view sRelationshipType,
@@ -1093,7 +1093,7 @@ bool XclExpXmlStream::exportDocument()
openFragmentStream("xl/vbaProject.bin", "application/vnd.ms-office.vbaProject");
comphelper::OStorageHelper::CopyInputToOutput(xVBAStream, xVBAOutput);
- addRelation(GetCurrentStream()->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), "vbaProject.bin");
+ addRelation(GetCurrentStream()->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), u"vbaProject.bin");
}
}
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 6376371fb1da..d3830d7ad9b0 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3189,7 +3189,7 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm )
{
sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream(
"xl/styles.xml",
- "styles.xml",
+ u"styles.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
oox::getRelationship(Relationship::STYLES));
diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx
index e8161e31e182..3dfdb87fbe40 100644
--- a/sc/source/filter/inc/xestream.hxx
+++ b/sc/source/filter/inc/xestream.hxx
@@ -309,7 +309,7 @@ public:
sax_fastparser::FSHelperPtr CreateOutputStream (
const OUString& sFullStream,
- const OUString& sRelativeStream,
+ std::u16string_view sRelativeStream,
const css::uno::Reference< css::io::XOutputStream >& xParentRelation,
const char* sContentType,
std::u16string_view sRelationshipType,
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 1efcd8b4f0e9..5ddd4bf64d7e 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1616,7 +1616,7 @@ static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm )
{
sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream(
"xl/revisions/userNames.xml",
- "revisions/userNames.xml",
+ u"revisions/userNames.xml",
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml",
CREATE_OFFICEDOC_RELATION_TYPE("usernames"));
@@ -1639,7 +1639,7 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm )
sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream(
"xl/revisions/revisionHeaders.xml",
- "revisions/revisionHeaders.xml",
+ u"revisions/revisionHeaders.xml",
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml",
CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));