impress193: rebase m84

42 files changed, 1665 insertions, 351 deletions

diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
index e39c92c599ae..16f332480cf6 100644
--- a/sfx2/inc/brokenpackageint.hxx
+++ b/sfx2/inc/brokenpackageint.hxx
@@ -36,7 +36,9 @@ using namespace ::framework;
 typedef ContinuationBase< ::com::sun::star::task::XInteractionApprove > SfxContinuationApprove;
 typedef ContinuationBase< ::com::sun::star::task::XInteractionDisapprove > SfxContinuationDisapprove;
 
-class SFX2_DLLPUBLIC RequestPackageReparation : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class SFX2_DLLPUBLIC RequestPackageReparation :
+        public ::com::sun::star::task::XInteractionRequest,
+        public ::cppu::OWeakObject
 {
     ::com::sun::star::uno::Any m_aRequest;
 
@@ -50,6 +52,11 @@ class SFX2_DLLPUBLIC RequestPackageReparation : public ::cppu::WeakImplHelper1<
 public:
     RequestPackageReparation( ::rtl::OUString aName );
 
+    // XInterface / OWeakObject
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire(  ) throw ();
+    virtual void SAL_CALL release(  ) throw ();
+
     sal_Bool    isApproved() { return m_pApprove->isSelected(); }
 
     virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
@@ -61,7 +68,9 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 };
 
-class SFX2_DLLPUBLIC NotifyBrokenPackage : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest >
+class SFX2_DLLPUBLIC NotifyBrokenPackage :
+    public ::com::sun::star::task::XInteractionRequest,
+    public ::cppu::OWeakObject
 {
     ::com::sun::star::uno::Any m_aRequest;
 
@@ -74,6 +83,11 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage : public ::cppu::WeakImplHelper1< ::com
 public:
     NotifyBrokenPackage( ::rtl::OUString aName );
 
+    // XInterface / OWeakObject
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire(  ) throw ();
+    virtual void SAL_CALL release(  ) throw ();
+
     sal_Bool    isAborted() { return m_pAbort->isSelected(); }
 
     virtual ::com::sun::star::uno::Any SAL_CALL getRequest()
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 8a49fde7b958..980eec04cfa6 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -259,7 +259,7 @@ public:
     void                        ResetLastDir();
 
 //#if 0 // _SOLAR__PRIVATE
-    SAL_DLLPRIVATE static SfxApplication* Is_Impl() { return pApp;}
+    SAL_DLLPRIVATE static SfxApplication* Get() { return pApp;}
     SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
     SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
 
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 074f74cb0e72..e4d3ff023b3b 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -154,6 +154,7 @@ public:
     const SfxFilter *   GetFilter() const { return pFilter; }
     const SfxFilter *   GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const;
     const String&       GetOrigURL() const;
+
     SfxItemSet  *       GetItemSet() const;
     void                SetItemSet(SfxItemSet *pSet);
     void                Close();
@@ -327,6 +328,7 @@ public:
     static sal_Bool CallApproveHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler, ::com::sun::star::uno::Any aRequest, sal_Bool bAllowAbort );
 
     static sal_Bool     SetWritableForUserOnly( const ::rtl::OUString& aURL );
+    static sal_uInt32   CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter );
 };
 
 SV_DECL_IMPL_REF( SfxMedium )
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index b4118272bb88..f024fdb07c06 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <tools/wldcrd.hxx>
 
+// TODO/LATER: The flags should be part of the UNO specification
 #define SFX_FILTER_IMPORT            0x00000001L
 #define SFX_FILTER_EXPORT            0x00000002L
 #define SFX_FILTER_TEMPLATE          0x00000004L
@@ -45,13 +46,13 @@
 #define SFX_FILTER_OWN               0x00000020L
 #define SFX_FILTER_ALIEN             0x00000040L
 #define SFX_FILTER_USESOPTIONS       0x00000080L
-#define SFX_FILTER_NOTINFILEDLG      0x00001000L
-#define SFX_FILTER_NOTINCHOOSER      0x00002000L
 
 #define SFX_FILTER_DEFAULT           0x00000100L
 #define SFX_FILTER_EXECUTABLE        0x00000200L
 #define SFX_FILTER_SUPPORTSSELECTION 0x00000400L
 #define SFX_FILTER_MAPTOAPPPLUG      0x00000800L
+#define SFX_FILTER_NOTINFILEDLG      0x00001000L
+#define SFX_FILTER_NOTINCHOOSER      0x00002000L
 #define SFX_FILTER_ASYNC             0x00004000L
 // Legt Objekt nur an, kein Laden
 #define SFX_FILTER_CREATOR           0x00008000L
@@ -64,6 +65,10 @@
 #define SFX_FILTER_SILENTEXPORT      0x00200000L
 
 #define SFX_FILTER_BROWSERPREFERED   0x00400000L
+
+#define SFX_FILTER_ENCRYPTION        0x01000000L
+#define SFX_FILTER_PASSWORDTOMODIFY  0x02000000L
+
 #define SFX_FILTER_PREFERED          0x10000000L
 
 #define SFX_FILTER_VERSION_NONE      0
@@ -72,20 +77,6 @@
 #include <sfx2/sfxdefs.hxx>
 
 //========================================================================
-
-namespace sfx2 {
-
-/** Returns true if the passed string is the name of a Microsoft Office file
-    format filter supporting export of password protected documents.
-
-    This function is just a hack for #i105076# is fixed and needs to be removed
-    then.
- */
-SFX2_DLLPUBLIC bool CheckMSPasswordCapabilityForExport( const String& rFilterName );
-
-} // namespace sfx2
-
-//========================================================================
 class SfxFilterContainer;
 class SotStorage;
 class SFX2_DLLPUBLIC SfxFilter
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
new file mode 100644
index 000000000000..51f341c5c3c0
--- /dev/null
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SFX_HTMLMODE_HXX_
+#define _SFX_HTMLMODE_HXX_
+
+
+#define HTMLMODE_ON                 0x0001
+#define HTMLMODE_PARA_BORDER        0x0002 /* Absatzumrandungen */
+#define HTMLMODE_PARA_DISTANCE      0x0004 /* bestimmte Absatzabstaende */
+#define HTMLMODE_SMALL_CAPS         0x0008 /* Kapitaelchen */
+#define HTMLMODE_FRM_COLUMNS        0x0010 /* spaltige Rahmen */
+#define HTMLMODE_SOME_STYLES        0x0020 /* mind. MS IE */
+#define HTMLMODE_FULL_STYLES        0x0040 /* == SW */
+#define HTMLMODE_BLINK              0x0080 /* blinkende Zeichen*/
+#define HTMLMODE_PARA_BLOCK         0x0100 /* Blocksatz */
+#define HTMLMODE_DROPCAPS           0x0200 /* Initialen*/
+#define HTMLMODE_FIRSTLINE          0x0400 /* Erstzeileneinzug mit Spacer == NS 3.0 */
+#define HTMLMODE_GRAPH_POS          0x0800 /* Grafikpositionen Hintergrund */
+#define HTMLMODE_FULL_ABS_POS       0x1000 /* abs. Rahmenpositionierung */
+#define HTMLMODE_SOME_ABS_POS       0x2000 /* abs. Rahmenpositionierung vollst.*/
+#define HTMLMODE_RESERVED1          0x4000
+#define HTMLMODE_RESERVED0          0x8000
+
+
+#endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index d514235cbfa2..63eb9e8c876f 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -286,6 +286,7 @@ public:
     sal_Bool                    HasName() const { return bHasName; }
     virtual String              GetAPIName() const;
     void                        SetHasName( sal_Bool bSet = sal_True ) { bHasName = bSet; }
+    void                        SetReadOnly();
     sal_Bool                    IsReadOnly() const;
     sal_Bool                    IsReadOnlyMedium() const;
     void                        SetReadOnlyUI( sal_Bool bReadOnly = sal_True );
@@ -438,6 +439,13 @@ public:
     void                                            SetSaveVersionOnClose( sal_Bool bSet );
     void                                              ResetFromTemplate( const String& rTemplateName, const String& rFileName );
 
+    // TODO/LATER: the following two methods should be replaced by Get/SetModifPasswordInfo in future
+    sal_uInt32                  GetModifyPasswordHash() const;
+    sal_Bool                    SetModifyPasswordHash( sal_uInt32 nHash );
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetModifyPasswordInfo() const;
+    sal_Bool                    SetModifyPasswordInfo( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
+
     static sal_uInt32           HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
 
     virtual void                ViewAssigned();
@@ -685,6 +693,15 @@ public:
                                sal_Int32 nVersion,
                                sal_Bool bTemplate = sal_False) const = 0;
 
+    // change recording and respective passwword protection for Writer and Calc
+    // slots available for Writer:  FN_REDLINE_ON, FN_REDLINE_ON
+    // slots used for Calc:         FID_CHG_RECORD, SID_CHG_PROTECT
+    virtual bool    IsChangeRecording() const;
+    virtual bool    HasChangeRecordProtection() const;
+    virtual void    SetChangeRecording( bool bActivate );
+    virtual bool    SetProtectionPassword( const String &rPassword );
+    virtual bool    GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
+
     // =================================
 
 //#if 0 // _SOLAR__PRIVATE
@@ -713,6 +730,8 @@ public:
     SAL_DLLPRIVATE sal_uInt16 ImplCheckSignaturesInformation(
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >& aInfos );
     SAL_DLLPRIVATE void CheckEncryption_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
+    SAL_DLLPRIVATE void SetModifyPasswordEntered( sal_Bool bEntered = sal_True );
+    SAL_DLLPRIVATE sal_Bool IsModifyPasswordEntered();
 
     SAL_DLLPRIVATE void InitBasicManager_Impl();
     SAL_DLLPRIVATE SfxObjectShell_Impl* Get_Impl() { return pImp; }
diff --git a/sfx2/inc/sfx2/securitypage.hxx b/sfx2/inc/sfx2/securitypage.hxx
new file mode 100644
index 000000000000..d25f0ee0b967
--- /dev/null
+++ b/sfx2/inc/sfx2/securitypage.hxx
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SECURITYPAGE_HXX_
+#define _SECURITYPAGE_HXX_
+
+#include "sfx2/tabdlg.hxx"
+#include "sfx2/htmlmode.hxx"
+
+#include <memory>
+
+
+//////////////////////////////////////////////////////////////////////
+
+struct SfxSecurityPage_Impl;
+
+class SfxSecurityPage : public SfxTabPage
+{
+    std::auto_ptr< SfxSecurityPage_Impl > m_pImpl;
+
+protected:
+    SfxSecurityPage( Window* pParent, const SfxItemSet& );
+    virtual ~SfxSecurityPage();
+
+    virtual BOOL            FillItemSet( SfxItemSet& );
+    virtual void            Reset( const SfxItemSet& );
+
+public:
+    static SfxTabPage*  Create( Window* pParent, const SfxItemSet& );
+};
+
+//////////////////////////////////////////////////////////////////////
+
+#endif // #ifndef _SECURITYPAGE_HXX_
+
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 917bd75e4138..a49b003b5b49 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -229,10 +229,15 @@
 #define TP_DOCINFOUSER                      (RID_SFX_START+5)
 #define TP_DOCINFORELOAD                    (RID_SFX_START+13)
 #define TP_CUSTOMPROPERTIES                 (RID_SFX_START+14)
