include/svtools/htmlout.hxx | 2 +- svtools/source/svhtml/htmlout.cxx | 2 +- svtools/source/svrtf/rtfout.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit be15fe550b8a4a067af8b113847b7b2a41a12cb1 Author: Jussi Suominen <[email protected]> AuthorDate: Sun Nov 2 21:04:38 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 6 08:24:59 2025 +0100 tdf#114441 change the type of nHex parameter to sal_uInt64 The sal_uInt64 type should be appropriate for the nHex parameter because the Out_Hex function's buffer holds up to 16 hex digits. To represent the full range of those 16 hex digits you need a 64 bit value. Each hex digit requires 4 bits, so 16 hex digits require 64 bits: 16 * 4 bits. Change-Id: I21f73e7c7076368294df28fb009bf04aab983742 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193309 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index d82807545167..62f7ffc6973b 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -51,7 +51,7 @@ struct HTMLOutFuncs OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, std::u16string_view, OUString *pNonConvertableChars = nullptr ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt32 nHex, sal_uInt8 nLen ); + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt64 nHex, sal_uInt8 nLen ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, bool bXHTML = false ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&, const HTMLOutEvent *pEventTable, diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index c5603057da8b..5d3e1a912d14 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -549,7 +549,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream ) return rStream; } -SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 nLen ) +SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt64 nHex, sal_uInt8 nLen ) { // out into a stream char aNToABuf[] = "0000000000000000"; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index da2bd7b103f8..f5d7b0e01de5 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -26,7 +26,7 @@ namespace { -SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) +SvStream& Out_Hex( SvStream& rStream, sal_uInt64 nHex, sal_uInt8 nLen ) { char aNToABuf[] = "0000000000000000";
