summaryrefslogtreecommitdiff
path: root/sd/source/filter
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-14 16:03:48 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-14 16:44:34 +0100
commit9b2440f985f8676393094140cfd919ef82161e31 (patch)
tree8ce0d2015773647b11597b2aa0b2a64f355802a8 /sd/source/filter
parent4e7f9650e2a32b648cbd50ab113955920f960354 (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
Diffstat (limited to 'sd/source/filter')
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx21
1 files changed, 7 insertions, 14 deletions
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 1dc354368513..b77e179af501 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -162,7 +162,6 @@ struct XML_SERVICEMAP
{
const sal_Char* mpService;
const sal_Char* mpStream;
- sal_Bool mbPlain;
};
struct XML_SERVICES
@@ -1003,22 +1002,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;
@@ -1051,11 +1046,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 ) );