oox/source/export/drawingml.cxx | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
New commits: commit 5c1a27bb66aa21f68cd358169a91606824a3921a Author: Simon Chenery <[email protected]> AuthorDate: Sat Feb 7 10:14:46 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Feb 13 06:23:40 2026 +0100 tdf#158068 Use UTF-16 literals and std::u16string_view in drawingml.cxx Change-Id: Id889c339da761a7296b9b0a77b4b01c1f34907e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198881 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 99f1893aa172..8b0c8989f766 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -4949,9 +4949,21 @@ bool IsValidOOXMLFormula(std::u16string_view sFormula) // "?: n1 n2 n3" // ifelse // Below vector contains validTokens for the 1st token based on the number of tokens in the formula. The order is: 2, 3, 4 - const std::vector<std::set<OUString>> validTokens - = { { "val", "abs", "sqrt" }, { "min", "max" }, { "*/", "+-", "+/", "?:" } }; - const std::set<OUString> builtInVariables = { "w", "h", "t", "b", "l", "r" }; + const std::vector<std::set<std::u16string_view>> validTokens = + { + { u"val", u"abs", u"sqrt" }, + { u"min", u"max" }, + { u"*/", u"+-", u"+/", u"?:" } + }; + const std::set<std::u16string_view> builtInVariables = + { + u"w", + u"h", + u"t", + u"b", + u"l", + u"r" + }; const std::vector<OUString> strTokens = comphelper::string::split(sFormula, ' '); sal_uInt16 nSize = strTokens.size();
