sc/source/core/tool/addincol.cxx | 4 -
sc/source/core/tool/addinlis.cxx | 2
sc/source/core/tool/appoptio.cxx | 42 +++++++++----------
sc/source/core/tool/calcconfig.cxx | 8 +--
sc/source/core/tool/cellform.cxx | 2
sc/source/core/tool/cellkeytranslator.cxx | 2
sc/source/core/tool/cellkeywords.inl | 6 +-
sc/source/core/tool/charthelper.cxx | 14 +++---
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/defaultsoptions.cxx | 6 +-
sc/source/core/tool/docoptio.cxx | 30 ++++++-------
sc/source/core/tool/editutil.cxx | 4 -
sc/source/core/tool/filtopt.cxx | 6 +-
sc/source/core/tool/formulalogger.cxx | 2
sc/source/core/tool/formulaopt.cxx | 32 +++++++-------
sc/source/core/tool/formulaparserpool.cxx | 2
sc/source/core/tool/grouparealistener.cxx | 4 -
sc/source/core/tool/inputopt.cxx | 24 +++++-----
sc/source/core/tool/interpr1.cxx | 4 -
sc/source/core/tool/interpr4.cxx | 6 +-
sc/source/core/tool/interpr5.cxx | 2
sc/source/core/tool/printopt.cxx | 6 +-
sc/source/core/tool/stylehelper.cxx | 38 ++++++++---------
sc/source/core/tool/unitconv.cxx | 2
sc/source/core/tool/viewopti.cxx | 66 +++++++++++++++---------------
sc/source/core/tool/zforauto.cxx | 2
26 files changed, 159 insertions(+), 159 deletions(-)
New commits:
commit cb4e9a7bf2231716d4809c682ae4b6b8b91b09b4
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 17 12:40:23 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri May 17 14:15:20 2024 +0200
loplugin:ostr in sc/../tool
Change-Id: I04c41c79613397745a2e97c2e8a247e11f114c7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167767
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 66d8902de5f1..f66ff2da554c 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -260,7 +260,7 @@ void ScUnoAddInCollection::Initialize()
if ( xEnAc.is() )
{
uno::Reference<container::XEnumeration> xEnum =
- xEnAc->createContentEnumeration(
"com.sun.star.sheet.AddIn" );
+ xEnAc->createContentEnumeration(
u"com.sun.star.sheet.AddIn"_ustr );
if ( xEnum.is() )
{
// loop through all AddIns
@@ -368,7 +368,7 @@ void ScUnoAddInCollection::ReadConfiguration()
const OUString sSlash('/');
// get the list of add-ins (services)
- const uno::Sequence<OUString> aServiceNames = rAddInConfig.GetNodeNames(
"" );
+ const uno::Sequence<OUString> aServiceNames = rAddInConfig.GetNodeNames(
u""_ustr );
for ( const OUString& aServiceName : aServiceNames )
{
diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx
index f8a236780e07..b7548a78dec7 100644
--- a/sc/source/core/tool/addinlis.cxx
+++ b/sc/source/core/tool/addinlis.cxx
@@ -31,7 +31,7 @@
using namespace com::sun::star;
-SC_SIMPLE_SERVICE_INFO( ScAddInListener, "ScAddInListener",
"stardiv.one.sheet.AddInListener" )
+SC_SIMPLE_SERVICE_INFO( ScAddInListener, u"ScAddInListener"_ustr,
u"stardiv.one.sheet.AddInListener"_ustr )
::std::vector<rtl::Reference<ScAddInListener>> ScAddInListener::aAllListeners;
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index c35524f9588f..7b44ca39fe4f 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -213,51 +213,51 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames()
{
const bool bIsMetric = ScOptionsUtil::IsMetricSystem();
- return {(bIsMetric ? OUString("Other/MeasureUnit/Metric")
- : OUString("Other/MeasureUnit/NonMetric")), //
SCLAYOUTOPT_MEASURE
- "Other/StatusbarFunction", //
SCLAYOUTOPT_STATUSBAR
- "Zoom/Value", //
SCLAYOUTOPT_ZOOMVAL
- "Zoom/Type", //
SCLAYOUTOPT_ZOOMTYPE
- "Zoom/Synchronize", //
SCLAYOUTOPT_SYNCZOOM
- "Other/StatusbarMultiFunction"}; //
SCLAYOUTOPT_STATUSBARMULTI
+ return {(bIsMetric ? u"Other/MeasureUnit/Metric"_ustr
+ : u"Other/MeasureUnit/NonMetric"_ustr), //
SCLAYOUTOPT_MEASURE
+ u"Other/StatusbarFunction"_ustr, //
SCLAYOUTOPT_STATUSBAR
+ u"Zoom/Value"_ustr, //
SCLAYOUTOPT_ZOOMVAL
+ u"Zoom/Type"_ustr, //
SCLAYOUTOPT_ZOOMTYPE
+ u"Zoom/Synchronize"_ustr, //
SCLAYOUTOPT_SYNCZOOM
+ u"Other/StatusbarMultiFunction"_ustr}; //
SCLAYOUTOPT_STATUSBARMULTI
}
Sequence<OUString> ScAppCfg::GetInputPropertyNames()
{
- return {"LastFunctions", // SCINPUTOPT_LASTFUNCS
- "AutoInput", // SCINPUTOPT_AUTOINPUT
- "DetectiveAuto"}; // SCINPUTOPT_DET_AUTO
+ return {u"LastFunctions"_ustr, // SCINPUTOPT_LASTFUNCS
+ u"AutoInput"_ustr, // SCINPUTOPT_AUTOINPUT
+ u"DetectiveAuto"_ustr}; // SCINPUTOPT_DET_AUTO
}
Sequence<OUString> ScAppCfg::GetRevisionPropertyNames()
{
- return {"Change", // SCREVISOPT_CHANGE
- "Insertion", // SCREVISOPT_INSERTION
- "Deletion", // SCREVISOPT_DELETION
- "MovedEntry"}; // SCREVISOPT_MOVEDENTRY
+ return {u"Change"_ustr, // SCREVISOPT_CHANGE
+ u"Insertion"_ustr, // SCREVISOPT_INSERTION
+ u"Deletion"_ustr, // SCREVISOPT_DELETION
+ u"MovedEntry"_ustr}; // SCREVISOPT_MOVEDENTRY
}
Sequence<OUString> ScAppCfg::GetContentPropertyNames()
{
- return {"Link"}; // SCCONTENTOPT_LINK
+ return {u"Link"_ustr}; // SCCONTENTOPT_LINK
}
Sequence<OUString> ScAppCfg::GetSortListPropertyNames()
{
- return {"List"}; // SCSORTLISTOPT_LIST
+ return {u"List"_ustr}; // SCSORTLISTOPT_LIST
}
Sequence<OUString> ScAppCfg::GetMiscPropertyNames()
{
- return {"DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH
- "DefaultObjectSize/Height", // SCMISCOPT_DEFOBJHEIGHT
- "SharedDocument/ShowWarning"}; // SCMISCOPT_SHOWSHAREDDOCWARN
+ return {u"DefaultObjectSize/Width"_ustr, // SCMISCOPT_DEFOBJWIDTH
+ u"DefaultObjectSize/Height"_ustr, // SCMISCOPT_DEFOBJHEIGHT
+ u"SharedDocument/ShowWarning"_ustr}; //
SCMISCOPT_SHOWSHAREDDOCWARN
}
Sequence<OUString> ScAppCfg::GetCompatPropertyNames()
{
- return {"KeyBindings/BaseGroup", // SCCOMPATOPT_KEY_BINDING
- "Links" }; // SCCOMPATOPT_LINK_LIKE_MS
+ return {u"KeyBindings/BaseGroup"_ustr, // SCCOMPATOPT_KEY_BINDING
+ u"Links"_ustr }; // SCCOMPATOPT_LINK_LIKE_MS
}
ScAppCfg::ScAppCfg() :
diff --git a/sc/source/core/tool/calcconfig.cxx
b/sc/source/core/tool/calcconfig.cxx
index 58dc1b7c747e..dda6af3c0fc8 100644
--- a/sc/source/core/tool/calcconfig.cxx
+++ b/sc/source/core/tool/calcconfig.cxx
@@ -24,13 +24,13 @@ using comphelper::ConfigurationListener;
static rtl::Reference<ConfigurationListener> const & getMiscListener()
{
- static rtl::Reference<ConfigurationListener> xListener(new
ConfigurationListener("/org.openoffice.Office.Common/Misc"));
+ static rtl::Reference<ConfigurationListener> xListener(new
ConfigurationListener(u"/org.openoffice.Office.Common/Misc"_ustr));
return xListener;
}
static rtl::Reference<ConfigurationListener> const &
getFormulaCalculationListener()
{
- static rtl::Reference<ConfigurationListener> xListener(new
ConfigurationListener("/org.openoffice.Office.Calc/Formula/Calculation"));
+ static rtl::Reference<ConfigurationListener> xListener(new
ConfigurationListener(u"/org.openoffice.Office.Calc/Formula/Calculation"_ustr));
return xListener;
}
@@ -73,7 +73,7 @@ bool ScCalcConfig::isOpenCLEnabled()
static ForceCalculationType force = getForceCalculationType();
if( force != ForceCalculationNone )
return force == ForceCalculationOpenCL;
- static comphelper::ConfigurationListenerProperty<bool>
gOpenCLEnabled(getMiscListener(), "UseOpenCL");
+ static comphelper::ConfigurationListenerProperty<bool>
gOpenCLEnabled(getMiscListener(), u"UseOpenCL"_ustr);
return gOpenCLEnabled.get();
}
@@ -84,7 +84,7 @@ bool ScCalcConfig::isThreadingEnabled()
static ForceCalculationType force = getForceCalculationType();
if( force != ForceCalculationNone )
return force == ForceCalculationThreads;
- static comphelper::ConfigurationListenerProperty<bool>
gThreadingEnabled(getFormulaCalculationListener(),
"UseThreadedCalculationForFormulaGroups");
+ static comphelper::ConfigurationListenerProperty<bool>
gThreadingEnabled(getFormulaCalculationListener(),
u"UseThreadedCalculationForFormulaGroups"_ustr);
return gThreadingEnabled.get();
}
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 875e3ac3f396..8e58bdd4a0d9 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -81,7 +81,7 @@ OUString ScCellFormat::GetString( const ScRefCellValue&
rCell, sal_uInt32 nForma
(!pFCell->GetDocument().GetMacroInterpretLevel()
|| pFCell->IsRunning()) )
{
- return "...";
+ return u"..."_ustr;
}
else
{
diff --git a/sc/source/core/tool/cellkeytranslator.cxx
b/sc/source/core/tool/cellkeytranslator.cxx
index 8e2218f9313a..4f4a1dd4179d 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -97,7 +97,7 @@ static void lclMatchKeyword(OUString& rName, const
ScCellKeywordHashMap& aMap,
return;
}
- LanguageTag aLanguageTag( pLocale ? *pLocale : lang::Locale("","",""));
+ LanguageTag aLanguageTag( pLocale ? *pLocale :
lang::Locale(u""_ustr,u""_ustr,u""_ustr));
const char* aBestMatchName = itr->second.front().mpName;
LocaleMatch eLocaleMatchLevel = LOCALE_MATCH_NONE;
bool bOpCodeMatched = false;
diff --git a/sc/source/core/tool/cellkeywords.inl
b/sc/source/core/tool/cellkeywords.inl
index b56e3eeadfb5..364e16042f46 100644
--- a/sc/source/core/tool/cellkeywords.inl
+++ b/sc/source/core/tool/cellkeywords.inl
@@ -21,7 +21,7 @@
// French language locale (automatically generated)
-static const lang::Locale aFr("fr", "", "");
+static const lang::Locale aFr(u"fr"_ustr, u""_ustr, u""_ustr);
// pre instantiations of localized function names
static const sal_Unicode cell_address_fr[] = {
@@ -76,7 +76,7 @@ addToMap(pFr, aFr);
// Hungarian language locale (automatically generated)
-static const lang::Locale aHu("hu", "", "");
+static const lang::Locale aHu(u"hu"_ustr, u""_ustr, u""_ustr);
// pre instantiations of localized function names
static const sal_Unicode cell_address_hu[] = {
@@ -146,7 +146,7 @@ addToMap(pHu, aHu);
// German language locale (automatically generated)
-static const lang::Locale aDe("de", "", "");
+static const lang::Locale aDe(u"de"_ustr, u""_ustr, u""_ustr);
// pre instantiations of localized function names
static const sal_Unicode cell_row_de[] = {
diff --git a/sc/source/core/tool/charthelper.cxx
b/sc/source/core/tool/charthelper.cxx
index fd8ade6ce93b..651f2fcdc920 100644
--- a/sc/source/core/tool/charthelper.cxx
+++ b/sc/source/core/tool/charthelper.cxx
@@ -223,7 +223,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference<
chart2::XChartDocument
try
{
- OUString aPropertyNameRole( "Role" );
+ OUString aPropertyNameRole( u"Role"_ustr );
uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >
aLabeledDataSequences( xDataSource->getDataSequences() );
sal_Int32 nRange=0;
@@ -291,7 +291,7 @@ void ScChartHelper::AddRangesIfProtectedChart(
ScRangeListVector& rRangesVector,
(void)svt::EmbeddedObjectRef::TryRunningState( xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps(
xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue("DisableDataTableDialog") >>=
bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue(u"DisableDataTableDialog"_ustr) >>=
bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
ScChartListenerCollection* pCollection =
rDocument.GetChartListenerCollection();
@@ -372,7 +372,7 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify(
ScDocument& rDoc, co
(void)svt::EmbeddedObjectRef::TryRunningState(
xEmbeddedObj );
uno::Reference< beans::XPropertySet > xProps(
xEmbeddedObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- (
xProps->getPropertyValue("DisableDataTableDialog") >>= bDisableDataTableDialog
) &&
+ (
xProps->getPropertyValue(u"DisableDataTableDialog"_ustr) >>=
bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
if ( bSameDoc )
@@ -388,9 +388,9 @@ void ScChartHelper::CreateProtectedChartListenersAndNotify(
ScDocument& rDoc, co
}
else
{
-
xProps->setPropertyValue("DisableDataTableDialog",
+
xProps->setPropertyValue(u"DisableDataTableDialog"_ustr,
uno::Any( false ) );
-
xProps->setPropertyValue("DisableComplexChartTypes",
+
xProps->setPropertyValue(u"DisableComplexChartTypes"_ustr,
uno::Any( false ) );
}
}
@@ -403,10 +403,10 @@ void
ScChartHelper::CreateProtectedChartListenersAndNotify( ScDocument& rDoc, co
ScRangeList aChangeRanges( aRange );
uno::Sequence< beans::PropertyValue > aProperties{
- comphelper::makePropertyValue("Name", aChartName)
+ comphelper::makePropertyValue(u"Name"_ustr,
aChartName)
};
- pModelObj->NotifyChanges( "insert-chart",
aChangeRanges, aProperties );
+ pModelObj->NotifyChanges( u"insert-chart"_ustr,
aChangeRanges, aProperties );
}
}
}
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6c847cfac501..68422b3b83de 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -703,7 +703,7 @@ static bool lcl_parseExternalName(
static OUString lcl_makeExternalNameStr(const OUString& rFile, const OUString&
rName,
const sal_Unicode cSep, bool bODF )
{
- OUString aEscQuote("''");
+ OUString aEscQuote(u"''"_ustr);
OUString aFile(rFile.replaceAll("'", aEscQuote));
OUString aName(rName);
if (bODF)
diff --git a/sc/source/core/tool/defaultsoptions.cxx
b/sc/source/core/tool/defaultsoptions.cxx
index a55f154fefe1..098cc11e6230 100644
--- a/sc/source/core/tool/defaultsoptions.cxx
+++ b/sc/source/core/tool/defaultsoptions.cxx
@@ -70,9 +70,9 @@ constexpr OUStringLiteral CFGPATH_FORMULA =
u"Office.Calc/Defaults";
Sequence<OUString> ScDefaultsCfg::GetPropertyNames()
{
- return {"Sheet/SheetCount", // SCDEFAULTSOPT_TAB_COUNT
- "Sheet/SheetPrefix", // SCDEFAULTSOPT_TAB_PREFIX
- "Sheet/JumboSheets"}; // SCDEFAULTSOPT_JUMBO_SHEETS
+ return {u"Sheet/SheetCount"_ustr, // SCDEFAULTSOPT_TAB_COUNT
+ u"Sheet/SheetPrefix"_ustr, // SCDEFAULTSOPT_TAB_PREFIX
+ u"Sheet/JumboSheets"_ustr}; // SCDEFAULTSOPT_JUMBO_SHEETS
}
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index b2c1a86c59b3..98c8bd7124d6 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -153,27 +153,27 @@ constexpr OUStringLiteral CFGPATH_DOCLAYOUT =
u"Office.Calc/Layout/Other";
Sequence<OUString> ScDocCfg::GetCalcPropertyNames()
{
- return {"IterativeReference/Iteration", // SCCALCOPT_ITER_ITER
- "IterativeReference/Steps", // SCCALCOPT_ITER_STEPS
- "IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG
- "Other/Date/DD", // SCCALCOPT_DATE_DAY
- "Other/Date/MM", // SCCALCOPT_DATE_MONTH
- "Other/Date/YY", // SCCALCOPT_DATE_YEAR
- "Other/DecimalPlaces", // SCCALCOPT_DECIMALS
- "Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE
- "Other/Precision", // SCCALCOPT_PRECISION
- "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT
- "Other/FindLabel", // SCCALCOPT_FINDLABEL
- "Other/RegularExpressions", // SCCALCOPT_REGEX
- "Other/Wildcards"}; // SCCALCOPT_WILDCARDS
+ return {u"IterativeReference/Iteration"_ustr, // SCCALCOPT_ITER_ITER
+ u"IterativeReference/Steps"_ustr, // SCCALCOPT_ITER_STEPS
+ u"IterativeReference/MinimumChange"_ustr, // SCCALCOPT_ITER_MINCHG
+ u"Other/Date/DD"_ustr, // SCCALCOPT_DATE_DAY
+ u"Other/Date/MM"_ustr, // SCCALCOPT_DATE_MONTH
+ u"Other/Date/YY"_ustr, // SCCALCOPT_DATE_YEAR
+ u"Other/DecimalPlaces"_ustr, // SCCALCOPT_DECIMALS
+ u"Other/CaseSensitive"_ustr, //
SCCALCOPT_CASESENSITIVE
+ u"Other/Precision"_ustr, // SCCALCOPT_PRECISION
+ u"Other/SearchCriteria"_ustr, // SCCALCOPT_SEARCHCRIT
+ u"Other/FindLabel"_ustr, // SCCALCOPT_FINDLABEL
+ u"Other/RegularExpressions"_ustr, // SCCALCOPT_REGEX
+ u"Other/Wildcards"_ustr}; // SCCALCOPT_WILDCARDS
}
Sequence<OUString> ScDocCfg::GetLayoutPropertyNames()
{
if (ScOptionsUtil::IsMetricSystem())
- return {"TabStop/Metric"}; // SCDOCLAYOUTOPT_TABSTOP
+ return {u"TabStop/Metric"_ustr}; // SCDOCLAYOUTOPT_TABSTOP
else
- return {"TabStop/NonMetric"}; // SCDOCLAYOUTOPT_TABSTOP
+ return {u"TabStop/NonMetric"_ustr}; // SCDOCLAYOUTOPT_TABSTOP
}
ScDocCfg::ScDocCfg() :
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index c9a299465c32..6737c947ea14 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -846,7 +846,7 @@ OUString ScHeaderEditEngine::CalcFieldValue( const
SvxFieldItem& rField,
{
const SvxFieldData* pFieldData = rField.GetField();
if (!pFieldData)
- return "?";
+ return u"?"_ustr;
OUString aRet;
sal_Int32 nClsId = pFieldData->GetClassId();
@@ -912,7 +912,7 @@ OUString ScFieldEditEngine::CalcFieldValue( const
SvxFieldItem& rField,
const SvxFieldData* pFieldData = rField.GetField();
if (!pFieldData)
- return " ";
+ return u" "_ustr;
return ScEditUtil::GetCellFieldValue(*pFieldData, mpDoc, &rTxtColor,
&rFldLineStyle);
}
diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx
index 13c856150dcd..5c6ee2c437e8 100644
--- a/sc/source/core/tool/filtopt.cxx
+++ b/sc/source/core/tool/filtopt.cxx
@@ -35,9 +35,9 @@ ScFilterOptions::ScFilterOptions() :
ConfigItem( CFGPATH_FILTER ),
bWK3Flag( false )
{
- Sequence<OUString> aNames { "MS_Excel/ColScale", // SCFILTOPT_COLSCALE
- "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE
- "Lotus123/WK3" }; // SCFILTOPT_WK3
+ Sequence<OUString> aNames { u"MS_Excel/ColScale"_ustr, //
SCFILTOPT_COLSCALE
+ u"MS_Excel/RowScale"_ustr, //
SCFILTOPT_ROWSCALE
+ u"Lotus123/WK3"_ustr }; // SCFILTOPT_WK3
Sequence<Any> aValues = GetProperties(aNames);
const Any* pValues = aValues.getConstArray();
OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties
failed");
diff --git a/sc/source/core/tool/formulalogger.cxx
b/sc/source/core/tool/formulalogger.cxx
index a5c01a596b42..79f1816a7fa5 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -222,7 +222,7 @@ void
FormulaLogger::GroupScope::addGroupSizeThresholdMessage( const ScFormulaCel
void FormulaLogger::GroupScope::setCalcComplete()
{
mpImpl->mbCalcComplete = true;
- addMessage("calculation performed");
+ addMessage(u"calculation performed"_ustr);
}
FormulaLogger::FormulaLogger()
diff --git a/sc/source/core/tool/formulaopt.cxx
b/sc/source/core/tool/formulaopt.cxx
index 77a5e3cad9f2..4d3027002d27 100644
--- a/sc/source/core/tool/formulaopt.cxx
+++ b/sc/source/core/tool/formulaopt.cxx
@@ -170,22 +170,22 @@ constexpr OUStringLiteral CFGPATH_FORMULA =
u"Office.Calc/Formula";
Sequence<OUString> ScFormulaCfg::GetPropertyNames()
{
- return {"Syntax/Grammar", // SCFORMULAOPT_GRAMMAR
- "Syntax/EnglishFunctionName", //
SCFORMULAOPT_ENGLISH_FUNCNAME
- "Syntax/SeparatorArg", // SCFORMULAOPT_SEP_ARG
- "Syntax/SeparatorArrayRow", //
SCFORMULAOPT_SEP_ARRAY_ROW
- "Syntax/SeparatorArrayCol", //
SCFORMULAOPT_SEP_ARRAY_COL
- "Syntax/StringRefAddressSyntax", //
SCFORMULAOPT_STRING_REF_SYNTAX
- "Syntax/StringConversion", //
SCFORMULAOPT_STRING_CONVERSION
- "Syntax/EmptyStringAsZero", //
SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO
- "Load/OOXMLRecalcMode", //
SCFORMULAOPT_OOXML_RECALC
- "Load/ODFRecalcMode", // SCFORMULAOPT_ODF_RECALC
- "Load/RecalcOptimalRowHeightMode", //
SCFORMULAOPT_ROW_HEIGHT_RECALC
- "Calculation/OpenCLAutoSelect", //
SCFORMULAOPT_OPENCL_AUTOSELECT
- "Calculation/OpenCLDevice", //
SCFORMULAOPT_OPENCL_DEVICE
- "Calculation/OpenCLSubsetOnly", //
SCFORMULAOPT_OPENCL_SUBSET_ONLY
- "Calculation/OpenCLMinimumDataSize", //
SCFORMULAOPT_OPENCL_MIN_SIZE
- "Calculation/OpenCLSubsetOpCodes"}; //
SCFORMULAOPT_OPENCL_SUBSET_OPS
+ return {u"Syntax/Grammar"_ustr, //
SCFORMULAOPT_GRAMMAR
+ u"Syntax/EnglishFunctionName"_ustr, //
SCFORMULAOPT_ENGLISH_FUNCNAME
+ u"Syntax/SeparatorArg"_ustr, //
SCFORMULAOPT_SEP_ARG
+ u"Syntax/SeparatorArrayRow"_ustr, //
SCFORMULAOPT_SEP_ARRAY_ROW
+ u"Syntax/SeparatorArrayCol"_ustr, //
SCFORMULAOPT_SEP_ARRAY_COL
+ u"Syntax/StringRefAddressSyntax"_ustr, //
SCFORMULAOPT_STRING_REF_SYNTAX
+ u"Syntax/StringConversion"_ustr, //
SCFORMULAOPT_STRING_CONVERSION
+ u"Syntax/EmptyStringAsZero"_ustr, //
SCFORMULAOPT_EMPTY_OUSTRING_AS_ZERO
+ u"Load/OOXMLRecalcMode"_ustr, //
SCFORMULAOPT_OOXML_RECALC
+ u"Load/ODFRecalcMode"_ustr, //
SCFORMULAOPT_ODF_RECALC
+ u"Load/RecalcOptimalRowHeightMode"_ustr, //
SCFORMULAOPT_ROW_HEIGHT_RECALC
+ u"Calculation/OpenCLAutoSelect"_ustr, //
SCFORMULAOPT_OPENCL_AUTOSELECT
+ u"Calculation/OpenCLDevice"_ustr, //
SCFORMULAOPT_OPENCL_DEVICE
+ u"Calculation/OpenCLSubsetOnly"_ustr, //
SCFORMULAOPT_OPENCL_SUBSET_ONLY
+ u"Calculation/OpenCLMinimumDataSize"_ustr, //
SCFORMULAOPT_OPENCL_MIN_SIZE
+ u"Calculation/OpenCLSubsetOpCodes"_ustr}; //
SCFORMULAOPT_OPENCL_SUBSET_OPS
}
ScFormulaCfg::PropsToIds ScFormulaCfg::GetPropNamesToId()
diff --git a/sc/source/core/tool/formulaparserpool.cxx
b/sc/source/core/tool/formulaparserpool.cxx
index e423dfb1ded6..4b04a0343136 100644
--- a/sc/source/core/tool/formulaparserpool.cxx
+++ b/sc/source/core/tool/formulaparserpool.cxx
@@ -62,7 +62,7 @@ ScParserFactoryMap::ScParserFactoryMap() :
{
// enumerate all implementations of the FormulaParser service
Reference< XContentEnumerationAccess > xFactoryEA(
mxContext->getServiceManager(), UNO_QUERY_THROW );
- Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration(
"com.sun.star.sheet.FilterFormulaParser" ), UNO_SET_THROW );
+ Reference< XEnumeration > xEnum( xFactoryEA->createContentEnumeration(
u"com.sun.star.sheet.FilterFormulaParser"_ustr ), UNO_SET_THROW );
while( xEnum->hasMoreElements() ) try // single try/catch for every
element
{
// create an instance of the formula parser implementation
diff --git a/sc/source/core/tool/grouparealistener.cxx
b/sc/source/core/tool/grouparealistener.cxx
index 67862cd4a539..4954ce8d8d0f 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -96,7 +96,7 @@ FormulaGroupAreaListener::FormulaGroupAreaListener( const
ScRange& rRange, const
assert(mpColumn);
SAL_INFO( "sc.core.grouparealistener",
"FormulaGroupAreaListener ctor this " << this <<
- " range " << (maRange == BCA_LISTEN_ALWAYS ? "LISTEN-ALWAYS" :
maRange.Format(mrDocument, ScRefFlags::VALID)) <<
+ " range " << (maRange == BCA_LISTEN_ALWAYS ? u"LISTEN-ALWAYS"_ustr
: maRange.Format(mrDocument, ScRefFlags::VALID)) <<
" mnTopCellRow " << mnTopCellRow << " length " << mnGroupLen <<
", col/tab " << mpColumn->GetCol() << "/" << mpColumn->GetTab());
}
@@ -186,7 +186,7 @@ void FormulaGroupAreaListener::collectFormulaCells(
{
SAL_INFO( "sc.core.grouparealistener",
"FormulaGroupAreaListener::collectFormulaCells() this " << this <<
- " range " << (maRange == BCA_LISTEN_ALWAYS ? "LISTEN-ALWAYS" :
maRange.Format(mrDocument, ScRefFlags::VALID)) <<
+ " range " << (maRange == BCA_LISTEN_ALWAYS ? u"LISTEN-ALWAYS"_ustr
: maRange.Format(mrDocument, ScRefFlags::VALID)) <<
" mnTopCellRow " << mnTopCellRow << " length " << mnGroupLen <<
", col/tab " << mpColumn->GetCol() << "/" << mpColumn->GetTab());
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 08d4feff60dc..bdf49863919c 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -66,18 +66,18 @@ constexpr OUStringLiteral CFGPATH_INPUT =
u"Office.Calc/Input";
Sequence<OUString> ScInputCfg::GetPropertyNames()
{
- return {"MoveSelectionDirection", // SCINPUTOPT_MOVEDIR
- "MoveSelection", // SCINPUTOPT_MOVESEL
- "SwitchToEditMode", // SCINPUTOPT_EDTEREDIT
- "ExpandFormatting", // SCINPUTOPT_EXTENDFMT
- "ShowReference", // SCINPUTOPT_RANGEFIND
- "ExpandReference", // SCINPUTOPT_EXPANDREFS
- "UpdateReferenceOnSort", // SCINPUTOPT_SORT_REF_UPDATE
- "HighlightSelection", // SCINPUTOPT_MARKHEADER
- "UseTabCol", // SCINPUTOPT_USETABCOL
- "ReplaceCellsWarning", // SCINPUTOPT_REPLCELLSWARN
- "LegacyCellSelection", // SCINPUTOPT_LEGACY_CELL_SELECTION
- "EnterPasteMode"}; // SCINPUTOPT_ENTER_PASTE_MODE
+ return {u"MoveSelectionDirection"_ustr, // SCINPUTOPT_MOVEDIR
+ u"MoveSelection"_ustr, // SCINPUTOPT_MOVESEL
+ u"SwitchToEditMode"_ustr, // SCINPUTOPT_EDTEREDIT
+ u"ExpandFormatting"_ustr, // SCINPUTOPT_EXTENDFMT
+ u"ShowReference"_ustr, // SCINPUTOPT_RANGEFIND
+ u"ExpandReference"_ustr, // SCINPUTOPT_EXPANDREFS
+ u"UpdateReferenceOnSort"_ustr, // SCINPUTOPT_SORT_REF_UPDATE
+ u"HighlightSelection"_ustr, // SCINPUTOPT_MARKHEADER
+ u"UseTabCol"_ustr, // SCINPUTOPT_USETABCOL
+ u"ReplaceCellsWarning"_ustr, // SCINPUTOPT_REPLCELLSWARN
+ u"LegacyCellSelection"_ustr, //
SCINPUTOPT_LEGACY_CELL_SELECTION
+ u"EnterPasteMode"_ustr}; // SCINPUTOPT_ENTER_PASTE_MODE
}
ScInputCfg::ScInputCfg() :
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index eb6893c7ed4b..621e3d9ee8a0 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3664,7 +3664,7 @@ static OUString lcl_convertIntoHalfWidth( const OUString
& rStr )
auto init = []() -> utl::TransliterationWrapper&
{
static utl::TransliterationWrapper trans(
::comphelper::getProcessComponentContext(), TransliterationFlags::NONE );
- trans.loadModuleByImplName( "FULLWIDTH_HALFWIDTH_LIKE_ASC",
LANGUAGE_SYSTEM );
+ trans.loadModuleByImplName( u"FULLWIDTH_HALFWIDTH_LIKE_ASC"_ustr,
LANGUAGE_SYSTEM );
return trans;
};
static utl::TransliterationWrapper& aTrans( init());
@@ -3676,7 +3676,7 @@ static OUString lcl_convertIntoFullWidth( const OUString
& rStr )
auto init = []() -> utl::TransliterationWrapper&
{
static utl::TransliterationWrapper trans(
::comphelper::getProcessComponentContext(), TransliterationFlags::NONE );
- trans.loadModuleByImplName( "HALFWIDTH_FULLWIDTH_LIKE_JIS",
LANGUAGE_SYSTEM );
+ trans.loadModuleByImplName( u"HALFWIDTH_FULLWIDTH_LIKE_JIS"_ustr,
LANGUAGE_SYSTEM );
return trans;
};
static utl::TransliterationWrapper& aTrans( init());
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b56c1e060e1c..520c0b6d7acd 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3170,7 +3170,7 @@ static uno::Any lcl_getSheetModule( const
uno::Reference<table::XCellRange>& xCe
uno::Reference< sheet::XSheetCellRange > xSheetRange( xCellRange,
uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xProps(
xSheetRange->getSpreadsheet(), uno::UNO_QUERY_THROW );
OUString sCodeName;
- xProps->getPropertyValue("CodeName") >>= sCodeName;
+ xProps->getPropertyValue(u"CodeName"_ustr) >>= sCodeName;
// #TODO #FIXME ideally we should 'throw' here if we don't get a valid
parent, but... it is possible
// to create a module ( and use 'Option VBASupport 1' ) for a calc
document, in this scenario there
// are *NO* special document module objects ( of course being able to
switch between vba/non vba mode at
@@ -3181,7 +3181,7 @@ static uno::Any lcl_getSheetModule( const
uno::Reference<table::XCellRange>& xCe
uno::Reference< uno::XInterface > xIf;
if ( pBasMgr && !pBasMgr->GetName().isEmpty() )
{
- OUString sProj( "Standard" );
+ OUString sProj( u"Standard"_ustr );
if ( !pDok->GetDocumentShell()->GetBasicManager()->GetName().isEmpty()
)
{
sProj = pDok->GetDocumentShell()->GetBasicManager()->GetName();
@@ -3211,7 +3211,7 @@ static bool lcl_setVBARange( const ScRange& aRange, const
ScDocument& rDok, SbxV
xVBARange = ooo::vba::createVBAUnoAPIServiceWithArgs(
rDok.GetDocumentShell(), "ooo.vba.excel.Range", aArgs );
if ( xVBARange.is() )
{
- SbxObjectRef aObj = GetSbUnoObject( "A-Range", uno::Any( xVBARange
) );
+ SbxObjectRef aObj = GetSbUnoObject( u"A-Range"_ustr, uno::Any(
xVBARange ) );
SetSbUnoObjectDfltPropName( aObj.get() );
bOk = pPar->PutObject( aObj.get() );
}
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index de7a410246b9..dce3f25819ea 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -3338,7 +3338,7 @@ void ScInterpreter::ScInfo()
OUString aStr = GetString().getString();
ScCellKeywordTranslator::transKeyword(aStr, &ScGlobal::GetLocale(),
ocInfo);
if( aStr == "SYSTEM" )
- PushString( SC_INFO_OSVERSION );
+ PushString( u"" SC_INFO_OSVERSION ""_ustr );
else if( aStr == "OSVERSION" )
#if (defined LINUX || defined __FreeBSD__)
PushString(Application::GetOSVersion());
diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx
index e9b3e1516147..773834ebc630 100644
--- a/sc/source/core/tool/printopt.cxx
+++ b/sc/source/core/tool/printopt.cxx
@@ -78,9 +78,9 @@ constexpr OUStringLiteral CFGPATH_PRINT =
u"Office.Calc/Print";
Sequence<OUString> ScPrintCfg::GetPropertyNames()
{
- return {"Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES
- "Other/AllSheets", // SCPRINTOPT_ALLSHEETS
- "Page/ForceBreaks"}; // SCPRINTOPT_FORCEBREAKS;
+ return {u"Page/EmptyPages"_ustr, // SCPRINTOPT_EMPTYPAGES
+ u"Other/AllSheets"_ustr, // SCPRINTOPT_ALLSHEETS
+ u"Page/ForceBreaks"_ustr}; // SCPRINTOPT_FORCEBREAKS;
}
ScPrintCfg::ScPrintCfg() :
diff --git a/sc/source/core/tool/stylehelper.cxx
b/sc/source/core/tool/stylehelper.cxx
index bdd580ee326c..89b096a403af 100644
--- a/sc/source/core/tool/stylehelper.cxx
+++ b/sc/source/core/tool/stylehelper.cxx
@@ -50,24 +50,24 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap(
SfxStyleFamily nType )
// Installed to "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER
"/calc/styles.xml"
// e.g. /usr/lib64/libreoffice/share/calc/styles.xml
// or instdir/share/calc/styles.xml
- { ScResId( STR_STYLENAME_HEADING ), "Heading" },
- { ScResId( STR_STYLENAME_HEADING_1 ), "Heading 1" },
- { ScResId( STR_STYLENAME_HEADING_2 ), "Heading 2" },
- { ScResId( STR_STYLENAME_TEXT ), "Text" },
- { ScResId( STR_STYLENAME_NOTE ), "Note" },
- { ScResId( STR_STYLENAME_FOOTNOTE ), "Footnote" },
- { ScResId( STR_STYLENAME_HYPERLINK ), "Hyperlink" },
- { ScResId( STR_STYLENAME_STATUS ), "Status" },
- { ScResId( STR_STYLENAME_GOOD ), "Good" },
- { ScResId( STR_STYLENAME_NEUTRAL ), "Neutral" },
- { ScResId( STR_STYLENAME_BAD ), "Bad" },
- { ScResId( STR_STYLENAME_WARNING ), "Warning" },
- { ScResId( STR_STYLENAME_ERROR ), "Error" },
- { ScResId( STR_STYLENAME_ACCENT ), "Accent" },
- { ScResId( STR_STYLENAME_ACCENT_1 ), "Accent 1" },
- { ScResId( STR_STYLENAME_ACCENT_2 ), "Accent 2" },
- { ScResId( STR_STYLENAME_ACCENT_3 ), "Accent 3" },
- { ScResId( STR_STYLENAME_RESULT ), "Result" },
+ { ScResId( STR_STYLENAME_HEADING ), u"Heading"_ustr },
+ { ScResId( STR_STYLENAME_HEADING_1 ), u"Heading 1"_ustr },
+ { ScResId( STR_STYLENAME_HEADING_2 ), u"Heading 2"_ustr },
+ { ScResId( STR_STYLENAME_TEXT ), u"Text"_ustr },
+ { ScResId( STR_STYLENAME_NOTE ), u"Note"_ustr },
+ { ScResId( STR_STYLENAME_FOOTNOTE ), u"Footnote"_ustr },
+ { ScResId( STR_STYLENAME_HYPERLINK ), u"Hyperlink"_ustr },
+ { ScResId( STR_STYLENAME_STATUS ), u"Status"_ustr },
+ { ScResId( STR_STYLENAME_GOOD ), u"Good"_ustr },
+ { ScResId( STR_STYLENAME_NEUTRAL ), u"Neutral"_ustr },
+ { ScResId( STR_STYLENAME_BAD ), u"Bad"_ustr },
+ { ScResId( STR_STYLENAME_WARNING ), u"Warning"_ustr },
+ { ScResId( STR_STYLENAME_ERROR ), u"Error"_ustr },
+ { ScResId( STR_STYLENAME_ACCENT ), u"Accent"_ustr },
+ { ScResId( STR_STYLENAME_ACCENT_1 ), u"Accent 1"_ustr },
+ { ScResId( STR_STYLENAME_ACCENT_2 ), u"Accent 2"_ustr },
+ { ScResId( STR_STYLENAME_ACCENT_3 ), u"Accent 3"_ustr },
+ { ScResId( STR_STYLENAME_RESULT ), u"Result"_ustr },
// API compatibility programmatic names after.
{ ScResId( STR_STYLENAME_STANDARD ), SC_STYLE_PROG_STANDARD },
{ ScResId( STR_STYLENAME_RESULT ), SC_STYLE_PROG_RESULT },
@@ -102,7 +102,7 @@ static const ScDisplayNameMap* lcl_GetStyleNameMap(
SfxStyleFamily nType )
static ScDisplayNameMap const aGraphicMap[]
{
{ ScResId( STR_STYLENAME_STANDARD ), SC_STYLE_PROG_STANDARD },
- { ScResId( STR_STYLENAME_NOTE ), "Note" },
+ { ScResId( STR_STYLENAME_NOTE ), u"Note"_ustr },
// last entry remains empty
{ OUString(), OUString() },
};
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 1f5337cd8196..e793f81c8e43 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -54,7 +54,7 @@ ScUnitConverter::ScUnitConverter()
ScLinkConfigItem aConfigItem( CFGPATH_UNIT );
// empty node name -> use the config item's path itself
- const Sequence<OUString> aNodeNames = aConfigItem.GetNodeNames( "" );
+ const Sequence<OUString> aNodeNames = aConfigItem.GetNodeNames( u""_ustr );
tools::Long nNodeCount = aNodeNames.getLength();
if ( !nNodeCount )
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index da05bcd71d6b..70c343d61449 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -69,7 +69,7 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy )
const
}
ScViewRenderingOptions::ScViewRenderingOptions()
- : sColorSchemeName("Default")
+ : sColorSchemeName(u"Default"_ustr)
,
aDocCol(SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor)
{
}
@@ -235,48 +235,48 @@ constexpr OUStringLiteral CFGPATH_GRID =
u"Office.Calc/Grid";
Sequence<OUString> ScViewCfg::GetLayoutPropertyNames()
{
- return {"Line/GridLine", // SCLAYOUTOPT_GRIDLINES
- "Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR
- "Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK
- "Line/Guide", // SCLAYOUTOPT_GUIDE
- "Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR
- "Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL
- "Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL
- "Window/SheetTab", // SCLAYOUTOPT_SHEETTAB
- "Window/OutlineSymbol", // SCLAYOUTOPT_OUTLINE
- "Line/GridOnColoredCells", // SCLAYOUTOPT_GRID_ONCOLOR;
- "Window/SearchSummary", // SCLAYOUTOPT_SUMMARY
- "Window/ThemedCursor"}; // SCLAYOUTOPT_THEMEDCURSOR
+ return {u"Line/GridLine"_ustr, // SCLAYOUTOPT_GRIDLINES
+ u"Line/GridLineColor"_ustr, // SCLAYOUTOPT_GRIDCOLOR
+ u"Line/PageBreak"_ustr, // SCLAYOUTOPT_PAGEBREAK
+ u"Line/Guide"_ustr, // SCLAYOUTOPT_GUIDE
+ u"Window/ColumnRowHeader"_ustr, // SCLAYOUTOPT_COLROWHDR
+ u"Window/HorizontalScroll"_ustr, // SCLAYOUTOPT_HORISCROLL
+ u"Window/VerticalScroll"_ustr, // SCLAYOUTOPT_VERTSCROLL
+ u"Window/SheetTab"_ustr, // SCLAYOUTOPT_SHEETTAB
+ u"Window/OutlineSymbol"_ustr, // SCLAYOUTOPT_OUTLINE
+ u"Line/GridOnColoredCells"_ustr, // SCLAYOUTOPT_GRID_ONCOLOR;
+ u"Window/SearchSummary"_ustr, // SCLAYOUTOPT_SUMMARY
+ u"Window/ThemedCursor"_ustr}; // SCLAYOUTOPT_THEMEDCURSOR
}
Sequence<OUString> ScViewCfg::GetDisplayPropertyNames()
{
- return {"Formula", // SCDISPLAYOPT_FORMULA
- "ZeroValue", // SCDISPLAYOPT_ZEROVALUE
- "NoteTag", // SCDISPLAYOPT_NOTETAG
- "NoteAuthor", // SCDISPLAYOPT_NOTEAUTHOR
- "FormulaMark", // SCDISPLAYOPT_FORMULAMARK
- "ValueHighlighting", // SCDISPLAYOPT_VALUEHI
- "Anchor", // SCDISPLAYOPT_ANCHOR
- "ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA
- "Chart", // SCDISPLAYOPT_CHART
- "DrawingObject"}; // SCDISPLAYOPT_DRAWING;
+ return {u"Formula"_ustr, // SCDISPLAYOPT_FORMULA
+ u"ZeroValue"_ustr, // SCDISPLAYOPT_ZEROVALUE
+ u"NoteTag"_ustr, // SCDISPLAYOPT_NOTETAG
+ u"NoteAuthor"_ustr, // SCDISPLAYOPT_NOTEAUTHOR
+ u"FormulaMark"_ustr, // SCDISPLAYOPT_FORMULAMARK
+ u"ValueHighlighting"_ustr, // SCDISPLAYOPT_VALUEHI
+ u"Anchor"_ustr, // SCDISPLAYOPT_ANCHOR
+ u"ObjectGraphic"_ustr, // SCDISPLAYOPT_OBJECTGRA
+ u"Chart"_ustr, // SCDISPLAYOPT_CHART
+ u"DrawingObject"_ustr}; // SCDISPLAYOPT_DRAWING;
}
Sequence<OUString> ScViewCfg::GetGridPropertyNames()
{
const bool bIsMetric = ScOptionsUtil::IsMetricSystem();
- return {(bIsMetric ? OUString("Resolution/XAxis/Metric")
- : OUString("Resolution/XAxis/NonMetric")), //
SCGRIDOPT_RESOLU_X
- (bIsMetric ? OUString("Resolution/YAxis/Metric")
- : OUString("Resolution/YAxis/NonMetric")), //
SCGRIDOPT_RESOLU_Y
- "Subdivision/XAxis", //
SCGRIDOPT_SUBDIV_X
- "Subdivision/YAxis", //
SCGRIDOPT_SUBDIV_Y
- "Option/SnapToGrid", //
SCGRIDOPT_SNAPTOGRID
- "Option/Synchronize", //
SCGRIDOPT_SYNCHRON
- "Option/VisibleGrid", //
SCGRIDOPT_VISIBLE
- "Option/SizeToGrid"}; //
SCGRIDOPT_SIZETOGRID;
+ return {(bIsMetric ? u"Resolution/XAxis/Metric"_ustr
+ : u"Resolution/XAxis/NonMetric"_ustr), //
SCGRIDOPT_RESOLU_X
+ (bIsMetric ? u"Resolution/YAxis/Metric"_ustr
+ : u"Resolution/YAxis/NonMetric"_ustr), //
SCGRIDOPT_RESOLU_Y
+ u"Subdivision/XAxis"_ustr, //
SCGRIDOPT_SUBDIV_X
+ u"Subdivision/YAxis"_ustr, //
SCGRIDOPT_SUBDIV_Y
+ u"Option/SnapToGrid"_ustr, //
SCGRIDOPT_SNAPTOGRID
+ u"Option/Synchronize"_ustr, //
SCGRIDOPT_SYNCHRON
+ u"Option/VisibleGrid"_ustr, //
SCGRIDOPT_VISIBLE
+ u"Option/SizeToGrid"_ustr}; //
SCGRIDOPT_SIZETOGRID;
}
ScViewCfg::ScViewCfg() :
diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx
index f6fb26cba18d..a35b015b2333 100644
--- a/sc/source/core/tool/zforauto.cxx
+++ b/sc/source/core/tool/zforauto.cxx
@@ -28,7 +28,7 @@
#include <tools/stream.hxx>
ScNumFormatAbbrev::ScNumFormatAbbrev() :
- sFormatstring ( "Standard" ),
+ sFormatstring ( u"Standard"_ustr ),
eLanguage (LANGUAGE_SYSTEM),
eSysLanguage (LANGUAGE_GERMAN) // otherwise "Standard" does not
fit
{
