loplugin:ostr in sc

Change-Id: I72438d38c75a7facb9bd5f9cfb7be1213ac3d141
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168356
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 65 insertions, 63 deletions

diff --git a/sc/inc/SolverSettings.hxx b/sc/inc/SolverSettings.hxx
index 9d9b96ef975f..7f328ed89eed 100644
--- a/sc/inc/SolverSettings.hxx
+++ b/sc/inc/SolverSettings.hxx
@@ -248,39 +248,41 @@ private:
     // NonNegative: for MS compatibility, use 1 for selected and 2 for not selected
     typedef std::vector<std::variant<OUString, SolverParameter>> TParamInfo;
     std::map<OUString, TParamInfo> SolverParamNames
-        = { { "Integer", { SP_INTEGER, "solver_int", "bool" } },
-            { "NonNegative", { SP_NON_NEGATIVE, "solver_neg", "bool" } },
-            { "EpsilonLevel", { SP_EPSILON_LEVEL, "solver_eps", "int" } },
-            { "LimitBBDepth", { SP_LIMIT_BBDEPTH, "solver_bbd", "bool" } },
-            { "Timeout", { SP_TIMEOUT, "solver_tim", "int" } },
-            { "Algorithm", { SP_ALGORITHM, "solver_alg", "int" } },
+        = { { u"Integer"_ustr, { SP_INTEGER, "solver_int", "bool" } },
+            { u"NonNegative"_ustr, { SP_NON_NEGATIVE, "solver_neg", "bool" } },
+            { u"EpsilonLevel"_ustr, { SP_EPSILON_LEVEL, "solver_eps", "int" } },
+            { u"LimitBBDepth"_ustr, { SP_LIMIT_BBDEPTH, "solver_bbd", "bool" } },
+            { u"Timeout"_ustr, { SP_TIMEOUT, "solver_tim", "int" } },
+            { u"Algorithm"_ustr, { SP_ALGORITHM, "solver_alg", "int" } },
             // SCO and DEPS
-            { "AssumeNonNegative", { SP_NON_NEGATIVE, "solver_neg", "bool" } },
-            { "SwarmSize", { SP_SWARM_SIZE, "solver_ssz", "int" } },
-            { "LearningCycles", { SP_LEARNING_CYCLES, "solver_lcy", "int" } },
-            { "GuessVariableRange", { SP_GUESS_VARIABLE_RANGE, "solver_gvr", "bool" } },
-            { "VariableRangeThreshold", { SP_VARIABLE_RANGE_THRESHOLD, "solver_vrt", "double" } },
-            { "UseACRComparator", { SP_ACR_COMPARATOR, "solver_acr", "bool" } },
-            { "UseRandomStartingPoint", { SP_RND_STARTING_POINT, "solver_rsp", "bool" } },
-            { "UseStrongerPRNG", { SP_STRONGER_PRNG, "solver_prng", "bool" } },
-            { "StagnationLimit", { SP_STAGNATION_LIMIT, "solver_slim", "int" } },
-            { "Tolerance", { SP_STAGNATION_TOLERANCE, "solver_stol", "double" } },
-            { "EnhancedSolverStatus", { SP_ENHANCED_STATUS, "solver_enst", "bool" } },
+            { u"AssumeNonNegative"_ustr, { SP_NON_NEGATIVE, "solver_neg", "bool" } },
+            { u"SwarmSize"_ustr, { SP_SWARM_SIZE, "solver_ssz", "int" } },
+            { u"LearningCycles"_ustr, { SP_LEARNING_CYCLES, "solver_lcy", "int" } },
+            { u"GuessVariableRange"_ustr, { SP_GUESS_VARIABLE_RANGE, "solver_gvr", "bool" } },
+            { u"VariableRangeThreshold"_ustr,
+              { SP_VARIABLE_RANGE_THRESHOLD, "solver_vrt", "double" } },
+            { u"UseACRComparator"_ustr, { SP_ACR_COMPARATOR, "solver_acr", "bool" } },
+            { u"UseRandomStartingPoint"_ustr, { SP_RND_STARTING_POINT, "solver_rsp", "bool" } },
+            { u"UseStrongerPRNG"_ustr, { SP_STRONGER_PRNG, "solver_prng", "bool" } },
+            { u"StagnationLimit"_ustr, { SP_STAGNATION_LIMIT, "solver_slim", "int" } },
+            { u"Tolerance"_ustr, { SP_STAGNATION_TOLERANCE, "solver_stol", "double" } },
+            { u"EnhancedSolverStatus"_ustr, { SP_ENHANCED_STATUS, "solver_enst", "bool" } },
             // DEPS only
-            { "AgentSwitchRate", { SP_AGENT_SWITCH_RATE, "solver_asr", "double" } },
-            { "DEFactorMin", { SP_SCALING_MIN, "solver_smin", "double" } },
-            { "DEFactorMax", { SP_SCALING_MAX, "solver_smax", "double" } },
-            { "DECR", { SP_CROSSOVER_PROB, "solver_crpb", "double" } },
-            { "PSC1", { SP_COGNITIVE_CONST, "solver_cog", "double" } },
-            { "PSC2", { SP_SOCIAL_CONST, "solver_soc", "double" } },
-            { "PSWeight", { SP_CONSTRICTION_COEFF, "solver_ccoeff", "double" } },
-            { "PSCL", { SP_MUTATION_PROB, "solver_mtpb", "double" } },
+            { u"AgentSwitchRate"_ustr, { SP_AGENT_SWITCH_RATE, "solver_asr", "double" } },
+            { u"DEFactorMin"_ustr, { SP_SCALING_MIN, "solver_smin", "double" } },
+            { u"DEFactorMax"_ustr, { SP_SCALING_MAX, "solver_smax", "double" } },
+            { u"DECR"_ustr, { SP_CROSSOVER_PROB, "solver_crpb", "double" } },
+            { u"PSC1"_ustr, { SP_COGNITIVE_CONST, "solver_cog", "double" } },
+            { u"PSC2"_ustr, { SP_SOCIAL_CONST, "solver_soc", "double" } },
+            { u"PSWeight"_ustr, { SP_CONSTRICTION_COEFF, "solver_ccoeff", "double" } },
+            { u"PSCL"_ustr, { SP_MUTATION_PROB, "solver_mtpb", "double" } },
             // SCO only
-            { "LibrarySize", { SP_LIBRARY_SIZE, "solver_lbsz", "int" } } };
+            { u"LibrarySize"_ustr, { SP_LIBRARY_SIZE, "solver_lbsz", "int" } } };
 
     // Stores the roots used for named ranges of constraint parts
     // Items here must be in the same order as in ConstraintPart enum
