diff options
| author | Thorsten Behrens <tbehrens@suse.com> | 2012-11-14 16:42:11 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-01-14 19:33:30 +0100 |
| commit | 577dd810d94374d634b46515a19127bc26dae516 (patch) | |
| tree | 45b08a6c26fcf82f0733bd5504eac584a98dfacc /starmath | |
| parent | 959ce73b266d3639ff1ced9cb980adf5fe643ad5 (diff) | |
Fix fdo#51121 OWA misbehaviour with uncompressed meta.xml
Change Writer and Math to save ODF with compressed meta.xml as well,
since there's no reason not to.
Change-Id: Idde0dc9eafb03f0c84e52353289d857615aa3748
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/mathmlexport.cxx | 16 | ||||
| -rw-r--r-- | starmath/source/mathmlexport.hxx | 3 |
2 files changed, 4 insertions, 15 deletions
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 34cbf54acf7c..b543f2d4ef18 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -216,8 +216,7 @@ sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium) bRet = WriteThroughComponent( xStg, xModelComp, "meta.xml", xServiceFactory, xInfoSet, (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaExporter" - : "com.sun.star.comp.Math.XMLMetaExporter"), - sal_False); + : "com.sun.star.comp.Math.XMLMetaExporter")); } if ( bRet ) { @@ -326,8 +325,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent( const sal_Char* pStreamName, Reference<lang::XMultiServiceFactory> & rFactory, Reference<beans::XPropertySet> & rPropSet, - const sal_Char* pComponentName, - sal_Bool bCompress + const sal_Char* pComponentName ) { OSL_ENSURE(xStorage.is(), "Need storage!"); @@ -355,15 +353,7 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent( uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); xSet->setPropertyValue( aPropName, aAny ); - if ( !bCompress ) - { - aPropName = "Compressed"; - sal_Bool bFalse = sal_False; - aAny.setValue( &bFalse, ::getBooleanCppuType() ); - xSet->setPropertyValue( aPropName, aAny ); - } - - // even plain stream must be encrypted in encrypted document + // all streams must be encrypted in encrypted document OUString aTmpPropName( "UseCommonStoragePasswordEncryption" ); sal_Bool bTrue = sal_True; aAny.setValue( &bTrue, ::getBooleanCppuType() ); diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx index 4ab602bad8b3..daf935651373 100644 --- a/starmath/source/mathmlexport.hxx +++ b/starmath/source/mathmlexport.hxx @@ -80,8 +80,7 @@ public: ::com::sun::star::lang::XMultiServiceFactory > & rFactory, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropSet, - const sal_Char* pComponentName, - sal_Bool bCompress=sal_True ); + const sal_Char* pComponentName ); }; //////////////////////////////////////////////////////////// |