+#define TP_DOCINFOSECURITY                  (RID_SFX_START+215)
 #define DLG_DOCINFO_EDT                     (RID_SFX_START+6)
 #define TP_MANAGE_STYLES                    (RID_SFX_START+7)
 #define DLG_STYLE_DESIGNER                  (RID_SFX_START+8)
 
+#define RID_SFX_PROTECT_RECORDS             (RID_SFX_START+216)
+#define RID_SFX_UNPROTECT_RECORDS           (RID_SFX_START+217)
+#define RID_SFX_INCORRECT_PASSWORD          (RID_SFX_START+218)
+
 #define STR_STYLE_FILTER_AUTO               (RID_SFX_START+9)
 #define STR_STYLE_FILTER_USED               (RID_SFX_START+10)
 #define STR_STYLE_FILTER_USERDEF            (RID_SFX_START+11)
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 275e5c06a7be..26e1991c24b8 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -155,6 +155,7 @@
 #define SID_RELOAD                          (SID_SFX_START + 508)
 #define SID_PRINTDOCDIRECT                  (SID_SFX_START + 509)
 #define SID_PICKLIST                        (SID_SFX_START + 510)
+#define SID_ATTR_XWINDOW                    (SID_SFX_START + 777)
 #define SID_PLUGIN_MODE                     (SID_SFX_START + 827)
 #define SID_EXPORTDOC                       (SID_SFX_START + 829)
 #define SID_EXPORTDOCASPDF                  (SID_SFX_START + 1673)
@@ -306,7 +307,9 @@
 #define SID_ACTIVATE_STYLE_APPLY            (SID_SFX_START + 1715)
 #define SID_FONT_NAME                       (SID_SFX_START + 1716)
 #define SID_DEFAULTFILENAME                 (SID_SFX_START + 1717)
-#define SID_SFX_free_START                  (SID_SFX_START + 1718)
+#define SID_MODIFYPASSWORDINFO              (SID_SFX_START + 1718)
+#define SID_RECOMMENDREADONLY               (SID_SFX_START + 1719)
+#define SID_SFX_free_START                  (SID_SFX_START + 1720)
 #define SID_SFX_free_END                    (SID_SFX_START + 3999)
 
 #define SID_OPEN_NEW_VIEW                   (SID_SFX_START + 520)
@@ -1002,5 +1005,30 @@
 
 #endif  // #ifndef _SFXSIDS_HRC
 
+//-----------------------------------------------------------------------
+// SfxSecurityPage related stuff
+
+#define FN_EDIT2                (SID_SW_START + 1800)
+#define FN_REDLINE_PROTECT      (FN_EDIT2 + 23)
+#define FN_REDLINE_ON           (FN_EDIT2 + 25)
+
+#define SID_HTML_MODE           (SID_SVX_START + 414)
+
+// Calc-Id's used for SfxSecurityPage
+#ifndef SC_FUNCTION_START
+#define SC_FUNCTION_START       (SID_SC_START + 200)
+#endif
+#ifndef FILE_MENU_END
+#define FILE_MENU_END           (SC_FUNCTION_START + 20)
+#endif
+#ifndef EDIT_MENU_START
+#define EDIT_MENU_START         (FILE_MENU_END)
+#endif
+#ifndef SC_VIEW_START
+#define SC_VIEW_START           (SID_SC_START)
+#endif
+#define FID_CHG_RECORD          (EDIT_MENU_START + 18)
+#define SID_CHG_PROTECT         (SC_VIEW_START + 84)
+
 // eof ------------------------------------------------------------------------
 
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index e4e43c51052f..8ca8645a05ff 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3594,6 +3594,34 @@ SfxVoidItem MacroOrganizer SID_MACROORGANIZER
 ]
 
 //--------------------------------------------------------------------------
+SfxBoolItem ReccomendReadonly SID_RECOMMENDREADONLY
+
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = FALSE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = TRUE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    Readonly = TRUE,
+
+    /* config: */
+    AccelConfig = FALSE,
+    MenuConfig = FALSE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = FALSE,
+    GroupId = ;
+]
+
+
+//--------------------------------------------------------------------------
 SfxVoidItem RunMacro SID_RUNMACRO
 ()
 [
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index a07623df46b1..38ea69280c49 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -89,7 +89,7 @@ void SfxBasicManagerCreationListener::onBasicManagerCreated( const Reference< XM
         m_rAppData.OnApplicationBasicManagerCreated( _rBasicManager );
 }
 
-SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
+SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) :
         pDdeService( 0 ),
         pDocTopics( 0 ),
         pTriggerTopic(0),
@@ -116,8 +116,7 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) :
         nRescheduleLocks(0),
         nInReschedule(0),
         nAsynchronCalls(0),
-        m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(
-                               *pApp, comphelper::getProcessServiceFactory()))
+        m_xImeStatusWindow(new sfx2::appl::ImeStatusWindow(comphelper::getProcessServiceFactory()))
     , pTbxCtrlFac(0)
     , pStbCtrlFac(0)
     , pViewFrames(0)
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index 020f68d01e8d..cf097b900b52 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -93,9 +93,6 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] =
 
 //===================================================================
 
-typedef Link* LinkPtr;
-SV_DECL_PTRARR(SfxInitLinkList, LinkPtr, 4, 4)
-
 TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 4da32cf9f566..d615d90ff37a 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -74,57 +74,11 @@
 
 using ::basic::BasicManagerRepository;
 
-#ifdef DBG_UTIL
-DECLARE_LIST( SfxFrameWindowFactoryArray_Impl, SfxFrameWindowFactory* )
-SV_DECL_PTRARR(SfxInitLinkList, Link*, 2, 2)
-#endif
-
 //===================================================================
 BOOL SfxApplication::QueryExit_Impl()
 {
     BOOL bQuit = TRUE;
 
-/*
-    BOOL bPrinting = FALSE;
-    for ( SfxViewShell *pViewSh = SfxViewShell::GetFirst();
-          !bPrinting && pViewSh;
-          pViewSh = SfxViewShell::GetNext(*pViewSh) )
-    {
-        SfxPrinter *pPrinter = pViewSh->GetPrinter();
-        bPrinting = pPrinter && pPrinter->IsPrinting();
-    }
-
-    if ( bPrinting )
-    {
-        // Benutzer fragen, ob abgebrochen werden soll
-        if ( RET_OK == QueryBox( 0, SfxResId( MSG_ISPRINTING_QUERYABORT ) ).Execute() )
-        {
-            // alle Jobs canceln
-            for ( SfxViewShell *pViewSh = SfxViewShell::GetFirst();
-                  !bPrinting && pViewSh;
-                  pViewSh = SfxViewShell::GetNext(*pViewSh) )
-            {
-                SfxPrinter *pPrinter = pViewSh->GetPrinter();
-                if ( pPrinter && pPrinter->IsPrinting() )
-                    pPrinter->AbortJob();
-            }
-
-            // da das Canceln asynchron ist, Quit erstmal wieder verlassen
-            GetDispatcher_Impl()->Execute( SID_QUITAPP, SFX_CALLMODE_ASYNCHRON );
-            DBG_TRACE( "QueryExit => FALSE (printing)" );
-            return FALSE;
-        }
-    }
-*/
-/*
-    SfxObjectShell *pLastDocSh = SfxObjectShell::GetFirst();
-    if ( bQuit )
-    {
-        // Jetzt zur Sicherheit auch hidden Frames abr"aumen
-        SfxViewFrame::CloseHiddenFrames_Impl();
-        pLastDocSh = SfxObjectShell::GetFirst();
-    }
-*/
     // will trotzdem noch jemand, den man nicht abschiessen kann, die App haben?
     if ( !bQuit )
     {
@@ -197,22 +151,18 @@ void SfxApplication::Deinitialize()
 
     delete pAppData_Impl->pLabelResMgr;
 
-#ifdef DBG_UTIL
     DELETEX(pAppData_Impl->pSlotPool);
     DELETEX(pAppData_Impl->pEventConfig);
     SfxMacroConfig::Release_Impl();
     DELETEX(pAppData_Impl->pFactArr);
     DELETEX(pAppData_Impl->pInitLinkList);
-#endif
 
-#ifdef DBG_UTIL
     DELETEX(pAppData_Impl->pTbxCtrlFac);
     DELETEX(pAppData_Impl->pStbCtrlFac);
     DELETEX(pAppData_Impl->pMenuCtrlFac);
     DELETEX(pAppData_Impl->pViewFrames);
     DELETEX(pAppData_Impl->pViewShells);
     DELETEX(pAppData_Impl->pObjShells);
-#endif
 
     //TODO/CLEANTUP
     //ReleaseArgs could be used instead!
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 14789100bb24..bd9efc9bca1e 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -51,20 +51,15 @@
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/system/SystemShellExecuteException.hpp>
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
 #include <comphelper/processfactory.hxx>
-#endif
 #include <comphelper/storagehelper.hxx>
+#include "comphelper/configurationhelper.hxx"
 
-#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_
 #include <svtools/addresstemplate.hxx>
-#endif
 #include <svl/visitem.hxx>
 #include <unotools/intlwrapper.hxx>
 
-#ifndef _UNOTOOLS_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
-#endif
 #include <tools/config.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
@@ -90,6 +85,7 @@
 #include <vos/process.hxx>
 #include <rtl/bootstrap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/script/provider/XScriptProviderFactory.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
@@ -879,6 +875,31 @@ namespace
     }
 }
 
+static ::rtl::OUString getConfigurationStringValue(
+    const ::rtl::OUString& rPackage,
+    const ::rtl::OUString& rRelPath,
+    const ::rtl::OUString& rKey,
+    const ::rtl::OUString& rDefaultValue )
+{
+    ::rtl::OUString aDefVal( rDefaultValue );
+
+    try
+    {
+        ::comphelper::ConfigurationHelper::readDirectKey(
+            comphelper::getProcessServiceFactory(),
+            rPackage,
+            rRelPath,
+            rKey,
+            ::comphelper::ConfigurationHelper::E_READONLY) >>= aDefVal;
+    }
+    catch(const com::sun::star::uno::RuntimeException& exRun)
+    { throw exRun; }
+    catch(const com::sun::star::uno::Exception&)
+    {}
+
+    return aDefVal;
+}
+
 void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
 {
     DBG_MEMTEST();
@@ -924,8 +945,34 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
                 uno::Reference< css::system::XSystemShellExecute > xSystemShell(
                     xSMGR->createInstance( DEFINE_CONST_UNICODE("com.sun.star.system.SystemShellExecute" ) ),
                     uno::UNO_QUERY_THROW );
-                if ( xSystemShell.is() )
-                    xSystemShell->execute( DEFINE_CONST_UNICODE("http://extensions.services.openoffice.org/dictionary?cid=926385"), ::rtl::OUString(), css::system::SystemShellExecuteFlags::DEFAULTS );
+
+                // read repository URL from configuration
+                ::rtl::OUString sTemplRepoURL =
+                    getConfigurationStringValue(
+                        ::rtl::OUString::createFromAscii("org.openoffice.Office.Common"),
+                        ::rtl::OUString::createFromAscii("Dictionaries"),
+                        ::rtl::OUString::createFromAscii("RepositoryURL"),
+                        ::rtl::OUString());
+
+                if ( xSystemShell.is() && sTemplRepoURL.getLength() > 0 )
+                {
+                    ::rtl::OUStringBuffer aURLBuf( sTemplRepoURL );
+                    aURLBuf.appendAscii( "?" );
+                    aURLBuf.appendAscii( "lang=" );
+
+                    // read locale from configuration
+                    ::rtl::OUString sLocale = getConfigurationStringValue(
+                        ::rtl::OUString::createFromAscii("org.openoffice.Setup"),
+                        ::rtl::OUString::createFromAscii("L10N"),
+                        ::rtl::OUString::createFromAscii("ooLocale"),
+                        ::rtl::OUString::createFromAscii("en-US"));
+
+                    aURLBuf.append( sLocale );
+                    xSystemShell->execute(
+                        aURLBuf.makeStringAndClear(),
+                        ::rtl::OUString(),
+                        css::system::SystemShellExecuteFlags::DEFAULTS );
+                }
             }
             catch( const ::com::sun::star::uno::Exception& )
             {
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index fd33e21ea645..6f9d3b258745 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -191,6 +191,7 @@ static char const sFolderName[] = "FolderName";
 static char const sUseSystemDialog[] = "UseSystemDialog";
 static char const sStandardDir[] = "StandardDir";
 static char const sBlackList[] = "BlackList";
+static char const sModifyPasswordInfo[] = "ModifyPasswordInfo";
 
 void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs, SfxAllItemSet& rSet, const SfxSlot* pSlot )
 {
@@ -846,6 +847,10 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) );
                 }
+                else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(sModifyPasswordInfo)) )
+                {
+                    rSet.Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, rProp.Value ) );
+                }
 #ifdef DBG_UTIL
                 else
                     --nFoundArgs;
@@ -1058,6 +1063,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 nAdditional++;
             if ( rSet.GetItemState( SID_NOAUTOSAVE ) == SFX_ITEM_SET )
                 nAdditional++;
+            if ( rSet.GetItemState( SID_MODIFYPASSWORDINFO ) == SFX_ITEM_SET )
+                nAdditional++;
 
             // consider additional arguments
             nProps += nAdditional;
@@ -1197,7 +1204,9 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                     // used only internally
                     if ( nId == SID_SAVETO )
                         continue;
-                }
+                     if ( nId == SID_MODIFYPASSWORDINFO )
+                        continue;
+               }
 
                 ByteString aDbg( "Unknown item detected: ");
                 aDbg += ByteString::CreateFromInt32( nId );
@@ -1555,7 +1564,11 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
                 pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sNoAutoSave));
                 pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() );
             }
-
+            if ( rSet.GetItemState( SID_MODIFYPASSWORDINFO, sal_False, &pItem ) == SFX_ITEM_SET )
+            {
+                pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sModifyPasswordInfo));
+                pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() );
+            }
         }
     }
 
@@ -2411,6 +2424,26 @@ RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName )
        m_lContinuations[1] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pDisapprove );
 }
 
+/*uno::*/Any SAL_CALL RequestPackageReparation::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+{
+    return ::cppu::queryInterface ( rType,
+            // OWeakObject interfaces
+            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
+            static_cast< XWeak* > ( this ),
+            // my own interfaces
+            static_cast< XInteractionRequest*  > ( this ) );
+}
+
+void SAL_CALL RequestPackageReparation::acquire(  ) throw ()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL RequestPackageReparation::release(  ) throw ()
+{
+    OWeakObject::release();
+}
+
 ::com::sun::star::uno::Any SAL_CALL RequestPackageReparation::getRequest()
         throw( ::com::sun::star::uno::RuntimeException )
 {
@@ -2442,6 +2475,26 @@ NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName )
        m_lContinuations[0] = ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation >( m_pAbort  );
 }
 
+/*uno::*/Any SAL_CALL NotifyBrokenPackage::queryInterface( const /*uno::*/Type& rType ) throw (RuntimeException)
+{
+    return ::cppu::queryInterface ( rType,
+            // OWeakObject interfaces
+            dynamic_cast< XInterface* > ( (XInteractionRequest *) this ),
+            static_cast< XWeak* > ( this ),
+            // my own interfaces
+            static_cast< XInteractionRequest*  > ( this ) );
+}
+
+void SAL_CALL NotifyBrokenPackage::acquire(  ) throw ()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL NotifyBrokenPackage::release(  ) throw ()
+{
+    OWeakObject::release();
+}
+
 ::com::sun::star::uno::Any SAL_CALL NotifyBrokenPackage::getRequest()
         throw( ::com::sun::star::uno::RuntimeException )
 {
diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx
index 3cdc3064fb81..07eb47bd92ad 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -57,10 +57,8 @@ namespace css = com::sun::star;
 using sfx2::appl::ImeStatusWindow;
 
 ImeStatusWindow::ImeStatusWindow(
-    SfxApplication & rApplication,
     css::uno::Reference< css::lang::XMultiServiceFactory > const &
         rServiceFactory):
-    m_rApplication(rApplication),
     m_xServiceFactory(rServiceFactory),
     m_bDisposed(false)
 {}
@@ -161,7 +159,9 @@ ImeStatusWindow::propertyChange(css::beans::PropertyChangeEvent const & )
     throw (css::uno::RuntimeException)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
-    m_rApplication.Invalidate(SID_SHOW_IME_STATUS_WINDOW);
+    SfxApplication* pApp = SfxApplication::Get();
+    if (pApp)
+    pApp->Invalidate(SID_SHOW_IME_STATUS_WINDOW);
 }
 
 css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 71c0b371f796..4edba523ed30 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -37,7 +37,6 @@ namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
     namespace lang { class XMultiServiceFactory; }
 } } }
-class SfxApplication;
 
 namespace sfx2 { namespace appl {
 
@@ -56,10 +55,7 @@ ImeStatusWindow_Impl;
 class ImeStatusWindow: private ImeStatusWindow_Impl
 {
 public:
-    ImeStatusWindow(SfxApplication & rApplication,
-                    com::sun::star::uno::Reference<
-                            com::sun::star::lang::XMultiServiceFactory > const &
-                        rServiceFactory);
+    ImeStatusWindow( com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > const& rServiceFactory );
 
     /** Set up VCL according to the configuration.
 
@@ -115,7 +111,6 @@ private:
     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >
     getConfig();
 
-    SfxApplication & m_rApplication;
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
         m_xServiceFactory;
 
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 649ae121c274..3af0ba2b0a6f 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -706,7 +706,7 @@ SfxProgress* SfxProgress::GetActiveProgress
 */
 
 {
-    if ( !SfxApplication::Is_Impl() )
+    if ( !SfxApplication::Get() )
         return 0;
 
     SfxProgress *pProgress = 0;
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 6132e958b900..8a4b434f460b 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -62,11 +62,7 @@ sal_Char __FAR_DATA sHTML_MIME_application[] = "application/";
 sal_Char __FAR_DATA sHTML_MIME_experimental[] = "x-";
 
 // <INPUT TYPE=xxx>
-#ifdef __MINGW32__ // for runtime pseudo reloc
-static HTMLOptionEnum aAreaShapeOptEnums[] =
-#else
 static HTMLOptionEnum __READONLY_DATA aAreaShapeOptEnums[] =
-#endif
 {
     { OOO_STRING_SVTOOLS_HTML_SH_rect,      IMAP_OBJ_RECTANGLE  },
     { OOO_STRING_SVTOOLS_HTML_SH_rectangle, IMAP_OBJ_RECTANGLE  },
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d2ad8c645eb7..e53f1766b7b9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -823,7 +823,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                 pItem = pDispatcher->Execute( GetId(), nCall, 0, &aInternalSet, nModifier );
 
             // no bindings, no invalidate ( usually done in SfxDispatcher::Call_Impl()! )
-            if ( SfxApplication::Is_Impl() )
+            if ( SfxApplication::Get() )
             {
                 SfxDispatcher* pAppDispat = SFX_APP()->GetAppDispatcher_Impl();
                 if ( pAppDispat )
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index 4635733b934d..fab379f9f215 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -172,20 +172,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
     rtl::OUString sProduct;
     utl::ConfigManager::GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME) >>= sProduct;
 
-    if ( sProduct.equals( rtl::OUString::createFromAscii("StarOffice") ) ||
-         sProduct.equals( rtl::OUString::createFromAscii("StarSuite") ) )
-    {
-        // --> PB 2004-11-18 #118455# new copyright text (only in french version show a french text)
-        ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
-        ::rtl::OUString sFrenchLang( DEFINE_CONST_OUSTRING( "fr" ) );
-        if ( aLocale.Language.equals( sFrenchLang ) )
-        {
-            String sNewCopyrightText( ResId( ABOUT_STR_FRENCH_COPYRIGHT, *rId.GetResMgr() ) );
-            aCopyrightText.SetText( sNewCopyrightText );
-        }
-        // <--
-    }
-
     // load image from module path
     aAppLogo = SfxApplication::GetApplicationLogo();
 
@@ -299,22 +285,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
 
     // explizite Help-Id
     SetHelpId( SID_ABOUT );
-
-    //#112429# replace occurences of "StarOffice" in the "StarSuite" version
-    String sCopyright( aCopyrightText.GetText() );
-    if(sProduct.equals(rtl::OUString::createFromAscii("StarSuite")))
-    {
-        String sSO(String::CreateFromAscii("StarOffice"));
-        sCopyright.SearchAndReplaceAll(sSO, sProduct);
-    }
-
-    String sNewYear( DEFINE_CONST_UNICODE("2005") );
-    xub_StrLen nIdx = sCopyright.SearchAndReplace( DEFINE_CONST_UNICODE("2002"), sNewYear );
-    if ( STRING_NOTFOUND == nIdx )
-        nIdx = sCopyright.SearchAndReplace( DEFINE_CONST_UNICODE("2003"), sNewYear );
-    if ( STRING_NOTFOUND == nIdx )
-        nIdx = sCopyright.SearchAndReplace( DEFINE_CONST_UNICODE("2004"), sNewYear );
-    aCopyrightText.SetText( sCopyright );
 }
 
 // -----------------------------------------------------------------------
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 45ebfeac69f9..0ad62ae1eec1 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -27,6 +27,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sfx2.hxx"
+
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
@@ -59,7 +60,8 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <vcl/timer.hxx>
-#include <sfx2/dinfdlg.hxx>
+#include "sfx2/dinfdlg.hxx"
+#include "sfx2/securitypage.hxx"
 #include "sfxresid.hxx"
 #include "dinfedt.hxx"
 #include <sfx2/frame.hxx>
@@ -1564,6 +1566,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
     AddTabPage(TP_DOCINFODOC, SfxDocumentPage::Create, 0);
     AddTabPage(TP_CUSTOMPROPERTIES, SfxCustomPropertiesPage::Create, 0);
     AddTabPage(TP_DOCINFORELOAD, SfxInternetPage::Create, 0);
+    AddTabPage(TP_DOCINFOSECURITY, SfxSecurityPage::Create, 0);
 }
 
 // -----------------------------------------------------------------------
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 99a062c4aecf..53b0f35685cb 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -27,11 +27,11 @@
 
  // include ---------------------------------------------------------------
 
-#include <sfx2/sfx.hrc>
+#include "sfx2/sfx.hrc"
 #include "helpid.hrc"
 #include "sfxlocal.hrc"
 #include "dinfdlg.hrc"
-#include <dialog.hrc>
+#include "dialog.hrc"
 
  // TP_DOCINFODESC --------------------------------------------------------
 String STR_SFX_NEWOFFICEDOC
@@ -685,8 +685,6 @@ QueryBox SFX_QB_WRONG_TYPE
     Message [ en-US ] = "The value entered does not match the specified type.\nThe value will be stored as text." ;
 };
 
- // SID_DOCINFO -----------------------------------------------------------
-
 TabDialog SID_DOCINFO
 {
     OutputSize = TRUE ;
@@ -718,6 +716,11 @@ TabDialog SID_DOCINFO
                 Identifier = TP_DOCINFORELOAD ;
                 Text [ en-US ] = "Internet" ;
             };
+            PageItem
+            {
+                Identifier = TP_DOCINFOSECURITY ;
+                Text [ en-US ] = "Security" ;
+            };
         };
     };
 };
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 7d177d0bbfd8..b0890a3ee781 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -81,11 +81,13 @@
 #include <svtools/helpid.hrc>
 #include <svl/pickerhelper.hxx>
 #include <comphelper/docpasswordrequest.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/frame.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfac.hxx>
 #include "openflag.hxx"
@@ -465,31 +467,6 @@ sal_Bool FileDialogHelper_Impl::isInOpenMode() const
 
 // ------------------------------------------------------------------------
 
-namespace {
-
-bool lclCheckODFPasswordCapability( const SfxFilter* pFilter )
-{
-    return pFilter && pFilter->IsOwnFormat() && pFilter->UsesStorage() && (pFilter->GetVersion() >= SOFFICE_FILEFORMAT_60);
-}
-
-bool lclCheckMSPasswordCapability( const SfxFilter* pFilter )
-{
-    // TODO #i105076# this should be in the filter configuration!!!
-    return pFilter && CheckMSPasswordCapabilityForExport( pFilter->GetFilterName() );
-}
-
-bool lclCheckPasswordCapability( const SfxFilter* pFilter )
-{
-    return
-        lclCheckODFPasswordCapability( pFilter ) ||
-        // TODO #i105076# this should be in the filter configuration!!!
-        lclCheckMSPasswordCapability( pFilter );
-}
-
-}
-
-// ------------------------------------------------------------------------
-
 void FileDialogHelper_Impl::updateFilterOptionsBox()
 {
     if ( !m_bHaveFilterOptions )
@@ -546,10 +523,30 @@ void FileDialogHelper_Impl::updateSelectionBox()
     if ( !mbHasSelectionBox )
         return;
 
-    const SfxFilter* pFilter = getCurentSfxFilter();
-    mbSelectionFltrEnabled = updateExtendedControl(
-        ExtendedFilePickerElementIds::CHECKBOX_SELECTION,
-        ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) );
+    // Does the selection box exist?
+    sal_Bool bSelectionBoxFound = sal_False;
+    uno::Reference< XControlInformation > xCtrlInfo( mxFileDlg, UNO_QUERY );
+    if ( xCtrlInfo.is() )
+    {
+        Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls();
+        sal_uInt32 nCount = aCtrlList.getLength();
+        for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl )
+            if ( aCtrlList[ nCtrl ].equalsAscii("SelectionBox") )
+            {
+                bSelectionBoxFound = sal_False;
+                break;
+            }
+    }
+
+    if ( bSelectionBoxFound )
+    {
+        const SfxFilter* pFilter = getCurentSfxFilter();
+        mbSelectionFltrEnabled = updateExtendedControl(
+            ExtendedFilePickerElementIds::CHECKBOX_SELECTION,
+            ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) );
+        uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY );
+        xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( (sal_Bool)mbSelection ) );
+    }
 }
 
 // ------------------------------------------------------------------------
@@ -560,9 +557,10 @@ void FileDialogHelper_Impl::enablePasswordBox( sal_Bool bInit )
 
     sal_Bool bWasEnabled = mbIsPwdEnabled;
 
+    const SfxFilter* pCurrentFilter = getCurentSfxFilter();
     mbIsPwdEnabled = updateExtendedControl(
         ExtendedFilePickerElementIds::CHECKBOX_PASSWORD,
-        lclCheckPasswordCapability( getCurentSfxFilter() )
+        pCurrentFilter && ( pCurrentFilter->GetFilterFlags() & SFX_FILTER_ENCRYPTION )
     );
 
     if( bInit )
@@ -1534,6 +1532,10 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
         {
             SFX_ITEMSET_ARG( rpSet, pPassItem, SfxStringItem, SID_PASSWORD, FALSE );
             mbPwdCheckBoxState = ( pPassItem != NULL );
+
+            // in case the document has password to modify, the dialog should be shown
+            SFX_ITEMSET_ARG( rpSet, pPassToModifyItem, SfxUnoAnyItem, SID_MODIFYPASSWORDINFO, FALSE );
+            mbPwdCheckBoxState |= ( pPassToModifyItem && pPassToModifyItem->GetValue().hasValue() );
         }
 
         SFX_ITEMSET_ARG( rpSet, pSelectItem, SfxBoolItem, SID_SELECTION, FALSE );
@@ -1544,6 +1546,9 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
 
         // the password will be set in case user decide so
         rpSet->ClearItem( SID_PASSWORD );
+        rpSet->ClearItem( SID_RECOMMENDREADONLY );
+        rpSet->ClearItem( SID_MODIFYPASSWORDINFO );
+
     }
 
     if ( mbHasPassword && !mbPwdCheckBoxState )
@@ -1620,13 +1625,15 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
         // set the filter
         getRealFilter( rFilter );
 
+        const SfxFilter* pCurrentFilter = getCurentSfxFilter();
+
         // fill the rpURLList
-        implGetAndCacheFiles(mxFileDlg, rpURLList, getCurentSfxFilter());
+        implGetAndCacheFiles( mxFileDlg, rpURLList, pCurrentFilter );
         if ( rpURLList == NULL || rpURLList->GetObject(0) == NULL )
             return ERRCODE_ABORT;
 
         // check, wether or not we have to display a password box
-        if ( mbHasPassword && mbIsPwdEnabled && xCtrlAccess.is() )
+        if ( pCurrentFilter && mbHasPassword && mbIsPwdEnabled && xCtrlAccess.is() )
         {
             try
             {
@@ -1640,18 +1647,38 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList,
                     if( xInteractionHandler.is() )
                     {
                         // TODO: need a save way to distinguish MS filters from other filters
-                        bool bMSType = CheckMSPasswordCapabilityForExport( rFilter );
+                        // for now MS-filters are the only alien filters that support encryption
+                        sal_Bool bMSType = !pCurrentFilter->IsOwnFormat();
                         ::comphelper::DocPasswordRequestType eType = bMSType ?
                             ::comphelper::DocPasswordRequestType_MS :
                             ::comphelper::DocPasswordRequestType_STANDARD;
 
-                        ::comphelper::DocPasswordRequest* pPasswordRequest = new ::comphelper::DocPasswordRequest(
-                            eType, ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, *(rpURLList->GetObject(0)) );
+                        ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( eType, ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE, *(rpURLList->GetObject(0)), ( pCurrentFilter->GetFilterFlags() & SFX_FILTER_PASSWORDTOMODIFY ) != 0 ) );
 
-                        uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest );
+                        uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest.get() );
                         xInteractionHandler->handle( rRequest );
                         if ( pPasswordRequest->isPassword() )
-                            rpSet->Put( SfxStringItem( SID_PASSWORD, pPasswordRequest->getPassword() ) );
+                        {
+                            if ( pPasswordRequest->getPassword().getLength() )
+                                rpSet->Put( SfxStringItem( SID_PASSWORD, pPasswordRequest->getPassword() ) );
+
+                            if ( pPasswordRequest->getRecommendReadOnly() )
+                                rpSet->Put( SfxBoolItem( SID_RECOMMENDREADONLY, sal_True ) );
+
+                            if ( bMSType )
+                            {
+                                // the empty password has 0 as Hash
+                                sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pCurrentFilter->GetServiceName() ) );
+                                if ( nHash )
+                                    rpSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( nHash ) ) );
+                            }
+                            else
+                            {
+                                uno::Sequence< beans::PropertyValue > aModifyPasswordInfo = ::comphelper::DocPasswordHelper::GenerateNewModifyPasswordInfo( pPasswordRequest->getPasswordToModify() );
+                                if ( aModifyPasswordInfo.getLength() )
+                                    rpSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( aModifyPasswordInfo ) ) );
+                            }
+                        }
                         else
                             return ERRCODE_ABORT;
                     }
diff --git a/sfx2/source/dialog/makefile.mk b/sfx2/source/dialog/makefile.mk
index 3d0c53cdb932..4c56cd683e34 100644
--- a/sfx2/source/dialog/makefile.mk
+++ b/sfx2/source/dialog/makefile.mk
@@ -69,6 +69,7 @@ SLOFILES =\
         $(SLO)$/tplcitem.obj		\
         $(SLO)$/tplpitem.obj		\
         $(SLO)$/versdlg.obj         \
+        $(SLO)$/securitypage.obj    \
         $(SLO)$/titledockwin.obj
 
 SRS1NAME=$(TARGET)
@@ -87,6 +88,7 @@ SRC1FILES =\
         versdlg.src			\
         printopt.src        \
         srchdlg.src         \
+        securitypage.src    \
         titledockwin.src    \
         taskpane.src
 
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
new file mode 100644
index 000000000000..d32ee843cbf2
--- /dev/null
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -0,0 +1,523 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sfx2.hxx"
+
+#include "sfx2/securitypage.hxx"
+
+#include "securitypage.hrc"
+#include "sfxresid.hxx"
+
+#include <sfx2/sfx.hrc>
+#include <sfx2/sfxsids.hrc>
+#include <sfx2/objsh.hxx>
+#include <sfx2/viewsh.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/passwd.hxx>
+
+#include <vcl/button.hxx>
+#include <vcl/edit.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/msgbox.hxx>
+#include <svl/eitem.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/intitem.hxx>
+#include <svl/PasswordHelper.hxx>
+#include <svtools/xwindowitem.hxx>
+
+
+using namespace ::com::sun::star;
+
+//////////////////////////////////////////////////////////////////////
+
+
+namespace
+{
+    enum RedliningMode  { RL_NONE, RL_WRITER, RL_CALC };
+    enum RedlineFunc    { RF_ON, RF_PROTECT };
+
+/*
+    bool QueryIsEnabled( USHORT _nSlot )
+    {
+        bool bRes = false;
+        SfxViewShell* pViewSh = SfxViewShell::Current();
+        if (pViewSh)
+        {
+            const SfxPoolItem* pItem;
+            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
+            SfxItemState eState = pDisp->QueryState( _nSlot, pItem );
+            bRes = (eState & SFX_ITEM_DISABLED) == 0;
+        }
+        return bRes;
+    }
+*/
+
+    bool QueryState( USHORT _nSlot, bool& _rValue )
+    {
+        bool bRet = false;
+        SfxViewShell* pViewSh = SfxViewShell::Current();
+        if (pViewSh)
+        {
+            const SfxPoolItem* pItem;
+            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
+            SfxItemState nState = pDisp->QueryState( _nSlot, pItem );
+            bRet = SFX_ITEM_AVAILABLE <= nState;
+            if (bRet)
+                _rValue = ( static_cast< const SfxBoolItem* >( pItem ) )->GetValue();
+        }
+        return bRet;
+    }
+
+
+    bool QueryRecordChangesProtectionState( RedliningMode _eMode, bool& _rValue )
+    {
+        bool bRet = false;
+        if (_eMode != RL_NONE)
+        {
+            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_PROTECT : SID_CHG_PROTECT;
+            bRet = QueryState( nSlot, _rValue );
+        }
+        return bRet;
+    }
+
+
+    bool QueryRecordChangesState( RedliningMode _eMode, bool& _rValue )
+    {
+        bool bRet = false;
+        if (_eMode != RL_NONE)
+        {
+            USHORT nSlot = _eMode == RL_WRITER ? FN_REDLINE_ON : FID_CHG_RECORD;
+            bRet = QueryState( nSlot, _rValue );
+        }
+        return bRet;
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+static short lcl_GetPassword(
+    Window *pParent,
+    bool bProtect,
+    /*out*/String &rPassword )
+{
+    bool bRes = false;
+    SfxPasswordDialog aPasswdDlg( pParent );
+    const String aTitle( SfxResId( bProtect ? RID_SFX_PROTECT_RECORDS : RID_SFX_UNPROTECT_RECORDS ) );
+    aPasswdDlg.SetText( aTitle );
+    aPasswdDlg.SetMinLen( 1 );
+    if (bProtect)
+        aPasswdDlg.ShowExtras( SHOWEXTRAS_CONFIRM );
+    if (RET_OK == aPasswdDlg.Execute() && aPasswdDlg.GetPassword().Len() > 0)
+    {
+        rPassword = aPasswdDlg.GetPassword();
+        bRes = true;
+    }
+    return bRes;
+}
+
+
+static bool lcl_IsPasswordCorrect( const String &rPassword )
+{
+    bool bRes = false;
+
+    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+    uno::Sequence< sal_Int8 >   aPasswordHash;
+    pCurDocShell->GetProtectionHash( aPasswordHash );
+
+    // check if supplied password was correct
+    uno::Sequence< sal_Int8 > aNewPasswd( aPasswordHash );
+    SvPasswordHelper::GetHashPassword( aNewPasswd, rPassword );
+    if (SvPasswordHelper::CompareHashPassword( aPasswordHash, rPassword ))
+        bRes = true;    // password was correct
+    else
+        InfoBox( NULL, String( SfxResId( RID_SFX_INCORRECT_PASSWORD ) ) ).Execute();
+
+    return bRes;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+struct SfxSecurityPage_Impl
+{
+    SfxSecurityPage &   m_rMyTabPage;
+
+    FixedLine           m_aNewPasswordToOpenFL;
+    FixedText           m_aNewPasswordToOpenFT;
+    Edit                m_aNewPasswordToOpenED;
+    FixedText           m_aConfirmPasswordToOpenFT;
+    Edit                m_aConfirmPasswordToOpenED;
+    FixedText           m_aNewPasswordInfoFT;
+
+    FixedLine           m_aNewPasswordToModifyFL;
+    FixedText           m_aNewPasswordToModifyFT;
+    Edit                m_aNewPasswordToModifyED;
+    FixedText           m_aConfirmPasswordToModifyFT;
+    Edit                m_aConfirmPasswordToModifyED;
+
+    FixedLine           m_aOptionsFL;
+    CheckBox            m_aOpenReadonlyCB;
+    CheckBox            m_aRecordChangesCB;         // for record changes
+    PushButton          m_aChangeProtectionPB;      // for record changes
+    String              m_aProtectSTR;              // for record changes
+    String              m_aUnProtectSTR;            // for record changes
+    RedliningMode       m_eRedlingMode;             // for record changes
+
+    bool                m_bOrigPasswordIsConfirmed;
+    bool                m_bNewPasswordIsValid;
+    String              m_aNewPassword;
+
+    String              m_aEndRedliningWarning;
+    bool                m_bEndRedliningWarningDone;
+
+    DECL_LINK( RecordChangesCBToggleHdl, void* );
+    DECL_LINK( ChangeProtectionPBHdl, void* );
+
+    SfxSecurityPage_Impl( SfxSecurityPage &rDlg, const SfxItemSet &rItemSet );
+    ~SfxSecurityPage_Impl();
+
+    BOOL    FillItemSet_Impl( SfxItemSet & );
+    void    Reset_Impl( const SfxItemSet & );
+};
+
+
+SfxSecurityPage_Impl::SfxSecurityPage_Impl( SfxSecurityPage &rTabPage, const SfxItemSet & ) :
+    m_rMyTabPage                    (rTabPage),
+    m_aNewPasswordToOpenFL          (&rTabPage, SfxResId( PASSWORD_TO_OPEN_FL ) ),
+    m_aNewPasswordToOpenFT          (&rTabPage, SfxResId( PASSWORD_TO_OPEN_FT ) ),
+    m_aNewPasswordToOpenED          (&rTabPage, SfxResId( PASSWORD_TO_OPEN_ED ) ),
+    m_aConfirmPasswordToOpenFT      (&rTabPage, SfxResId( CONFIRM_PASSWORD_TO_OPEN_FT ) ),
+    m_aConfirmPasswordToOpenED      (&rTabPage, SfxResId( CONFIRM_PASSWORD_TO_OPEN_ED ) ),
+    m_aNewPasswordInfoFT            (&rTabPage, SfxResId( PASSWORD_INFO_FT ) ),
+    m_aNewPasswordToModifyFL        (&rTabPage, SfxResId( PASSWORD_TO_MODIFY_FL ) ),
+    m_aNewPasswordToModifyFT        (&rTabPage, SfxResId( PASSWORD_TO_MODIFY_FT ) ),
+    m_aNewPasswordToModifyED        (&rTabPage, SfxResId( PASSWORD_TO_MODIFY_ED ) ),
+    m_aConfirmPasswordToModifyFT    (&rTabPage, SfxResId( CONFIRM_PASSWORD_TO_MODIFY_FT ) ),
+    m_aConfirmPasswordToModifyED    (&rTabPage, SfxResId( CONFIRM_PASSWORD_TO_MODIFY_ED ) ),
+    m_aOptionsFL                    (&rTabPage, SfxResId( OPTIONS_FL ) ),
+    m_aOpenReadonlyCB               (&rTabPage, SfxResId( OPEN_READONLY_CB ) ),
+    m_aRecordChangesCB              (&rTabPage, SfxResId( RECORD_CHANGES_CB ) ),
+    m_aChangeProtectionPB           (&rTabPage, SfxResId( CHANGE_PROTECTION_PB ) ),
+    m_aProtectSTR                   ( SfxResId( STR_PROTECT ) ),
+    m_aUnProtectSTR                 ( SfxResId( STR_UNPROTECT ) ),
+    m_eRedlingMode                  ( RL_NONE ),
+    m_bOrigPasswordIsConfirmed      ( false ),
+    m_bNewPasswordIsValid           ( false ),
+    m_aEndRedliningWarning          ( SfxResId( STR_END_REDLINING_WARNING ) ),
+    m_bEndRedliningWarningDone      ( false )
+{
+    m_aChangeProtectionPB.SetText( m_aProtectSTR );
+    // adjust button width if necessary
+    long nBtnTextWidth = 0;
+    long nTemp = m_aChangeProtectionPB.GetCtrlTextWidth( m_aChangeProtectionPB.GetText() );
+    if (nTemp > nBtnTextWidth)
+        nBtnTextWidth = nTemp;
+
+    // force toggle hdl called before visual change of checkbox
+    m_aRecordChangesCB.SetStyle( m_aRecordChangesCB.GetStyle() | WB_EARLYTOGGLE );
+    m_aRecordChangesCB.SetToggleHdl( LINK( this, SfxSecurityPage_Impl, RecordChangesCBToggleHdl ) );
+    m_aChangeProtectionPB.SetClickHdl( LINK( this, SfxSecurityPage_Impl, ChangeProtectionPBHdl ) );
+}
+
+
+SfxSecurityPage_Impl::~SfxSecurityPage_Impl()
+{
+}
+
+
+BOOL SfxSecurityPage_Impl::FillItemSet_Impl( SfxItemSet & )
+{
+    bool bModified = false;
+
+    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+    if (pCurDocShell&& !pCurDocShell->IsReadOnly())
+    {
+        if (m_eRedlingMode != RL_NONE )
+        {
+            const bool bDoRecordChanges     = m_aRecordChangesCB.IsChecked();
+            const bool bDoChangeProtection  = m_aChangeProtectionPB.GetText() != m_aProtectSTR;
+
+            // sanity checks
+            DBG_ASSERT( bDoRecordChanges || !bDoChangeProtection, "no change recording should imply no change protection" );
+            DBG_ASSERT( bDoChangeProtection || !bDoRecordChanges, "no change protection should imply no change recording" );
+            DBG_ASSERT( !bDoChangeProtection || m_aNewPassword.Len() > 0, "change protection should imply password length is > 0" );
+            DBG_ASSERT( bDoChangeProtection || m_aNewPassword.Len() == 0, "no change protection should imply password length is 0" );
+
+            // change recording
+            if (bDoRecordChanges != pCurDocShell->IsChangeRecording())
+            {
+                pCurDocShell->SetChangeRecording( bDoRecordChanges );
+                bModified = true;
+            }
+
+            // change record protection
+            if (m_bNewPasswordIsValid &&
+                bDoChangeProtection != pCurDocShell->HasChangeRecordProtection())
+            {
+                DBG_ASSERT( !bDoChangeProtection || bDoRecordChanges,
+                        "change protection requires record changes to be active!" );
+                pCurDocShell->SetProtectionPassword( m_aNewPassword );
+                bModified = true;
+            }
+        }
+
+        // open read-only?
+        const sal_Bool bDoOpenReadonly = m_aOpenReadonlyCB.IsChecked();
+        if (pCurDocShell->HasSecurityOptOpenReadOnly() &&
+            bDoOpenReadonly != pCurDocShell->IsSecurityOptOpenReadOnly())
+        {
+            pCurDocShell->SetSecurityOptOpenReadOnly( bDoOpenReadonly );
+            bModified = true;
+        }
+    }
+
+    return bModified;
+}
+
+
+void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & )
+{
+    SfxObjectShell* pCurDocShell = SfxObjectShell::Current();
+
+    String sNewText = m_aProtectSTR;
+    if (!pCurDocShell)
+    {
+        // no doc -> hide document settings
+        m_aOpenReadonlyCB.Disable();
+        m_aRecordChangesCB.Disable();
+        m_aChangeProtectionPB.Disable();
+    }
+    else
+    {
+        bool bIsHTMLDoc = false;
+        SfxViewShell* pViewSh = SfxViewShell::Current();
+        if (pViewSh)
+        {
+            const SfxPoolItem* pItem;
+            SfxDispatcher* pDisp = pViewSh->GetDispatcher();
+            if (SFX_ITEM_AVAILABLE <= pDisp->QueryState( SID_HTML_MODE, pItem ))
+            {
+                USHORT nMode = static_cast< const SfxUInt16Item* >( pItem )->GetValue();
+                bIsHTMLDoc = ( ( nMode & HTMLMODE_ON ) != 0 );
+            }
+        }
+
+        sal_Bool bIsReadonly = pCurDocShell->IsReadOnly();
+        if (pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc)
+        {
+            m_aOpenReadonlyCB.Check( pCurDocShell->IsSecurityOptOpenReadOnly() );
+            m_aOpenReadonlyCB.Enable( !bIsReadonly );
+        }
+        else
+            m_aOpenReadonlyCB.Disable();
+
+        bool bRecordChanges;
+        if (QueryRecordChangesState( RL_WRITER, bRecordChanges ) && !bIsHTMLDoc)
+            m_eRedlingMode = RL_WRITER;
+        else if (QueryRecordChangesState( RL_CALC, bRecordChanges ))
+            m_eRedlingMode = RL_CALC;
+        else
+            m_eRedlingMode = RL_NONE;
+
+        if (m_eRedlingMode != RL_NONE)
+        {
+            bool bProtection;
+            QueryRecordChangesProtectionState( m_eRedlingMode, bProtection );
+
+            m_aChangeProtectionPB.Enable( !bIsReadonly );
+            // set the right text
+            if (bProtection)
+                sNewText = m_aUnProtectSTR;
+
+            m_aRecordChangesCB.Check( bRecordChanges );
+            m_aRecordChangesCB.Enable( /*!bProtection && */!bIsReadonly );
+
+            m_bOrigPasswordIsConfirmed = true;   // default case if no password is set
+            uno::Sequence< sal_Int8 > aPasswordHash;
+            // check if password is available
+            if (pCurDocShell->GetProtectionHash( aPasswordHash ) &&
+                aPasswordHash.getLength() > 0)
+                m_bOrigPasswordIsConfirmed = false;  // password found, needs to be confirmed later on
+        }
+        else
+        {
+            // A Calc document that is shared will have 'm_eRedlingMode == RL_NONE'
+            // In shared documents change recording and protection must be disabled,
+            // similar to documents that do not support change recording at all.
+            m_aRecordChangesCB.Check( FALSE );
+            m_aRecordChangesCB.Disable();
+            m_aChangeProtectionPB.Check( FALSE );
+            m_aChangeProtectionPB.Disable();
+        }
+    }
+
+    m_aChangeProtectionPB.SetText( sNewText );
+}
+
+
+IMPL_LINK( SfxSecurityPage_Impl, RecordChangesCBToggleHdl, void*, EMPTYARG )
+{
+    // when change recording gets disabled protection must be disabled as well
+    if (!m_aRecordChangesCB.IsChecked())    // the new check state is already present, thus the '!'
+    {
+        bool bAlreadyDone = false;
+        if (!m_bEndRedliningWarningDone)
+        {
+            WarningBox aBox( m_rMyTabPage.GetParent(), WinBits(WB_YES_NO | WB_DEF_NO),
+                    m_aEndRedliningWarning );
+            if (aBox.Execute() != RET_YES)
+                bAlreadyDone = true;
+            else
+                m_bEndRedliningWarningDone = true;
+        }
+
+        const bool bNeedPasssword = !m_bOrigPasswordIsConfirmed
+                && m_aChangeProtectionPB.GetText() != m_aProtectSTR;
+        if (!bAlreadyDone && bNeedPasssword)
+        {
+            String aPasswordText;
+
+            // dialog canceled or no password provided
+            if (!lcl_GetPassword( m_rMyTabPage.GetParent(), false, aPasswordText ))
+                bAlreadyDone = true;
+
+            // ask for password and if dialog is canceled or no password provided return
+            if (lcl_IsPasswordCorrect( aPasswordText ))
+                m_bOrigPasswordIsConfirmed = true;
+            else
+                bAlreadyDone = true;
+        }
+
+        if (bAlreadyDone)
+            m_aRecordChangesCB.Check( true );     // restore original state
+        else
+        {
+            // remember required values to change protection and change recording in
+            // FillItemSet_Impl later on if password was correct.
+            m_bNewPasswordIsValid = true;
+            m_aNewPassword = String();
+
+            m_aChangeProtectionPB.SetText( m_aProtectSTR );
+        }
+    }
+
+    return 0;
+}
+
+
+IMPL_LINK( SfxSecurityPage_Impl, ChangeProtectionPBHdl, void*, EMPTYARG )
+{
+    if (m_eRedlingMode == RL_NONE)
+        return 0;
+
+    // the push button text is always the opposite of the current state. Thus:
+    const bool bCurrentProtection = m_aChangeProtectionPB.GetText() != m_aProtectSTR;
+
+    // ask user for password (if still necessary)
+    String aPasswordText;
+    bool bNewProtection = !bCurrentProtection;
+    const bool bNeedPassword = bNewProtection || !m_bOrigPasswordIsConfirmed;
+    if (bNeedPassword)
+    {
+        // ask for password and if dialog is canceled or no password provided return
+        if (!lcl_GetPassword( m_rMyTabPage.GetParent(), bNewProtection, aPasswordText ))
+            return 0;
+
+        // provided password still needs to be checked?
+        if (!bNewProtection && !m_bOrigPasswordIsConfirmed)
+        {
+            if (lcl_IsPasswordCorrect( aPasswordText ))
+                m_bOrigPasswordIsConfirmed = true;
+            else
+                return 0;
+        }
+    }
+    DBG_ASSERT( m_bOrigPasswordIsConfirmed, "ooops... this should not have happened!" );
+
+    // remember required values to change protection and change recording in
+    // FillItemSet_Impl later on if password was correct.
+    m_bNewPasswordIsValid = true;
+    m_aNewPassword = bNewProtection? aPasswordText : String();
+
+//    // RecordChangesCB is enabled if protection is off
+//    m_aRecordChangesCB.Enable( !bNewProtection );
+    m_aRecordChangesCB.Check( bNewProtection );
+    // toggle text of button "Protect" <-> "Unprotect"
+    m_aChangeProtectionPB.SetText( bNewProtection ? m_aUnProtectSTR : m_aProtectSTR );
+
+    return 0;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
+SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet & rItemSet )
+{
+    return new SfxSecurityPage( pParent, rItemSet );
+}
+
+
+SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet ) :
+    SfxTabPage( pParent, SfxResId( TP_DOCINFOSECURITY ), rItemSet )
+{
+    m_pImpl = std::auto_ptr< SfxSecurityPage_Impl >(new SfxSecurityPage_Impl( *this, rItemSet ));
+
+    FreeResource();
+}
+
+
+SfxSecurityPage::~SfxSecurityPage()
+{
+}
+
+
+BOOL SfxSecurityPage::FillItemSet( SfxItemSet & rItemSet )
+{
+    bool bModified = false;
+    DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
+    if (m_pImpl.get() != 0)
+        bModified =  m_pImpl->FillItemSet_Impl( rItemSet );
+    return bModified;
+}
+
+
+void SfxSecurityPage::Reset( const SfxItemSet & rItemSet )
+{
+    DBG_ASSERT( m_pImpl.get(), "implementation pointer is 0. Still in c-tor?" );
+    if (m_pImpl.get() != 0)
+        m_pImpl->Reset_Impl( rItemSet );
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
diff --git a/sfx2/source/dialog/securitypage.hrc b/sfx2/source/dialog/securitypage.hrc
new file mode 100644
index 000000000000..d425131b4772
--- /dev/null
+++ b/sfx2/source/dialog/securitypage.hrc
@@ -0,0 +1,52 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SECURITYPAGE_HRC_
+#define _SECURITYPAGE_HRC_
+
+
+#define PASSWORD_TO_OPEN_FL                 1
+#define PASSWORD_TO_OPEN_FT                 2
+#define PASSWORD_TO_OPEN_ED                 3
+#define CONFIRM_PASSWORD_TO_OPEN_FT         4
+#define CONFIRM_PASSWORD_TO_OPEN_ED         5
+#define PASSWORD_INFO_FT                    6
+#define PASSWORD_TO_MODIFY_FL               7
+#define PASSWORD_TO_MODIFY_FT               8
+#define PASSWORD_TO_MODIFY_ED               9
+#define CONFIRM_PASSWORD_TO_MODIFY_FT       10
+#define CONFIRM_PASSWORD_TO_MODIFY_ED       11
+#define OPTIONS_FL                          12
+#define OPEN_READONLY_CB                    13
+#define RECORD_CHANGES_CB                   14
+#define CHANGE_PROTECTION_PB                15
+
+#define STR_PROTECT                         101
+#define STR_UNPROTECT                       102
+#define STR_END_REDLINING_WARNING           103
+
+#endif
+
diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src
new file mode 100644
index 000000000000..fee60404d01c
--- /dev/null
+++ b/sfx2/source/dialog/securitypage.src
@@ -0,0 +1,174 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include "sfx2/sfx.hrc"
+#include "securitypage.hrc"
+#include "helpid.hrc"
+#include "dialog.hrc"
+#include "sfxlocal.hrc"
+
+#include <svtools/controldims.hrc>
+
+
+TabPage TP_DOCINFOSECURITY
+{
+    HelpId = HID_DOCINFOSECURITY ;
+    Hide = TRUE ;
+    Size = MAP_APPFONT ( 260 , 185 ) ;
+
+    FixedLine PASSWORD_TO_OPEN_FL
+    {
+        Pos = MAP_APPFONT( 6, 6 );
+        Size = MAP_APPFONT( 248, RSC_CD_FIXEDLINE_HEIGHT );
+        Text [ en-US ] = "File encryption password";
+    };
+    FixedText PASSWORD_TO_OPEN_FT
+    {
+        Pos = MAP_APPFONT( 12, 20 );
+        Size = MAP_APPFONT( 82, RSC_CD_FIXEDTEXT_HEIGHT );
+        Text [ en-US ] = "~Enter password to open";
+    };
+    Edit PASSWORD_TO_OPEN_ED
+    {
+        HelpId = HID_SECURITYTAB_PASSWORD_TO_OPEN;
+        Pos = MAP_APPFONT( 100, 18 );
+        Size = MAP_APPFONT( 88, RSC_CD_TEXTBOX_HEIGHT );
+        Border = TRUE;
+        PassWord = TRUE;
+    };
+    FixedText CONFIRM_PASSWORD_TO_OPEN_FT
+    {
+        Pos = MAP_APPFONT( 12, 34 );
+        Size = MAP_APPFONT( 82, RSC_CD_FIXEDTEXT_HEIGHT );
+        Text [ en-US ] = "~Reenter password to open";
+    };
+    Edit CONFIRM_PASSWORD_TO_OPEN_ED
+    {
+        HelpId = HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN;
+        Pos = MAP_APPFONT( 100, 32 );
+        Size = MAP_APPFONT( 88, RSC_CD_TEXTBOX_HEIGHT );
+        Border = TRUE;
+        PassWord = TRUE;
+    };
+    FixedText PASSWORD_INFO_FT
+    {
+        Pos = MAP_APPFONT( 12, 48 );
+        Size = MAP_APPFONT( 236, 3 * RSC_CD_FIXEDTEXT_HEIGHT );
+        Text [ en-US ] =
+                "Note: After a password has been set, the document will only open "\
+                "with the password. Should you lose the password, there will be "\
+                "no way to recover the document. Please also note that this password "\
+                "is case-sensitive.";
+        WordBreak = TRUE;
+    };
+    FixedLine PASSWORD_TO_MODIFY_FL
+    {
+        Pos = MAP_APPFONT( 6, 78 );
+        Size = MAP_APPFONT( 248, RSC_CD_FIXEDLINE_HEIGHT );
+        Text [ en-US ] = "File sharing password";
+    };
+    FixedText PASSWORD_TO_MODIFY_FT
+    {
+        Pos = MAP_APPFONT( 12, 92 );
+        Size = MAP_APPFONT( 82, RSC_CD_FIXEDTEXT_HEIGHT );
+        Text [ en-US ] = "Enter password to modify";
+    };
+    Edit PASSWORD_TO_MODIFY_ED
+    {
+        HelpId = HID_SECURITYTAB_PASSWORD_TO_MODIFY;
+        Pos = MAP_APPFONT( 100, 90 );
+        Size = MAP_APPFONT( 88, RSC_CD_TEXTBOX_HEIGHT );
+        Border = TRUE;
+        PassWord = TRUE;
+    };
+    FixedText CONFIRM_PASSWORD_TO_MODIFY_FT
+    {
+        Pos = MAP_APPFONT( 12, 106 );
+        Size = MAP_APPFONT( 82, RSC_CD_FIXEDTEXT_HEIGHT );
+        Text [ en-US ] = "Reenter password to modify";
+    };
+    Edit CONFIRM_PASSWORD_TO_MODIFY_ED
+    {
+        HelpId = HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY;
+        Pos = MAP_APPFONT( 100, 104 );
+        Size = MAP_APPFONT( 88, RSC_CD_TEXTBOX_HEIGHT );
+        Border = TRUE;
+        PassWord = TRUE;
+    };
+    FixedLine OPTIONS_FL
+    {
+        Pos = MAP_APPFONT( 6, 120 );
+        Size = MAP_APPFONT( 248, RSC_CD_FIXEDLINE_HEIGHT );
+        Text [ en-US ] = "File sharing options";
+    };
+    CheckBox OPEN_READONLY_CB
+    {
+        HelpId = HID_SECURITYTAB_OPEN_FILE_READONLY;
+        Pos = MAP_APPFONT( 12, 133 );
+        Size = MAP_APPFONT( 176, RSC_CD_CHECKBOX_HEIGHT );
+        Text [ en-US ] = "~Open file read-only";
+    };
+    CheckBox RECORD_CHANGES_CB
+    {
+        HelpId = HID_SECURITYTAB_RECORD_CHANGES;
+        Pos = MAP_APPFONT( 12, 147 );
+        Size = MAP_APPFONT( 176, RSC_CD_CHECKBOX_HEIGHT );
+        Text [ en-US ] = "Record ~changes";
+    };
+    PushButton CHANGE_PROTECTION_PB
+    {
+        HelpId = HID_SECURITYTAB_PROTECTION;
+        Pos = MAP_APPFONT( 194, 145 );
+        Size = MAP_APPFONT( 60, RSC_CD_PUSHBUTTON_HEIGHT );
+    };
+    String STR_PROTECT
+    {
+        Text [ en-US ] = "~Protect...";
+    };
+    String STR_UNPROTECT
+    {
+        Text [ en-US ] = "~Unprotect...";
+    };
+    String STR_END_REDLINING_WARNING
+    {
+        Text [ en-US ] = "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n" ;
+    };
+};
+
+String RID_SFX_PROTECT_RECORDS
+{
+    Text [ en-US ] = "Protect Records" ;
+};
+String RID_SFX_UNPROTECT_RECORDS
+{
+    Text [ en-US ] = "Unprotect Records" ;
+};
+String RID_SFX_INCORRECT_PASSWORD
+{
+    Text [ en-US ] = "Incorrect password" ;
+};
+
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 6e1d89f2a8cd..49188defc4f1 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1332,7 +1332,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 );
 
@@ -2049,9 +2048,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();
@@ -2589,9 +2585,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");
@@ -2602,13 +2595,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() )
         {
@@ -2867,8 +2854,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! )
@@ -2905,18 +2890,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
@@ -2948,31 +2923,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 );
@@ -3153,9 +3109,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 6502eeaeb78c..f202266dd74e 100644
--- 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();
@@ -1074,3 +1076,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 ) );
 
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 91305eb95cce..bd12f3db80dc 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -82,6 +82,9 @@ class SfxBasicManagerCreationListener;
 
 namespace sfx2 { namespace appl { class ImeStatusWindow; } }
 
+typedef Link* LinkPtr;
+SV_DECL_PTRARR(SfxInitLinkList, LinkPtr, 4, 4)
+
 //=========================================================================
 // SfxAppData_Impl
 //=========================================================================
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 848446a774e9..79dba3208729 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -46,6 +46,7 @@
 #define HID_DOCINFODESC                             (HID_SFX_START +   8)
 #define HID_DOCINFODOC                              (HID_SFX_START +   9)
 #define HID_DOCINFOUSER                             (HID_SFX_START +  10)
+#define HID_DOCINFOSECURITY                         (HID_SFX_START +  11)
 #define HID_BOOKMARKPROPS                           (HID_SFX_START +  14)
 #define HID_BOOKGROUPPROPS                          (HID_SFX_START +  15)
 #define HID_BOOKFILEPROPS                           (HID_SFX_START +  16)
@@ -346,7 +347,15 @@
 #define HID_CTRL_CUSTOMPROPS_YES_NO                 (HID_SFX_START + 326)
 #define HID_DLG_CUSTOMPROPS_DURATION                (HID_SFX_START + 327)
 
-#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION
+#define HID_SECURITYTAB_PASSWORD_TO_OPEN            (HID_SFX_START + 328)
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN    (HID_SFX_START + 329)
+#define HID_SECURITYTAB_PASSWORD_TO_MODIFY          (HID_SFX_START + 330)
+#define HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY  (HID_SFX_START + 331)
+#define HID_SECURITYTAB_OPEN_FILE_READONLY          (HID_SFX_START + 332)
+#define HID_SECURITYTAB_RECORD_CHANGES              (HID_SFX_START + 333)
+#define HID_SECURITYTAB_PROTECTION                  (HID_SFX_START + 334)
+
+#define ACT_SFX_HID_END HID_SECURITYTAB_PROTECTION
 
 // "Uberlaufpr"ufung --------------------------------------------------------
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index a882cfedd821..b5087fb46294 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -149,6 +149,10 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
 
     sal_Bool                m_bIncomplEncrWarnShown;
 
