mib17: rebase to DEV300_m84

8 files changed, 285 insertions, 63 deletions

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 298da13be147..1dea202e0d0e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -115,6 +115,7 @@ using namespace ::com::sun::star::io;
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/mediadescriptor.hxx>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/inetmime.hxx>
 #include <unotools/ucblockbytes.hxx>
@@ -2558,18 +2559,72 @@ void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ )
     pFilter = pFilterP;
     pImp->nFileVersion = 0;
 }
+
 //----------------------------------------------------------------
 
 const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const
 {
     return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pFilter;
 }
+
 //----------------------------------------------------------------
 
 void SfxMedium::SetOrigFilter_Impl( const SfxFilter* pOrigFilter )
 {
     pImp->pOrigFilter = pOrigFilter;
 }
+
+//------------------------------------------------------------------
+
+sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter )
+{
+    sal_uInt32 nHash = 0;
+
+    if ( aPasswd.getLength() )
+    {
+        if ( bWriter )
+        {
+            nHash = ::comphelper::DocPasswordHelper::GetWordHashAsUINT32( aPasswd );
+        }
+        else
+        {
+            rtl_TextEncoding nEncoding = RTL_TEXTENCODING_UTF8;
+
+            // if the MS-filter should be used
+            // use the inconsistent algorithm to find the encoding specified by MS
+            nEncoding = osl_getThreadTextEncoding();
+            switch( nEncoding )
+            {
+                case RTL_TEXTENCODING_ISO_8859_15:
+                case RTL_TEXTENCODING_MS_874:
+                case RTL_TEXTENCODING_MS_1250:
+                case RTL_TEXTENCODING_MS_1251:
+                case RTL_TEXTENCODING_MS_1252:
+                case RTL_TEXTENCODING_MS_1253:
+                case RTL_TEXTENCODING_MS_1254:
+                case RTL_TEXTENCODING_MS_1255:
+                case RTL_TEXTENCODING_MS_1256:
+                case RTL_TEXTENCODING_MS_1257:
+                case RTL_TEXTENCODING_MS_1258:
+                case RTL_TEXTENCODING_SHIFT_JIS:
+                case RTL_TEXTENCODING_GB_2312:
+                case RTL_TEXTENCODING_BIG5:
+                    // in case the system uses an encoding from the list above, it should be used
+                    break;
+
+                default:
+                    // in case other encoding is used, use one of the encodings from the list
+                    nEncoding = RTL_TEXTENCODING_MS_1250;
+                    break;
+            }
+
+            nHash = ::comphelper::DocPasswordHelper::GetXLHashAsUINT16( aPasswd, nEncoding );
+        }
+    }
+
+    return nHash;
+}
+
 //------------------------------------------------------------------
 
 void SfxMedium::Close()
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index e955c43af705..1219d30d7b27 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -49,20 +49,6 @@
 
 using namespace ::com::sun::star;
 
-namespace sfx2 {
-
-// TODO #i105076# this should be in the filter configuration!!!
-bool CheckMSPasswordCapabilityForExport( const String& rFilterName )
-{
-    return
-        rFilterName.EqualsAscii( "MS Word 97" ) ||
-        rFilterName.EqualsAscii( "MS Word 97 Vorlage" ) ||
-        rFilterName.EqualsAscii( "MS Excel 97" ) ||
-        rFilterName.EqualsAscii( "MS Excel 97 Vorlage/Template" );
-}
-
-} // namespace sfx2
-
 // STATIC DATA -----------------------------------------------------------
 
 DBG_NAME(SfxFilter)
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 24f2f359607f..3c4df7276d6b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -62,6 +62,9 @@
 #include <unotools/pathoptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/itemset.hxx>
+#include <svl/eitem.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/saveopt.hxx>
 #include <tools/debug.hxx>
@@ -80,6 +83,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/dinfdlg.hxx>
+#include <sfx2/request.hxx>
 #include <sfxtypes.hxx>
 #include "alienwarn.hxx"
 
