diff options
author | Oliver Specht <oliver.specht@cib.de> | 2016-03-18 15:57:17 +0100 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-23 13:57:16 +0000 |
commit | 46fa816aa0a713c54836b9689fa7a1c9ff55ef5a (patch) | |
tree | 8dad103eca59e741a51a2b761c9bfd69a24f95fc /include/svtools | |
parent | f9cf53a082f1d99b313ebd09c8791541859eac40 (diff) |
tdf#63211: saving embedded images to HTML optional
This change re-introduces linked images in HTML export
but keeps embedded image export in mailmerge e-Mail function
Change-Id: I9e956b590f4c675b5954e19e4d3948c36b55f1e6
Reviewed-on: https://gerrit.libreoffice.org/23359
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/htmlout.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 1547550b5bb8..715f0ba7534b 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -66,7 +66,8 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, OUString *pNonConvertableChars = nullptr ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 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 OUString&, const ImageMap&, const OUString&, @@ -103,6 +104,7 @@ struct HTMLOutFuncs SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, OUString *pNonConvertableChars = nullptr); + SVT_DLLPUBLIC static bool PrivateURLToInternalImg( OUString& rURL ); }; struct HtmlWriterHelper |