diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-03-23 14:13:24 +0100 |
| commit | 1c847b5fd09e5a64092e4df48591ec38ee3dabdd (patch) | |
| tree | ea790e57f9caa3d6d4037d6779023c97c9b8def6 /sfx2 | |
| parent | 0c3818deda652f31d685b4d4d440de4faab1c044 (diff) | |
mav60: #164341# fix problems with the new implementation
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 2ccf5fa7a849..1df7d2b01920 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -670,6 +670,10 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) //------------------------------------------------------------------------- sal_Int8 ModelData_Impl::CheckStateForSave() { + // if the document is readonly or a new one a SaveAs operation must be used + if ( !GetStorable()->hasLocation() || GetStorable()->isReadonly() ) + return STATUS_SAVEAS; + // check acceptable entries for media descriptor sal_Bool bVersInfoNeedsStore = sal_False; ::comphelper::SequenceAsHashMap aAcceptedArgs; @@ -701,10 +705,6 @@ sal_Int8 ModelData_Impl::CheckStateForSave() if ( !GetModifiable()->isModified() && !bVersInfoNeedsStore ) return STATUS_NO_ACTION; - // if the document is readonly or a new one a SaveAs operation must be used - if ( !GetStorable()->hasLocation() || GetStorable()->isReadonly() ) - return STATUS_SAVEAS; - // check that the old filter is acceptable ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( aFilterNameString, diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 56032d689e76..38f30b78974a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -389,7 +389,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto aEncryptionAlgs[2].Value <<= xml::crypto::DigestID::SHA256_1K; } if ( !aSaveOpt.IsUseBlowfishInODF12() ) - aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::AES_CBC; + aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::AES_CBC_W3C_PADDING; } try |