diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 15:06:45 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 15:06:45 +0200 |
| commit | aa2d6f3360a16f9066e8b83ddcd69e62996a6f53 (patch) | |
| tree | b0c5761fba57670b0f11eaa239d3a754f370eb13 /oox | |
| parent | f98601b66a4bdfea70771cac44eb8f45faf70e33 (diff) | |
| parent | 97c177fa64631a26a09c0d5085bc40da395af274 (diff) | |
CWS-TOOLING: integrate CWS fwk138
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/helper/zipstorage.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx index 72b6fcd1bff0..384870430c39 100644 --- a/oox/source/helper/zipstorage.cxx +++ b/oox/source/helper/zipstorage.cxx @@ -66,10 +66,15 @@ ZipStorage::ZipStorage( /* #i105325# ::comphelper::OStorageHelper::GetStorageFromInputStream() cannot be used here as it will open a storage with format type 'PackageFormat' that will not work with OOXML packages. + + #161971# The MS-document storages should always be opened in Repair-Mode to + ignore the format errors and get so much info as possible. I hate this + solution, but it seems to be the only consistent way to handle the MS-documents. + TODO: #i105410# switch to 'OFOPXMLFormat' and use its implementation of relations handling. */ mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( - ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory ); + ZIP_STORAGE_FORMAT_STRING, rxInStream, rxFactory, sal_True ); } catch( Exception& ) { @@ -87,7 +92,7 @@ ZipStorage::ZipStorage( { using namespace ::com::sun::star::embed::ElementModes; mxStorage = ::comphelper::OStorageHelper::GetStorageOfFormatFromStream( - OFOPXML_STORAGE_FORMAT_STRING, rxStream, READWRITE | TRUNCATE, rxFactory ); + OFOPXML_STORAGE_FORMAT_STRING, rxStream, READWRITE | TRUNCATE, rxFactory, sal_True ); } catch( Exception& ) { |