-    std::vector<OUString> m_aConstraintParts{ "solver_lhs", "solver_rel", "solver_rhs" };
+    std::vector<OUString> m_aConstraintParts{ u"solver_lhs"_ustr, u"solver_rel"_ustr,
+                                              u"solver_rhs"_ustr };
 
 public:
     /* A SolverSettings object is linked to the ScTable where solver parameters
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index c1dcc4b5fb82..b05afb09617b 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -68,82 +68,82 @@ public:
 
     // XGlobalSheetSettings
     virtual sal_Bool SAL_CALL getMoveSelection() override
-        { return getPropertyBool("MoveSelection"); }
+        { return getPropertyBool(u"MoveSelection"_ustr); }
     virtual void SAL_CALL setMoveSelection(sal_Bool p1) override
-        { setProperty("MoveSelection", static_cast<bool>(p1)); }
+        { setProperty(u"MoveSelection"_ustr, static_cast<bool>(p1)); }
     virtual sal_Int16 SAL_CALL getMoveDirection() override
-        { return getPropertyInt16("MoveDirection"); }
+        { return getPropertyInt16(u"MoveDirection"_ustr); }
     virtual void SAL_CALL setMoveDirection(sal_Int16 p1) override
-        { setProperty("MoveDirection", p1); }
+        { setProperty(u"MoveDirection"_ustr, p1); }
     virtual sal_Bool SAL_CALL getEnterEdit() override
-        { return getPropertyBool("EnterEdit"); }
+        { return getPropertyBool(u"EnterEdit"_ustr); }
     virtual void SAL_CALL setEnterEdit(sal_Bool p1) override
-        { setProperty("EnterEdit", static_cast<bool>(p1)); }
+        { setProperty(u"EnterEdit"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getExtendFormat() override
-        { return getPropertyBool("ExtendFormat"); }
+        { return getPropertyBool(u"ExtendFormat"_ustr); }
     virtual void SAL_CALL setExtendFormat(sal_Bool p1) override
-        { setProperty("ExtendFormat", static_cast<bool>(p1)); }
+        { setProperty(u"ExtendFormat"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getRangeFinder() override
-        { return getPropertyBool("RangeFinder"); }
+        { return getPropertyBool(u"RangeFinder"_ustr); }
     virtual void SAL_CALL setRangeFinder(sal_Bool p1) override
-        { setProperty("RangeFinder", static_cast<bool>(p1)); }
+        { setProperty(u"RangeFinder"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getExpandReferences() override
-        { return getPropertyBool("ExpandReferences"); }
+        { return getPropertyBool(u"ExpandReferences"_ustr); }
     virtual void SAL_CALL setExpandReferences(sal_Bool p1) override
-        { setProperty("ExpandReferences", static_cast<bool>(p1)); }
+        { setProperty(u"ExpandReferences"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getMarkHeader() override
-        { return getPropertyBool("MarkHeader"); }
+        { return getPropertyBool(u"MarkHeader"_ustr); }
     virtual void SAL_CALL setMarkHeader(sal_Bool p1) override
-        { setProperty("MarkHeader", static_cast<bool>(p1)); }
+        { setProperty(u"MarkHeader"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getUseTabCol() override
-        { return getPropertyBool("UseTabCol"); }
+        { return getPropertyBool(u"UseTabCol"_ustr); }
     virtual void SAL_CALL setUseTabCol(sal_Bool p1) override
-        { setProperty("UseTabCol", static_cast<bool>(p1)); }
+        { setProperty(u"UseTabCol"_ustr, static_cast<bool>(p1)); }
     virtual sal_Int16 SAL_CALL getMetric() override
-        { return getPropertyInt16("Metric"); }
+        { return getPropertyInt16(u"Metric"_ustr); }
     virtual void SAL_CALL setMetric(sal_Int16 p1) override
-        { setProperty("Metric", p1); }
+        { setProperty(u"Metric"_ustr, p1); }
     virtual sal_Int16 SAL_CALL getScale() override
-        { return getPropertyInt16("Scale"); }
+        { return getPropertyInt16(u"Scale"_ustr); }
     virtual void SAL_CALL setScale(sal_Int16 p1) override
-        { setProperty("Scale", p1); }
+        { setProperty(u"Scale"_ustr, p1); }
     virtual sal_Bool SAL_CALL getDoAutoComplete() override
-        { return getPropertyBool("DoAutoComplete"); }
+        { return getPropertyBool(u"DoAutoComplete"_ustr); }
     virtual void SAL_CALL setDoAutoComplete(sal_Bool p1) override
-        { setProperty("DoAutoComplete", static_cast<bool>(p1)); }
+        { setProperty(u"DoAutoComplete"_ustr, static_cast<bool>(p1)); }
     virtual sal_Int16 SAL_CALL getStatusBarFunction() override
-        { return getPropertyInt16("StatusBarFunction"); }
+        { return getPropertyInt16(u"StatusBarFunction"_ustr); }
     virtual void SAL_CALL setStatusBarFunction(sal_Int16 p1) override
-        { setProperty("StatusBarFunction", p1); }
+        { setProperty(u"StatusBarFunction"_ustr, p1); }
     virtual css::uno::Sequence<OUString> SAL_CALL getUserLists() override
         {
-           css::uno::Any any = getPropertyValue("UserLists");
+           css::uno::Any any = getPropertyValue(u"UserLists"_ustr);
            css::uno::Sequence<OUString> b;
            any >>= b;
            return b;
         }
     virtual void SAL_CALL setUserLists(const css::uno::Sequence<OUString>& p1) override
-        { setPropertyValue( "UserLists", css::uno::Any(p1) ); }
+        { setPropertyValue( u"UserLists"_ustr, css::uno::Any(p1) ); }
     virtual sal_Int16 SAL_CALL getLinkUpdateMode() override
-        { return getPropertyInt16("LinkUpdateMode"); }
+        { return getPropertyInt16(u"LinkUpdateMode"_ustr); }
     virtual void SAL_CALL setLinkUpdateMode(sal_Int16 p1) override
-        { setProperty("LinkUpdateMode", p1); }
+        { setProperty(u"LinkUpdateMode"_ustr, p1); }
     virtual sal_Bool SAL_CALL getPrintAllSheets() override
-        { return getPropertyBool("PrintAllSheets"); }
+        { return getPropertyBool(u"PrintAllSheets"_ustr); }
     virtual void SAL_CALL setPrintAllSheets(sal_Bool p1) override
-        { setProperty("PrintAllSheets", static_cast<bool>(p1)); }
+        { setProperty(u"PrintAllSheets"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getPrintEmptyPages() override
-        { return getPropertyBool("PrintEmptyPages"); }
+        { return getPropertyBool(u"PrintEmptyPages"_ustr); }
     virtual void SAL_CALL setPrintEmptyPages(sal_Bool p1) override
-        { setProperty("PrintEmptyPages", static_cast<bool>(p1)); }
+        { setProperty(u"PrintEmptyPages"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getUsePrinterMetrics() override
-        { return getPropertyBool("UsePrinterMetrics"); }
+        { return getPropertyBool(u"UsePrinterMetrics"_ustr); }
     virtual void SAL_CALL setUsePrinterMetrics(sal_Bool p1) override
-        { setProperty("UsePrinterMetrics", static_cast<bool>(p1)); }
+        { setProperty(u"UsePrinterMetrics"_ustr, static_cast<bool>(p1)); }
     virtual sal_Bool SAL_CALL getReplaceCellsWarning() override
-        { return getPropertyBool("ReplaceCellsWarning"); }
+        { return getPropertyBool(u"ReplaceCellsWarning"_ustr); }
     virtual void SAL_CALL setReplaceCellsWarning(sal_Bool p1) override
-        { setProperty("ReplaceCellsWarning", static_cast<bool>(p1)); }
+        { setProperty(u"ReplaceCellsWarning"_ustr, static_cast<bool>(p1)); }
 
     // XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo >