svgio/source/svgreader/svgnode.cxx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
New commits: commit af0eca8181ad3d9e601167b70dd84e892f24ee8c Author: Xisco Fauli <xiscofa...@libreoffice.org> AuthorDate: Fri Jul 8 14:51:00 2022 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Fri Jul 8 16:08:44 2022 +0200 svgio: o3tl::starts_with() -> o3tl::equalsIgnoreAsciiCase(o3tl::trim()) display="NONE" or display=" none " are valid but display="nonet" is not Change-Id: Ib230d9365be3671a9a0fcb05be099b7afad15375 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136902 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index b2c076d2285b..9ac07afb0f81 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -339,75 +339,75 @@ namespace svgio::svgreader { if(!aContent.empty()) { - if(o3tl::starts_with(aContent, u"inline")) + if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"inline")) { return Display::Inline; } - else if(o3tl::starts_with(aContent, u"none")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"none")) { return Display::None; } - else if(o3tl::starts_with(aContent, u"inherit")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"inherit")) { return Display::Inherit; } - else if(o3tl::starts_with(aContent, u"block")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"block")) { return Display::Block; } - else if(o3tl::starts_with(aContent, u"list-item")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"list-item")) { return Display::ListItem; } - else if(o3tl::starts_with(aContent, u"run-in")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"run-in")) { return Display::RunIn; } - else if(o3tl::starts_with(aContent, u"compact")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"compact")) { return Display::Compact; } - else if(o3tl::starts_with(aContent, u"marker")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"marker")) { return Display::Marker; } - else if(o3tl::starts_with(aContent, u"table")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table")) { return Display::Table; } - else if(o3tl::starts_with(aContent, u"inline-table")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"inline-table")) { return Display::InlineTable; } - else if(o3tl::starts_with(aContent, u"table-row-group")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-row-group")) { return Display::TableRowGroup; } - else if(o3tl::starts_with(aContent, u"table-header-group")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-header-group")) { return Display::TableHeaderGroup; } - else if(o3tl::starts_with(aContent, u"table-footer-group")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-footer-group")) { return Display::TableFooterGroup; } - else if(o3tl::starts_with(aContent, u"table-row")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-row")) { return Display::TableRow; } - else if(o3tl::starts_with(aContent, u"table-column-group")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-column-group")) { return Display::TableColumnGroup; } - else if(o3tl::starts_with(aContent, u"table-column")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-column")) { return Display::TableColumn; } - else if(o3tl::starts_with(aContent, u"table-cell")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-cell")) { return Display::TableCell; } - else if(o3tl::starts_with(aContent, u"table-caption")) + else if(o3tl::equalsIgnoreAsciiCase(o3tl::trim(aContent), u"table-caption")) { return Display::TableCaption; }