diff options
61 files changed, 150 insertions, 150 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index d8590804a165..f1602465f7d2 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -269,9 +269,9 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf89920) CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedUnicodeString) { const OUString sCorrectString(u"English Русский 中文"_ustr); - static constexpr OUStringLiteral sMacroURL( - u"vnd.sun.Star.script:Protected.Module1.TestUnicodeString?language=Basic&location=document"); - static constexpr OUStringLiteral sLibName(u"Protected"); + static constexpr OUString sMacroURL( + u"vnd.sun.Star.script:Protected.Module1.TestUnicodeString?language=Basic&location=document"_ustr); + static constexpr OUString sLibName(u"Protected"_ustr); createScDoc("tdf57113.ods"); @@ -309,9 +309,9 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedUnicodeString) CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedArrayInUserType) { - static constexpr OUStringLiteral sMacroURL( - u"vnd.sun.Star.script:Protected.Module1.TestMyType?language=Basic&location=document"); - static constexpr OUStringLiteral sLibName(u"Protected"); + static constexpr OUString sMacroURL( + u"vnd.sun.Star.script:Protected.Module1.TestMyType?language=Basic&location=document"_ustr); + static constexpr OUString sLibName(u"Protected"_ustr); createScDoc("ProtectedArrayInCustomType.ods"); diff --git a/sc/qa/unit/ThemeImportExportTest.cxx b/sc/qa/unit/ThemeImportExportTest.cxx index e8e1a31dbbff..ec33c2a1afe3 100644 --- a/sc/qa/unit/ThemeImportExportTest.cxx +++ b/sc/qa/unit/ThemeImportExportTest.cxx @@ -78,7 +78,7 @@ CPPUNIT_TEST_FIXTURE(ThemeImportExportTest, testThemeExportAndImport) { xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"); - static constexpr OStringLiteral sThemePath = "//office:styles/loext:theme"; + static constexpr OString sThemePath = "//office:styles/loext:theme"_ostr; assertXPath(pXmlDoc, sThemePath, 1); assertXPath(pXmlDoc, sThemePath + "[@loext:name='MyTheme']"); const OString sThemeColorsPath = sThemePath + "/loext:theme-colors"; diff --git a/sc/qa/unit/helper/shared_test_impl.hxx b/sc/qa/unit/helper/shared_test_impl.hxx index 8dcb387df38b..4d792cd378b2 100644 --- a/sc/qa/unit/helper/shared_test_impl.hxx +++ b/sc/qa/unit/helper/shared_test_impl.hxx @@ -286,7 +286,7 @@ void testCeilingFloor_Impl( ScDocument& rDoc ) { // Original test case document is ceiling-floor.xlsx // Sheet1.K1 has =AND(K3:K81) to evaluate all results. - static constexpr OUStringLiteral pORef = u"Sheet1.K1"; + static constexpr OUString pORef = u"Sheet1.K1"_ustr; ScAddress aPos; aPos.Parse(pORef, rDoc); CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong formula.", OUString("=AND(K3:K81)"), rDoc.GetFormula(aPos.Col(), aPos.Row(), aPos.Tab())); diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx index 68752e6cab35..ee167117278a 100644 --- a/sc/qa/unit/screenshots/screenshots.cxx +++ b/sc/qa/unit/screenshots/screenshots.cxx @@ -132,7 +132,7 @@ VclPtr<VclAbstractDialog> ScScreenshotTest::createDialogByID(sal_uInt32 nID) { VclPtr<VclAbstractDialog> pReturnDialog; ////FIXME: translatable string here - static constexpr OUStringLiteral aDefaultSheetName(u"Sheet1"); + static constexpr OUString aDefaultSheetName(u"Sheet1"_ustr); switch ( nID ) { diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 83ec9c63986e..c7bfc3eb8198 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -463,7 +463,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf113027) // Add a formula containing a remote reference, i.e., to another sheet const ScAddress aScAddress(0, 0, 0); - static constexpr OUStringLiteral aFormula = u"='Sheet 2'!RC"; + static constexpr OUString aFormula = u"='Sheet 2'!RC"_ustr; m_pDoc->SetString(aScAddress, aFormula); // Switch from relative to absolute cell reference diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 6c5c4e96a9f4..8c549ed4b3ab 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -101,7 +101,7 @@ constexpr OUStringLiteral SC_DBPROP_DATASOURCENAME = u"DataSourceName"; constexpr OUStringLiteral SC_DBPROP_COMMAND = u"Command"; constexpr OUStringLiteral SC_DBPROP_COMMANDTYPE = u"CommandType"; -constexpr OUStringLiteral SCDPSOURCE_SERVICE = u"com.sun.star.sheet.DataPilotSource"; +constexpr OUString SCDPSOURCE_SERVICE = u"com.sun.star.sheet.DataPilotSource"_ustr; namespace { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 12bfff06b8e9..cc4a783d5300 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -29,10 +29,10 @@ #define DEBUG_TAB_PROTECTION 0 -constexpr OUStringLiteral URI_SHA1 = u"http://www.w3.org/2000/09/xmldsig#sha1"; -constexpr OUStringLiteral URI_SHA256_ODF12 = u"http://www.w3.org/2000/09/xmldsig#sha256"; +constexpr OUString URI_SHA1 = u"http://www.w3.org/2000/09/xmldsig#sha1"_ustr; +constexpr OUString URI_SHA256_ODF12 = u"http://www.w3.org/2000/09/xmldsig#sha256"_ustr; constexpr OUStringLiteral URI_SHA256_W3C = u"http://www.w3.org/2001/04/xmlenc#sha256"; -constexpr OUStringLiteral URI_XLS_LEGACY = u"http://docs.oasis-open.org/office/ns/table/legacy-hash-excel"; +constexpr OUString URI_XLS_LEGACY = u"http://docs.oasis-open.org/office/ns/table/legacy-hash-excel"_ustr; using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index c9db273f54a1..a18800781bda 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -346,9 +346,9 @@ constexpr OUStringLiteral CFGSTR_ADDINFUNCTIONS = u"AddInFunctions"; #define CFG_FUNCPROP_DESCRIPTION 1 #define CFG_FUNCPROP_CATEGORY 2 #define CFG_FUNCPROP_COUNT 3 -constexpr OUStringLiteral CFGSTR_DISPLAYNAME = u"DisplayName"; -constexpr OUStringLiteral CFGSTR_DESCRIPTION = u"Description"; -constexpr OUStringLiteral CFGSTR_CATEGORY = u"Category"; +constexpr OUString CFGSTR_DISPLAYNAME = u"DisplayName"_ustr; +constexpr OUString CFGSTR_DESCRIPTION = u"Description"_ustr; +constexpr OUString CFGSTR_CATEGORY = u"Category"_ustr; // CategoryDisplayName is ignored for now constexpr OUStringLiteral CFGSTR_COMPATIBILITYNAME = u"CompatibilityName"; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 32fde79e5735..d6a178bf1894 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -65,7 +65,7 @@ * be synchronized with Writer's SwTableAutoFmtTbl sw/source/core/doc/tblafmt.cxx */ -constexpr OUStringLiteral sAutoTblFmtName = u"autotbl.fmt"; +constexpr OUString sAutoTblFmtName = u"autotbl.fmt"_ustr; // till SO5PF const sal_uInt16 AUTOFORMAT_ID_X = 9501; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 8ea94c434283..2a5491f4666b 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -776,7 +776,7 @@ struct Convention_A1 : public ScCompiler::Convention KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names because of Xcl :-/ - static constexpr OUStringLiteral aAddAllowed(u"?#"); + static constexpr OUString aAddAllowed(u"?#"_ustr); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, (bGroupSeparator ? nContFlags | KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags), @@ -1401,7 +1401,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR; constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static constexpr OUStringLiteral aAddAllowed(u"?!"); + static constexpr OUString aAddAllowed(u"?!"_ustr); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, (bGroupSeparator ? nContFlags | KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags), @@ -1745,7 +1745,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL KParseTokens::ASC_UNDERSCORE ; constexpr sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT; // '?' allowed in range names - static constexpr OUStringLiteral aAddAllowed(u"?-[]!"); + static constexpr OUString aAddAllowed(u"?-[]!"_ustr); return pCharClass->parseAnyToken( rFormula, nSrcPos, nStartFlags, aAddAllowed, diff --git a/sc/source/core/tool/stylehelper.cxx b/sc/source/core/tool/stylehelper.cxx index e4bfed1f1b0e..c9cf69646571 100644 --- a/sc/source/core/tool/stylehelper.cxx +++ b/sc/source/core/tool/stylehelper.cxx @@ -115,7 +115,7 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap( SfxStyleFamily nType ) // programmatic name suffix for display names that match other programmatic names // is " (user)" including a space -constexpr OUStringLiteral SC_SUFFIX_USER = u" (user)"; +constexpr OUString SC_SUFFIX_USER = u" (user)"_ustr; static bool lcl_EndsWithUser( std::u16string_view rString ) { diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 9c7eb9673c9f..b09f370dd20f 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1912,7 +1912,7 @@ bool XclExpChSeries::ConvertDataSeries( if( xColorScheme.is() ) { static constexpr OUStringLiteral aFillStyleName = u"FillStyle"; - static constexpr OUStringLiteral aColorName = u"Color"; + static constexpr OUString aColorName = u"Color"_ustr; namespace cssd = ::com::sun::star::drawing; for( sal_Int32 nPointIdx = 0; nPointIdx < nMaxPointCount; ++nPointIdx ) { diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2b69dfb83561..4158fa2c153d 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1074,7 +1074,7 @@ bool XclExpXmlStream::exportDocument() } } - static constexpr OUStringLiteral workbook = u"xl/workbook.xml"; + static constexpr OUString workbook = u"xl/workbook.xml"_ustr; const char* pWorkbookContentType = nullptr; if (mbExportVBA) { diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 1df74ca56de4..3f5969cead78 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -476,7 +476,7 @@ rtl::Reference<SdrObject> XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter { const Reference< XControlModel >& xCtrlModel = pSdrUnoObj->GetUnoControlModel(); Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY); - static constexpr OUStringLiteral sPropertyName(u"ControlTypeinMSO"); + static constexpr OUString sPropertyName(u"ControlTypeinMSO"_ustr); enum { eCreateFromOffice = 0, eCreateFromMSTBXControl, eCreateFromMSOCXControl }; @@ -3341,7 +3341,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( { } -constexpr OUStringLiteral gaStdFormName( u"Standard" ); /// Standard name of control forms. +constexpr OUString gaStdFormName( u"Standard"_ustr ); /// Standard name of control forms. XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 7b64ec696b34..431ff8a34f35 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -54,7 +54,7 @@ const sal_uInt32 BIFF12_DEFNAME_VBNAME = 0x00000004; const sal_uInt32 BIFF12_DEFNAME_MACRO = 0x00000008; const sal_uInt32 BIFF12_DEFNAME_BUILTIN = 0x00000020; -constexpr OUStringLiteral spcOoxPrefix(u"_xlnm."); +constexpr OUString spcOoxPrefix(u"_xlnm."_ustr); const char* const sppcBaseNames[] = { diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 7f6e762aaf98..825389d37ad0 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -473,8 +473,8 @@ const char* const sppcItalicNames[] = constexpr OUStringLiteral gaPageNumberService( u"com.sun.star.text.TextField.PageNumber" ); constexpr OUStringLiteral gaPageCountService( u"com.sun.star.text.TextField.PageCount" ); constexpr OUStringLiteral gaSheetNameService( u"com.sun.star.text.TextField.SheetName" ); -constexpr OUStringLiteral gaFileNameService( u"com.sun.star.text.TextField.FileName" ); -constexpr OUStringLiteral gaDateTimeService( u"com.sun.star.text.TextField.DateTime" ); +constexpr OUString gaFileNameService( u"com.sun.star.text.TextField.FileName"_ustr ); +constexpr OUString gaDateTimeService( u"com.sun.star.text.TextField.DateTime"_ustr ); HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 754eafce5137..1ec2ea8be012 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -249,7 +249,7 @@ void QueryTable::finalizeImport() PropertySet aDocProps( getDocument() ); Reference< XAreaLinks > xAreaLinks( aDocProps.getAnyProperty( PROP_AreaLinks ), UNO_QUERY_THROW ); CellAddress aDestPos( aDestRange.aStart.Tab(), aDestRange.aStart.Col(), aDestRange.aStart.Row() ); - static constexpr OUStringLiteral aFilterName = u"calc_HTML_WebQuery"; + static constexpr OUString aFilterName = u"calc_HTML_WebQuery"_ustr; xAreaLinks->insertAtPosition( aDestPos, aFileUrl, aTables, aFilterName, /*aFilterOptions*/"" ); // set refresh interval (convert minutes to seconds) sal_Int32 nRefreshPeriod = xConnection->getModel().mnInterval * 60; diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index b7db3ba669dd..07e3769e65b9 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -165,7 +165,7 @@ bool lcl_IsFontwork( const SdrObject* pObj ) bool bIsFontwork = false; if( pObj->GetObjIdentifier() == SdrObjKind::CustomShape ) { - static constexpr OUStringLiteral aTextPath = u"TextPath"; + static constexpr OUString aTextPath = u"TextPath"_ustr; const SdrCustomShapeGeometryItem& rGeometryItem = pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); if( const Any* pAny = rGeometryItem.GetPropertyValueByName( aTextPath, aTextPath ) ) diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index efe429b49faa..076ceda030f9 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -28,7 +28,7 @@ #include <sax/tools/converter.hxx> #include <utility> -constexpr OStringLiteral SC_CHANGE_ID_PREFIX = "ct"; +constexpr OString SC_CHANGE_ID_PREFIX = "ct"_ostr; ScMyCellInfo::ScMyCellInfo( ScCellValue aCell, OUString aFormulaAddress, OUString aFormula, diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 063729d5c2f8..347f21d0f850 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -48,8 +48,8 @@ bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeNam return false; } -constexpr OUStringLiteral gsDocName( u"*doc*" ); -constexpr OUStringLiteral gsCodeNameProp( u"CodeName" ); +constexpr OUString gsDocName( u"*doc*"_ustr ); +constexpr OUString gsCodeNameProp( u"CodeName"_ustr ); XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : mpDoc( pDoc ) diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 61c01d236bfa..6905e02d651b 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -50,7 +50,7 @@ #include <map> //! not found in unonames.hxx -constexpr OUStringLiteral SC_USERLIST = u"UserList"; +constexpr OUString SC_USERLIST = u"UserList"_ustr; using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index a100c61e5c8d..0708bfd6c25d 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -384,7 +384,7 @@ void ScMyValidationsContainer::WriteValidations(ScXMLExport& rExport) // and the property name is "MacroName". bool bScriptURL = SfxApplication::IsXScriptURL( rValidation.sErrorTitle ); - static constexpr OUStringLiteral sScript(u"Script"); + static constexpr OUString sScript(u"Script"_ustr); uno::Sequence<beans::PropertyValue> aSeq( comphelper::InitPropertySequence({ { "EventType", uno::Any(bScriptURL ? sScript : OUString("StarBasic")) }, { "Library", uno::Any(OUString()) }, diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 9acae7b1ec0d..e1d1b7bc0f79 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -167,7 +167,7 @@ namespace com::sun::star::uno { class XComponentContext; } //! not found in unonames.hxx -constexpr OUStringLiteral SC_LAYERID = u"LayerID"; +constexpr OUString SC_LAYERID = u"LayerID"_ustr; #define SC_VIEWCHANGES_COUNT 13 #define SC_SHOW_CHANGES 0 @@ -895,7 +895,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() // Export each unique number format used in the external ref cache. vector<sal_uInt32> aNumFmts; pRefMgr->getAllCachedNumberFormats(aNumFmts); - static constexpr OUStringLiteral aDefaultStyle(u"Default"); + static constexpr OUString aDefaultStyle(u"Default"_ustr); for (const auto& rNumFmt : aNumFmts) { sal_Int32 nNumFmt = static_cast<sal_Int32>(rNumFmt); @@ -905,7 +905,7 @@ void ScXMLExport::ExportExternalRefCacheStyles() uno::Any aVal; aVal <<= nNumFmt; vector<XMLPropertyState> aProps; - aVal <<= OUString(aDefaultStyle); + aVal <<= aDefaultStyle; aProps.emplace_back(nEntryIndex, aVal); OUString aName; @@ -1828,7 +1828,7 @@ void ScXMLExport::CopySourceStream( sal_Int64 nStartOffset, sal_Int64 nEndOffset if ( getExportFlags() & SvXMLExportFlags::PRETTY ) { - static constexpr OStringLiteral aOutStr("\n "); + static constexpr OString aOutStr("\n "_ostr); uno::Sequence<sal_Int8> aOutSeq( reinterpret_cast<sal_Int8 const *>(aOutStr.getStr()), aOutStr.getLength() ); xDestStream->writeBytes( aOutSeq ); } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b440d5ca0392..db113a47b4b1 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -101,7 +101,7 @@ #include <memory> #include <utility> -constexpr OUStringLiteral SC_LOCALE = u"Locale"; +constexpr OUString SC_LOCALE = u"Locale"_ustr; constexpr OUStringLiteral SC_CURRENCYSYMBOL = u"CurrencySymbol"; constexpr OUStringLiteral SC_REPEAT_ROW = u"repeat-row"; constexpr OUStringLiteral SC_FILTER = u"filter"; @@ -1171,7 +1171,7 @@ void SAL_CALL ScXMLImport::startDocument() xImportInfo.is() ? xImportInfo->getPropertySetInfo() : nullptr); if (xPropertySetInfo.is()) { - static constexpr OUStringLiteral sOrganizerMode(u"OrganizerMode"); + static constexpr OUString sOrganizerMode(u"OrganizerMode"_ustr); if (xPropertySetInfo->hasPropertyByName(sOrganizerMode)) { bool bStyleOnly(false); diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index f6871ccffa46..6f1fccd9cb0d 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -49,7 +49,7 @@ const TranslateId lclAnovaLabels[] = {} }; -constexpr OUStringLiteral strWildcardRange = u"%RANGE%"; +constexpr OUString strWildcardRange = u"%RANGE%"_ustr; OUString lclCreateMultiParameterFormula( ScRangeList& aRangeList, const OUString& aFormulaTemplate, diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx index c6cff45e8c6d..5a1e192ef3de 100644 --- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx @@ -210,7 +210,7 @@ void ScFourierAnalysisDialog::getDataLabel(OUString& rLabel) void ScFourierAnalysisDialog::genFormula(OUString& rFormula) { - static constexpr OUStringLiteral aSep(u";"); + static constexpr OUString aSep(u";"_ustr); if (!mbPolar) { diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index e9ac99dda4bd..f2059ff822a8 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -71,7 +71,7 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell) output.writeString(getLabel()); output.nextColumn(); - static constexpr OUStringLiteral strWildcardNumber(u"%NUMBER%"); + static constexpr OUString strWildcardNumber(u"%NUMBER%"_ustr); // write labels to columns for (size_t i = 0; i < aRangeList.size(); i++) diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 5f9f8354bbfe..b900d3491c95 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -32,8 +32,8 @@ using namespace com::sun::star::uno; -constexpr OUStringLiteral SEP_PATH = u"Office.Calc/Dialogs/CSVImport"; -constexpr OUStringLiteral FIXED_WIDTH_LIST = u"FixedWidthList"; +constexpr OUString SEP_PATH = u"Office.Calc/Dialogs/CSVImport"_ustr; +constexpr OUString FIXED_WIDTH_LIST = u"FixedWidthList"_ustr; static void load_FixedWidthList(ScCsvSplits &rSplits) { diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 3cbf57616670..47a8cd1729c4 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -253,7 +253,7 @@ void DataStream::MakeToolbarVisible() if (!xLayoutManager.is()) return; - static constexpr OUStringLiteral sResourceURL( u"private:resource/toolbar/datastreams" ); + static constexpr OUString sResourceURL( u"private:resource/toolbar/datastreams"_ustr ); css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL); if (!xUIElement.is()) { diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 96a1ff9407ff..7ba08a1cc5d5 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -160,7 +160,7 @@ using ::std::vector; constexpr OUStringLiteral pFilterSc50 = u"StarCalc 5.0"; const char pFilterXML[] = "StarOffice XML (Calc)"; -constexpr OUStringLiteral pFilterLotus = u"Lotus"; +constexpr OUString pFilterLotus = u"Lotus"_ustr; const char pFilterQPro6[] = "Quattro Pro 6.0"; const char16_t pFilterExcel4[] = u"MS Excel 4.0"; const char16_t pFilterEx4Temp[] = u"MS Excel 4.0 Vorlage/Template"; @@ -170,11 +170,11 @@ const char pFilterExcel95[] = "MS Excel 95"; const char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; const char pFilterExcel97[] = "MS Excel 97"; const char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; -constexpr OUStringLiteral pFilterDBase = u"dBase"; -constexpr OUStringLiteral pFilterDif = u"DIF"; +constexpr OUString pFilterDBase = u"dBase"_ustr; +constexpr OUString pFilterDif = u"DIF"_ustr; const char16_t pFilterSylk[] = u"SYLK"; -constexpr OUStringLiteral pFilterHtml = u"HTML (StarCalc)"; -constexpr OUStringLiteral pFilterHtmlWebQ = u"calc_HTML_WebQuery"; +constexpr OUString pFilterHtml = u"HTML (StarCalc)"_ustr; +constexpr OUString pFilterHtmlWebQ = u"calc_HTML_WebQuery"_ustr; const char16_t pFilterRtf[] = u"Rich Text Format (StarCalc)"; #define ShellClass_ScDocShell diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 0843e6580946..8b2599ab2684 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1223,9 +1223,9 @@ void ScDocShell::Execute( SfxRequest& rReq ) if ( !aLangText.isEmpty() ) { LanguageType eLang, eLatin, eCjk, eCtl; - static constexpr OUStringLiteral aSelectionLangPrefix(u"Current_"); - static constexpr OUStringLiteral aParagraphLangPrefix(u"Paragraph_"); - static constexpr OUStringLiteral aDocLangPrefix(u"Default_"); + static constexpr OUString aSelectionLangPrefix(u"Current_"_ustr); + static constexpr OUString aParagraphLangPrefix(u"Paragraph_"_ustr); + static constexpr OUString aDocLangPrefix(u"Default_"_ustr); bool bSelection = false; bool bParagraph = false; @@ -1373,7 +1373,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) if (pItem2) sApplyText = pItem2->GetValue(); - static constexpr OUStringLiteral sSpellingRule(u"Spelling_"); + static constexpr OUString sSpellingRule(u"Spelling_"_ustr); sal_Int32 nPos = 0; if(-1 != (nPos = sApplyText.indexOf( sSpellingRule ))) { diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 44a080770a15..cc0be89a4bd6 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -84,21 +84,21 @@ using ::std::vector; #if HAVE_FEATURE_DBCONNECTIVITY -constexpr OUStringLiteral SC_SERVICE_ROWSET = u"com.sun.star.sdb.RowSet"; +constexpr OUString SC_SERVICE_ROWSET = u"com.sun.star.sdb.RowSet"_ustr; //! move to a header file? -constexpr OUStringLiteral SC_DBPROP_ACTIVECONNECTION = u"ActiveConnection"; -constexpr OUStringLiteral SC_DBPROP_COMMAND = u"Command"; -constexpr OUStringLiteral SC_DBPROP_COMMANDTYPE = u"CommandType"; +constexpr OUString SC_DBPROP_ACTIVECONNECTION = u"ActiveConnection"_ustr; +constexpr OUString SC_DBPROP_COMMAND = u"Command"_ustr; +constexpr OUString SC_DBPROP_COMMANDTYPE = u"CommandType"_ustr; constexpr OUStringLiteral SC_DBPROP_PROPCHANGE_NOTIFY = u"PropertyChangeNotificationEnabled"; -constexpr OUStringLiteral SC_DBPROP_NAME = u"Name"; +constexpr OUString SC_DBPROP_NAME = u"Name"_ustr; constexpr OUStringLiteral SC_DBPROP_TYPE = u"Type"; constexpr OUStringLiteral SC_DBPROP_PRECISION = u"Precision"; constexpr OUStringLiteral SC_DBPROP_SCALE = u"Scale"; -constexpr OUStringLiteral SC_DBPROP_EXTENSION = u"Extension"; -constexpr OUStringLiteral SC_DBPROP_CHARSET = u"CharSet"; +constexpr OUString SC_DBPROP_EXTENSION = u"Extension"_ustr; +constexpr OUString SC_DBPROP_CHARSET = u"CharSet"_ustr; namespace { diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 17e1db62b6be..4a585657de1a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1319,7 +1319,7 @@ static bool lcl_PutString( sal_Int16 nMonth = static_cast<sal_Int16>(aMStr.toInt32()); if (!nMonth) { - static constexpr OUStringLiteral aSepShortened = u"SEP"; + static constexpr OUString aSepShortened = u"SEP"_ustr; uno::Sequence< i18n::CalendarItem2 > xMonths; sal_Int32 i, nMonthCount; // first test all month names from local international diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index f0cdad08e370..0b9dc129d7cb 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -62,8 +62,8 @@ ScLinkedAreaDlg::~ScLinkedAreaDlg() { } -constexpr OUStringLiteral FILTERNAME_HTML = u"HTML (StarCalc)"; -constexpr OUStringLiteral FILTERNAME_QUERY = u"calc_HTML_WebQuery"; +constexpr OUString FILTERNAME_HTML = u"HTML (StarCalc)"_ustr; +constexpr OUString FILTERNAME_QUERY = u"calc_HTML_WebQuery"_ustr; IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl, weld::Button&, void) { diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 7c73a06c2461..31772a05cf9b 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; -constexpr OUStringLiteral SCSOLVER_SERVICE = u"com.sun.star.sheet.Solver"; +constexpr OUString SCSOLVER_SERVICE = u"com.sun.star.sheet.Solver"_ustr; void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, uno::Sequence<OUString>& rDescriptions ) diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index a8f9dc148f28..7d4081eda570 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -36,8 +36,8 @@ using namespace css; using namespace css::uno; -constexpr OUStringLiteral SETBORDERSTYLE = u"SetBorderStyle"; -constexpr OUStringLiteral LINESTYLE = u"LineStyle"; +constexpr OUString SETBORDERSTYLE = u"SetBorderStyle"_ustr; +constexpr OUString LINESTYLE = u"LineStyle"_ustr; // namespace open diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 7fbf1ba74639..fce07d2b9697 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -120,7 +120,7 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetAutoFieldMap() return aAutoFieldMap_Impl; } -constexpr OUStringLiteral SCAUTOFORMATSOBJ_SERVICE = u"com.sun.star.sheet.TableAutoFormats"; +constexpr OUString SCAUTOFORMATSOBJ_SERVICE = u"com.sun.star.sheet.TableAutoFormats"_ustr; SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 5365b3474611..3b12dc9da756 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -78,9 +78,9 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetSettingsPropertyMap() return aSettingsPropertyMap_Impl; } -constexpr OUStringLiteral SCFUNCTIONLISTOBJ_SERVICE = u"com.sun.star.sheet.FunctionDescriptions"; -constexpr OUStringLiteral SCRECENTFUNCTIONSOBJ_SERVICE = u"com.sun.star.sheet.RecentFunctions"; -constexpr OUStringLiteral SCSPREADSHEETSETTINGS_SERVICE = u"com.sun.star.sheet.GlobalSheetSettings"; +constexpr OUString SCFUNCTIONLISTOBJ_SERVICE = u"com.sun.star.sheet.FunctionDescriptions"_ustr; +constexpr OUString SCRECENTFUNCTIONSOBJ_SERVICE = u"com.sun.star.sheet.RecentFunctions"_ustr; +constexpr OUString SCSPREADSHEETSETTINGS_SERVICE = u"com.sun.star.sheet.GlobalSheetSettings"_ustr; SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "stardiv.StarCalc.ScFunctionListObj", SCFUNCTIONLISTOBJ_SERVICE ) SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "stardiv.StarCalc.ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 7dde419b369d..59d77e3517fa 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -809,15 +809,15 @@ static const SvxItemPropertySet* lcl_GetEditPropertySet() return &aEditPropertySet; } -constexpr OUStringLiteral SCCHARPROPERTIES_SERVICE = u"com.sun.star.style.CharacterProperties"; -constexpr OUStringLiteral SCPARAPROPERTIES_SERVICE = u"com.sun.star.style.ParagraphProperties"; -constexpr OUStringLiteral SCCELLPROPERTIES_SERVICE = u"com.sun.star.table.CellProperties"; -constexpr OUStringLiteral SCCELLRANGE_SERVICE = u"com.sun.star.table.CellRange"; -constexpr OUStringLiteral SCCELL_SERVICE = u"com.sun.star.table.Cell"; -constexpr OUStringLiteral SCSHEETCELLRANGES_SERVICE = u"com.sun.star.sheet.SheetCellRanges"; -constexpr OUStringLiteral SCSHEETCELLRANGE_SERVICE = u"com.sun.star.sheet.SheetCellRange"; -constexpr OUStringLiteral SCSPREADSHEET_SERVICE = u"com.sun.star.sheet.Spreadsheet"; -constexpr OUStringLiteral SCSHEETCELL_SERVICE = u"com.sun.star.sheet.SheetCell"; +constexpr OUString SCCHARPROPERTIES_SERVICE = u"com.sun.star.style.CharacterProperties"_ustr; +constexpr OUString SCPARAPROPERTIES_SERVICE = u"com.sun.star.style.ParagraphProperties"_ustr; +constexpr OUString SCCELLPROPERTIES_SERVICE = u"com.sun.star.table.CellProperties"_ustr; +constexpr OUString SCCELLRANGE_SERVICE = u"com.sun.star.table.CellRange"_ustr; +constexpr OUString SCCELL_SERVICE = u"com.sun.star.table.Cell"_ustr; +constexpr OUString SCSHEETCELLRANGES_SERVICE = u"com.sun.star.sheet.SheetCellRanges"_ustr; +constexpr OUString SCSHEETCELLRANGE_SERVICE = u"com.sun.star.sheet.SheetCellRange"_ustr; +constexpr OUString SCSPREADSHEET_SERVICE = u"com.sun.star.sheet.Spreadsheet"_ustr; +constexpr OUString SCSHEETCELL_SERVICE = u"com.sun.star.sheet.SheetCell"_ustr; SC_SIMPLE_SERVICE_INFO( ScCellFormatsEnumeration, "ScCellFormatsEnumeration", "com.sun.star.sheet.CellFormatRangesEnumeration" ) SC_SIMPLE_SERVICE_INFO( ScCellFormatsObj, "ScCellFormatsObj", "com.sun.star.sheet.CellFormatRanges" ) diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 575b7fc8ff08..4c69e656455d 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; -constexpr OUStringLiteral SCSAVEVERSION = u"SaveVersionOnClose"; +constexpr OUString SCSAVEVERSION = u"SaveVersionOnClose"_ustr; static std::span<const SfxItemPropertyMapEntry> lcl_GetConfigPropertyMap() { diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 545e0e1e7571..f2b9142f37cc 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -29,8 +29,8 @@ using namespace com::sun::star; -constexpr OUStringLiteral SCSHEETCELLCURSOR_SERVICE = u"com.sun.star.sheet.SheetCellCursor"; -constexpr OUStringLiteral SCCELLCURSOR_SERVICE = u"com.sun.star.table.CellCursor"; +constexpr OUString SCSHEETCELLCURSOR_SERVICE = u"com.sun.star.sheet.SheetCellCursor"_ustr; +constexpr OUString SCCELLCURSOR_SERVICE = u"com.sun.star.table.CellCursor"_ustr; ScCellCursorObj::ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangeObj( pDocSh, rR ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 5b06bf4c1840..f172716c1130 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -189,7 +189,7 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupObj, "ScDataPilotFieldGroupObj", "c SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItemObj", "com.sun.star.sheet.DataPilotFieldGroupItem" ) // name that is used in the API for the data layout field -constexpr OUStringLiteral SC_DATALAYOUT_NAME = u"Data"; +constexpr OUString SC_DATALAYOUT_NAME = u"Data"_ustr; ScGeneralFunction ScDataPilotConversion::FirstFunc( PivotFunc nBits ) { diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index d14f7ca497a2..536d271d643f 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text -constexpr OUStringLiteral cURLDocDataSource = u".uno:DataSourceBrowser/DocumentDataSource"; +constexpr OUString cURLDocDataSource = u".uno:DataSourceBrowser/DocumentDataSource"_ustr; static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( const SfxViewShell* pViewShell ) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9ef2e5971528..9c11774b1501 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -137,7 +137,7 @@ using namespace com::sun::star; // #i111553# provides the name of the VBA constant for this document type (e.g. 'ThisExcelDoc' for Calc) -constexpr OUStringLiteral SC_UNO_VBAGLOBNAME = u"VBAGlobalConstantName"; +constexpr OUString SC_UNO_VBAGLOBNAME = u"VBAGlobalConstantName"_ustr; // no Which-ID here, map only for PropertySetInfo @@ -227,9 +227,9 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetRowsPropertyMap() return aRowsPropertyMap_Impl; } -constexpr OUStringLiteral SCMODELOBJ_SERVICE = u"com.sun.star.sheet.SpreadsheetDocument"; -constexpr OUStringLiteral SCDOCSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetDocumentSettings"; -constexpr OUStringLiteral SCDOC_SERVICE = u"com.sun.star.document.OfficeDocument"; +constexpr OUString SCMODELOBJ_SERVICE = u"com.sun.star.sheet.SpreadsheetDocument"_ustr; +constexpr OUString SCDOCSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetDocumentSettings"_ustr; +constexpr OUString SCDOC_SERVICE = u"com.sun.star.document.OfficeDocument"_ustr; SC_SIMPLE_SERVICE_INFO( ScAnnotationsObj, "ScAnnotationsObj", "com.sun.star.sheet.CellAnnotations" ) SC_SIMPLE_SERVICE_INFO( ScDrawPagesObj, "ScDrawPagesObj", "com.sun.star.drawing.DrawPages" ) diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index f9474961cf3a..fa520e23aeff 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -47,19 +47,19 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace connectivity::dbase; -constexpr OUStringLiteral SCFILTEROPTIONSOBJ_SERVICE = u"com.sun.star.ui.dialogs.FilterOptionsDialog"; +constexpr OUString SCFILTEROPTIONSOBJ_SERVICE = u"com.sun.star.ui.dialogs.FilterOptionsDialog"_ustr; constexpr OUStringLiteral SCFILTEROPTIONSOBJ_IMPLNAME = u"com.sun.star.comp.Calc.FilterOptionsDialog"; SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTEROPTIONSOBJ_SERVICE ) constexpr OUStringLiteral SC_UNONAME_FILENAME = u"URL"; constexpr OUStringLiteral SC_UNONAME_FILTERNAME = u"FilterName"; -constexpr OUStringLiteral SC_UNONAME_FILTEROPTIONS = u"FilterOptions"; +constexpr OUString SC_UNONAME_FILTEROPTIONS = u"FilterOptions"_ustr; constexpr OUStringLiteral SC_UNONAME_INPUTSTREAM = u"InputStream"; -constexpr OUStringLiteral DBF_CHAR_SET = u"CharSet"; -constexpr OUStringLiteral DBF_SEP_PATH_IMPORT = u"Office.Calc/Dialogs/DBFImport"; -constexpr OUStringLiteral DBF_SEP_PATH_EXPORT = u"Office.Calc/Dialogs/DBFExport"; +constexpr OUString DBF_CHAR_SET = u"CharSet"_ustr; +constexpr OUString DBF_SEP_PATH_IMPORT = u"Office.Calc/Dialogs/DBFImport"_ustr; +constexpr OUString DBF_SEP_PATH_EXPORT = u"Office.Calc/Dialogs/DBFExport"_ustr; namespace { diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 8b5ef69aca66..6f5226452bf7 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -52,8 +52,8 @@ using namespace com::sun::star; // registered as implementation for service FunctionAccess, // also supports service SpreadsheetDocumentSettings (to set null date etc.) -constexpr OUStringLiteral SCFUNCTIONACCESS_SERVICE = u"com.sun.star.sheet.FunctionAccess"; -constexpr OUStringLiteral SCDOCSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetDocumentSettings"; +constexpr OUString SCFUNCTIONACCESS_SERVICE = u"com.sun.star.sheet.FunctionAccess"_ustr; +constexpr OUString SCDOCSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetDocumentSettings"_ustr; // helper to use cached document if not in use, temporary document otherwise diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 39973ba74cad..6a43a4c05f35 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -69,7 +69,7 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetNamedRangesMap() return aNamedRangesMap_Impl; } -constexpr OUStringLiteral SCNAMEDRANGEOBJ_SERVICE = u"com.sun.star.sheet.NamedRange"; +constexpr OUString SCNAMEDRANGEOBJ_SERVICE = u"com.sun.star.sheet.NamedRange"_ustr; SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.LabelRange" ) SC_SIMPLE_SERVICE_INFO( ScLabelRangesObj, "ScLabelRangesObj", "com.sun.star.sheet.LabelRanges" ) diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index f14be95c65c9..5d1ecadb08a7 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1334,9 +1334,9 @@ SdrObject* ScShapeObj::GetSdrObject() const noexcept return nullptr; } -constexpr OUStringLiteral SC_EVENTACC_ONCLICK = u"OnClick"; -constexpr OUStringLiteral SC_EVENTACC_SCRIPT = u"Script"; -constexpr OUStringLiteral SC_EVENTACC_EVENTTYPE = u"EventType"; +constexpr OUString SC_EVENTACC_ONCLICK = u"OnClick"_ustr; +constexpr OUString SC_EVENTACC_SCRIPT = u"Script"_ustr; +constexpr OUString SC_EVENTACC_EVENTTYPE = u"EventType"_ustr; class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameReplace > { @@ -1397,7 +1397,7 @@ public: if ( pInfo && !pInfo->GetMacro().isEmpty() ) { aProperties = { comphelper::makePropertyValue(SC_EVENTACC_EVENTTYPE, - OUString(SC_EVENTACC_SCRIPT)), + SC_EVENTACC_SCRIPT), comphelper::makePropertyValue(SC_EVENTACC_SCRIPT, pInfo->GetMacro()) }; } diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index e06fe501df6e..0ecb6a103c04 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -53,8 +53,8 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetSearchPropertyMap() return aSearchPropertyMap_Impl; } -constexpr OUStringLiteral SCSEARCHDESCRIPTOR_SERVICE = u"com.sun.star.util.SearchDescriptor"; -constexpr OUStringLiteral SCREPLACEDESCRIPTOR_SERVICE = u"com.sun.star.util.ReplaceDescriptor"; +constexpr OUString SCSEARCHDESCRIPTOR_SERVICE = u"com.sun.star.util.SearchDescriptor"_ustr; +constexpr OUString SCREPLACEDESCRIPTOR_SERVICE = u"com.sun.star.util.ReplaceDescriptor"_ustr; ScCellSearchObj::ScCellSearchObj() : aPropSet(lcl_GetSearchPropertyMap()), diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 44396017f227..8dd6fc58f86a 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -404,21 +404,21 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() #define SC_STYLE_FAMILY_COUNT 3 -constexpr OUStringLiteral SC_FAMILYNAME_CELL = u"CellStyles"; -constexpr OUStringLiteral SC_FAMILYNAME_PAGE = u"PageStyles"; -constexpr OUStringLiteral SC_FAMILYNAME_GRAPHIC = u"GraphicStyles"; +constexpr OUString SC_FAMILYNAME_CELL = u"CellStyles"_ustr; +constexpr OUString SC_FAMILYNAME_PAGE = u"PageStyles"_ustr; +constexpr OUString SC_FAMILYNAME_GRAPHIC = u"GraphicStyles"_ustr; const SfxStyleFamily aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SfxStyleFamily::Para, SfxStyleFamily::Page, SfxStyleFamily::Frame }; -constexpr OUStringLiteral SCSTYLE_SERVICE = u"com.sun.star.style.Style"; -constexpr OUStringLiteral SCCELLSTYLE_SERVICE = u"com.sun.star.style.CellStyle"; -constexpr OUStringLiteral SCPAGESTYLE_SERVICE = u"com.sun.star.style.PageStyle"; -constexpr OUStringLiteral SCGRAPHICSTYLE_SERVICE = u"com.sun.star.style.GraphicStyle"; +constexpr OUString SCSTYLE_SERVICE = u"com.sun.star.style.Style"_ustr; +constexpr OUString SCCELLSTYLE_SERVICE = u"com.sun.star.style.CellStyle"_ustr; +constexpr OUString SCPAGESTYLE_SERVICE = u"com.sun.star.style.PageStyle"_ustr; +constexpr OUString SCGRAPHICSTYLE_SERVICE = u"com.sun.star.style.GraphicStyle"_ustr; SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" ) SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" ) -constexpr OUStringLiteral SC_PAPERBIN_DEFAULTNAME = u"[From printer settings]"; +constexpr OUString SC_PAPERBIN_DEFAULTNAME = u"[From printer settings]"_ustr; static bool lcl_AnyTabProtected( const ScDocument& rDoc ) { diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 70f57dda89ca..e9b6c31fe70b 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -118,8 +118,8 @@ static std::span<const SfxItemPropertyMapEntry> lcl_GetViewOptPropertyMap() return aViewOptPropertyMap_Impl; } -constexpr OUStringLiteral SCTABVIEWOBJ_SERVICE = u"com.sun.star.sheet.SpreadsheetView"; -constexpr OUStringLiteral SCVIEWSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetViewSettings"; +constexpr OUString SCTABVIEWOBJ_SERVICE = u"com.sun.star.sheet.SpreadsheetView"_ustr; +constexpr OUString SCVIEWSETTINGS_SERVICE = u"com.sun.star.sheet.SpreadsheetViewSettings"_ustr; SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" ) diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 4751ef85d4f2..aa461abee0da 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -30,9 +30,9 @@ using namespace ::ooo::vba::excel::XlAxisCrosses; using namespace ::ooo::vba::excel::XlAxisType; using namespace ::ooo::vba::excel::XlScaleType; -constexpr OUStringLiteral ORIGIN(u"Origin"); -constexpr OUStringLiteral AUTOORIGIN(u"AutoOrigin"); -constexpr OUStringLiteral VBA_MIN(u"Max"); +constexpr OUString ORIGIN(u"Origin"_ustr); +constexpr OUString AUTOORIGIN(u"AutoOrigin"_ustr); +constexpr OUString VBA_MIN(u"Max"_ustr); constexpr OUStringLiteral VBA_MAX(u"Min"); ScVbaChart* ScVbaAxis::getChartPtr() diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index ae5716e871c0..157994adbcab 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -43,7 +43,7 @@ typedef InheritedHelperInterfaceWeakImpl<excel::XBorder > ScVbaBorder_Base; // borders, the enumeration will match the order in this list const sal_Int16 supportedIndexTable[] = { XlBordersIndex::xlEdgeLeft, XlBordersIndex::xlEdgeTop, XlBordersIndex::xlEdgeBottom, XlBordersIndex::xlEdgeRight, XlBordersIndex::xlDiagonalDown, XlBordersIndex::xlDiagonalUp, XlBordersIndex::xlInsideVertical, XlBordersIndex::xlInsideHorizontal }; -constexpr OUStringLiteral sTableBorder = u"TableBorder"; +constexpr OUString sTableBorder = u"TableBorder"_ustr; // Equiv widths in 1/100 mm const sal_Int32 OOLineThin = 26; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index d6257591f333..d4cf3a0e1e89 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -52,20 +52,20 @@ using namespace ::ooo::vba::excel::XlAxisGroup; constexpr OUStringLiteral CHART_NAME(u"Name"); // #TODO move this constant to vbaseries.[ch]xx ( when it exists ) constexpr OUStringLiteral DEFAULTSERIESPREFIX(u"Series"); -constexpr OUStringLiteral DATAROWSOURCE(u"DataRowSource"); -constexpr OUStringLiteral UPDOWN(u"UpDown"); -constexpr OUStringLiteral VOLUME(u"Volume"); -constexpr OUStringLiteral LINES(u"Lines"); -constexpr OUStringLiteral SPLINETYPE(u"SplineType"); -constexpr OUStringLiteral SYMBOLTYPE(u"SymbolType"); -constexpr OUStringLiteral DEEP(u"Deep"); -constexpr OUStringLiteral SOLIDTYPE(u"SolidType"); -constexpr OUStringLiteral VERTICAL(u"Vertical"); -constexpr OUStringLiteral PERCENT(u"Percent"); -constexpr OUStringLiteral STACKED(u"Stacked"); -constexpr OUStringLiteral DIM3D(u"Dim3D"); -constexpr OUStringLiteral HASMAINTITLE(u"HasMainTitle"); -constexpr OUStringLiteral HASLEGEND(u"HasLegend"); +constexpr OUString DATAROWSOURCE(u"DataRowSource"_ustr); +constexpr OUString UPDOWN(u"UpDown"_ustr); +constexpr OUString VOLUME(u"Volume"_ustr); +constexpr OUString LINES(u"Lines"_ustr); +constexpr OUString SPLINETYPE(u"SplineType"_ustr); +constexpr OUString SYMBOLTYPE(u"SymbolType"_ustr); +constexpr OUString DEEP(u"Deep"_ustr); +constexpr OUString SOLIDTYPE(u"SolidType"_ustr); +constexpr OUString VERTICAL(u"Vertical"_ustr); +constexpr OUString PERCENT(u"Percent"_ustr); +constexpr OUString STACKED(u"Stacked"_ustr); +constexpr OUString DIM3D(u"Dim3D"_ustr); +constexpr OUString HASMAINTITLE(u"HasMainTitle"_ustr); +constexpr OUString HASLEGEND(u"HasLegend"_ustr); ScVbaChart::ScVbaChart( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::lang::XComponent >& _xChartComponent, css::uno::Reference< css::table::XTableChart > _xTableChart ) : ChartImpl_BASE( _xParent, _xContext ), mxTableChart(std::move( _xTableChart )) { diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index dfbc4d706c4c..0ae7b298ab2c 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -54,8 +54,8 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -constexpr OUStringLiteral FORMATSTRING = u"FormatString"; -constexpr OUStringLiteral LOCALE = u"Locale"; +constexpr OUString FORMATSTRING = u"FormatString"_ustr; +constexpr OUString LOCALE = u"Locale"_ustr; template< typename... Ifc > ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 33c5c5547442..ce94c893ad07 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -39,9 +39,9 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel::XlPattern; -constexpr OUStringLiteral BACKCOLOR = u"CellBackColor"; -constexpr OUStringLiteral PATTERN = u"Pattern"; -constexpr OUStringLiteral PATTERNCOLOR = u"PatternColor"; +constexpr OUString BACKCOLOR = u"CellBackColor"_ustr; +constexpr OUString PATTERN = u"Pattern"_ustr; +constexpr OUString PATTERNCOLOR = u"PatternColor"_ustr; constexpr auto aPatternMap = frozen::make_map<sal_Int32, sal_Int32>({ { xlPatternAutomatic, 0 }, diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 913b05ceffc9..842450b3ea0b 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -670,15 +670,15 @@ public: } -constexpr OUStringLiteral ISVISIBLE = u"IsVisible"; +constexpr OUString ISVISIBLE = u"IsVisible"_ustr; const char EQUALS[] = "="; const char NOTEQUALS[] = "<>"; const char GREATERTHAN[] = ">"; const char GREATERTHANEQUALS[] = ">="; const char LESSTHAN[] = "<"; const char LESSTHANEQUALS[] = "<="; -constexpr OUStringLiteral STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY(u"The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again"); -constexpr OUStringLiteral CELLSTYLE = u"CellStyle"; +constexpr OUString STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY(u"The command you chose cannot be performed with multiple selections.\nSelect a single range and click the command again"_ustr); +constexpr OUString CELLSTYLE = u"CellStyle"_ustr; namespace { @@ -982,7 +982,7 @@ public: } -constexpr OUStringLiteral sNA = u"#N/A"; +constexpr OUString sNA = u"#N/A"_ustr; namespace { @@ -1002,7 +1002,7 @@ public: if ( y < nColCount ) mCellValueSetter.processValue( aMatrix[ y ], xCell ); else - mCellValueSetter.processValue( uno::Any( OUString(sNA) ), xCell ); + mCellValueSetter.processValue( uno::Any( sNA ), xCell ); } }; @@ -1025,7 +1025,7 @@ public: if ( x < nRowCount && y < nColCount ) mCellValueSetter.processValue( aMatrix[ x ][ y ], xCell ); else - mCellValueSetter.processValue( uno::Any( OUString(sNA) ), xCell ); + mCellValueSetter.processValue( uno::Any( sNA ), xCell ); } }; diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index ff37ab8addfb..c0321a5a3be5 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -37,8 +37,8 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -constexpr OUStringLiteral gaListenerType = u"XActionListener"; -constexpr OUStringLiteral gaEventMethod = u"actionPerformed"; +constexpr OUString gaListenerType = u"XActionListener"_ustr; +constexpr OUString gaEventMethod = u"actionPerformed"_ustr; static double HmmToPoints(double nHmm) { diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index ae393804d70e..4f839ade005f 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -25,7 +25,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -constexpr OUStringLiteral DISPLAYNAME = u"DisplayName"; +constexpr OUString DISPLAYNAME = u"DisplayName"_ustr; uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 028fdc77b3b0..6556062f6c7a 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1791,7 +1791,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) bThousand = nIntegerDigits > 0 && ((nIntegerDigits % 3) == 0); } OUString aFormat; - static constexpr OUStringLiteral sBreak = u","; + static constexpr OUString sBreak = u","_ustr; const OUString sThousand = OUString::number(static_cast<sal_Int32>(bThousand)); const OUString sNegRed = OUString::number(static_cast<sal_Int32>(bNegRed)); const OUString sPrecision = OUString::number(nPrecision); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 0c0b2680e0b3..511051d6f49c 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -77,7 +77,7 @@ using namespace com::sun::star; #define SC_GROWY_SMALL_EXTRA 100 #define SC_GROWY_BIG_EXTRA 200 -constexpr OUStringLiteral TAG_TABBARWIDTH = u"tw:"; +constexpr OUString TAG_TABBARWIDTH = u"tw:"_ustr; namespace { |