+    // TODO/LATER: m_aModifyPasswordInfo should completely replace m_nModifyPasswordHash in future
+    sal_uInt32              m_nModifyPasswordHash;
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModifyPasswordInfo;
+    sal_Bool                m_bModifyPasswordEntered;
 
     SfxObjectShell_Impl( SfxObjectShell& _rDocShell );
     virtual ~SfxObjectShell_Impl();
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 6d61f4182bbb..328d88d8b2b9 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -131,6 +131,8 @@ public:
     , m_bResizeNoScale( sal_False )
     {}
 
+    ~SfxInPlaceClient_Impl();
+
     void SizeHasChanged();
     DECL_LINK           (TimerHdl, Timer*);
     uno::Reference < frame::XFrame > GetFrame() const;
@@ -168,6 +170,10 @@ public:
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 };
 
+SfxInPlaceClient_Impl::~SfxInPlaceClient_Impl()
+{
+}
+
 void SAL_CALL SfxInPlaceClient_Impl::changingState(
     const ::com::sun::star::lang::EventObject& /*aEvent*/,
     ::sal_Int32 /*nOldState*/,
@@ -645,6 +651,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal
     m_pViewSh( pViewShell ),
     m_pEditWin( pDraw )
 {
+    m_pImp->acquire();
     m_pImp->m_pClient = this;
     m_pImp->m_nAspect = nAspect;
     m_pImp->m_aScaleWidth = m_pImp->m_aScaleHeight = Fraction(1,1);
@@ -668,6 +675,7 @@ SfxInPlaceClient::~SfxInPlaceClient()
 
     // the next call will destroy m_pImp if no other reference to it exists
     m_pImp->m_xClient = uno::Reference < embed::XEmbeddedClient >();
+    m_pImp->release();
 
     // TODO/LATER:
     // the class is not intended to be used in multithreaded environment;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 189c9a8aae0e..035fd3f794de 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -83,6 +83,8 @@
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/configurationhelper.hxx>
+#include <comphelper/docpasswordrequest.hxx>
+#include <comphelper/docpasswordhelper.hxx>
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/ucb/XContent.hpp>
@@ -185,6 +187,56 @@ namespace
         return *i_rViewFrameImpl.aHasToolPanels;
     }
 }
+
+//-------------------------------------------------------------------------
+static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const ::rtl::OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo )
+{
+    // TODO/LATER: In future the info should replace the direct hash completely
+    sal_Bool bResult = ( !nPasswordHash && !aInfo.getLength() );
+
+    OSL_ENSURE( pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_PASSWORDTOMODIFY ), "PasswordToModify feature is active for a filter that does not support it!" );
+
+    if ( pFilter && xHandler.is() )
+    {
+        sal_Bool bCancel = sal_False;
+        sal_Bool bFirstTime = sal_True;
+
+        while ( !bResult && !bCancel )
+        {
+            sal_Bool bMSType = !pFilter->IsOwnFormat();
+
+            ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest(
+                 new ::comphelper::DocPasswordRequest(
+                 bMSType ? ::comphelper::DocPasswordRequestType_MS : ::comphelper::DocPasswordRequestType_STANDARD,
+                 bFirstTime ? ::com::sun::star::task::PasswordRequestMode_PASSWORD_ENTER : ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER,
+                 aPath,
+                 sal_True ) );
+
+            uno::Reference< com::sun::star::task::XInteractionRequest > rRequest( pPasswordRequest.get() );
+            xHandler->handle( rRequest );
+
+            if ( pPasswordRequest->isPassword() )
+            {
+                if ( aInfo.getLength() )
+                {
+                    bResult = ::comphelper::DocPasswordHelper::IsModifyPasswordCorrect( pPasswordRequest->getPasswordToModify(), aInfo );
+                }
+                else
+                {
+                    // the binary format
+                    bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pFilter->GetServiceName() ) ) == nPasswordHash );
+                }
+            }
+            else
+                bCancel = sal_True;
+
+            bFirstTime = sal_False;
+        }
+    }
+
+    return bResult;
+}
+
 //-------------------------------------------------------------------------
 void SfxViewFrame::SetDowning_Impl()
 {
@@ -324,10 +376,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
             if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ))
                 break;
 
+            SfxMedium* pMed = pSh->GetMedium();
+
             SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), pItem, SfxBoolItem, SID_VIEWONLY, sal_False );
             if ( pItem && pItem->GetValue() )
             {
-                SfxMedium* pMed = pSh->GetMedium();
                 SfxApplication* pApp = SFX_APP();
                 SfxAllItemSet aSet( pApp->GetPool() );
                 aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) );
@@ -359,17 +412,38 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 // Speichern und Readonly Reloaden
                 if( pSh->IsModified() )
                 {
-                    if ( !pSh->PrepareClose() )
+                    if ( pSh->PrepareClose() )
+                    {
+                        // the storing could let the medium be changed
+                        pMed = pSh->GetMedium();
+                        bNeedsReload = sal_True;
+                    }
+                    else
                     {
                         rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_False ) );
                         return;
                     }
-                    else bNeedsReload = sal_True;
                 }
                 nOpenMode = SFX_STREAM_READONLY;
             }
             else
             {
+                if ( pSh->IsReadOnlyMedium()
+                  && ( pSh->GetModifyPasswordHash() || pSh->GetModifyPasswordInfo().getLength() )
+                  && !pSh->IsModifyPasswordEntered() )
+                {
+                    ::rtl::OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+                    if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetOrigFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) )
+                    {
+                        // this is a read-only document, if it has "Password to modify"
+                        // the user should enter password before he can edit the document
+                        rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_False ) );
+                        return;
+                    }
+
+                    pSh->SetModifyPasswordEntered();
+                }
+
                 nOpenMode = SFX_STREAM_READWRITE;
                 pSh->SetReadOnlyUI( sal_False );
 
@@ -389,130 +463,113 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
             }
 
             // doing
