From 48e279c6748bf023fba12fdc3f4cee402f611c6e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Apr 2021 14:03:48 +0200 Subject: 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 --- sd/source/filter/eppt/pptx-epptooxml.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'sd/source') diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index afed524c0452..d87f51a07712 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -384,7 +384,7 @@ bool PowerPointExport::exportDocument() //write document properties writeDocumentProperties(); - addRelation(oox::getRelationship(Relationship::OFFICEDOCUMENT), "ppt/presentation.xml"); + addRelation(oox::getRelationship(Relationship::OFFICEDOCUMENT), u"ppt/presentation.xml"); OUString aMediaType; if (mbPptm) @@ -414,7 +414,7 @@ bool PowerPointExport::exportDocument() addRelation(mPresentationFS->getOutputStream(), oox::getRelationship(Relationship::THEME), - "theme/theme1.xml"); + u"theme/theme1.xml"); mPresentationFS->startElementNS(XML_p, XML_presentation, PNMSS); @@ -953,7 +953,7 @@ void PowerPointExport::WriteAuthors() "application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml"); addRelation(mPresentationFS->getOutputStream(), oox::getRelationship(Relationship::COMMENTAUTHORS), - "commentAuthors.xml"); + u"commentAuthors.xml"); pFS->startElementNS(XML_p, XML_cmAuthorLst, FSNS(XML_xmlns, XML_p), getNamespaceURL(OOX_NS(ppt))); @@ -1070,7 +1070,7 @@ void PowerPointExport::WriteVBA() comphelper::OStorageHelper::CopyInputToOutput(xMacrosStream, xOutputStream); // Write the relationship. - addRelation(mPresentationFS->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), "vbaProject.bin"); + addRelation(mPresentationFS->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), u"vbaProject.bin"); } void PowerPointExport::ImplWriteSlide(sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_uInt16 /* nMode */, @@ -1205,7 +1205,7 @@ void PowerPointExport::ImplWriteNotes(sal_uInt32 nPageNum) // add implicit relation to notes master addRelation(pFS->getOutputStream(), oox::getRelationship(Relationship::NOTESMASTER), - "../notesMasters/notesMaster1.xml"); + u"../notesMasters/notesMaster1.xml"); SAL_INFO("sd.eppt", "-----------------"); } @@ -1879,7 +1879,7 @@ void PowerPointExport::WriteNotesMaster() OUString sRelId = addRelation(mPresentationFS->getOutputStream(), oox::getRelationship(Relationship::NOTESMASTER), - "notesMasters/notesMaster1.xml"); + u"notesMasters/notesMaster1.xml"); mPresentationFS->singleElementNS(XML_p, XML_notesMasterId, FSNS(XML_r, XML_id), sRelId); -- cgit