summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@suse.com>2012-11-14 16:39:07 +0100
committerThorsten Behrens <tbehrens@suse.com>2012-11-14 16:44:35 +0100
commit54ba550c31c7de1e7d1bf99042883aa4ae6863c6 (patch)
treee3b2b8ac4be10ce7e3e1f65e9bd1c609f8404014
parent38a2e86db2d1f23b95f705bfe1b626f419f4e290 (diff)
Fix fdo#51121 OWA misbehaviour with uncompressed meta.xml
Change Calc to save ODF with compressed meta.xml as well, since there's no reason not to. Change-Id: Ib591b0e771a6f394d955f2ea9b43d6fb7c30ecdf
-rw-r--r--sc/inc/xmlwrap.hxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx14
2 files changed, 7 insertions, 9 deletions
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index 7d03f56f27be..42ab215be02b 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -62,7 +62,7 @@ class ScXMLImportWrapper
com::sun::star::uno::Reference<com::sun::star::xml::sax::XWriter>& xWriter,
com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aDescriptor,
const rtl::OUString& sName, const rtl::OUString& sMediaType, const rtl::OUString& sComponentName,
- const sal_Bool bPlainText, com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs,
+ com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs,
ScMySharedData*& pSharedData);
public:
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index d059e86ad4b4..435006bab937 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -626,7 +626,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XWriter>& xWriter,
uno::Sequence<beans::PropertyValue>& aDescriptor, const rtl::OUString& sName,
const rtl::OUString& sMediaType, const rtl::OUString& sComponentName,
- const sal_Bool bPlainText, uno::Sequence<uno::Any>& aArgs, ScMySharedData*& pSharedData)
+ uno::Sequence<uno::Any>& aArgs, ScMySharedData*& pSharedData)
{
sal_Bool bRet(false);
uno::Reference<io::XOutputStream> xOut;
@@ -647,10 +647,8 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
{
xSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(sMediaType));
OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
- if (bPlainText)
- xSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")), uno::makeAny(false));
- // even plain stream should be encrypted in encrypted documents
+ // advise storage impl to use common encryption
xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(sal_True) );
}
@@ -846,7 +844,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
sTextMediaType,
bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisMetaExporter"))
: rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLMetaExporter")),
- sal_True, aMetaArgs, pSharedData);
+ aMetaArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "meta export end" );
}
@@ -887,7 +885,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
sTextMediaType,
bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisStylesExporter"))
: rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLStylesExporter")),
- false, aStylesArgs, pSharedData);
+ aStylesArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "styles export end" );
}
@@ -911,7 +909,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
sTextMediaType,
bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisContentExporter"))
: rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLContentExporter")),
- false, aDocArgs, pSharedData);
+ aDocArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "content export end" );
}
@@ -939,7 +937,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
sTextMediaType,
bOasis ? rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLOasisSettingsExporter"))
: rtl::OUString (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Calc.XMLSettingsExporter")),
- false, aSettingsArgs, pSharedData);
+ aSettingsArgs, pSharedData);
RTL_LOGFILE_CONTEXT_TRACE( aLog, "settings export end" );
}