@@ -108,6 +112,7 @@ const ::rtl::OUString aFilterFlagsString   = ::rtl::OUString::createFromAscii( "
 
 using namespace ::com::sun::star;
 
+namespace {
 //-------------------------------------------------------------------------
 static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
 {
@@ -168,6 +173,69 @@ static sal_Int32 getDontFlags( sal_Int8 nStoreMode )
 }
 
 //=========================================================================
+// class DocumentSettingsGuard
+//=========================================================================
+
+class DocumentSettingsGuard
+{
+    uno::Reference< beans::XPropertySet > m_xDocumentSettings;
+    sal_Bool m_bPreserveReadOnly;
+    sal_Bool m_bReadOnlySupported;
+
+    sal_Bool m_bRestoreSettings;
+public:
+    DocumentSettingsGuard( const uno::Reference< frame::XModel >& xModel, sal_Bool bReadOnly, sal_Bool bRestore )
+    : m_bPreserveReadOnly( sal_False )
+    , m_bReadOnlySupported( sal_False )
+    , m_bRestoreSettings( bRestore )
+    {
+        try
+        {
+            uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY_THROW );
+            m_xDocumentSettings.set(
+                xDocSettingsSupplier->createInstance(
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.Settings" ) ) ),
+                uno::UNO_QUERY_THROW );
+
+            ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) );
+
+            try
+            {
+                m_xDocumentSettings->getPropertyValue( aLoadReadonlyString ) >>= m_bPreserveReadOnly;
+                m_xDocumentSettings->setPropertyValue( aLoadReadonlyString, uno::makeAny( bReadOnly ) );
+                m_bReadOnlySupported = sal_True;
+            }
+            catch( uno::Exception& )
+            {}
+        }
+        catch( uno::Exception& )
+        {}
+
+        if ( ( bReadOnly && !m_bReadOnlySupported ) )
+            throw uno::RuntimeException(); // the user could provide the data, so it must be stored
+    }
+
+    ~DocumentSettingsGuard()
+    {
+        if ( m_bRestoreSettings )
+        {
+            ::rtl::OUString aLoadReadonlyString( RTL_CONSTASCII_USTRINGPARAM( "LoadReadonly" ) );
+
+            try
+            {
+                if ( m_bReadOnlySupported )
+                    m_xDocumentSettings->setPropertyValue( aLoadReadonlyString, uno::makeAny( m_bPreserveReadOnly ) );
+            }
+            catch( uno::Exception& )
+            {
+                OSL_ASSERT( "Unexpected exception!" );
+            }
+        }
+    }
+};
+} // anonymous namespace
+
+//=========================================================================
 // class ModelData_Impl
 //=========================================================================
 class ModelData_Impl
@@ -184,6 +252,8 @@ class ModelData_Impl
 
     ::comphelper::SequenceAsHashMap m_aMediaDescrHM;
 
+    sal_Bool m_bRecommendReadOnly;
+
 public:
     ModelData_Impl( SfxStoringHelper& aOwner,
                     const uno::Reference< frame::XModel >& xModel,
@@ -200,6 +270,8 @@ public:
 
     ::comphelper::SequenceAsHashMap& GetMediaDescr() { return m_aMediaDescrHM; }
 
+    sal_Bool IsRecommendReadOnly() { return m_bRecommendReadOnly; }
+
     const ::comphelper::SequenceAsHashMap& GetDocProps();
 
     ::rtl::OUString GetModuleName();
@@ -252,6 +324,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner,
 , m_pDocumentPropsHM( NULL )
 , m_pModulePropsHM( NULL )
 , m_aMediaDescrHM( aMediaDescr )
+, m_bRecommendReadOnly( sal_False )
 {
     CheckInteractionHandler();
 }
@@ -923,6 +996,12 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
 
     ::rtl::OUString aFilterName = aStringTypeFN;
 
+    // the following two arguments can not be converted in MediaDescriptor,
+    // so they should be removed from the ItemSet after retrieving
+    SFX_ITEMSET_ARG( pDialogParams, pRecommendReadOnly, SfxBoolItem, SID_RECOMMENDREADONLY, sal_False );
+    m_bRecommendReadOnly = ( pRecommendReadOnly && pRecommendReadOnly->GetValue() );
+    pDialogParams->ClearItem( SID_RECOMMENDREADONLY );
+
     uno::Sequence< beans::PropertyValue > aPropsFromDialog;
     TransformItems( nSlotID, *pDialogParams, aPropsFromDialog, NULL );
     GetMediaDescr() << aPropsFromDialog;
@@ -1509,6 +1588,8 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >&
     // store the document and handle it's docinfo
     SvtSaveOptions aOptions;
 
+    DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(), aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED );
+
     if ( aOptions.IsDocInfoSave()
       && ( !aModelData.GetStorable()->hasLocation()
           || INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL ) )
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index e73594af1e10..451e33084c07 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -1242,3 +1242,51 @@ void SfxObjectShell::SetSaveVersionOnClose( sal_Bool bNew )
     pImp->bSaveVersionOnClose = bNew;
 }
 