-            if( pSh  )
+
+            String aTemp;
+            utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp );
+            INetURLObject aPhysObj( aTemp );
+            SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(),
+                             pVersionItem, SfxInt16Item, SID_VERSION, sal_False );
+
+            INetURLObject aMedObj( pMed->GetName() );
+
+            // the logic below is following, if the document seems not to need to be reloaded and the physical name is different
+            // to the logical one, then on file system it can be checked that the copy is still newer than the original and no document reload is required
+            if ( ( !bNeedsReload && ( (aMedObj.GetProtocol() == INET_PROT_FILE &&
+                    aMedObj.getFSysPath(INetURLObject::FSYS_DETECT) != aPhysObj.getFSysPath(INetURLObject::FSYS_DETECT) &&
+                    !::utl::UCBContentHelper::IsYounger( aMedObj.GetMainURL( INetURLObject::NO_DECODE ), aPhysObj.GetMainURL( INetURLObject::NO_DECODE ) ))
+                  || pMed->IsRemote() ) )
+               || pVersionItem )
             {
-                SfxMedium* pMed = pSh->GetMedium();
-                String aTemp;
-                utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp );
-                INetURLObject aPhysObj( aTemp );
-                SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(),
-                                 pVersionItem, SfxInt16Item, SID_VERSION, sal_False );
-
-                INetURLObject aMedObj( pMed->GetName() );
-
-                // the logic below is following, if the document seems not to need to be reloaded and the physical name is different
-                // to the logical one, then on file system it can be checked that the copy is still newer than the original and no document reload is required
-                if ( ( !bNeedsReload && ( (aMedObj.GetProtocol() == INET_PROT_FILE &&
-                        aMedObj.getFSysPath(INetURLObject::FSYS_DETECT) != aPhysObj.getFSysPath(INetURLObject::FSYS_DETECT) &&
-                        !::utl::UCBContentHelper::IsYounger( aMedObj.GetMainURL( INetURLObject::NO_DECODE ), aPhysObj.GetMainURL( INetURLObject::NO_DECODE ) ))
-                      || pMed->IsRemote() ) )
-                   || pVersionItem )
+                sal_Bool bOK = sal_False;
+                if ( !pVersionItem )
                 {
-                    sal_Bool bOK = sal_False;
-                    if ( !pVersionItem )
+                    sal_Bool bHasStorage = pMed->HasStorage_Impl();
+                    // switching edit mode could be possible without reload
+                    if ( bHasStorage && pMed->GetStorage() == pSh->GetStorage() )
                     {
-                        sal_Bool bHasStorage = pMed->HasStorage_Impl();
-                        // switching edit mode could be possible without reload
-                        if ( bHasStorage && pMed->GetStorage() == pSh->GetStorage() )
-                        {
-                            // TODO/LATER: faster creation of copy
-                            if ( !pSh->ConnectTmpStorage_Impl( pMed->GetStorage(), pMed ) )
-                                return;
-                        }
+                        // TODO/LATER: faster creation of copy
+                        if ( !pSh->ConnectTmpStorage_Impl( pMed->GetStorage(), pMed ) )
+                            return;
+                    }
 
-                        pMed->CloseAndRelease();
-                        pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) );
-                        pMed->SetOpenMode( nOpenMode, pMed->IsDirect() );
+                    pMed->CloseAndRelease();
+                    pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) );
+                    pMed->SetOpenMode( nOpenMode, pMed->IsDirect() );
 
-                        pMed->CompleteReOpen();
-                        if ( nOpenMode & STREAM_WRITE )
-                            pMed->LockOrigFileOnDemand( sal_False, sal_True );
+                    pMed->CompleteReOpen();
+                    if ( nOpenMode & STREAM_WRITE )
+                        pMed->LockOrigFileOnDemand( sal_False, sal_True );
 
-                        // LockOrigFileOnDemand might set the readonly flag itself, it should be set back
-                        pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) );
+                    // LockOrigFileOnDemand might set the readonly flag itself, it should be set back
+                    pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) );
 
-                        if ( !pMed->GetErrorCode() )
-                            bOK = sal_True;
-                    }
+                    if ( !pMed->GetErrorCode() )
+                        bOK = sal_True;
+                }
 
-                    if( !bOK )
+                if( !bOK )
+                {
+                    ErrCode nErr = pMed->GetErrorCode();
+                    if ( pVersionItem )
+                        nErr = ERRCODE_IO_ACCESSDENIED;
+                    else
                     {
-                        ErrCode nErr = pMed->GetErrorCode();
-                        if ( pVersionItem )
-                            nErr = ERRCODE_IO_ACCESSDENIED;
-                        else
-                        {
-                            pMed->ResetError();
-                            pMed->SetOpenMode( SFX_STREAM_READONLY, pMed->IsDirect() );
-                            pMed->ReOpen();
-                            pSh->DoSaveCompleted( pMed );
-                        }
+                        pMed->ResetError();
+                        pMed->SetOpenMode( SFX_STREAM_READONLY, pMed->IsDirect() );
+                        pMed->ReOpen();
+                        pSh->DoSaveCompleted( pMed );
+                    }
 
-                        // r/o-Doc kann nicht in Editmode geschaltet werden?
-                        rReq.Done( sal_False );
+                    // r/o-Doc kann nicht in Editmode geschaltet werden?
+                    rReq.Done( sal_False );
 
-                        if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() )
+                    if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() )
+                    {
+                        // dem ::com::sun::star::sdbcx::User anbieten, als Vorlage zu oeffnen
+                        QueryBox aBox( &GetWindow(), SfxResId(MSG_QUERY_OPENASTEMPLATE) );
+                        if ( RET_YES == aBox.Execute() )
                         {
-                            // dem ::com::sun::star::sdbcx::User anbieten, als Vorlage zu oeffnen
-                            QueryBox aBox( &GetWindow(), SfxResId(MSG_QUERY_OPENASTEMPLATE) );
-                            if ( RET_YES == aBox.Execute() )
+                            SfxApplication* pApp = SFX_APP();
+                            SfxAllItemSet aSet( pApp->GetPool() );
+                            aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetName() ) );
+                            SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False );
+                            if ( pReferer )
+                                aSet.Put( *pReferer );
+                            aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
+                            if ( pVersionItem )
+                                aSet.Put( *pVersionItem );
+
+                            if( pMed->GetFilter() )
                             {
-                                SfxApplication* pApp = SFX_APP();
-                                SfxAllItemSet aSet( pApp->GetPool() );
-                                aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetName() ) );
-                                SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False );
-                                if ( pReferer )
-                                    aSet.Put( *pReferer );
-                                aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) );
-                                if ( pVersionItem )
-                                    aSet.Put( *pVersionItem );
-
-                                if( pMed->GetFilter() )
-                                {
-                                    aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) );
-                                    SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions,
-                                                     SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False );
-                                    if ( pOptions )
-                                        aSet.Put( *pOptions );
-                                }
-
-                                GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet );
-                                return;
+                                aSet.Put( SfxStringItem( SID_FILTER_NAME, pMed->GetFilter()->GetFilterName() ) );
+                                SFX_ITEMSET_ARG( pMed->GetItemSet(), pOptions,
+                                                 SfxStringItem, SID_FILE_FILTEROPTIONS, sal_False );
+                                if ( pOptions )
+                                    aSet.Put( *pOptions );
                             }
-                            else
-                                nErr = 0;
-                        }
 
-                        ErrorHandler::HandleError( nErr );
-                        rReq.SetReturnValue(
-                            SfxBoolItem( rReq.GetSlot(), sal_False ) );
-                        return;
-                    }
-                    else
-                    {
-                        pSh->DoSaveCompleted( pMed );
-                        pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
-                        rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_True ) );
-                        rReq.Done( sal_True );
-                        // if( nOpenMode == SFX_STREAM_READONLY )
-                        //    pMed->Close();
-                        return;
+                            GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, aSet );
+                            return;
+                        }
+                        else
+                            nErr = 0;
                     }
-                }
 
-                /*
-                if ( !bReload )
-                {
-                    // Es soll nicht reloaded werden
-                    SfxErrorContext aEc( ERRCODE_SFX_NODOCRELOAD );
-                    ErrorHandler::HandleError( ERRCODE_SFX_NODOCRELOAD );
+                    ErrorHandler::HandleError( nErr );
                     rReq.SetReturnValue(
                         SfxBoolItem( rReq.GetSlot(), sal_False ) );
                     return;
                 }
-                */
-                // Ansonsten ( lokal und arbeiten auf Kopie ) muss gereloaded
-                // werden.
+                else
+                {
+                    pSh->DoSaveCompleted( pMed );
+                    pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
+                    rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), sal_True ) );
+                    rReq.Done( sal_True );
+                    // if( nOpenMode == SFX_STREAM_READONLY )
+                    //    pMed->Close();
+                    return;
+                }
             }
 
             rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, sal_True) );
@@ -692,6 +749,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 }
 
                 xNewObj = SfxObjectShell::CreateObject( pFilter->GetServiceName(), SFX_CREATE_MODE_STANDARD );
+
+                if ( xOldObj->IsModifyPasswordEntered() )
+                    xNewObj->SetModifyPasswordEntered();
+
                 uno::Sequence < beans::PropertyValue > aLoadArgs;
                 TransformItems( SID_OPENDOC, *pNewSet, aLoadArgs );
                 try
@@ -747,6 +808,12 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                 }
                 else
                 {
+                    if ( xNewObj->GetModifyPasswordHash() && xNewObj->GetModifyPasswordHash() != xOldObj->GetModifyPasswordHash() )
+                    {
+                        xNewObj->SetModifyPasswordEntered( sal_False );
+                        xNewObj->SetReadOnly();
+                    }
+
                     if ( xNewObj->IsDocShared() )
                     {
                         // the file is shared but the closing can change the sharing control file
@@ -759,10 +826,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
                     TransformItems( SID_OPENDOC, *xNewObj->GetMedium()->GetItemSet(), aLoadArgs );
 
                     UpdateDocument_Impl();
-                }
 
-                if ( xNewObj.Is() )
-                {
                     try
                     {
                         while ( !aViewFrames.empty() )
@@ -1527,7 +1591,7 @@ void SfxViewFrame::KillDispatcher_Impl()
 //------------------------------------------------------------------------
 SfxViewFrame* SfxViewFrame::Current()
 {
-    return SfxApplication::Is_Impl() ? SFX_APP()->Get_Impl()->pViewFrame : NULL;
+    return SfxApplication::Get() ? SFX_APP()->Get_Impl()->pViewFrame : NULL;
 }
 
 //--------------------------------------------------------------------
@@ -2079,9 +2143,7 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
     else
         aTransformLoadArgs.remove( "Hidden" );
 
-    ::rtl::OUString sURL( xDocument->getURL() );
-    if ( !sURL.getLength() )
-        sURL = i_rDoc.GetFactory().GetFactoryURL();
+    ::rtl::OUString sURL( RTL_CONSTASCII_USTRINGPARAM( "private:object" ) );
 
     Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
     xLoader->loadComponentFromURL( sURL, ::rtl::OUString::createFromAscii( "_self" ), 0,
diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src
index bbea19100df9..38e5577a72be 100644
--- a/sfx2/util/hidother.src
+++ b/sfx2/util/hidother.src
@@ -165,4 +165,6 @@ hidspecial HID_DID_SAVE_PACKED_XML              { HelpID = HID_DID_SAVE_PACKED_X
 hidspecial HID_HELP_ONHELP                      { HelpID = HID_HELP_ONHELP; };
 hidspecial HID_HELP_TEXT_SELECTION_MODE         { HelpID = HID_HELP_TEXT_SELECTION_MODE; };
 hidspecial HID_DLG_CHECKFORONLINEUPDATE         { HelpID = HID_DLG_CHECKFORONLINEUPDATE; };
-hidspecial HID_TASKPANE_VIEW_MENU               { HelpID = HID_TASKPANE_VIEW_MENU; };
\ No newline at end of file
+hidspecial HID_DOCINFOSECURITY                  { HelpID = HID_DOCINFOSECURITY; };
+hidspecial HID_TASKPANE_VIEW_MENU               { HelpID = HID_TASKPANE_VIEW_MENU; };
+