diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-11-14 16:03:48 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-01-14 19:33:31 +0100 |
| commit | a6892bd5511bac086000efac9c865a5a148202dc (patch) | |
| tree | 98a9cd8bd2f12dc9fcc5dc4d0f0aa98bc5b54784 | |
| parent | 28e6acb724671e72bd4e2e207a61fee0c94c432b (diff) | |
Fix fdo#51121 OWA misbehaviour with uncompressed meta.xml
Change draw/impress to save ODF with compressed meta.xml as well,
since there's no reason not to.
Change-Id: I856e716b1e673cffe3b483628d934ab2c7d7271b
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
| -rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index eaf5285d2c40..fcde1367fdde 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -160,7 +160,6 @@ struct XML_SERVICEMAP { const sal_Char* mpService; const sal_Char* mpStream; - sal_Bool mbPlain; }; struct XML_SERVICES @@ -1012,22 +1011,18 @@ sal_Bool SdXMLFilter::Export() XML_SERVICEMAP aServices[5]; sal_uInt16 i = 0; aServices[i ].mpService = pServiceNames->mpStyles; - aServices[i ].mpStream = sXML_styleStreamName; - aServices[i++].mbPlain = sal_False; + aServices[i++].mpStream = sXML_styleStreamName; aServices[i ].mpService = pServiceNames->mpContent; - aServices[i ].mpStream = sXML_contentStreamName; - aServices[i++].mbPlain = sal_False; + aServices[i++].mpStream = sXML_contentStreamName; aServices[i ].mpService = pServiceNames->mpSettings; - aServices[i ].mpStream = sXML_settingsStreamName; - aServices[i++].mbPlain = sal_False; + aServices[i++].mpStream = sXML_settingsStreamName; if( mrDocShell.GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { aServices[i ].mpService = pServiceNames->mpMeta; - aServices[i ].mpStream = sXML_metaStreamName; - aServices[i++].mbPlain = sal_True; + aServices[i++].mpStream = sXML_metaStreamName; }; aServices[i].mpService = NULL; @@ -1060,11 +1055,9 @@ sal_Bool SdXMLFilter::Export() uno::Any aAny; aAny <<= OUString( "text/xml"); xProps->setPropertyValue( "MediaType" , aAny); - OUString aUseCommonPassPropName( "UseCommonStoragePasswordEncryption"); - if( pServices->mbPlain ) - xProps->setPropertyValue( "Compressed" , uno::makeAny( (sal_Bool) sal_False ) ); - // if the document is encrypted even the plain streams should be encrypted - xProps->setPropertyValue( aUseCommonPassPropName, uno::makeAny( (sal_Bool)sal_True ) ); + // encrypt all streams + xProps->setPropertyValue( "UseCommonStoragePasswordEncryption", + uno::makeAny( (sal_Bool)sal_True ) ); const OUString sStreamName( "StreamName"); xInfoSet->setPropertyValue( sStreamName, Any( sDocName ) ); |