+sal_uInt32 SfxObjectShell::GetModifyPasswordHash() const
+{
+    return pImp->m_nModifyPasswordHash;
+}
+
+sal_Bool SfxObjectShell::SetModifyPasswordHash( sal_uInt32 nHash )
+{
+    if ( ( !IsReadOnly() && !IsReadOnlyUI() )
+      || !(pImp->nFlagsInProgress & SFX_LOADED_MAINDOCUMENT ) )
+    {
+        // the hash can be changed only in editable documents,
+        // or during loading of document
+        pImp->m_nModifyPasswordHash = nHash;
+        return sal_True;
+    }
+
+    return sal_False;
+}
+
+uno::Sequence< beans::PropertyValue > SfxObjectShell::GetModifyPasswordInfo() const
+{
+    return pImp->m_aModifyPasswordInfo;
+}
+
+sal_Bool SfxObjectShell::SetModifyPasswordInfo( const uno::Sequence< beans::PropertyValue >& aInfo )
+{
+    if ( ( !IsReadOnly() && !IsReadOnlyUI() )
+      || !(pImp->nFlagsInProgress & SFX_LOADED_MAINDOCUMENT ) )
+    {
+        // the hash can be changed only in editable documents,
+        // or during loading of document
+        pImp->m_aModifyPasswordInfo = aInfo;
+        return sal_True;
+    }
+
+    return sal_False;
+}
+
+void SfxObjectShell::SetModifyPasswordEntered( sal_Bool bEntered )
+{
+    pImp->m_bModifyPasswordEntered = bEntered;
+}
+
+sal_Bool SfxObjectShell::IsModifyPasswordEntered()
+{
+    return pImp->m_bModifyPasswordEntered;
+}
+
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 628c3b020c08..addb648ef2e9 100755
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -470,6 +470,32 @@ void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly )
 
 //-------------------------------------------------------------------------
 
+void SfxObjectShell::SetReadOnly()
+{
+    // Let the document be completely readonly, means that the
+    // medium open mode is adjusted accordingly, and the write lock
+    // on the file is removed.
+
+     if ( pMedium && !IsReadOnlyMedium() )
+    {
+        sal_Bool bWasROUI = IsReadOnly();
+
+        pMedium->UnlockFile( sal_False );
+
+        // the storage-based mediums are already based on the temporary file
+        // so UnlockFile has already closed the locking stream
+        if ( !pMedium->HasStorage_Impl() && IsLoadingFinished() )
+            pMedium->CloseInStream();
+
+        pMedium->SetOpenMode( SFX_STREAM_READONLY, pMedium->IsDirect(), sal_True );
+        pMedium->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) );
+
+        if ( !bWasROUI )
+            Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
+    }
+}
+//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::IsReadOnly() const
 {
     return pImp->bReadOnlyUI || IsReadOnlyMedium();
@@ -1363,6 +1389,9 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags )
         if( !IsAbortingImport() )
             PositionView_Impl();
 
