From 8b8f0fdcd980e1f19274c38f42aef27c1c380d7d Mon Sep 17 00:00:00 2001 From: Henning Brinkmann Date: Wed, 2 Jun 2010 17:03:29 +0200 Subject: writerfilter08: temporal fix: DOCX document not recognized --- oox/source/helper/zipstorage.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'oox/source/helper') diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index 384870430c39..d17259ef692a 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -73,8 +73,10 @@ ZipStorage::ZipStorage( TODO: #i105410# switch to 'OFOPXMLFormat' and use its implementation of relations handling. */ + mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( - ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, sal_True ); + ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, + sal_False /* DEV300_m80: Was sal_True, but DOCX and others did not load */ ); } catch( Exception& ) { -- cgit From ae39e55e174bcef4ef6387351a76da5f723fcb2d Mon Sep 17 00:00:00 2001 From: Henning Brinkmann Date: Fri, 11 Jun 2010 14:21:32 +0200 Subject: writerfilter08: removed temporary fix --- oox/source/helper/zipstorage.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'oox/source/helper') diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index d17259ef692a..384870430c39 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -73,10 +73,8 @@ ZipStorage::ZipStorage( TODO: #i105410# switch to 'OFOPXMLFormat' and use its implementation of relations handling. */ - mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( - ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, - sal_False /* DEV300_m80: Was sal_True, but DOCX and others did not load */ ); + ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, sal_True ); } catch( Exception& ) { -- cgit