sc/source/filter/excel/excdoc.cxx | 2 sc/source/filter/excel/excel.cxx | 12 - sc/source/filter/excel/excform.cxx | 6 sc/source/filter/excel/excform8.cxx | 6 sc/source/filter/excel/excimp8.cxx | 4 sc/source/filter/excel/expop2.cxx | 2 sc/source/filter/excel/xechart.cxx | 2 sc/source/filter/excel/xecontent.cxx | 4 sc/source/filter/excel/xeescher.cxx | 72 ++++----- sc/source/filter/excel/xelink.cxx | 4 sc/source/filter/excel/xepivotxml.cxx | 2 sc/source/filter/excel/xeroot.cxx | 2 sc/source/filter/excel/xestream.cxx | 6 sc/source/filter/excel/xestyle.cxx | 2 sc/source/filter/excel/xichart.cxx | 4 sc/source/filter/excel/xiescher.cxx | 132 ++++++++--------- sc/source/filter/excel/xistyle.cxx | 2 sc/source/filter/excel/xlchart.cxx | 12 - sc/source/filter/excel/xltoolbar.cxx | 6 sc/source/filter/html/htmlexp.cxx | 2 sc/source/filter/html/htmlexp2.cxx | 2 sc/source/filter/html/htmlpars.cxx | 6 sc/source/filter/lotus/lotimpop.cxx | 4 sc/source/filter/oox/SparklineFragment.cxx | 8 - sc/source/filter/oox/commentsbuffer.cxx | 2 sc/source/filter/oox/condformatbuffer.cxx | 4 sc/source/filter/oox/drawingfragment.cxx | 32 ++-- sc/source/filter/oox/excelchartconverter.cxx | 2 sc/source/filter/oox/excelfilter.cxx | 2 sc/source/filter/oox/extlstcontext.cxx | 4 sc/source/filter/oox/formulabase.cxx | 4 sc/source/filter/oox/numberformatsbuffer.cxx | 4 sc/source/filter/oox/ooxformulaparser.cxx | 6 sc/source/filter/oox/pivottablefragment.cxx | 2 sc/source/filter/oox/querytablebuffer.cxx | 6 sc/source/filter/oox/sheetdatabuffer.cxx | 2 sc/source/filter/oox/stylesbuffer.cxx | 2 sc/source/filter/oox/unitconverter.cxx | 14 - sc/source/filter/oox/viewsettings.cxx | 2 sc/source/filter/oox/workbookfragment.cxx | 6 sc/source/filter/oox/workbookhelper.cxx | 6 sc/source/filter/oox/workbooksettings.cxx | 12 - sc/source/filter/orcus/filterdetect.cxx | 10 - sc/source/filter/xcl97/XclExpChangeTrack.cxx | 4 sc/source/filter/xcl97/xcl97esc.cxx | 4 sc/source/filter/xcl97/xcl97rec.cxx | 2 sc/source/filter/xml/SparklineGroupsExport.cxx | 2 sc/source/filter/xml/XMLCodeNameProvider.cxx | 2 sc/source/filter/xml/XMLExportDataPilot.cxx | 16 +- sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 16 +- sc/source/filter/xml/XMLStylesExportHelper.cxx | 6 sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 14 - sc/source/filter/xml/XMLTableShapeResizer.cxx | 2 sc/source/filter/xml/XMLTrackedChangesContext.cxx | 2 sc/source/filter/xml/xmlcondformat.cxx | 2 sc/source/filter/xml/xmlcvali.cxx | 2 sc/source/filter/xml/xmlexprt.cxx | 98 ++++++------- sc/source/filter/xml/xmlimprt.cxx | 68 ++++----- sc/source/filter/xml/xmlstyli.cxx | 8 - sc/source/filter/xml/xmlwrap.cxx | 140 +++++++++---------- 60 files changed, 407 insertions(+), 407 deletions(-)
New commits: commit 000aaf1f8c6b3520a604327445a41ca6b8f568dc Author: Noel Grandin <[email protected]> AuthorDate: Fri May 17 08:50:01 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri May 17 12:15:12 2024 +0200 loplugin:ostr in sc/../filter Change-Id: I3c986d9e7f9780f08653131205626471ac75896f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167759 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 00b1ab0a3d72..9b2a29ff62ca 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -872,7 +872,7 @@ void ExcDocument::WriteXml( XclExpXmlStream& rStrm ) std::shared_ptr<model::Theme> pTheme = pDrawLayer->getTheme(); if (pTheme) { - OUString sThemeRelationshipPath = "theme/theme1.xml"; + OUString sThemeRelationshipPath = u"theme/theme1.xml"_ustr; OUString sThemeDocumentPath = "xl/" + sThemeRelationshipPath; oox::ThemeExport aThemeExport(&rStrm, oox::drawingml::DOCUMENT_XLSX); diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 82dca81539ae..79e4c9073627 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -90,7 +90,7 @@ static rtl::Reference<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); uno::Reference< packages::XPackageEncryption > xPackageEncryption( xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.oox.crypto.DRMDataSpace", aArguments, xComponentContext), uno::UNO_QUERY); + u"com.sun.star.comp.oox.crypto.DRMDataSpace"_ustr, aArguments, xComponentContext), uno::UNO_QUERY); if (!xPackageEncryption.is()) { @@ -109,7 +109,7 @@ static rtl::Reference<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const return aNewStorage; } - rtl::Reference<SotStorageStream> rContentStream = rStorage->OpenSotStream(" DRMContent", StreamMode::READ | StreamMode::SHARE_DENYALL); + rtl::Reference<SotStorageStream> rContentStream = rStorage->OpenSotStream(u" DRMContent"_ustr, StreamMode::READ | StreamMode::SHARE_DENYALL); if (!rContentStream.is()) { return aNewStorage; @@ -132,7 +132,7 @@ static rtl::Reference<SotStorage> lcl_DRMDecrypt(const SfxMedium& rMedium, const aNewStorage = new SotStorage(*rNewStorageStrm); // Set the media descriptor data - uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(""); + uno::Sequence<beans::NamedValue> aEncryptionData = xPackageEncryption->createEncryptionData(u""_ustr); rMedium.GetItemSet().Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, uno::Any(aEncryptionData))); } catch (const std::exception&) @@ -182,7 +182,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* if( xRootStrg.is() ) { // Check if there is DRM encryption in storage - rtl::Reference<SotStorageStream> xDRMStrm = ScfTools::OpenStorageStreamRead(xRootStrg, " DRMContent"); + rtl::Reference<SotStorageStream> xDRMStrm = ScfTools::OpenStorageStreamRead(xRootStrg, u" DRMContent"_ustr); if (xDRMStrm.is()) { auto pDecryptedStorage = lcl_DRMDecrypt(rMedium, xRootStrg, aNewStorageStrm); @@ -273,13 +273,13 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, if (pEncryptionDataItem && (pEncryptionDataItem->GetValue() >>= aEncryptionData)) { ::comphelper::SequenceAsHashMap aHashData(aEncryptionData); - OUString sCryptoType = aHashData.getUnpackedValueOrDefault("CryptoType", OUString()); + OUString sCryptoType = aHashData.getUnpackedValueOrDefault(u"CryptoType"_ustr, OUString()); if (sCryptoType.getLength()) { uno::Reference<uno::XComponentContext> xComponentContext(comphelper::getProcessComponentContext()); uno::Sequence<uno::Any> aArguments{ - uno::Any(beans::NamedValue("Binary", uno::Any(true))) }; + uno::Any(beans::NamedValue(u"Binary"_ustr, uno::Any(true))) }; xPackageEncryption.set( xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext( "com.sun.star.comp.oox.crypto." + sCryptoType, aArguments, xComponentContext), uno::UNO_QUERY); diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index d217c9622e06..10119bb1d338 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -190,7 +190,7 @@ ExcelToSc::~ExcelToSc() std::unique_ptr<ScTokenArray> ExcelToSc::GetDummy() { - aPool.Store( "Dummy()" ); + aPool.Store( u"Dummy()"_ustr ); aPool >> aStack; return aPool.GetTokenArray( GetDocImport().getDoc(), aStack.Get()); } @@ -216,7 +216,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream if( nFormulaLen == 0 ) { - aPool.Store( "-/-" ); + aPool.Store( u"-/-"_ustr ); aPool >> aStack; pResult = aPool.GetTokenArray( GetDocImport().getDoc(), aStack.Get()); return ConvErr::OK; @@ -679,7 +679,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream case 0x78: case 0x38: // Command-Equivalent Function [333 ] { - OUString aString = "COMM_EQU_FUNC"; + OUString aString = u"COMM_EQU_FUNC"_ustr; sal_uInt8 nByte = aIn.ReaduInt8(); aString += OUString::number( nByte ); nByte = aIn.ReaduInt8(); diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 00c01923e201..ebd868aeb7d2 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -153,7 +153,7 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt if( nFormulaLen == 0 ) { - aPool.Store( "-/-" ); + aPool.Store( u"-/-"_ustr ); aPool >> aStack; rpTokArray = aPool.GetTokenArray( GetDocImport().getDoc(), aStack.Get()); return ConvErr::OK; @@ -651,7 +651,7 @@ ConvErr ExcelToSc8::Convert( std::unique_ptr<ScTokenArray>& rpTokArray, XclImpSt case 0x78: case 0x38: // Command-Equivalent Function [333 ] { - OUString aString = "COMM_EQU_FUNC"; + OUString aString = u"COMM_EQU_FUNC"_ustr; sal_uInt8 nByte = aIn.ReaduInt8(); aString += OUString::number( nByte ); nByte = aIn.ReaduInt8(); @@ -1300,7 +1300,7 @@ void ExcelToSc8::ConvertExternName( std::unique_ptr<ScTokenArray>& rpArray, XclI if (nFormulaLen == 0) { - aPool.Store("-/-"); + aPool.Store(u"-/-"_ustr); aPool >> aStack; rpArray = aPool.GetTokenArray( GetDocImport().getDoc(), aStack.Get()); return; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 12ed36cebd48..a3c0112e0228 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -335,7 +335,7 @@ void ImportExcel8::ReadBasic() officecfg::Office::Calc::Filter::Import::VBA::Executable::get() ) { // see if we have the XCB stream - rtl::Reference<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", StreamMode::STD_READ ); + rtl::Reference<SotStorageStream> xXCB = xRootStrg->OpenSotStream( u"XCB"_ustr, StreamMode::STD_READ ); if ( xXCB.is()|| ERRCODE_NONE == xXCB->GetError() ) { ScCTBWrapper wrapper; @@ -354,7 +354,7 @@ void ImportExcel8::ReadBasic() SfxMedium& rMedium = GetMedium(); uno::Reference< io::XInputStream > xIn = rMedium.GetInputStream(); oox::ole::OleStorage root( aCtx, xIn, false ); - oox::StorageRef vbaStg = root.openSubStorage( "_VBA_PROJECT_CUR", false ); + oox::StorageRef vbaStg = root.openSubStorage( u"_VBA_PROJECT_CUR"_ustr, false ); if ( vbaStg ) { oox::ole::VbaProject aVbaPrj( aCtx, pShell->GetModel(), u"Calc" ); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 1c9ea2ae0b72..72ff1cac17ae 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -91,7 +91,7 @@ ErrCode ExportBiff5::Write() VbaExport aExport(pDocShell->GetModel()); if (aExport.containsVBAProject()) { - rtl::Reference<SotStorage> xVBARoot = xRootStrg->OpenSotStorage("_VBA_PROJECT_CUR"); + rtl::Reference<SotStorage> xVBARoot = xRootStrg->OpenSotStorage(u"_VBA_PROJECT_CUR"_ustr); aExport.exportVBA( xVBARoot.get() ); } } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index d9ef2b2f3a7f..7956951bb8d1 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -3293,7 +3293,7 @@ static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc, return; OUString aTitle; - Any any = xProp->getPropertyValue("String"); + Any any = xProp->getPropertyValue(u"String"_ustr); if (any >>= aTitle) rSubTitle = aTitle; } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index e31ba8b19bb6..4f2cec309159 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -211,7 +211,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) return; sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream( - "xl/sharedStrings.xml", + u"xl/sharedStrings.xml"_ustr, u"sharedStrings.xml", rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml", @@ -1043,7 +1043,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) || eOperation == ScConditionMode::BottomPercent; bool bPercent = eOperation == ScConditionMode::TopPercent || eOperation == ScConditionMode::BottomPercent; - OUString aRank("0"); + OUString aRank(u"0"_ustr); if(IsTopBottomRule(eOperation)) { // position and formula grammar are not important diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index c2eccb79d58f..314f2ebe5b1c 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -536,7 +536,7 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc // OBJ record flags SetLocked( true ); - SetPrintable( aCtrlProp.GetBoolProperty( "Printable" ) ); + SetPrintable( aCtrlProp.GetBoolProperty( u"Printable"_ustr ) ); SetAutoFill( false ); SetAutoLine( false ); @@ -552,13 +552,13 @@ XclExpOcxControlObj::XclExpOcxControlObj( XclExpObjectManager& rObjMgr, Referenc // #i51348# name of the control, may overwrite shape name OUString aCtrlName; - if( aCtrlProp.GetProperty( aCtrlName, "Name" ) && !aCtrlName.isEmpty() ) + if( aCtrlProp.GetProperty( aCtrlName, u"Name"_ustr ) && !aCtrlName.isEmpty() ) aPropOpt.AddOpt( ESCHER_Prop_wzName, aCtrlName ); // meta file //TODO - needs check Reference< XPropertySet > xShapePS( xShape, UNO_QUERY ); - if( xShapePS.is() && aPropOpt.CreateGraphicProperties( xShapePS, "MetaFile", false ) ) + if( xShapePS.is() && aPropOpt.CreateGraphicProperties( xShapePS, u"MetaFile"_ustr, false ) ) { sal_uInt32 nBlipId; if( aPropOpt.GetOpt( ESCHER_Prop_pib, nBlipId ) ) @@ -667,7 +667,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // control type sal_Int16 nClassId = 0; - if( aCtrlProp.GetProperty( nClassId, "ClassId" ) ) + if( aCtrlProp.GetProperty( nClassId, u"ClassId"_ustr ) ) { switch( nClassId ) { @@ -687,7 +687,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // OBJ record flags SetLocked( true ); - mbPrint = aCtrlProp.GetBoolProperty( "Printable" ); + mbPrint = aCtrlProp.GetBoolProperty( u"Printable"_ustr ); SetPrintable( mbPrint ); SetAutoFill( false ); SetAutoLine( false ); @@ -696,7 +696,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, ShapeFlag::HaveAnchor | ShapeFlag::HaveShapeProperty ); EscherPropertyContainer aPropOpt; - mbVisible = aCtrlProp.GetBoolProperty( "EnableVisible" ); + mbVisible = aCtrlProp.GetBoolProperty( u"EnableVisible"_ustr ); aPropOpt.AddOpt( ESCHER_Prop_fPrint, mbVisible ? 0x00080000 : 0x00080002 ); // visible flag aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01000100 ); // bool field @@ -707,7 +707,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field // #i51348# name of the control, may overwrite shape name - if( aCtrlProp.GetProperty( msCtrlName, "Name" ) && !msCtrlName.isEmpty() ) + if( aCtrlProp.GetProperty( msCtrlName, u"Name"_ustr ) && !msCtrlName.isEmpty() ) aPropOpt.AddOpt( ESCHER_Prop_wzName, msCtrlName ); //Export description as alt text @@ -730,7 +730,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mrEscherEx.UpdateDffFragmentEnd(); // control label - if( aCtrlProp.GetProperty( msLabel, "Label" ) ) + if( aCtrlProp.GetProperty( msLabel, u"Label"_ustr ) ) { /* Be sure to construct the MSODRAWING record containing the ClientTextbox atom after the base OBJ's MSODRAWING record data is @@ -756,7 +756,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< mrEscherEx.CloseContainer(); // ESCHER_SpContainer // other properties - aCtrlProp.GetProperty( mnLineCount, "LineCount" ); + aCtrlProp.GetProperty( mnLineCount, u"LineCount"_ustr ); // border style sal_Int16 nApiButton = AwtVisualEffect::LOOK3D; @@ -765,11 +765,11 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { case FormCompType::LISTBOX: case FormCompType::COMBOBOX: - aCtrlProp.GetProperty( nApiBorder, "Border" ); + aCtrlProp.GetProperty( nApiBorder, u"Border"_ustr ); break; case FormCompType::CHECKBOX: case FormCompType::RADIOBUTTON: - aCtrlProp.GetProperty( nApiButton, "VisualEffect" ); + aCtrlProp.GetProperty( nApiButton, u"VisualEffect"_ustr ); nApiBorder = AwtVisualEffect::NONE; break; // Push button cannot be set to flat in Excel @@ -797,7 +797,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< // control state sal_Int16 nApiState = 0; - if( aCtrlProp.GetProperty( nApiState, "State" ) ) + if( aCtrlProp.GetProperty( nApiState, u"State"_ustr ) ) { switch( nApiState ) { @@ -812,9 +812,9 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { case FormCompType::LISTBOX: { - mbMultiSel = aCtrlProp.GetBoolProperty( "MultiSelection" ); + mbMultiSel = aCtrlProp.GetBoolProperty( u"MultiSelection"_ustr ); Sequence< sal_Int16 > aSelection; - if( aCtrlProp.GetProperty( aSelection, "SelectedItems" ) ) + if( aCtrlProp.GetProperty( aSelection, u"SelectedItems"_ustr ) ) { if( aSelection.hasElements() ) { @@ -824,7 +824,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< } // convert listbox with dropdown button to Excel dropdown - if( aCtrlProp.GetBoolProperty( "Dropdown" ) ) + if( aCtrlProp.GetBoolProperty( u"Dropdown"_ustr ) ) mnObjType = EXC_OBJTYPE_DROPDOWN; } break; @@ -833,8 +833,8 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< { Sequence< OUString > aStringList; OUString aDefText; - if( aCtrlProp.GetProperty( aStringList, "StringItemList" ) && - aCtrlProp.GetProperty( aDefText, "Text" ) && + if( aCtrlProp.GetProperty( aStringList, u"StringItemList"_ustr ) && + aCtrlProp.GetProperty( aDefText, u"Text"_ustr ) && aStringList.hasElements() && !aDefText.isEmpty() ) { auto nIndex = comphelper::findValue(aStringList, aDefText); @@ -845,7 +845,7 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< } // convert combobox without dropdown button to Excel listbox - if( !aCtrlProp.GetBoolProperty( "Dropdown" ) ) + if( !aCtrlProp.GetBoolProperty( u"Dropdown"_ustr ) ) mnObjType = EXC_OBJTYPE_LISTBOX; } break; @@ -853,17 +853,17 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< case FormCompType::SCROLLBAR: { sal_Int32 nApiValue = 0; - if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMin" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"ScrollValueMin"_ustr ) ) mnScrollMin = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "ScrollValueMax" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"ScrollValueMax"_ustr ) ) mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "ScrollValue" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"ScrollValue"_ustr ) ) mnScrollValue = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, mnScrollMax ); - if( aCtrlProp.GetProperty( nApiValue, "LineIncrement" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"LineIncrement"_ustr ) ) mnScrollStep = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "BlockIncrement" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"BlockIncrement"_ustr ) ) mnScrollPage = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "Orientation" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"Orientation"_ustr ) ) mbScrollHor = nApiValue == AwtScrollOrient::HORIZONTAL; } break; @@ -871,15 +871,15 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot, Reference< case FormCompType::SPINBUTTON: { sal_Int32 nApiValue = 0; - if( aCtrlProp.GetProperty( nApiValue, "SpinValueMin" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"SpinValueMin"_ustr ) ) mnScrollMin = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "SpinValueMax" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"SpinValueMax"_ustr ) ) mnScrollMax = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "SpinValue" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"SpinValue"_ustr ) ) mnScrollValue = limit_cast< sal_uInt16 >( nApiValue, mnScrollMin, mnScrollMax ); - if( aCtrlProp.GetProperty( nApiValue, "SpinIncrement" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"SpinIncrement"_ustr ) ) mnScrollStep = limit_cast< sal_uInt16 >( nApiValue, EXC_OBJ_SCROLLBAR_MIN, EXC_OBJ_SCROLLBAR_MAX ); - if( aCtrlProp.GetProperty( nApiValue, "Orientation" ) ) + if( aCtrlProp.GetProperty( nApiValue, u"Orientation"_ustr ) ) mbScrollHor = nApiValue == AwtScrollOrient::HORIZONTAL; } break; @@ -1289,19 +1289,19 @@ void XclExpTbxControlObj::SaveXml( XclExpXmlStream& rStrm ) { css::uno::Any mAny; - mAny = rXPropSet->getPropertyValue("TextLeftDistance"); + mAny = rXPropSet->getPropertyValue(u"TextLeftDistance"_ustr); if (mAny.hasValue()) mAny >>= nLeft; - mAny = rXPropSet->getPropertyValue("TextRightDistance"); + mAny = rXPropSet->getPropertyValue(u"TextRightDistance"_ustr); if (mAny.hasValue()) mAny >>= nRight; - mAny = rXPropSet->getPropertyValue("TextUpperDistance"); + mAny = rXPropSet->getPropertyValue(u"TextUpperDistance"_ustr); if (mAny.hasValue()) mAny >>= nTop; - mAny = rXPropSet->getPropertyValue("TextLowerDistance"); + mAny = rXPropSet->getPropertyValue(u"TextLowerDistance"_ustr); if (mAny.hasValue()) mAny >>= nBottom; } @@ -1326,7 +1326,7 @@ void XclExpTbxControlObj::SaveXml( XclExpXmlStream& rStrm ) { css::uno::Any mAny; - mAny = rXPropSet->getPropertyValue("TextAutoGrowHeight"); + mAny = rXPropSet->getPropertyValue(u"TextAutoGrowHeight"_ustr); if (mAny.hasValue()) mAny >>= bTextAutoGrowHeight; } @@ -1571,7 +1571,7 @@ XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape // create the chart substream object ScfPropertySet aShapeProp( xShape ); css::awt::Rectangle aBoundRect; - aShapeProp.GetProperty( aBoundRect, "BoundRect" ); + aShapeProp.GetProperty( aBoundRect, u"BoundRect"_ustr ); tools::Rectangle aChartRect( Point( aBoundRect.X, aBoundRect.Y ), Size( aBoundRect.Width, aBoundRect.Height ) ); mxChart = std::make_shared<XclExpChart>(GetRoot(), GetChartDoc(), aChartRect); } @@ -1682,7 +1682,7 @@ XclExpNote::XclExpNote(const XclExpRoot& rRoot, const ScAddress& rScPos, // author. String length MUST be greater than or equal to 1 and less than or equal // to 54. if( pScNote->GetAuthor().isEmpty() ) - maAuthor = XclExpString( " " ); + maAuthor = XclExpString( u" "_ustr ); else maAuthor = XclExpString( pScNote->GetAuthor(), XclStrFlags::NONE, 54 ); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 528286ea49e9..dd27be049429 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -1117,7 +1117,7 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde( // create the leading 'StdDocumentName' EXTERNNAME record if( maNameList.IsEmpty() ) AppendNew( new XclExpExtNameDde( - GetRoot(), "StdDocumentName", EXC_EXTN_EXPDDE_STDDOC ) ); + GetRoot(), u"StdDocumentName"_ustr, EXC_EXTN_EXPDDE_STDDOC ) ); // try to find DDE result array, but create EXTERNNAME record without them too const ScMatrix* pScMatrix = GetDoc().GetDdeLinkResultMatrix( nPos ); @@ -1997,7 +1997,7 @@ bool XclExpSupbookBuffer::InsertEuroTool( sal_uInt16& rnSupbook, sal_uInt16& rnExtName, const OUString& rName ) { XclExpSupbookRef xSupbook; - OUString aUrl( "EUROTOOL.XLA" ); + OUString aUrl( u"EUROTOOL.XLA"_ustr ); if( !GetSupbookUrl( xSupbook, rnSupbook, aUrl ) ) { xSupbook = new XclExpSupbook( GetRoot(), aUrl, XclSupbookType::Eurotool ); diff --git a/sc/source/filter/excel/xepivotxml.cxx b/sc/source/filter/excel/xepivotxml.cxx index 3cb4bcf35b26..d6e8bad4d4b8 100644 --- a/sc/source/filter/excel/xepivotxml.cxx +++ b/sc/source/filter/excel/xepivotxml.cxx @@ -1187,7 +1187,7 @@ void XclExpXmlPivotTables::SavePivotTableXml( XclExpXmlStream& rStrm, const ScDP savePivotTableFormats(rStrm, rDPObj); // Now add style info (use grab bag, or just a set which is default on Excel 2007 through 2016) - if (const auto [bHas, aVal] = rDPObj.GetInteropGrabBagValue("pivotTableStyleInfo"); bHas) + if (const auto [bHas, aVal] = rDPObj.GetInteropGrabBagValue(u"pivotTableStyleInfo"_ustr); bHas) WriteGrabBagItemToStream(rStrm, XML_pivotTableStyleInfo, aVal); else pPivotStrm->singleElement(XML_pivotTableStyleInfo, XML_name, "PivotStyleLight16", diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index bcc1a7c10ce0..ede76264ca05 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -318,7 +318,7 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( std::u16s sal_uInt8 pnDocId[16]; if (rtl_random_getBytes(nullptr, pnDocId, 16) != rtl_Random_E_None) { - throw uno::RuntimeException("rtl_random_getBytes failed"); + throw uno::RuntimeException(u"rtl_random_getBytes failed"_ustr); } sal_uInt16 pnPasswd[16] = {}; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 93c1e7bcbc35..b777d7771c23 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -565,7 +565,7 @@ void XclExpBiff8Encrypter::Init( const Sequence< NamedValue >& rEncryptionData ) // generate the salt here if (rtl_random_getBytes(nullptr, mpnSalt, 16) != rtl_Random_E_None) { - throw uno::RuntimeException("rtl_random_getBytes failed"); + throw uno::RuntimeException(u"rtl_random_getBytes failed"_ustr); } memset( mpnSaltDigest, 0, sizeof( mpnSaltDigest ) ); @@ -1117,7 +1117,7 @@ bool XclExpXmlStream::exportDocument() css::uno::Reference<css::io::XInputStream> xVBAStream( new utl::OInputStreamWrapper(aVbaStream)); css::uno::Reference<css::io::XOutputStream> xVBAOutput = - openFragmentStream("xl/vbaProject.bin", "application/vnd.ms-office.vbaProject"); + openFragmentStream(u"xl/vbaProject.bin"_ustr, u"application/vnd.ms-office.vbaProject"_ustr); comphelper::OStorageHelper::CopyInputToOutput(xVBAStream, xVBAOutput); addRelation(GetCurrentStream()->getOutputStream(), oox::getRelationship(Relationship::VBAPROJECT), u"vbaProject.bin"); @@ -1169,7 +1169,7 @@ bool XclExpXmlStream::exportDocument() OUString XclExpXmlStream::getImplementationName() { - return "TODO"; + return u"TODO"_ustr; } void XclExpXmlStream::validateTabNames(std::vector<OUString>& aOriginalTabNames) diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 057bee7b30f4..4254fccf91db 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -3347,7 +3347,7 @@ XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr aStyleSheet = rStrm.CreateOutputStream( - "xl/styles.xml", + u"xl/styles.xml"_ustr, u"styles.xml", rStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml", diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 534e252b74b4..e5c8a34bac4d 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -857,7 +857,7 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin { try { - OUString aString("\""); + OUString aString(u"\""_ustr); xDataSeq = xDataProv->createDataSequenceByRangeRepresentation( aString + mxString->GetText() + aString ); // set sequence role ScfPropertySet aSeqProp( xDataSeq ); @@ -1543,7 +1543,7 @@ void XclImpChDataFormat::Convert( ScfPropertySet& rPropSet, const XclChExtTypeIn // #i83151# only hair lines in 3D charts with filled data points if( rTypeInfo.mb3dChart && rTypeInfo.IsSeriesFrameFormat() && mxLineFmt && mxLineFmt->HasLine() ) - rPropSet.SetProperty< sal_Int32 >( "BorderWidth", 0 ); + rPropSet.SetProperty< sal_Int32 >( u"BorderWidth"_ustr, 0 ); // other formatting if( mxMarkerFmt ) diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index afce3213e892..ef6618ef7b6a 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1490,7 +1490,7 @@ rtl::Reference<SdrObject> XclImpTextObj::DoCreateSdrObj( XclImpDffConverter& rDf new SdrObjCustomShape( *GetDoc().GetDrawLayer())); xSdrObj->NbcSetSnapRect( rAnchorRect ); - OUString aRectType = "rectangle"; + OUString aRectType = u"rectangle"_ustr; xSdrObj->MergeDefaultAttributes( &aRectType ); ConvertRectStyle( *xSdrObj ); bool bAutoSize = ::get_flag( maTextData.maData.mnFlags, EXC_OBJ_TEXT_AUTOSIZE ); @@ -1991,11 +1991,11 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co ScfPropertySet aPropSet( xCtrlModel ); // #i51348# set object name at control model - aPropSet.SetStringProperty( "Name", rDrawObj.GetObjName() ); + aPropSet.SetStringProperty( u"Name"_ustr, rDrawObj.GetObjName() ); // control visible and printable? - aPropSet.SetBoolProperty( "EnableVisible", rDrawObj.IsVisible() ); - aPropSet.SetBoolProperty( "Printable", rDrawObj.IsPrintable() ); + aPropSet.SetBoolProperty( u"EnableVisible"_ustr, rDrawObj.IsVisible() ); + aPropSet.SetBoolProperty( u"Printable"_ustr, rDrawObj.IsPrintable() ); // virtual call for type specific processing DoProcessControl( aPropSet ); @@ -2130,7 +2130,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const if( nPos != -1 ) aLabel = aLabel.replaceAt( nPos, 0, u"~" ); } - rPropSet.SetStringProperty( "Label", aLabel ); + rPropSet.SetStringProperty( u"Label"_ustr, aLabel ); //Excel Alt text <==> Aoo description //For TBX control, if user does not operate alt text, alt text will be set label text as default value in Excel. @@ -2140,7 +2140,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const Reference< css::beans::XPropertySet > xPropset( mxShape, UNO_QUERY ); try{ if(xPropset.is()) - xPropset->setPropertyValue( "Description", Any(aLabel) ); + xPropset->setPropertyValue( u"Description"_ustr, Any(aLabel) ); }catch( ... ) { SAL_WARN("sc.filter", "Can't set a default text for TBX Control "); @@ -2181,7 +2181,7 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_HOR_CENTER: nHorAlign = 1; break; case EXC_OBJ_HOR_RIGHT: nHorAlign = 2; break; } - rPropSet.SetProperty( "Align", nHorAlign ); + rPropSet.SetProperty( u"Align"_ustr, nHorAlign ); // vertical text alignment namespace csss = ::com::sun::star::style; @@ -2192,14 +2192,14 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_VER_CENTER: eVerAlign = csss::VerticalAlignment_MIDDLE; break; case EXC_OBJ_VER_BOTTOM: eVerAlign = csss::VerticalAlignment_BOTTOM; break; } - rPropSet.SetProperty( "VerticalAlign", eVerAlign ); + rPropSet.SetProperty( u"VerticalAlign"_ustr, eVerAlign ); // always wrap text automatically - rPropSet.SetBoolProperty( "MultiLine", true ); + rPropSet.SetBoolProperty( u"MultiLine"_ustr, true ); // default button bool bDefButton = ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_DEFAULT ); - rPropSet.SetBoolProperty( "DefaultButton", bDefButton ); + rPropSet.SetBoolProperty( u"DefaultButton"_ustr, bDefButton ); // button type (flags cannot be combined in OOo) namespace cssa = ::com::sun::star::awt; @@ -2211,12 +2211,12 @@ void XclImpButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const else if( ::get_flag( maTextData.maData.mnButtonFlags, EXC_OBJ_BUTTON_HELP ) ) eButtonType = cssa::PushButtonType_HELP; // property type is short, not enum - rPropSet.SetProperty( "PushButtonType", sal_Int16( eButtonType ) ); + rPropSet.SetProperty( u"PushButtonType"_ustr, sal_Int16( eButtonType ) ); } OUString XclImpButtonObj::DoGetServiceName() const { - return "com.sun.star.form.component.CommandButton"; + return u"com.sun.star.form.component.CommandButton"_ustr; } XclTbxEventType XclImpButtonObj::DoGetEventType() const @@ -2283,32 +2283,32 @@ void XclImpCheckBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const case EXC_OBJ_CHECKBOX_TRISTATE: nApiState = bSupportsTristate ? 2 : 1; break; } if( bSupportsTristate ) - rPropSet.SetBoolProperty( "TriState", nApiState == 2 ); - rPropSet.SetProperty( "DefaultState", nApiState ); + rPropSet.SetBoolProperty( u"TriState"_ustr, nApiState == 2 ); + rPropSet.SetProperty( u"DefaultState"_ustr, nApiState ); // box style namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; sal_Int16 nEffect = ::get_flagvalue( mnCheckBoxFlags, EXC_OBJ_CHECKBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); - rPropSet.SetProperty( "VisualEffect", nEffect ); + rPropSet.SetProperty( u"VisualEffect"_ustr, nEffect ); // do not wrap text automatically - rPropSet.SetBoolProperty( "MultiLine", false ); + rPropSet.SetBoolProperty( u"MultiLine"_ustr, false ); // #i40279# always centered vertically namespace csss = ::com::sun::star::style; - rPropSet.SetProperty( "VerticalAlign", csss::VerticalAlignment_MIDDLE ); + rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_MIDDLE ); // background color if( maFillData.IsFilled() ) { sal_Int32 nColor = static_cast< sal_Int32 >( GetSolidFillColor( maFillData ) ); - rPropSet.SetProperty( "BackgroundColor", nColor ); + rPropSet.SetProperty( u"BackgroundColor"_ustr, nColor ); } } OUString XclImpCheckBoxObj::DoGetServiceName() const { - return "com.sun.star.form.component.CheckBox"; + return u"com.sun.star.form.component.CheckBox"_ustr; } XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const @@ -2379,8 +2379,8 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const ScfPropertySet aProps( xCtrlModel ); OUString sGroupName = OUString::number( pLeader->GetDffShapeId() ); - aProps.SetStringProperty( "GroupName", sGroupName ); - aProps.SetStringProperty( "RefValue", OUString::number( nRefVal++ ) ); + aProps.SetStringProperty( u"GroupName"_ustr, sGroupName ); + aProps.SetStringProperty( u"RefValue"_ustr, OUString::number( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info @@ -2401,7 +2401,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpOptionButtonObj::DoGetServiceName() const { - return "com.sun.star.form.component.RadioButton"; + return u"com.sun.star.form.component.RadioButton"_ustr; } XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const @@ -2425,17 +2425,17 @@ void XclImpLabelObj::DoProcessControl( ScfPropertySet& rPropSet ) const ConvertLabel( rPropSet ); // text alignment (always top/left aligned) - rPropSet.SetProperty( "Align", sal_Int16( 0 ) ); + rPropSet.SetProperty( u"Align"_ustr, sal_Int16( 0 ) ); namespace csss = ::com::sun::star::style; - rPropSet.SetProperty( "VerticalAlign", csss::VerticalAlignment_TOP ); + rPropSet.SetProperty( u"VerticalAlign"_ustr, csss::VerticalAlignment_TOP ); // always wrap text automatically - rPropSet.SetBoolProperty( "MultiLine", true ); + rPropSet.SetBoolProperty( u"MultiLine"_ustr, true ); } OUString XclImpLabelObj::DoGetServiceName() const { - return "com.sun.star.form.component.FixedText"; + return u"com.sun.star.form.component.FixedText"_ustr; } XclTbxEventType XclImpLabelObj::DoGetEventType() const @@ -2486,7 +2486,7 @@ void XclImpGroupBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpGroupBoxObj::DoGetServiceName() const { - return "com.sun.star.form.component.GroupBox"; + return u"com.sun.star.form.component.GroupBox"_ustr; } XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const @@ -2508,7 +2508,7 @@ void XclImpDialogObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpDialogObj::DoGetServiceName() const { // dialog frame faked by a groupbox - return "com.sun.star.form.component.GroupBox"; + return u"com.sun.star.form.component.GroupBox"_ustr; } XclTbxEventType XclImpDialogObj::DoGetEventType() const @@ -2569,14 +2569,14 @@ void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const if( IsNumeric() ) { // TODO: OUString::toDouble() does not handle local decimal separator - rPropSet.SetProperty( "DefaultValue", aText.toDouble() ); - rPropSet.SetBoolProperty( "Spin", mnScrollBar != 0 ); + rPropSet.SetProperty( u"DefaultValue"_ustr, aText.toDouble() ); + rPropSet.SetBoolProperty( u"Spin"_ustr, mnScrollBar != 0 ); } else { - rPropSet.SetProperty( "DefaultText", aText ); - rPropSet.SetBoolProperty( "MultiLine", mnMultiLine != 0 ); - rPropSet.SetBoolProperty( "VScroll", mnScrollBar != 0 ); + rPropSet.SetProperty( u"DefaultText"_ustr, aText ); + rPropSet.SetBoolProperty( u"MultiLine"_ustr, mnMultiLine != 0 ); + rPropSet.SetBoolProperty( u"VScroll"_ustr, mnScrollBar != 0 ); } } ConvertFont( rPropSet ); @@ -2585,8 +2585,8 @@ void XclImpEditObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpEditObj::DoGetServiceName() const { return IsNumeric() ? - OUString( "com.sun.star.form.component.NumericField" ) : - OUString( "com.sun.star.form.component.TextField" ); + u"com.sun.star.form.component.NumericField"_ustr : + u"com.sun.star.form.component.TextField"_ustr; } XclTbxEventType XclImpEditObj::DoGetEventType() const @@ -2652,19 +2652,19 @@ void XclImpSpinButtonObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, void XclImpSpinButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( "Border", css::awt::VisualEffect::NONE ); - rPropSet.SetProperty< sal_Int32 >( "DefaultSpinValue", mnValue ); - rPropSet.SetProperty< sal_Int32 >( "SpinValueMin", mnMin ); - rPropSet.SetProperty< sal_Int32 >( "SpinValueMax", mnMax ); - rPropSet.SetProperty< sal_Int32 >( "SpinIncrement", mnStep ); + rPropSet.SetProperty( u"Border"_ustr, css::awt::VisualEffect::NONE ); + rPropSet.SetProperty< sal_Int32 >( u"DefaultSpinValue"_ustr, mnValue ); + rPropSet.SetProperty< sal_Int32 >( u"SpinValueMin"_ustr, mnMin ); + rPropSet.SetProperty< sal_Int32 >( u"SpinValueMax"_ustr, mnMax ); + rPropSet.SetProperty< sal_Int32 >( u"SpinIncrement"_ustr, mnStep ); // Excel spin buttons always vertical - rPropSet.SetProperty( "Orientation", css::awt::ScrollBarOrientation::VERTICAL ); + rPropSet.SetProperty( u"Orientation"_ustr, css::awt::ScrollBarOrientation::VERTICAL ); } OUString XclImpSpinButtonObj::DoGetServiceName() const { - return "com.sun.star.form.component.SpinButton"; + return u"com.sun.star.form.component.SpinButton"_ustr; } XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const @@ -2689,22 +2689,22 @@ void XclImpScrollBarObj::DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, s void XclImpScrollBarObj::DoProcessControl( ScfPropertySet& rPropSet ) const { // Calc's "Border" property is not the 3D/flat style effect in Excel (#i34712#) - rPropSet.SetProperty( "Border", css::awt::VisualEffect::NONE ); - rPropSet.SetProperty< sal_Int32 >( "DefaultScrollValue", mnValue ); - rPropSet.SetProperty< sal_Int32 >( "ScrollValueMin", mnMin ); - rPropSet.SetProperty< sal_Int32 >( "ScrollValueMax", mnMax ); - rPropSet.SetProperty< sal_Int32 >( "LineIncrement", mnStep ); - rPropSet.SetProperty< sal_Int32 >( "BlockIncrement", mnPageStep ); - rPropSet.SetProperty( "VisibleSize", ::std::min< sal_Int32 >( mnPageStep, 1 ) ); + rPropSet.SetProperty( u"Border"_ustr, css::awt::VisualEffect::NONE ); + rPropSet.SetProperty< sal_Int32 >( u"DefaultScrollValue"_ustr, mnValue ); + rPropSet.SetProperty< sal_Int32 >( u"ScrollValueMin"_ustr, mnMin ); + rPropSet.SetProperty< sal_Int32 >( u"ScrollValueMax"_ustr, mnMax ); + rPropSet.SetProperty< sal_Int32 >( u"LineIncrement"_ustr, mnStep ); + rPropSet.SetProperty< sal_Int32 >( u"BlockIncrement"_ustr, mnPageStep ); + rPropSet.SetProperty( u"VisibleSize"_ustr, ::std::min< sal_Int32 >( mnPageStep, 1 ) ); namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation; sal_Int32 nApiOrient = ::get_flagvalue( mnOrient, EXC_OBJ_SCROLLBAR_HOR, AwtScrollOrient::HORIZONTAL, AwtScrollOrient::VERTICAL ); - rPropSet.SetProperty( "Orientation", nApiOrient ); + rPropSet.SetProperty( u"Orientation"_ustr, nApiOrient ); } OUString XclImpScrollBarObj::DoGetServiceName() const { - return "com.sun.star.form.component.ScrollBar"; + return u"com.sun.star.form.component.ScrollBar"_ustr; } XclTbxEventType XclImpScrollBarObj::DoGetEventType() const @@ -2736,7 +2736,7 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const // border style namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect; sal_Int16 nApiBorder = ::get_flagvalue( mnListFlags, EXC_OBJ_LISTBOX_FLAT, AwtVisualEffect::FLAT, AwtVisualEffect::LOOK3D ); - rPropSet.SetProperty( "Border", nApiBorder ); + rPropSet.SetProperty( u"Border"_ustr, nApiBorder ); // font formatting if( mbHasDefFontIdx ) @@ -2798,7 +2798,7 @@ void XclImpListBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const // selection type sal_uInt8 nSelType = ::extract_value< sal_uInt8 >( mnListFlags, 4, 2 ); bool bMultiSel = nSelType != EXC_OBJ_LISTBOX_SINGLE; - rPropSet.SetBoolProperty( "MultiSelection", bMultiSel ); + rPropSet.SetBoolProperty( u"MultiSelection"_ustr, bMultiSel ); // selection (do not set, if listbox is linked to a cell) if( HasCellLink() ) @@ -2824,13 +2824,13 @@ void XclImpListBoxObj::DoProcessControl( ScfPropertySet& rPropSet ) const if( !aSelVec.empty() ) { Sequence<sal_Int16> aSelSeq(aSelVec.data(), static_cast<sal_Int32>(aSelVec.size())); - rPropSet.SetProperty( "DefaultSelection", aSelSeq ); + rPropSet.SetProperty( u"DefaultSelection"_ustr, aSelSeq ); } } OUString XclImpListBoxObj::DoGetServiceName() const { - return "com.sun.star.form.component.ListBox"; + return u"com.sun.star.form.component.ListBox"_ustr; } XclTbxEventType XclImpListBoxObj::DoGetEventType() const @@ -2904,15 +2904,15 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const // dropdown listbox formatting SetBoxFormatting( rPropSet ); // enable dropdown button - rPropSet.SetBoolProperty( "Dropdown", true ); + rPropSet.SetBoolProperty( u"Dropdown"_ustr, true ); // dropdown line count - rPropSet.SetProperty( "LineCount", mnLineCount ); + rPropSet.SetProperty( u"LineCount"_ustr, mnLineCount ); if( GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX ) { // text of editable combobox if( maTextData.mxString ) - rPropSet.SetStringProperty( "DefaultText", maTextData.mxString->GetText() ); + rPropSet.SetStringProperty( u"DefaultText"_ustr, maTextData.mxString->GetText() ); } else { @@ -2920,7 +2920,7 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const if( !HasCellLink() && (mnSelEntry > 0) ) { Sequence< sal_Int16 > aSelSeq{ o3tl::narrowing<sal_Int16>(mnSelEntry - 1) }; - rPropSet.SetProperty( "DefaultSelection", aSelSeq ); + rPropSet.SetProperty( u"DefaultSelection"_ustr, aSelSeq ); } } } @@ -2928,8 +2928,8 @@ void XclImpDropDownObj::DoProcessControl( ScfPropertySet& rPropSet ) const OUString XclImpDropDownObj::DoGetServiceName() const { return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? - OUString( "com.sun.star.form.component.ComboBox" ) : - OUString( "com.sun.star.form.component.ListBox" ); + u"com.sun.star.form.component.ComboBox"_ustr : + u"com.sun.star.form.component.ListBox"_ustr; } XclTbxEventType XclImpDropDownObj::DoGetEventType() const @@ -3520,7 +3520,7 @@ rtl::Reference<SdrObject> XclImpDffConverter::CreateSdrObject( const XclImpPictu { css::awt::Size aSz; // not used in import ScfPropertySet aPropSet( xFComp ); - aPropSet.SetStringProperty( "Name", rPicObj.GetObjName() ); + aPropSet.SetStringProperty( u"Name"_ustr, rPicObj.GetObjName() ); InsertControl( xFComp, aSz,&xShape,true); xSdrObj = rPicObj.CreateSdrObjectFromShape( xShape, rAnchorRect ); } @@ -3758,7 +3758,7 @@ bool XclImpDffConverter::InsertControl( const Reference< XFormComponent >& rxFor Reference< XControlModel > xCtrlModel( rxFormComp, UNO_QUERY_THROW ); // create the control shape - Reference< XShape > xShape( ScfApiHelper::CreateInstance( GetDocShell(), "com.sun.star.drawing.ControlShape" ), UNO_QUERY_THROW ); + Reference< XShape > xShape( ScfApiHelper::CreateInstance( GetDocShell(), u"com.sun.star.drawing.ControlShape"_ustr ), UNO_QUERY_THROW ); Reference< XControlShape > xCtrlShape( xShape, UNO_QUERY_THROW ); // insert the new control into the form @@ -3946,7 +3946,7 @@ void XclImpDffConverter::InitControlForm() } else if( SfxObjectShell* pDocShell = GetDocShell() ) { - rConvData.mxCtrlForm.set( ScfApiHelper::CreateInstance( pDocShell, "com.sun.star.form.component.Form" ), UNO_QUERY_THROW ); + rConvData.mxCtrlForm.set( ScfApiHelper::CreateInstance( pDocShell, u"com.sun.star.form.component.Form"_ustr ), UNO_QUERY_THROW ); xFormsNC->insertByName( gaStdFormName, Any( rConvData.mxCtrlForm ) ); } } @@ -4110,7 +4110,7 @@ void XclImpDrawing::ApplyGroupBoxes() if (!pRadioButton || pRadioButton->IsInGroup()) continue; - OUString sGroupName("autoGroup_"); + OUString sGroupName(u"autoGroup_"_ustr); for (auto& rGroupBox : aGroupBoxAreaMap) { assert(pRadioButton->GetTab() == rGroupBox.second->GetTab() && "impossible right?"); @@ -4123,7 +4123,7 @@ void XclImpDrawing::ApplyGroupBoxes() // I ASSUME the smallest box wins in MS Word. (otherwise first? last?) break; } - pRadioButton->SetStringProperty("GroupName", sGroupName); + pRadioButton->SetStringProperty(u"GroupName"_ustr, sGroupName); } } diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 1e44f58f5ed6..23db22d23ed8 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -139,7 +139,7 @@ XclImpPalette::ExportPalette() if ( pModel ) { uno::Reference< container::XIndexAccess > xIndex( new PaletteIndex( std::move(aColors) ) ); - pModel->setPropertyValue( "ColorPalette", uno::Any( xIndex ) ); + pModel->setPropertyValue( u"ColorPalette"_ustr, uno::Any( xIndex ) ); } } diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index c916b9d7dfbd..548c2c9be3b9 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -1162,7 +1162,7 @@ namespace { uno::Reference<drawing::XShape> lclGetMainTitleShape(const uno::Reference<chart::XChartDocument> & rxChart1Doc) { ScfPropertySet aPropSet(rxChart1Doc); - if (rxChart1Doc.is() && aPropSet.GetBoolProperty("HasMainTitle")) + if (rxChart1Doc.is() && aPropSet.GetBoolProperty(u"HasMainTitle"_ustr)) return rxChart1Doc->getTitle(); return uno::Reference<drawing::XShape>(); } @@ -1171,7 +1171,7 @@ uno::Reference<drawing::XShape> lclGetXAxisTitleShape(const uno::Reference<chart { uno::Reference<chart::XAxisXSupplier> xAxisSupp(rxChart1Doc->getDiagram(), uno::UNO_QUERY); ScfPropertySet aPropSet(xAxisSupp); - if (xAxisSupp.is() && aPropSet.GetBoolProperty("HasXAxisTitle")) + if (xAxisSupp.is() && aPropSet.GetBoolProperty(u"HasXAxisTitle"_ustr)) return xAxisSupp->getXAxisTitle(); return uno::Reference<drawing::XShape>(); } @@ -1180,7 +1180,7 @@ uno::Reference<drawing::XShape> lclGetYAxisTitleShape(const uno::Reference<chart { uno::Reference<chart::XAxisYSupplier> xAxisSupp(rxChart1Doc->getDiagram(), uno::UNO_QUERY); ScfPropertySet aPropSet(xAxisSupp); - if (xAxisSupp.is() && aPropSet.GetBoolProperty("HasYAxisTitle")) + if (xAxisSupp.is() && aPropSet.GetBoolProperty(u"HasYAxisTitle"_ustr)) return xAxisSupp->getYAxisTitle(); return uno::Reference<drawing::XShape>(); } @@ -1189,7 +1189,7 @@ uno::Reference<drawing::XShape> lclGetZAxisTitleShape(const uno::Reference<chart { uno::Reference<chart::XAxisZSupplier> xAxisSupp(rxChart1Doc->getDiagram(), uno::UNO_QUERY); ScfPropertySet aPropSet(xAxisSupp); - if (xAxisSupp.is() && aPropSet.GetBoolProperty("HasZAxisTitle")) + if (xAxisSupp.is() && aPropSet.GetBoolProperty(u"HasZAxisTitle"_ustr)) return xAxisSupp->getZAxisTitle(); return uno::Reference<drawing::XShape>(); } @@ -1198,7 +1198,7 @@ uno::Reference<drawing::XShape> lclGetSecXAxisTitleShape(const uno::Reference<ch { uno::Reference<chart::XSecondAxisTitleSupplier> xAxisSupp(rxChart1Doc->getDiagram(), uno::UNO_QUERY); ScfPropertySet aPropSet(xAxisSupp); - if (xAxisSupp.is() && aPropSet.GetBoolProperty("HasSecondaryXAxisTitle")) + if (xAxisSupp.is() && aPropSet.GetBoolProperty(u"HasSecondaryXAxisTitle"_ustr)) return xAxisSupp->getSecondXAxisTitle(); return uno::Reference<drawing::XShape>(); } @@ -1207,7 +1207,7 @@ uno::Reference<drawing::XShape> lclGetSecYAxisTitleShape(const uno::Reference<ch { uno::Reference<chart::XSecondAxisTitleSupplier> xAxisSupp(rxChart1Doc->getDiagram(), uno::UNO_QUERY); ScfPropertySet aPropSet(xAxisSupp); - if (xAxisSupp.is() && aPropSet.GetBoolProperty("HasSecondaryYAxisTitle")) + if (xAxisSupp.is() && aPropSet.GetBoolProperty(u"HasSecondaryYAxisTitle"_ustr)) return xAxisSupp->getSecondYAxisTitle(); return uno::Reference<drawing::XShape>(); } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index efb54925bd69..8e56abde5733 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -182,7 +182,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp uno::Reference< beans::XPropertySet > xProps( xIndexContainer, uno::UNO_QUERY_THROW ); WString& name = tb.getName(); // set UI name for toolbar - xProps->setPropertyValue("UIName", uno::Any( name.getString() ) ); + xProps->setPropertyValue(u"UIName"_ustr, uno::Any( name.getString() ) ); OUString sToolBarName = "private:resource/toolbar/custom_" + name.getString(); for ( auto& rItem : rTBC ) @@ -317,7 +317,7 @@ bool ScTBC::ImportToolBarControl( ScCTBWrapper& rWrapper, const css::uno::Refere if ( bBeginGroup ) { // insert spacer - uno::Sequence sProps{ comphelper::makePropertyValue("Type", + uno::Sequence sProps{ comphelper::makePropertyValue(u"Type"_ustr, ui::ItemType::SEPARATOR_LINE) }; toolbarcontainer->insertByIndex( toolbarcontainer->getCount(), uno::Any( sProps ) ); } @@ -424,7 +424,7 @@ void ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) for ( auto& rItem : rCTB ) { // for each customtoolbar - CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( "com.sun.star.sheet.SpreadsheetDocument" ) ); + CustomToolBarImportHelper helper( rDocSh, xAppCfgSupp->getUIConfigurationManager( u"com.sun.star.sheet.SpreadsheetDocument"_ustr ) ); helper.setMSOCommandMap( new MSOExcelCommandConvertor() ); // Ignore menu toolbars, excel doesn't ( afaics ) store // menu customizations ( but you can have menus in a customtoolbar diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 16031fd87be7..07591c2ad2aa 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -633,7 +633,7 @@ void ScHTMLExport::WriteBody() // Save graphic as (JPG) file aGrfNm = aStreamPath; ErrCode nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, - "JPG", XOutFlags::UseNativeIfPossible ); + u"JPG"_ustr, XOutFlags::UseNativeIfPossible ); if( !nErr ) // Contains errors, as we have nothing to output { aGrfNm = URIHelper::SmartRel2Abs( diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 59c1d27b6c53..5db9d24256b2 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -180,7 +180,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, OUString aGrfNm( aStreamPath ); nXOutFlags |= XOutFlags::UseNativeIfPossible; ErrCode nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, - "PNG", nXOutFlags ); + u"PNG"_ustr, nXOutFlags ); // If it worked, create a URL for the IMG tag if( !nErr ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 646791c668d4..fdbca6056c92 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -360,7 +360,7 @@ ErrCode ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); + xValues->Append( SvKeyValue( u"" OOO_STRING_SVTOOLS_HTML_META_content_type ""_ustr, aContentType ) ); pAttributes = xValues.get(); } } @@ -2272,7 +2272,7 @@ void ScHTMLTable::DataOn( const HtmlImportInfo& rInfo ) // any). OUString aClass = rOption.GetString(); const ScHTMLStyles& rStyles = mpParser->GetStyles(); - const OUString& rVal = rStyles.getPropertyValue("td", aClass, "mso-number-format"); + const OUString& rVal = rStyles.getPropertyValue(u"td"_ustr, aClass, u"mso-number-format"_ustr); if (!rVal.isEmpty()) { OUString aNumFmt = decodeNumberFormat(rVal); @@ -2983,7 +2983,7 @@ ErrCode ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL ) OUString::createFromAscii( pCharSet ); xValues = new SvKeyValueIterator; - xValues->Append( SvKeyValue( OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType ) ); + xValues->Append( SvKeyValue( u"" OOO_STRING_SVTOOLS_HTML_META_content_type ""_ustr, aContentType ) ); pAttributes = xValues.get(); } } diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index df7f17380ea6..593c4068fdb2 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -193,7 +193,7 @@ void ImportLotus::Errcell() aParam.setTextInput(); rD.EnsureTable(aA.Tab()); // coverity[tainted_data : FALSE] - ValidAddress has sanitized aA - rD.SetString(aA, "#ERR!", &aParam); + rD.SetString(aA, u"#ERR!"_ustr, &aParam); } void ImportLotus::Nacell() @@ -212,7 +212,7 @@ void ImportLotus::Nacell() aParam.setTextInput(); rD.EnsureTable(aA.Tab()); // coverity[tainted_data : FALSE] - ValidAddress has sanitized aA - rD.SetString(aA, "#NA!", &aParam); + rD.SetString(aA, u"#NA!"_ustr, &aParam); } void ImportLotus::Labelcell() diff --git a/sc/source/filter/oox/SparklineFragment.cxx b/sc/source/filter/oox/SparklineFragment.cxx index afb3f64285ae..88097024180a 100644 --- a/sc/source/filter/oox/SparklineFragment.cxx +++ b/sc/source/filter/oox/SparklineFragment.cxx @@ -138,12 +138,12 @@ void addAttributesToSparklineAttributes(sc::SparklineAttributes& rSparklineAttri rSparklineAttributes.setLineWeight(rAttribs.getDouble(XML_lineWeight, 0.75)); - OUString sType = rAttribs.getString(XML_type, "line"); + OUString sType = rAttribs.getString(XML_type, u"line"_ustr); rSparklineAttributes.setType(parseSparklineType(sType)); rSparklineAttributes.setDateAxis(rAttribs.getBool(XML_dateAxis, false)); - OUString sDisplayEmptyCellsAs = rAttribs.getString(XML_displayEmptyCellsAs, "zero"); + OUString sDisplayEmptyCellsAs = rAttribs.getString(XML_displayEmptyCellsAs, u"zero"_ustr); rSparklineAttributes.setDisplayEmptyCellsAs(parseDisplayEmptyCellsAs(sDisplayEmptyCellsAs)); rSparklineAttributes.setMarkers(rAttribs.getBool(XML_markers, false)); @@ -155,10 +155,10 @@ void addAttributesToSparklineAttributes(sc::SparklineAttributes& rSparklineAttri rSparklineAttributes.setDisplayXAxis(rAttribs.getBool(XML_displayXAxis, false)); rSparklineAttributes.setDisplayHidden(rAttribs.getBool(XML_displayHidden, false)); - OUString sMinAxisType = rAttribs.getString(XML_minAxisType, "individual"); + OUString sMinAxisType = rAttribs.getString(XML_minAxisType, u"individual"_ustr); rSparklineAttributes.setMinAxisType(parseAxisType(sMinAxisType)); - OUString sMaxAxisType = rAttribs.getString(XML_maxAxisType, "individual"); + OUString sMaxAxisType = rAttribs.getString(XML_maxAxisType, u"individual"_ustr); rSparklineAttributes.setMaxAxisType(parseAxisType(sMaxAxisType)); rSparklineAttributes.setRightToLeft(rAttribs.getBool(XML_rightToLeft, false)); diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 45580afbe878..25f76087876b 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -204,7 +204,7 @@ void Comment::finalizeImport() // Add shape formatting properties (autoFill, colHidden and rowHidden are dropped) // vvv TODO vvv TextFitToSize should be a drawing::TextFitToSizeType not bool xGenerator->maPropertyNames = - css::uno::Sequence<OUString>{ "TextFitToSize", "MoveProtect", "TextHorizontalAdjust", "TextVerticalAdjust" }; + css::uno::Sequence<OUString>{ u"TextFitToSize"_ustr, u"MoveProtect"_ustr, u"TextHorizontalAdjust"_ustr, u"TextVerticalAdjust"_ustr }; xGenerator->maPropertyValues = css::uno::Sequence<css::uno::Any>{ Any(maModel.mbAutoScale), Any(maModel.mbLocked), Any(lcl_ToHorizAlign( maModel.mnTHA )), Any(lcl_ToVertAlign( maModel.mnTVA )) }; diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 2e57824d1287..7ceb587a090e 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -406,7 +406,7 @@ void IconSetRule::importCfvo( const AttributeList& rAttribs ) void IconSetRule::importAttribs( const AttributeList& rAttribs ) { - maIconSetType = rAttribs.getString( XML_iconSet, "3TrafficLights1" ); + maIconSetType = rAttribs.getString( XML_iconSet, u"3TrafficLights1"_ustr ); mxFormatData->mbShowValue = rAttribs.getBool( XML_showValue, true ); mxFormatData->mbReverse = rAttribs.getBool( XML_reverse, false ); mbCustom = rAttribs.getBool(XML_custom, false); @@ -1516,7 +1516,7 @@ void ExtCfDataBarRule::importDataBar( const AttributeList& rAttribs ) { mnRuleType = DATABAR; maModel.mbGradient = rAttribs.getBool( XML_gradient, true ); - maModel.maAxisPosition = rAttribs.getString( XML_axisPosition, "automatic" ); + maModel.maAxisPosition = rAttribs.getString( XML_axisPosition, u"automatic"_ustr ); } void ExtCfDataBarRule::importPositiveFillColor( const AttributeList& rAttribs ) diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index efb6f728ec9f..b3fc629f17e8 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -82,9 +82,9 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl ) { Reference< XEventsSupplier > xSupplier( mxShape, UNO_QUERY_THROW ); Reference< XNameReplace > xEvents( xSupplier->getEvents(), UNO_SET_THROW ); - Sequence aEventProps{ comphelper::makePropertyValue("EventType", OUString( "Script" )), - comphelper::makePropertyValue("Script", rMacroUrl) }; - xEvents->replaceByName( "OnClick", Any( aEventProps ) ); + Sequence aEventProps{ comphelper::makePropertyValue(u"EventType"_ustr, u"Script"_ustr), + comphelper::makePropertyValue(u"Script"_ustr, rMacroUrl) }; + xEvents->replaceByName( u"OnClick"_ustr, Any( aEventProps ) ); } catch( Exception& ) { @@ -489,19 +489,19 @@ OUString VmlDrawing::getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) con { switch( pClientData->mnObjType ) { - case XML_Button: return "Button"; - case XML_Checkbox: return "Check Box"; - case XML_Dialog: return "Dialog Frame"; - case XML_Drop: return "Drop Down"; - case XML_Edit: return "Edit Box"; - case XML_GBox: return "Group Box"; - case XML_Label: return "Label"; - case XML_List: return "List Box"; - case XML_Note: return "Comment"; - case XML_Pict: return (pClientData->mbDde || getOleObjectInfo( rShape.getShapeId() )) ? OUString( "Object" ) : OUString( "Picture" ); - case XML_Radio: return "Option Button"; - case XML_Scroll: return "Scroll Bar"; - case XML_Spin: return "Spinner"; + case XML_Button: return u"Button"_ustr; + case XML_Checkbox: return u"Check Box"_ustr; + case XML_Dialog: return u"Dialog Frame"_ustr; + case XML_Drop: return u"Drop Down"_ustr; + case XML_Edit: return u"Edit Box"_ustr; + case XML_GBox: return u"Group Box"_ustr; + case XML_Label: return u"Label"_ustr; + case XML_List: return u"List Box"_ustr; + case XML_Note: return u"Comment"_ustr; + case XML_Pict: return (pClientData->mbDde || getOleObjectInfo( rShape.getShapeId() )) ? u"Object"_ustr : u"Picture"_ustr; + case XML_Radio: return u"Option Button"_ustr; + case XML_Scroll: return u"Scroll Bar"_ustr; + case XML_Spin: return u"Spinner"_ustr; } } return ::oox::vml::Drawing::getShapeBaseName( rShape ); diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index bc9a0bd030bf..3800cf68fcfc 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -54,7 +54,7 @@ void ExcelChartConverter::createDataProvider( const Reference< XChartDocument >& { Reference< XDataReceiver > xDataRec( rxChartDoc, UNO_QUERY_THROW ); Reference< XDataProvider > xDataProv( getBaseFilter().getModelFactory()->createInstance( - "com.sun.star.chart2.data.DataProvider" ), UNO_QUERY_THROW ); + u"com.sun.star.chart2.data.DataProvider"_ustr ), UNO_QUERY_THROW ); xDataRec->attachDataProvider( xDataProv ); } catch( Exception& ) diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 3a2d822d1431..eed4f162c51a 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -198,7 +198,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::Pro OUString ExcelFilter::getImplementationName() { - return "com.sun.star.comp.oox.xls.ExcelFilter"; + return u"com.sun.star.comp.oox.xls.ExcelFilter"_ustr; } } // namespace oox::xls diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx index 9e542b744b7f..c720e6beb3ce 100644 --- a/sc/source/filter/oox/extlstcontext.cxx +++ b/sc/source/filter/oox/extlstcontext.cxx @@ -328,8 +328,8 @@ void ExtConditionalFormattingContext::onEndElement() for (size_t i = 0; i < maModels.size(); ++i) { ScAddress rPos = aRange.GetTopLeftCorner(); - ScCondFormatEntry* pEntry = new ScCondFormatEntry(maModels[i].eOperator, maModels[i].aFormula, "", rDoc, - rPos, maModels[i].aStyle, "", "", + ScCondFormatEntry* pEntry = new ScCondFormatEntry(maModels[i].eOperator, maModels[i].aFormula, u""_ustr, rDoc, + rPos, maModels[i].aStyle, u""_ustr, u""_ustr, formula::FormulaGrammar::GRAM_OOXML , formula::FormulaGrammar::GRAM_OOXML, ScFormatEntry::Type::ExtCondition ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index b0dadaafa09d..86742cfed64c 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1179,7 +1179,7 @@ OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, try { Reference< XFormulaOpCodeMapper > xMapper( rxModelFactory->createInstance( - "com.sun.star.sheet.FormulaOpCodeMapper" ), UNO_QUERY_THROW ); + u"com.sun.star.sheet.FormulaOpCodeMapper"_ustr ), UNO_QUERY_THROW ); // op-codes provided as attributes OPCODE_UNKNOWN = xMapper->getOpCodeUnknown(); @@ -1463,7 +1463,7 @@ ApiParserWrapper::ApiParserWrapper( { if( rxModelFactory.is() ) try { - mxParser.set( rxModelFactory->createInstance( "com.sun.star.sheet.FormulaParser" ), UNO_QUERY_THROW ); + mxParser.set( rxModelFactory->createInstance( u"com.sun.star.sheet.FormulaParser"_ustr ), UNO_QUERY_THROW ); } catch( Exception& ) { diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 5fa701b3f19c..dc35b84a87c3 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1865,7 +1865,7 @@ private: }; NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : - maEnUsLocale( "en", "US", OUString() ) + maEnUsLocale( u"en"_ustr, u"US"_ustr, OUString() ) { try { @@ -2050,7 +2050,7 @@ void NumberFormatsBuffer::insertBuiltinFormats() "' not supported (#i29949#)" ).getStr() ); // start with default table, if no table has been found if( aMIt == aMEnd ) - aMIt = aBuiltinMap.find( "*" ); + aMIt = aBuiltinMap.find( u"*"_ustr ); OSL_ENSURE( aMIt != aMEnd, "NumberFormatsBuffer::insertBuiltinFormats - default map not found" ); // insert all tables into the vector for( ; aMIt != aMEnd; aMIt = aBuiltinMap.find( OUString::createFromAscii( aMIt->second->mpcParent ) ) ) diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 0a7c0d5243e0..bce44c008761 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -109,7 +109,7 @@ OOXMLFormulaParser::~OOXMLFormulaParser() // com.sun.star.lang.XServiceInfo interface ----------------------------------- OUString SAL_CALL OOXMLFormulaParser::getImplementationName() { - return "com.sun.star.comp.oox.xls.FormulaParser"; + return u"com.sun.star.comp.oox.xls.FormulaParser"_ustr; } sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) @@ -119,7 +119,7 @@ sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService Sequence< OUString > SAL_CALL OOXMLFormulaParser::getSupportedServiceNames() { - return { "com.sun.star.sheet.FilterFormulaParser" }; + return { u"com.sun.star.sheet.FilterFormulaParser"_ustr }; } // com.sun.star.lang.XInitialization interface -------------------------------- @@ -136,7 +136,7 @@ void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() { - return "http://schemas.microsoft.com/office/excel/formula";; + return u"http://schemas.microsoft.com/office/excel/formula"_ustr; } // com.sun.star.sheet.XFormulaParser interface -------------------------------- diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index d173e6bf0fa3..5158f3f87347 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -184,7 +184,7 @@ ContextHandlerRef PivotTableFragment::onCreateContext( sal_Int32 nElement, const case XLS_TOKEN(formats): return this; case XLS_TOKEN(pivotTableStyleInfo): - mrPivotTable.putToInteropGrabBag("pivotTableStyleInfo", rAttribs); + mrPivotTable.putToInteropGrabBag(u"pivotTableStyleInfo"_ustr, rAttribs); break; } break; diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 1c5ee4464887..f027ab7a4d94 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -87,7 +87,7 @@ void lclAppendWebQueryTableIndex( OUStringBuffer& rTables, sal_Int32 nTableIndex OUString lclBuildWebQueryTables( const WebPrModel::TablesVector& rTables ) { if( rTables.empty() ) - return "HTML_tables"; + return u"HTML_tables"_ustr; OUStringBuffer aTables; for( const auto& rTable : rTables ) @@ -241,7 +241,7 @@ void QueryTable::finalizeImport() return; // find tables mode: entire document, all tables, or specific tables - OUString aTables = pWebPr->mbHtmlTables ? lclBuildWebQueryTables( pWebPr->maTables ) : "HTML_all"; + OUString aTables = pWebPr->mbHtmlTables ? lclBuildWebQueryTables( pWebPr->maTables ) : u"HTML_all"_ustr; if( aTables.isEmpty() ) return; @@ -251,7 +251,7 @@ void QueryTable::finalizeImport() Reference< XAreaLinks > xAreaLinks( aDocProps.getAnyProperty( PROP_AreaLinks ), UNO_QUERY_THROW ); CellAddress aDestPos( aDestRange.aStart.Tab(), aDestRange.aStart.Col(), aDestRange.aStart.Row() ); static constexpr OUString aFilterName = u"calc_HTML_WebQuery"_ustr; - xAreaLinks->insertAtPosition( aDestPos, aFileUrl, aTables, aFilterName, /*aFilterOptions*/"" ); + xAreaLinks->insertAtPosition( aDestPos, aFileUrl, aTables, aFilterName, /*aFilterOptions*/u""_ustr ); // set refresh interval (convert minutes to seconds) sal_Int32 nRefreshPeriod = xConnection->getModel().mnInterval * 60; if( nRefreshPeriod > 0 ) diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index e124d9f32489..968689832407 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -168,7 +168,7 @@ void SheetDataBuffer::setDateTimeCell( const CellModel& rModel, const css::util: void SheetDataBuffer::setBooleanCell( const CellModel& rModel, bool bValue ) { getFormulaBuffer().setCellFormula( - rModel.maCellAddr, bValue ? OUString("TRUE()") : OUString("FALSE()")); + rModel.maCellAddr, bValue ? u"TRUE()"_ustr : u"FALSE()"_ustr); // #108770# set 'Standard' number format for all Boolean cells setCellFormat( rModel ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 234d0365bdec..5f64cf61addb 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -521,7 +521,7 @@ ApiScriptFontName::ApiScriptFontName() : ApiFontData::ApiFontData() : maDesc( - "Calibri", + u"Calibri"_ustr, 220, // height 11 points 0, OUString(), diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index dd4178eee8be..3b5e7e30e118 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -100,13 +100,13 @@ UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) : maCoeffs[Unit::Space] = o3tl::convert(1.0, o3tl::Length::mm, o3tl::Length::emu); // default 1 space = 1 mm // error code maps - addErrorCode( BIFF_ERR_NULL, "#NULL!" ); - addErrorCode( BIFF_ERR_DIV0, "#DIV/0!" ); - addErrorCode( BIFF_ERR_VALUE, "#VALUE!" ); - addErrorCode( BIFF_ERR_REF, "#REF!" ); - addErrorCode( BIFF_ERR_NAME, "#NAME?" ); - addErrorCode( BIFF_ERR_NUM, "#NUM!" ); - addErrorCode( BIFF_ERR_NA, "#N/A" ); + addErrorCode( BIFF_ERR_NULL, u"#NULL!"_ustr ); + addErrorCode( BIFF_ERR_DIV0, u"#DIV/0!"_ustr ); + addErrorCode( BIFF_ERR_VALUE, u"#VALUE!"_ustr ); + addErrorCode( BIFF_ERR_REF, u"#REF!"_ustr ); + addErrorCode( BIFF_ERR_NAME, u"#NAME?"_ustr ); + addErrorCode( BIFF_ERR_NUM, u"#NUM!"_ustr ); + addErrorCode( BIFF_ERR_NA, u"#N/A"_ustr ); } void UnitConverter::finalizeImport() diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 2badbd80a43a..56f68f7c090e 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -628,7 +628,7 @@ void ViewSettings::finalizeImport() // set the visible area as sequence of long at the media descriptor Sequence< sal_Int32 > aWinExtent{ aPos.X, aPos.Y, aPos.X + aSize.Width, aPos.Y + aSize.Height }; - getBaseFilter().getMediaDescriptor()[ "WinExtent" ] <<= aWinExtent; + getBaseFilter().getMediaDescriptor()[ u"WinExtent"_ustr ] <<= aWinExtent; } } diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 97cc3ca9d1f0..ea3b0aca4ac1 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -550,8 +550,8 @@ private: std::unique_ptr<weld::CheckButton> m_xWarningOnBox; public: MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId) - : MessageDialogController(pParent, rUIFile, rDialogId, "ask") - , m_xWarningOnBox(m_xBuilder->weld_check_button("ask")) + : MessageDialogController(pParent, rUIFile, rDialogId, u"ask"_ustr) + , m_xWarningOnBox(m_xBuilder->weld_check_button(u"ask"_ustr)) { } bool get_active() const { return m_xWarningOnBox->get_active(); } @@ -573,7 +573,7 @@ void WorkbookFragment::recalcFormulaCells() if (rDoc.IsUserInteractionEnabled()) { // Ask the user if full re-calculation is desired. - MessageWithCheck aQueryBox(ScDocShell::GetActiveDialogParent(), "modules/scalc/ui/recalcquerydialog.ui", "RecalcQueryDialog"); + MessageWithCheck aQueryBox(ScDocShell::GetActiveDialogParent(), u"modules/scalc/ui/recalcquerydialog.ui"_ustr, u"RecalcQueryDialog"_ustr); aQueryBox.set_primary_text(ScResId(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); aQueryBox.set_default_response(RET_YES); diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 270e5aca1dc6..b2a6859aa45f 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -435,7 +435,7 @@ WorkbookHelper::RangeDataRet WorkbookGlobals::createLocalNamedRangeObject( ScDocument& rDoc = getScDocument(); ScRangeName* pNames = rDoc.GetRangeName( nTab ); if(!pNames) - throw RuntimeException("invalid sheet index used"); + throw RuntimeException(u"invalid sheet index used"_ustr); // find an unused name orName = findUnusedName( pNames, orName ); // create the named range @@ -553,7 +553,7 @@ void WorkbookGlobals::initialize() mpDoc = &mpDocShell->GetDocument(); if (!mpDoc) - throw RuntimeException("Workbookhelper::getScDocument(): Failed to access ScDocument from model"); + throw RuntimeException(u"Workbookhelper::getScDocument(): Failed to access ScDocument from model"_ustr); Reference< XDocumentProperties > xDocProps = mxDoc->getDocumentProperties(); const OUString aGenerator( xDocProps->getGenerator()); @@ -739,7 +739,7 @@ void WorkbookHelper::finalizeWorkbookImport() number 1). Otherwise hidden sheets (e.g. for scenarios) which have 'Default' page style will break automatic page numbering for following sheets. Automatic numbering is set by passing the value 0. */ - PropertySet aDefPageStyle( getStyleObject( "Default", true ) ); + PropertySet aDefPageStyle( getStyleObject( u"Default"_ustr, true ) ); aDefPageStyle.setProperty< sal_Int16 >( PROP_FirstPageNumber, 0 ); // Has any string ref syntax been imported? diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index c91dbe1616ee..bb7269d9702f 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -197,10 +197,10 @@ void WorkbookSettings::finalizeImport() if (maFileSharing.mbRecommendReadOnly || (maFileSharing.mnPasswordHash != 0) || !maFileSharing.maHashValue.isEmpty()) try { - getBaseFilter().getMediaDescriptor()[ "ReadOnly" ] <<= true; + getBaseFilter().getMediaDescriptor()[ u"ReadOnly"_ustr ] <<= true; Reference< XPropertySet > xDocumentSettings( getBaseFilter().getModelFactory()->createInstance( - "com.sun.star.document.Settings" ), UNO_QUERY_THROW ); + u"com.sun.star.document.Settings"_ustr ), UNO_QUERY_THROW ); PropertySet aSettingsProp( xDocumentSettings ); /* TODO: not setting read-only if only mnPasswordHash ('password' @@ -215,10 +215,10 @@ void WorkbookSettings::finalizeImport() if (!maFileSharing.maHashValue.isEmpty()) { Sequence<PropertyValue> aResult{ - comphelper::makePropertyValue("algorithm-name", maFileSharing.maAlgorithmName), - comphelper::makePropertyValue("salt", maFileSharing.maSaltValue), - comphelper::makePropertyValue("iteration-count", maFileSharing.mnSpinCount), - comphelper::makePropertyValue("hash", maFileSharing.maHashValue) + comphelper::makePropertyValue(u"algorithm-name"_ustr, maFileSharing.maAlgorithmName), + comphelper::makePropertyValue(u"salt"_ustr, maFileSharing.maSaltValue), + comphelper::makePropertyValue(u"iteration-count"_ustr, maFileSharing.mnSpinCount), + comphelper::makePropertyValue(u"hash"_ustr, maFileSharing.maHashValue) }; aSettingsProp.setProperty(PROP_ModifyPasswordInfo, aResult); } diff --git a/sc/source/filter/orcus/filterdetect.cxx b/sc/source/filter/orcus/filterdetect.cxx index 06f6015a8f0c..0b11bf2dff3e 100644 --- a/sc/source/filter/orcus/filterdetect.cxx +++ b/sc/source/filter/orcus/filterdetect.cxx @@ -48,7 +48,7 @@ OrcusFormatDetect::OrcusFormatDetect() OUString OrcusFormatDetect::getImplementationName() { - return "com.sun.star.comp.sc.OrcusFilterDetect"; + return u"com.sun.star.comp.sc.OrcusFilterDetect"_ustr; } sal_Bool OrcusFormatDetect::supportsService(const OUString& rServiceName) @@ -58,7 +58,7 @@ sal_Bool OrcusFormatDetect::supportsService(const OUString& rServiceName) css::uno::Sequence<OUString> OrcusFormatDetect::getSupportedServiceNames() { - return {"com.sun.star.frame.ExtendedTypeDetection"}; + return {u"com.sun.star.frame.ExtendedTypeDetection"_ustr}; } OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>& rMediaDescSeq) @@ -87,11 +87,11 @@ OUString OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue> switch (eFormat) { case orcus::format_t::gnumeric: - return "Gnumeric XML"; + return u"Gnumeric XML"_ustr; case orcus::format_t::xls_xml: - return "calc_MS_Excel_2003_XML"; + return u"calc_MS_Excel_2003_XML"_ustr; case orcus::format_t::parquet: - return "Apache Parquet"; + return u"Apache Parquet"_ustr; default: ; } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 936e00f6a221..52d2150e9f75 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1687,7 +1687,7 @@ void XclExpChangeTrack::Write() static void lcl_WriteUserNamesXml( XclExpXmlStream& rWorkbookStrm ) { sax_fastparser::FSHelperPtr pUserNames = rWorkbookStrm.CreateOutputStream( - "xl/revisions/userNames.xml", + u"xl/revisions/userNames.xml"_ustr, u"revisions/userNames.xml", rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml", @@ -1710,7 +1710,7 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream& rWorkbookStrm ) lcl_WriteUserNamesXml( rWorkbookStrm ); sax_fastparser::FSHelperPtr pRevisionHeaders = rWorkbookStrm.CreateOutputStream( - "xl/revisions/revisionHeaders.xml", + u"xl/revisions/revisionHeaders.xml"_ustr, u"revisions/revisionHeaders.xml", rWorkbookStrm.GetCurrentStream()->getOutputStream(), "application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml", diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 43538de6c889..b2f81453c667 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -232,7 +232,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape Any aAny; try { - aAny = xPropSet->getPropertyValue("ControlTypeinMSO"); + aAny = xPropSet->getPropertyValue(u"ControlTypeinMSO"_ustr); aAny >>= nMsCtlType; } catch(const Exception&) @@ -314,7 +314,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape Any aAny; try { - aAny = xPropSet->getPropertyValue("ObjIDinMSO"); + aAny = xPropSet->getPropertyValue(u"ObjIDinMSO"_ustr); } catch(const Exception&) { diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index c29eba781b3f..26bca0d1d442 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1009,7 +1009,7 @@ XclObjOle::~XclObjOle() void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) { // write only as embedded, not linked - OUString aStorageName( "MBD" ); + OUString aStorageName( u"MBD"_ustr ); char aBuf[ sizeof(sal_uInt32) * 2 + 1 ]; // FIXME Eeek! Is this just a way to get a unique id? sal_uInt32 nPictureId = sal_uInt32(reinterpret_cast<sal_uIntPtr>(this) >> 2); diff --git a/sc/source/filter/xml/SparklineGroupsExport.cxx b/sc/source/filter/xml/SparklineGroupsExport.cxx index 0a652c225630..e4bd3f4e0a18 100644 --- a/sc/source/filter/xml/SparklineGroupsExport.cxx +++ b/sc/source/filter/xml/SparklineGroupsExport.cxx @@ -57,7 +57,7 @@ void SparklineGroupsExport::insertComplexColor(model::ComplexColor const& rCompl void SparklineGroupsExport::insertBool(bool bValue, XMLTokenEnum eToken) { if (bValue) - m_rExport.AddAttribute(XML_NAMESPACE_CALC_EXT, eToken, "true"); + m_rExport.AddAttribute(XML_NAMESPACE_CALC_EXT, eToken, u"true"_ustr); } void SparklineGroupsExport::addSparklineAttributes(Sparkline const& rSparkline) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 3068f10e54ef..92ba809d76a1 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -152,7 +152,7 @@ sal_Bool SAL_CALL XMLCodeNameProvider::hasElements() void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xNameAccess, ScDocument *pDoc ) { uno::Any aAny; - OUString sDocName("*doc*"); + OUString sDocName(u"*doc*"_ustr); OUString sCodeName; if( xNameAccess->hasByName( sDocName ) ) { diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index bd5f16d828ff..83ea28584e9f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -72,27 +72,27 @@ OUString ScXMLExportDataPilot::getDPOperatorXML( if (eSearchType == utl::SearchParam::SearchType::Regexp) return GetXMLToken(XML_MATCH); else - return "="; + return u"="_ustr; } case SC_NOT_EQUAL : { if (eSearchType == utl::SearchParam::SearchType::Regexp) return GetXMLToken(XML_NOMATCH); else - return "!="; + return u"!="_ustr; } case SC_BOTPERC : return GetXMLToken(XML_BOTTOM_PERCENT); case SC_BOTVAL : return GetXMLToken(XML_BOTTOM_VALUES); case SC_GREATER : - return ">"; + return u">"_ustr; case SC_GREATER_EQUAL : - return ">="; + return u">="_ustr; case SC_LESS : - return "<"; + return u"<"_ustr; case SC_LESS_EQUAL : - return "<="; + return u"<="_ustr; case SC_TOPPERC : return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL : @@ -100,7 +100,7 @@ OUString ScXMLExportDataPilot::getDPOperatorXML( default: OSL_FAIL("This FilterOperator is not supported."); } - return "="; + return u"="_ustr; } void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, @@ -698,7 +698,7 @@ void ScXMLExportDataPilot::WriteDimension(const ScDPSaveDimension* pDim, const S { if (rExport.getSaneDefaultVersion() & SvtSaveOptions::ODFSVER_EXTENDED) { - rExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_IGNORE_SELECTED_PAGE, "true"); + rExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_IGNORE_SELECTED_PAGE, u"true"_ustr); } rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SELECTED_PAGE, pDim->GetCurrentPage()); } diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index e4307065bd92..89ebcc27373c 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -383,21 +383,21 @@ private: if (eSearchType == utl::SearchParam::SearchType::Regexp) return GetXMLToken(XML_MATCH); else - return "="; + return u"="_ustr; } case SC_GREATER: - return ">"; + return u">"_ustr; case SC_GREATER_EQUAL: - return ">="; + return u">="_ustr; case SC_LESS: - return "<"; + return u"<"_ustr; case SC_LESS_EQUAL: - return "<="; + return u"<="_ustr; case SC_NOT_EQUAL: if (eSearchType == utl::SearchParam::SearchType::Regexp) return GetXMLToken(XML_NOMATCH); else - return "!="; + return u"!="_ustr; case SC_TOPPERC: return GetXMLToken(XML_TOP_PERCENT); case SC_TOPVAL: @@ -405,7 +405,7 @@ private: default: ; } - return "="; + return u"="_ustr; } class WriteSetItem @@ -489,7 +489,7 @@ private: // Store the 1st value for backward compatibility. const ScQueryEntry::Item& rItem = rItems.front(); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, rItem.maString.getString()); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, OUString("=")); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, u"="_ustr); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(rEntry.nField - nFieldStart)); if (bCaseSens) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 9ca2b865835d..13abd8808d01 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -393,12 +393,12 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) static constexpr OUString sScript(u"Script"_ustr); uno::Sequence<beans::PropertyValue> aSeq( comphelper::InitPropertySequence({ - { "EventType", uno::Any(bScriptURL ? sScript : OUString("StarBasic")) }, + { "EventType", uno::Any(bScriptURL ? sScript : u"StarBasic"_ustr) }, { "Library", uno::Any(OUString()) }, - { bScriptURL ? sScript : OUString("MacroName"), uno::Any(rValidation.sErrorTitle) } + { bScriptURL ? sScript : u"MacroName"_ustr, uno::Any(rValidation.sErrorTitle) } })); // 2) export the sequence - rExport.GetEventExport().ExportSingleEvent( aSeq, "OnError"); + rExport.GetEventExport().ExportSingleEvent( aSeq, u"OnError"_ustr); } } break; diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 0004c8849f97..71670335c59d 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -126,7 +126,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTableHeaderFooterCo } if (xText.is()) { - xText->setString(""); + xText->setString(u""_ustr); uno::Reference < text::XTextCursor > xTempTextCursor(xText->createTextCursor()); return new XMLHeaderFooterRegionContext( GetImport(), xTempTextCursor); } @@ -139,7 +139,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > XMLTableHeaderFooterCo if( xHeaderFooterContent.is() ) { uno::Reference < text::XText > xText(xHeaderFooterContent->getCenterText()); - xText->setString(""); + xText->setString(u""_ustr); xTextCursor.set(xText->createTextCursor()); xOldTextCursor.set(GetImport().GetTextImport()->GetCursor()); GetImport().GetTextImport()->SetCursor( xTextCursor ); @@ -164,7 +164,7 @@ void XMLTableHeaderFooterContext::endFastElement(sal_Int32 ) if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { GetImport().GetTextImport()->GetText()->insertString( - GetImport().GetTextImport()->GetCursorAsRange(), "", + GetImport().GetTextImport()->GetCursorAsRange(), u""_ustr, true ); } GetImport().GetTextImport()->ResetCursor(); @@ -174,11 +174,11 @@ void XMLTableHeaderFooterContext::endFastElement(sal_Int32 ) if (xHeaderFooterContent.is()) { if (!bContainsLeft) - xHeaderFooterContent->getLeftText()->setString(""); + xHeaderFooterContent->getLeftText()->setString(u""_ustr); if (!bContainsCenter) - xHeaderFooterContent->getCenterText()->setString(""); + xHeaderFooterContent->getCenterText()->setString(u""_ustr); if (!bContainsRight) - xHeaderFooterContent->getRightText()->setString(""); + xHeaderFooterContent->getRightText()->setString(u""_ustr); xPropSet->setPropertyValue( sCont, uno::Any(xHeaderFooterContent) ); } @@ -222,7 +222,7 @@ void XMLHeaderFooterRegionContext::endFastElement(sal_Int32 ) if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { GetImport().GetTextImport()->GetText()->insertString( - GetImport().GetTextImport()->GetCursorAsRange(), "", + GetImport().GetTextImport()->GetCursorAsRange(), u""_ustr, true ); } GetImport().GetTextImport()->ResetCursor(); diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 39024952f5fd..52392ef0d492 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx @@ -116,7 +116,7 @@ void ScMyOLEFixer::FixupOLEs() if (aShapes.empty() || !rImport.GetModel().is()) return; - OUString sPersistName ("PersistName"); + OUString sPersistName (u"PersistName"_ustr); ScDocument* pDoc(rImport.GetDocument()); ScXMLImport::MutexGuard aGuard(rImport); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index e2e51ed3141c..d71078c6fec8 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -856,7 +856,7 @@ void SAL_CALL ScXMLChangeCellContext::endFastElement( sal_Int32 /*nElement*/ ) if( GetImport().GetTextImport()->GetCursor()->goLeft( 1, true ) ) { GetImport().GetTextImport()->GetText()->insertString( - GetImport().GetTextImport()->GetCursorAsRange(), "", + GetImport().GetTextImport()->GetCursorAsRange(), u""_ustr, true ); } } diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index d85740af707f..85f457428702 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -260,7 +260,7 @@ void SAL_CALL ScXMLConditionalFormatContext::endFastElement( sal_Int32 /*nElemen aSrcPos.Parse( aSrcString, *pDoc ); ScCompiler aComp( *pDoc, aSrcPos ); aComp.SetGrammar( formula::FormulaGrammar::GRAM_ODFF ); - pTokens = aComp.CompileString( pCondFormatEntry->GetExpression(aSrcPos, 0), "" ); + pTokens = aComp.CompileString( pCondFormatEntry->GetExpression(aSrcPos, 0), u""_ustr ); if (HasRelRefIgnoringSheet0Relative( pDoc, pTokens.get() )) { // In general not eligible, but some might be. We handle one very special case: When the diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 4946bf236264..1f352354e021 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -364,7 +364,7 @@ void SAL_CALL ScXMLContentValidationContext::endFastElement( sal_Int32 /*nElemen if (xEventContext.is()) { uno::Sequence<beans::PropertyValue> aValues; - xEventContext->GetEventSequence( "OnError", aValues ); + xEventContext->GetEventSequence( u"OnError"_ustr, aValues ); auto pValue = std::find_if(std::cbegin(aValues), std::cend(aValues), [](const beans::PropertyValue& rValue) { diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 7f6d9440929e..1f56ece42e9c 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -249,61 +249,61 @@ OUString lcl_GetFormattedString(ScDocument* pDoc, const ScRefCellValue& rCell, c extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* Calc_XMLExporter_get_implementation(css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const &) { -e ... etc. - the rest is truncated