+        if ( ( GetModifyPasswordHash() || GetModifyPasswordInfo().getLength() ) && !IsModifyPasswordEntered() )
+            SetReadOnly();
+
         // Salvage
         if ( pSalvageItem )
             bSetModifiedTRUE = sal_True;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index e1b22ca26a22..6c4bdf56ba26 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1339,7 +1339,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
         {
             if ( pFilt->GetServiceName() != rMedium.GetFilter()->GetServiceName() )
             {
-//REMOVE            rMedium.GetStorage()->SetClass( SvFactory::GetServerName( nFormat ), nFormat, pFilt->GetTypeName() );
                 datatransfer::DataFlavor aDataFlavor;
                 SotExchange::GetFormatDataFlavor( nFormat, aDataFlavor );
 
@@ -2056,9 +2055,6 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
         }
         else
         {
-//REMOVE                if( pFilter->UsesStorage() )
-//REMOVE                    pMedium->GetStorage();
-//REMOVE                else if( pMedium->GetOpenMode() & STREAM_WRITE )
             if( pMedium->GetOpenMode() & STREAM_WRITE )
                 pMedium->GetInStream();
             xStorage = GetStorage();
@@ -2596,9 +2592,6 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
 
         SetError(pMediumTmp->GetErrorCode(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
-//REMOVE            if ( !IsHandsOff() )
-//REMOVE            pMediumTmp->Close();
-
         sal_Bool bOpen( sal_False );
         bOpen = DoSaveCompleted( pMediumTmp );
         DBG_ASSERT(bOpen,"Fehlerbehandlung fuer DoSaveCompleted nicht implementiert");
@@ -2609,13 +2602,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
         SetError( pMediumTmp->GetError(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
         // reconnect to object storage
-//REMOVE            if ( IsHandsOff() )
-//REMOVE            {
-//REMOVE                if ( !DoSaveCompleted( pRetrMedium ) )
-//REMOVE                    DBG_ERROR("Case not handled - no way to get a storage!");
-//REMOVE            }
-//REMOVE            else
-            DoSaveCompleted( 0 );
+        DoSaveCompleted( 0 );
 
         if( pRetrMedium->GetItemSet() )
         {
@@ -2874,8 +2861,6 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
     else
         pNewFile->SetFilter( GetFactory().GetFilterContainer()->GetAnyFilter( SFX_FILTER_IMPORT | SFX_FILTER_EXPORT ) );
 
-//REMOVE        // saving is alway done using a temporary file
-//REMOVE        pNewFile->CreateTempFileNoCopy();
     if ( pNewFile->GetErrorCode() != ERRCODE_NONE )
     {
         // creating temporary file failed ( f.e. floppy disk not inserted! )
@@ -2912,18 +2897,8 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
         SetError( pNewFile->GetErrorCode(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
         // notify the document that saving was done successfully
-//REMOVE            if ( bCopyTo )
-//REMOVE            {
-//REMOVE                if ( IsHandsOff() )
-//REMOVE                    bOk = DoSaveCompleted( pMedium );
-//REMOVE            }
-//REMOVE            else
         if ( !bCopyTo )
         {
-            // Muss !!!
-//REMOVE                if ( bToOwnFormat )
-//REMOVE                    SetFileName( pNewFile->GetPhysicalName() );
-
             bOk = DoSaveCompleted( pNewFile );
         }
         else
@@ -2955,31 +2930,12 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
             //       by the storage
             DELETEZ( pNewFile );
         }
-
-        // TODO/LATER: there is no need in the following code in case HandsOff is not used,
-        //             hope we will not have to introduce it back
-//REMOVE            String aPasswd;
-//REMOVE            if ( IsOwnStorageFormat_Impl( *GetMedium() ) && GetPasswd_Impl( GetMedium()->GetItemSet(), aPasswd ) )
-//REMOVE            {
-//REMOVE                try
-//REMOVE                {
-//REMOVE                    // the following code must throw an exception in case of failure
-//REMOVE                    ::comphelper::OStorageHelper::SetCommonStoragePassword( GetMedium->GetStorage(), aPasswd );
-//REMOVE                }
-//REMOVE                catch( uno::Exception& )
-//REMOVE                {
-//REMOVE                    // TODO: handle the error
-//REMOVE                }
-//REMOVE            }
     }
     else
     {
         SetError( pNewFile->GetErrorCode(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 
-//REMOVE            // reconnect to the old storage
-//REMOVE            if ( IsHandsOff() )
-//REMOVE                DoSaveCompleted( pMedium );
-//REMOVE            else
+        // reconnect to the old storage
         DoSaveCompleted( 0 );
 
         DELETEZ( pNewFile );
@@ -3160,9 +3116,6 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium )
     uno::Reference< embed::XStorage > xStorage = rMedium.GetStorage();
     if ( xStorage.is() )
     {
-//REMOVE            if ( rMedium.GetFileVersion() )
-//REMOVE                xStor->SetVersion( rMedium.GetFileVersion() );
-
         // Password
         SFX_ITEMSET_ARG( rMedium.GetItemSet(), pPasswdItem, SfxStringItem, SID_PASSWORD, sal_False );
         if ( pPasswdItem || ERRCODE_IO_ABORT != CheckPasswd_Impl( this, SFX_APP()->GetPool(), pMedium ) )
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index f8b6cfe44407..b7567b89f02f 100644..100755
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -247,6 +247,8 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     ,m_bCreateTempStor( sal_False )
     ,m_bIsInit( sal_False )
     ,m_bIncomplEncrWarnShown( sal_False )
+    ,m_nModifyPasswordHash( 0 )
+    ,m_bModifyPasswordEntered( sal_False )
 {
     SfxObjectShell* pDoc = &_rDocShell;
     SfxObjectShellArr_Impl &rArr = SFX_APP()->GetObjectShells_Impl();
@@ -1081,3 +1083,43 @@ void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew )
         SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_LOADFINISHED, GlobalEventConfig::GetEventName(STR_EVENT_LOADFINISHED), this ) );
     }
 }
+
+
+bool SfxObjectShell::IsChangeRecording() const
+{
+    // currently this function needs to be overwritten by Writer and Calc only
+    DBG_ASSERT( 0, "function not implemented" );
+    return false;
+}
+
+
+bool SfxObjectShell::HasChangeRecordProtection() const
+{
+    // currently this function needs to be overwritten by Writer and Calc only
+    DBG_ASSERT( 0, "function not implemented" );
+    return false;
+}
+
+
+void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ )
+{
+    // currently this function needs to be overwritten by Writer and Calc only
+    DBG_ASSERT( 0, "function not implemented" );
+}
+
+
+bool SfxObjectShell::SetProtectionPassword( const String & /*rPassword*/ )
+{
+    // currently this function needs to be overwritten by Writer and Calc only
+    DBG_ASSERT( 0, "function not implemented" );
+    return false;
+}
+
+
+bool SfxObjectShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ )
+{
+    // currently this function needs to be overwritten by Writer and Calc only
+    DBG_ASSERT( 0, "function not implemented" );
+    return false;
+}
+
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index e1b37c119f1a..b5a9536b12c5 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -74,6 +74,7 @@
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
 #include <basic/sbx.hxx>
 #include <basic/sbuno.hxx>
 #include <tools/urlobj.hxx>
@@ -2731,6 +2732,24 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
                     uno::Reference< uno::XInterface >() );
         }
 
+        sal_uInt32 nModifyPasswordHash = 0;
+        uno::Sequence< beans::PropertyValue > aModifyPasswordInfo;
+        SFX_ITEMSET_ARG( aParams, pModifyPasswordInfoItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, sal_False );
+        if ( pModifyPasswordInfoItem )
+        {
+            // it contains either a simple hash or a set of PropertyValues
+            // TODO/LATER: the sequence of PropertyValue should replace the hash completely in future
+            sal_Int32 nMPHTmp = 0;
+            pModifyPasswordInfoItem->GetValue() >>= nMPHTmp;
+            nModifyPasswordHash = (sal_uInt32)nMPHTmp;
+            pModifyPasswordInfoItem->GetValue() >>= aModifyPasswordInfo;
+        }
+        aParams->ClearItem( SID_MODIFYPASSWORDINFO );
+        sal_uInt32 nOldModifyPasswordHash = m_pData->m_pObjectShell->GetModifyPasswordHash();
+        m_pData->m_pObjectShell->SetModifyPasswordHash( nModifyPasswordHash );
+        uno::Sequence< beans::PropertyValue > aOldModifyPasswordInfo = m_pData->m_pObjectShell->GetModifyPasswordInfo();
+        m_pData->m_pObjectShell->SetModifyPasswordInfo( aModifyPasswordInfo );
+
         // since saving a document modifies its DocumentInfo, the current
         // DocumentInfo must be saved on "SaveTo", so it can be restored
         // after saving
@@ -2809,10 +2828,15 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
             if ( !bSaveTo )
             {
                 m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl();
+                m_pData->m_pObjectShell->SetModifyPasswordEntered();
+
                 SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEASDOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVEASDOCDONE), m_pData->m_pObjectShell ) );
             }
             else
             {
+                m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash );
+                m_pData->m_pObjectShell->SetModifyPasswordInfo( aOldModifyPasswordInfo );
+
                 SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVETODOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVETODOCDONE), m_pData->m_pObjectShell ) );
             }
         }
@@ -2822,6 +2846,10 @@ void SfxBaseModel::impl_store(  const   ::rtl::OUString&                   sURL
             m_pData->m_pObjectShell->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Storing failed!" ) ) );
             m_pData->m_pObjectShell->StoreLog();
 
+            m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash );
+            m_pData->m_pObjectShell->SetModifyPasswordInfo( aOldModifyPasswordInfo );
+
+
             SFX_APP()->NotifyEvent( SfxEventHint( bSaveTo ? SFX_EVENT_SAVETODOCFAILED : SFX_EVENT_SAVEASDOCFAILED, GlobalEventConfig::GetEventName( bSaveTo ? STR_EVENT_SAVETODOCFAILED : STR_EVENT_SAVEASDOCFAILED),
                                                     m_pData->m_pObjectShell ) );