summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-12-05 23:52:34 +0100
committerMichael Stahl <mstahl@redhat.com>2014-12-05 23:59:19 +0100
commitebfec3517d001f8aa8baaabde7c4af6b01347b95 (patch)
tree89bc61b9abb12c674b08b5d1ecab062d821a521b
parenta2a9c84deff54321da0042212bae86ede25dd7e2 (diff)
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. Change-Id: I27bdd83f96e46be054f808ff6782ad16ecc90da5
-rw-r--r--sfx2/source/doc/objstor.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index aad386757fb7..6decd9777461 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -380,7 +380,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
{