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 /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 'svtools')
| -rw-r--r-- | svtools/source/svhtml/htmlout.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 477c24d45108..99d9e38d5e84 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -558,7 +558,8 @@ 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_uLong nHex, sal_uInt8 nLen, + rtl_TextEncoding ) { // in einen Stream aus sal_Char aNToABuf[] = "0000000000000000"; @@ -977,6 +978,18 @@ OString HTMLOutFuncs::CreateTableDataOptionsValNum( return aStrTD.makeStringAndClear(); } +bool HTMLOutFuncs::PrivateURLToInternalImg( OUString& rURL ) +{ + if( rURL.getLength() > 14 && + rURL.compareTo( OOO_STRING_SVTOOLS_HTML_private_image, 14 ) == 0 ) + { + rURL = rURL.copy( 14 ); + return true; + } + + return false; +} + void HtmlWriterHelper::applyColor(HtmlWriter& rHtmlWriter, const OString &aAttributeName, const Color& rColor) { OStringBuffer sBuffer; |