starmath/inc/token.hxx | 2 +- starmath/source/mathml/starmathdatabase.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit b2f7ca61494a88cb082d356e47beb7fc2c0d92bb Author: dante <[email protected]> AuthorDate: Wed Feb 3 14:45:49 2021 +0100 Commit: Noel Grandin <[email protected]> CommitDate: Wed Feb 3 19:50:36 2021 +0100 Previous patches fixes From https://gerrit.libreoffice.org/c/core/+/110321/1 Chopped u(s) from color names From https://gerrit.libreoffice.org/c/core/+/110252 const std::u16string_view -> std::u16string_view Change-Id: Ibbaf219b3a3f0626693bb3b3355fc446198fcc34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110374 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index ad1289a5e09c..600c29b9f889 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -149,7 +149,7 @@ enum SmTokenType struct SmTokenTableEntry { - const std::u16string_view pIdent; + std::u16string_view pIdent; SmTokenType eType; sal_Unicode cMathChar; TG nGroup; diff --git a/starmath/source/mathml/starmathdatabase.cxx b/starmath/source/mathml/starmathdatabase.cxx index 4aef49cd37ac..630fb343840d 100644 --- a/starmath/source/mathml/starmathdatabase.cxx +++ b/starmath/source/mathml/starmathdatabase.cxx @@ -476,7 +476,7 @@ const SmColorTokenTableEntry starmathdatabase::aColorTokenTableParse[] { "palevioletred", THTMLCOL, COL_SM_PALEVIOLETRED }, { "papayawhip", THTMLCOL, COL_SM_PAPAYAWHIP }, { "peachpuff", THTMLCOL, COL_SM_PEACHPUFF }, - { "per", THTMLCOL, COL_SM_PERU }, + { "peru", THTMLCOL, COL_SM_PERU }, { "pink", THTMLCOL, COL_SM_PINK }, { "plum", THTMLCOL, COL_SM_PLUM }, { "powderblue", THTMLCOL, COL_SM_POWDERBLUE }, @@ -506,7 +506,7 @@ const SmColorTokenTableEntry starmathdatabase::aColorTokenTableParse[] { "thistle", THTMLCOL, COL_SM_THISTLE }, { "tomato", THTMLCOL, COL_SM_TOMATO }, { "turquoise", THTMLCOL, COL_SM_TURQUOISE }, - { "ubunt", TICONICCOL, COL_SM_UBUNTU_ORANGE }, + { "ubuntu", TICONICCOL, COL_SM_UBUNTU_ORANGE }, { "violet", THTMLCOL, COL_SM_VIOLET }, { "wheat", THTMLCOL, COL_SM_WHEAT }, { "white", TMATHMLCOL, COL_SM_WHITE }, @@ -629,7 +629,7 @@ const SmColorTokenTableEntry starmathdatabase::aColorTokenTableHTML[] { "palevioletred", THTMLCOL, COL_SM_PALEVIOLETRED }, { "papayawhip", THTMLCOL, COL_SM_PAPAYAWHIP }, { "peachpuff", THTMLCOL, COL_SM_PEACHPUFF }, - { "per", THTMLCOL, COL_SM_PERU }, + { "peru", THTMLCOL, COL_SM_PERU }, { "pink", THTMLCOL, COL_SM_PINK }, { "plum", THTMLCOL, COL_SM_PLUM }, { "powderblue", THTMLCOL, COL_SM_POWDERBLUE }, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
