diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-12-05 23:52:34 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-12-10 20:15:40 +0000 |
| commit | 7ee9d871254b0c3befa86cb7a2209bac7355e6da (patch) | |
| tree | 80d4e5e8bfbd30cb5a7dacd53f69f18b179e08d0 | |
| parent | 85e973d3b95e66b7d396d94bf44011b5e8d51b21 (diff) | |
fdo#72811: Revert "Broken security/password when saving to older odf (sx?)
... formats."
This exports ODF 1.1 files as ODF 1.2 packages, which is quite wrong.
Since we don't support OOoXML export any more, just revert it.
This reverts commit 06b918053fb9cf455cf431ca001a63030092d018.
(cherry picked from commit ebfec3517d001f8aa8baaabde7c4af6b01347b95)
Change-Id: I27bdd83f96e46be054f808ff6782ad16ecc90da5
Reviewed-on: https://gerrit.libreoffice.org/13325
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 5faedcab93d2f987f91e2750119198b18891f4d1)
Reviewed-on: https://gerrit.libreoffice.org/13377
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 1e37373efdd7..66f6a74bab8c 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -382,7 +382,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8; aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA1_1K; - if ( nVersion >= SOFFICE_FILEFORMAT_8 ) + if ( nDefVersion >= SvtSaveOptions::ODFVER_012 ) { try { |