diff options
| -rw-r--r-- | include/svtools/htmlout.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 14065fe4c801..8e87855b527c 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -24,7 +24,6 @@ #include <string_view> #include <svtools/svtdllapi.h> -#include <tools/solar.h> #include <rtl/textenc.h> #include <rtl/string.hxx> #include <svl/macitem.hxx> @@ -66,7 +65,7 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars = nullptr ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen ); + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt32 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, @@ -98,7 +97,7 @@ struct HTMLOutFuncs // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum( - bool bValue, double fVal, sal_uLong nFormat, + bool bValue, double fVal, sal_uInt32 nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, OUString *pNonConvertableChars = nullptr); diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index c75d293b6f77..b39609ad38d8 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -562,7 +562,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, return rStream; } -SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) +SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uInt32 nHex, sal_uInt8 nLen ) { // out into a stream char aNToABuf[] = "0000000000000000"; @@ -926,7 +926,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, OString HTMLOutFuncs::CreateTableDataOptionsValNum( bool bValue, - double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, + double fVal, sal_uInt32 nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc, OUString* pNonConvertableChars) { OStringBuffer aStrTD; |