mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhancement : tdf#90225 Cannot open compressed csv files from calc

Browse Source 
Change-Id: I5098fd25f1747b49e47e360f017ee1112a242771
Reviewed-on: https://gerrit.libreoffice.org/15108
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
This commit is contained in:
Dennis Francis
2015-04-15 22:22:16 +05:30
committed by Kohei Yoshida
parent 89aee8b17f
commit f0edb677f0
3 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
filter/source/textfilterdetect/filterdetect.cxx
View File

@@ -11,8 +11,10 @@
#include <svtools/htmltokn.h>
#include <tools/urlobj.hxx>
#include <tools/zcodec.hxx>
#include <ucbhelper/content.hxx>
#include <unotools/mediadescriptor.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -142,10 +144,34 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
else if (aType == "generic_Text")
{
uno::Reference<io::XStream> xStream(aMediaDesc[MediaDescriptor::PROP_STREAM()], uno::UNO_QUERY);
uno::Reference<io::XInputStream> xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY);
if (xStream.is() || xInStream.is())
{
ZCodec aCodecGZ;
std::unique_ptr<SvStream> pInStream;
if (xStream.is())
pInStream.reset(utl::UcbStreamHelper::CreateStream(xStream));
else
pInStream.reset(utl::UcbStreamHelper::CreateStream(xInStream));
std::unique_ptr<SvMemoryStream> pDecompressedStream(new SvMemoryStream());
if (aCodecGZ.AttemptDecompression(*pInStream, *pDecompressedStream, false, true))
{
uno::Reference<io::XStream> xStreamDecompressed(new utl::OStreamWrapper(*pDecompressedStream));
pDecompressedStream.release();
aMediaDesc[MediaDescriptor::PROP_STREAM()] <<= xStreamDecompressed;
aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()] <<= xStreamDecompressed->getInputStream();
OUString aURL = aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString() );
sal_Int32 nIdx = aURL.lastIndexOf(".gz");
if (nIdx != -1)
aMediaDesc[MediaDescriptor::PROP_URL()] <<= aURL.copy(0, nIdx);
}
}
// Get the file name extension.
INetURLObject aParser(aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString() ) );
OUString aExt = aParser.getExtension(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET);
aExt = aExt.toAsciiLowerCase();
OUString aName = aParser.getName().toAsciiLowerCase();
// Decide which filter to use based on the document service first,
// then on extension if that's not available.
@@ -153,7 +179,7 @@ OUString SAL_CALL PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= OUString(CALC_TEXT_FILTER);
else if (aDocService == WRITER_DOCSERVICE)
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= OUString(WRITER_TEXT_FILTER);
else if (aExt == "csv" || aExt == "tsv" || aExt == "tab" || aExt == "xls")
else if (aExt == "csv" || aExt == "tsv" || aExt == "tab" || aExt == "xls" || aName.endsWith(".csv.gz"))
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= OUString(CALC_TEXT_FILTER);
else
aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= OUString(WRITER_TEXT_FILTER);

1
include/tools/zcodec.hxx
View File

@@ -67,6 +67,7 @@ public:
long Compress( SvStream& rIStm, SvStream& rOStm );
long Decompress( SvStream& rIStm, SvStream& rOStm );
bool AttemptDecompression( SvStream& rIStm, SvStream& rOStm, bool updateCrc = false, bool gzLib = false );
long Write( SvStream& rOStm, const sal_uInt8* pData, sal_uIntPtr nSize );
long Read( SvStream& rIStm, sal_uInt8* pData, sal_uIntPtr nSize );

26
tools/source/zcodec/zcodec.cxx
View File

@@ -394,4 +394,30 @@ void ZCodec::UpdateCRC ( sal_uInt8* pSource, long nDatSize)
mnCRC = rtl_crc32( mnCRC, pSource, nDatSize );
}
bool ZCodec::AttemptDecompression(SvStream& rIStm, SvStream& rOStm, bool updateCrc, bool gzLib)
{
assert(meState == STATE_INIT);
sal_uLong nStreamPos = rIStm.Tell();
BeginCompression(ZCODEC_DEFAULT_COMPRESSION, updateCrc, gzLib);
InitDecompress(rIStm);
EndCompression();
if ( !mbStatus || rIStm.GetError() )
{
rIStm.Seek(nStreamPos);
return false;
}
rIStm.Seek(nStreamPos);
BeginCompression(ZCODEC_DEFAULT_COMPRESSION, updateCrc, gzLib);
Decompress(rIStm, rOStm);
EndCompression();
if( !mbStatus || rIStm.GetError() || rOStm.GetError() )
{
rIStm.Seek(nStreamPos);
return false;
}
rIStm.Seek(nStreamPos);
rOStm.Seek(0);
return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */