include/svtools/htmltokn.h | 2 +-
svtools/source/svhtml/htmlkywd.cxx | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 3207977c5b21acd305e01776df6c686abed43f64
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Nov 19 15:36:18 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Nov 19 21:00:27 2020 +0100
Clean up GetHTMLColor "not found" value
...after fe3dd6d831998dd5619ea223af04bc51f9294d2f "Changed return type of
GetHTMLColor". (Clients had already been updated with
530df0b322f64fdcb08e9ef0b6ba944dd172ef60 "Changed return type of
GetHTMLColor"
and 463563853a81499de2259372755b00aa5ec246a7 "Changed return type of
GetHTMLColor".)
Change-Id: I1db842775a69bb3c0ff08dca152094d7b67ca221
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index 1632109f45be..c4acf8dbeef7 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -38,7 +38,7 @@ SVT_DLLPUBLIC HtmlTokenId GetHTMLToken( const rtl::OUString&
rName );
// search the TokenId for an attribute token
HtmlOptionId GetHTMLOption( const rtl::OUString& rName );
-// search the 24-bit color for a color name (not found = ULONG_MAX)
+// search the 24-bit color for a color name (not found = SAL_MAX_UINT32)
SVT_DLLPUBLIC sal_uInt32 GetHTMLColor( const rtl::OUString& rName );
enum class HtmlTokenId : sal_Int16
diff --git a/svtools/source/svhtml/htmlkywd.cxx
b/svtools/source/svhtml/htmlkywd.cxx
index 03cfc16ea024..482bfab5e611 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -648,8 +648,6 @@ using HTML_ColorEntry = TokenEntry<sal_uInt32>;
// Flag: color table has already been sorted
static bool bSortColorKeyWords = false;
-#define HTML_NO_COLOR 0xffffffffUL
-
// Color names are not exported (source:
// "http://www.uio.no/~mnbjerke/colors_w.html";)
// "http://www.infi.net/wwwimages/colorindex.html"; seem to be buggy.
@@ -807,7 +805,7 @@ sal_uInt32 GetHTMLColor( const OUString& rName )
OUString aLowerCase(rName.toAsciiLowerCase());
- return search<sal_uInt32>( aHTMLColorNameTab, aLowerCase, HTML_NO_COLOR);
+ return search<sal_uInt32>( aHTMLColorNameTab, aLowerCase, SAL_MAX_UINT32);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
