Revert "tdf#118133 DOCX import: disable lazy-loading of tiff images"
This reverts commitfa356008b0Similar to1238ca8d10<Revert "tdf#126310 Disable lazy loading of WMF images> it seems this workaround is no longer needed and lazy-loading works with tiff images. The unittest has not been reverted Change-Id: Ie8debfc2978a4b57aa035679116472c98db89e33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112162 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
This commit is contained in:
@@ -251,8 +251,7 @@ Reference< XGraphic > GraphicHelper::importGraphic( const Reference< XInputStrea
|
||||
aArgs[ 0 ].Name = "InputStream";
|
||||
aArgs[ 0 ].Value <<= rxInStrm;
|
||||
aArgs[ 1 ].Name = "LazyRead";
|
||||
bool bLazyRead = !pExtHeader;
|
||||
aArgs[ 1 ].Value <<= bLazyRead;
|
||||
aArgs[ 1 ].Value <<= true;
|
||||
|
||||
if ( pExtHeader && pExtHeader->mapMode > 0 )
|
||||
{
|
||||
@@ -301,11 +300,6 @@ Reference< XGraphic > GraphicHelper::importEmbeddedGraphic( const OUString& rStr
|
||||
xGraphic = mxGraphicMapper->findGraphic(rStreamName);
|
||||
if (!xGraphic.is())
|
||||
{
|
||||
// Lazy-loading doesn't work with TIFF at the moment.
|
||||
WmfExternal aHeader;
|
||||
if (rStreamName.endsWith(".tiff") && !pExtHeader)
|
||||
pExtHeader = &aHeader;
|
||||
|
||||
auto xStream = mxStorage->openInputStream(rStreamName);
|
||||
xGraphic = importGraphic(xStream, pExtHeader);
|
||||
if (xGraphic.is())
|
||||
|
||||
Reference in New Issue
Block a user