|
 |
63f0e84 |
From 854505c4c2363c86ff0717aa9d4e83a274784f46 Mon Sep 17 00:00:00 2001
|
|
|
63f0e84 |
From: Michael Stahl <mstahl@redhat.com>
|
|
|
63f0e84 |
Date: Fri, 5 Dec 2014 23:52:34 +0100
|
|
|
63f0e84 |
Subject: [PATCH 2/5] fdo#72811: Revert "Broken security/password when saving
|
|
|
63f0e84 |
to older odf (sx?)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
... formats."
|
|
|
63f0e84 |
|
|
|
63f0e84 |
This exports ODF 1.1 files as ODF 1.2 packages, which is quite wrong.
|
|
|
63f0e84 |
Since we don't support OOoXML export any more, just revert it.
|
|
|
63f0e84 |
|
|
|
63f0e84 |
This reverts commit 06b918053fb9cf455cf431ca001a63030092d018.
|
|
|
63f0e84 |
|
|
|
63f0e84 |
(cherry picked from commit ebfec3517d001f8aa8baaabde7c4af6b01347b95)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
Change-Id: I27bdd83f96e46be054f808ff6782ad16ecc90da5
|
|
|
63f0e84 |
Reviewed-on: https://gerrit.libreoffice.org/13325
|
|
|
63f0e84 |
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
63f0e84 |
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
63f0e84 |
(cherry picked from commit 5faedcab93d2f987f91e2750119198b18891f4d1)
|
|
|
63f0e84 |
---
|
|
|
63f0e84 |
sfx2/source/doc/objstor.cxx | 2 +-
|
|
|
63f0e84 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
63f0e84 |
|
|
|
63f0e84 |
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
|
|
|
63f0e84 |
index df12f4f..a1eb2b7 100644
|
|
|
63f0e84 |
--- a/sfx2/source/doc/objstor.cxx
|
|
|
63f0e84 |
+++ b/sfx2/source/doc/objstor.cxx
|
|
|
63f0e84 |
@@ -382,7 +382,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
|
|
|
63f0e84 |
aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8;
|
|
|
63f0e84 |
aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA1_1K;
|
|
|
63f0e84 |
|
|
|
63f0e84 |
- if ( nVersion >= SOFFICE_FILEFORMAT_8 )
|
|
|
63f0e84 |
+ if ( nDefVersion >= SvtSaveOptions::ODFVER_012 )
|
|
|
63f0e84 |
{
|
|
|
63f0e84 |
try
|
|
|
63f0e84 |
{
|
|
|
63f0e84 |
--
|
|
|
63f0e84 |
1.9.3
|
|
|
63f0e84 |
|