diff options
Diffstat (limited to 'svtools/inc/svtools/htmlout.hxx')
| -rw-r--r-- | svtools/inc/svtools/htmlout.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index 665b0dfd1cd2..06caae765b6a 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -46,7 +46,7 @@ struct HTMLOutEvent { const sal_Char *pBasicName; const sal_Char *pJavaName; - USHORT nEvent; + sal_uInt16 nEvent; }; struct SVT_DLLPUBLIC HTMLOutContext @@ -61,7 +61,7 @@ struct SVT_DLLPUBLIC HTMLOutContext struct HTMLOutFuncs { -#if defined(MAC) || defined(UNX) +#if defined(UNX) static const sal_Char sNewLine; // nur \012 oder \015 #else static const sal_Char sNewLine[]; // \015\012 @@ -72,7 +72,7 @@ struct HTMLOutFuncs String *pNonConvertableChars = 0); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, - BOOL bOn = TRUE, + sal_Bool bOn = sal_True, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, HTMLOutContext& rContext, @@ -80,13 +80,13 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, ULONG nHex, BYTE nLen, + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const String&, const ImageMap&, const String&, const HTMLOutEvent *pEventTable, - BOOL bOutStarBasic, + sal_Bool bOutStarBasic, const sal_Char *pDelim = 0, const sal_Char *pIndentArea = 0, const sal_Char *pIndentMap = 0, @@ -108,18 +108,18 @@ struct HTMLOutFuncs // der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem // nur aus 0 bestehen Eintrag terminiert ist. SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&, - const HTMLOutEvent*, BOOL bOutStarBasic, + const HTMLOutEvent*, sal_Bool bOutStarBasic, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static ByteString& CreateTableDataOptionsValNum( ByteString& aStrTD, - BOOL bValue, double fVal, ULONG nFormat, + sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static BOOL PrivateURLToInternalImg( String& rURL ); + SVT_DLLPUBLIC static sal_Bool PrivateURLToInternalImg( String& rURL ); }; #endif |