diff options
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r-- | sc/source/filter/excel/xecontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/excel/xestream.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 2692406d9a2d..028ad89241d6 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -210,7 +210,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) "sharedStrings.xml", rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml", - OUStringToOString(oox::getRelationship(Relationship::SHAREDSTRINGS), RTL_TEXTENCODING_UTF8).getStr()); + oox::getRelationship(Relationship::SHAREDSTRINGS)); rStrm.PushStream( pSst ); pSst->startElement( XML_sst, diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index c104a97206b1..daf2a2777b23 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -1254,7 +1254,7 @@ OUString XclExpTbxControlObj::SaveControlPropertiesXml(XclExpXmlStream& rStrm) c XclXmlUtils::GetStreamName( "../", "ctrlProps/ctrlProps", nDrawing ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.ms-excel.controlproperties+xml", - OUStringToOString(oox::getRelationship(Relationship::CTRLPROP), RTL_TEXTENCODING_UTF8).getStr(), + oox::getRelationship(Relationship::CTRLPROP), &sIdFormControlPr ); rStrm.PushStream( pFormControl ); @@ -1714,7 +1714,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm ) XclXmlUtils::GetStreamName( "../", "comments", mnTab + 1 ), rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml", - OUStringToOString(oox::getRelationship(Relationship::COMMENTS), RTL_TEXTENCODING_UTF8).getStr()); + oox::getRelationship(Relationship::COMMENTS)); rStrm.PushStream( rComments ); if( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 ) diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 476c8a0bdf8d..a43c612e3e23 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -941,14 +941,14 @@ sax_fastparser::FSHelperPtr XclExpXmlStream::CreateOutputStream ( const OUString& sRelativeStream, const uno::Reference< XOutputStream >& xParentRelation, const char* sContentType, - const char* sRelationshipType, + std::u16string_view sRelationshipType, OUString* pRelationshipId ) { OUString sRelationshipId; if (xParentRelation.is()) - sRelationshipId = addRelation( xParentRelation, OUString::createFromAscii( sRelationshipType), sRelativeStream ); + sRelationshipId = addRelation( xParentRelation, sRelationshipType, sRelativeStream ); else - sRelationshipId = addRelation( OUString::createFromAscii( sRelationshipType ), sRelativeStream ); + sRelationshipId = addRelation( sRelationshipType, sRelativeStream ); if( pRelationshipId ) *pRelationshipId = sRelationshipId; @@ -1074,7 +1074,7 @@ bool XclExpXmlStream::exportDocument() PushStream( CreateOutputStream( workbook, workbook, uno::Reference <XOutputStream>(), pWorkbookContentType, - OUStringToOString(oox::getRelationship(Relationship::OFFICEDOCUMENT), RTL_TEXTENCODING_UTF8).getStr() ) ); + oox::getRelationship(Relationship::OFFICEDOCUMENT) ) ); if (mbExportVBA) { diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index dbf13483903a..48bc5df23dc9 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -3190,7 +3190,7 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) "styles.xml", rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml", - OUStringToOString(oox::getRelationship(Relationship::STYLES), RTL_TEXTENCODING_UTF8).getStr()); + oox::getRelationship(Relationship::STYLES)); rStrm.PushStream( aStyleSheet ); aStyleSheet->startElement(XML_styleSheet, XML_xmlns, rStrm.getNamespaceURL(OOX_NS(xls))); |