merge with m61

15 files changed, 100 insertions, 91 deletions

diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 772c3f7c5304..f8b19e1d5754 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/frame/XModuleManager.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
+#include <sfx2/signaturestate.hxx>
 
 
 namespace com { namespace sun { namespace star {
@@ -78,7 +79,8 @@ public:
                     const ::rtl::OUString& aSlotName,
                     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence,
                     sal_Bool bPreselectPassword,
-                    ::rtl::OUString aUserSelectedName );
+                    ::rtl::OUString aUserSelectedName,
+                    sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES );
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 08524fc64d1b..f6d0958d5cb7 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -484,8 +484,6 @@
 #include "sal/config.h"
 #include "sal/types.h"
 #include "setup_native/qswin32.h"
-#include "shell/systemshell.hxx"
-#include "sj2/sjapplet.hxx"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"
@@ -542,7 +540,6 @@
 #include "svtools/lckbitem.hxx"
 #include "svtools/localisationoptions.hxx"
 #include "svtools/localresaccess.hxx"
-#include "svtools/loginerr.hxx"
 #include "svtools/lstner.hxx"
 #include "svtools/memberid.hrc"
 #include "svtools/menuoptions.hxx"
diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx
index 1873c6e6c88e..27da2810d49e 100644
--- a/sfx2/inc/sfx2/dinfdlg.hxx
+++ b/sfx2/inc/sfx2/dinfdlg.hxx
@@ -417,12 +417,14 @@ private:
     ImageButton                         m_aRemoveButton;
 
     sal_Int32                           m_nLineHeight;
+    sal_Int32                           m_nScrollPos;
     SvtSysLocale                        m_aSysLocale;
     std::vector< CustomPropertyLine* >  m_aCustomPropertiesLines;
     CustomPropertyLine*                 m_pCurrentLine;
     SvNumberFormatter                   m_aNumberFormatter;
     Timer                               m_aEditLoseFocusTimer;
     Timer                               m_aBoxLoseFocusTimer;
+    Link                                m_aRemovedHdl;
 
     DECL_LINK(  TypeHdl, CustomPropertiesTypeBox* );
     DECL_LINK(  RemoveHdl, CustomPropertiesRemoveButton* );
@@ -449,6 +451,7 @@ public:
     bool                DoesCustomPropertyExist( const String& rName ) const;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
                         GetCustomProperties() const;
+    void                SetRemovedHdl( const Link& rLink ) { m_aRemovedHdl = rLink; }
 };
 
 // class CustomPropertiesControl -----------------------------------------
@@ -466,12 +469,13 @@ private:
     void                    Initialize();
 
     DECL_LINK( ScrollHdl, ScrollBar* );
+    DECL_LINK( RemovedHdl, void* );
 
 public:
     CustomPropertiesControl( Window* pParent, const ResId& rResId );
     ~CustomPropertiesControl();
 
-    void            AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny );
+    void            AddLine( const ::rtl::OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
 
     inline bool     AreAllLinesValid() const { return m_aPropertiesWin.AreAllLinesValid(); }
     inline void     ClearAllLines() { m_aPropertiesWin.ClearAllLines(); }
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index bebcdc684d89..e8ae3f5d1d85 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -199,8 +199,6 @@ public:
     void                SetDataAvailableLink( const Link& rLink );
     Link                GetDataAvailableLink( ) const;
 
-    void                SetClassFilter( const SvGlobalName & rFilterClass );
-
     sal_uInt32          GetMIMEAndRedirect( String& );
     sal_uInt32          GetErrorCode() const;
     sal_uInt32          GetError() const
@@ -227,17 +225,14 @@ public:
     SvEaMgr*            GetEaMgr();
 
     sal_Bool            Commit();
-    sal_Bool            TryStorage();
-    SAL_DLLPRIVATE ErrCode Unpack_Impl( const String& );
     sal_Bool            IsStorage();
 
     sal_Int8            ShowLockedDocumentDialog( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock );
     sal_Bool            LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI );
     void                UnlockFile();
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
+    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage( sal_Bool bCreateTempIfNo = sal_True );
     ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetOutputStorage();
-    const SvGlobalName& GetClassFilter();
     void                ResetError();
     sal_Bool            UsesCache() const;
     void                SetUsesCache( sal_Bool );
@@ -253,9 +248,8 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >  GetInputStream();
 
-    void                CreateTempFile();
+    void                CreateTempFile( sal_Bool bReplace = sal_True );
     void                CreateTempFileNoCopy();
-    void                TryToSwitchToRepairedTemp();
     ::rtl::OUString     SwitchDocumentToTempFile();
     sal_Bool            SwitchDocumentToFile( ::rtl::OUString aURL );
 
@@ -264,24 +258,19 @@ public:
     ::rtl::OUString     GetBaseURL( bool bForSaving=false );
 
 #if _SOLAR__PRIVATE
-//REMOVE        // the storage will be truncated, if it is still not open then the stream will be truncated
-//REMOVE        ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetOutputStorage_Impl();
-    SAL_DLLPRIVATE ::rtl::OUString GetOutputStorageURL_Impl();
     SAL_DLLPRIVATE BOOL HasStorage_Impl() const;
 
-    SAL_DLLPRIVATE sal_Bool BasedOnOriginalFile_Impl();
     SAL_DLLPRIVATE void StorageBackup_Impl();
     SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl();
 
-    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetLastCommitReadStorage_Impl();
-    SAL_DLLPRIVATE void CloseReadStorage_Impl();
+    SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetZipStorageToSign_Impl( sal_Bool bReadOnly = sal_True );
+    SAL_DLLPRIVATE void CloseZipStorage_Impl();
 
     // the storage that will be returned by the medium on GetStorage request
     SAL_DLLPRIVATE void SetStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xNewStorage );
 
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetInputStream_Impl();
     SAL_DLLPRIVATE void CloseAndReleaseStreams_Impl();
-//REMOVE        SvStorage*          GetStorage_Impl( BOOL bUCBStorage );
     SAL_DLLPRIVATE void RefreshName_Impl();
     SAL_DLLPRIVATE sal_uInt16 AddVersion_Impl( com::sun::star::util::RevisionTag& rVersion );
     SAL_DLLPRIVATE sal_Bool TransferVersionList_Impl( SfxMedium& rMedium );
@@ -320,7 +309,6 @@ public:
     SAL_DLLPRIVATE void DataAvailable_Impl();
     SAL_DLLPRIVATE void Cancel_Impl();
     SAL_DLLPRIVATE void SetPhysicalName_Impl(const String& rName);
-    SAL_DLLPRIVATE void MoveTempTo_Impl( SfxMedium* pMedium );
     SAL_DLLPRIVATE void CanDisposeStorage_Impl( sal_Bool bDisposeStorage );
     SAL_DLLPRIVATE sal_Bool WillDisposeStorageOnClose_Impl();
 
@@ -340,7 +328,7 @@ public:
                              const INetURLObject& aDest,
                              const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv );
 
-    SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent );
+    SAL_DLLPRIVATE sal_Bool SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature );
 
     // the following two methods must be used and make sence only during saving currently
     // TODO/LATER: in future the signature state should be controlled by the medium not by the document
@@ -353,6 +341,9 @@ public:
                     const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
     static sal_Bool EqualURLs( const ::rtl::OUString& aFirstURL, const ::rtl::OUString& aSecondURL );
     static ::rtl::OUString CreateTempCopyWithExt( const ::rtl::OUString& aURL );
+    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 );
 };
 
 SV_DECL_IMPL_REF( SfxMedium )
diff --git a/sfx2/inc/sfx2/docfilt.hxx b/sfx2/inc/sfx2/docfilt.hxx
index dbeba0763c67..47c1cba003e5 100644
--- a/sfx2/inc/sfx2/docfilt.hxx
+++ b/sfx2/inc/sfx2/docfilt.hxx
@@ -75,6 +75,20 @@
 #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/docmacromode.hxx b/sfx2/inc/sfx2/docmacromode.hxx
index 4f0f1d2f9d9b..79d0cb016104 100644
--- a/sfx2/inc/sfx2/docmacromode.hxx
+++ b/sfx2/inc/sfx2/docmacromode.hxx
@@ -114,10 +114,11 @@ namespace sfx2
         virtual ::rtl::OUString
                     getDocumentLocation() const = 0;
 
-        /** returns the storage to which the document has last been committed to, for read-only
-            access
+        /** returns a zip-storage based on the last commited version of the document,
+            for readonly access
 
-            An implementation is allowed to return <NULL/> here if and only if the document
+            The storage is intended to be used for signing. An implementation is
+            allowed to return <NULL/> here if and only if the document
             does not support signing the script storages.
 
             @todo
@@ -126,7 +127,7 @@ namespace sfx2
                 XStorageBasedDocument.
         */
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
-                    getLastCommitDocumentStorage() = 0;
+                    getZipStorageToSign() = 0;
 
         /** checks whether the document's storage contains sub storages with macros or scripts
 
@@ -161,7 +162,20 @@ namespace sfx2
             @seealso <sfx2/signaturestate.hxx>
         */
         virtual sal_Int16
-                    getScriptingSignatureState() const = 0;
+                    getScriptingSignatureState() = 0;
+
+        /** allows to detect whether there is a trusted scripting signature
+
+            Note: On the medium run, the signature handling of a document should be outsourced
+            into a dedicated class, instead of being hard-wired into the SfxObjectShell. This
+            class could then be used outside the SfxObjectShell (e.g. in Base documents), too.
+            When this happens, this method here should be replaced by a method at this
+            new class.
+
+            @seealso <sfx2/signaturestate.hxx>
+        */
+        virtual sal_Bool
+                    hasTrustedScriptingSignature( sal_Bool bAllowUIToAddAuthor ) = 0;
 
         /** shows a warning that the document's signature is broken
 
diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx
index 8adcf757c71a..9990b786666e 100644
--- a/sfx2/inc/sfx2/event.hxx
+++ b/sfx2/inc/sfx2/event.hxx
@@ -34,6 +34,8 @@
 #include "sfx2/dllapi.h"
 #include <tools/string.hxx>
 #include <svtools/hint.hxx>
+#include <svtools/eventcfg.hxx>
+#include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -44,33 +46,24 @@ class SfxObjectShell;
 
 class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
 {
-    USHORT              nEventId;
     SfxObjectShell*     pObjShell;
-    String              _aArgs;
-    BOOL                _bDummy;
-    BOOL                _bAddToHistory;
+    ::rtl::OUString     aEventName;
+    USHORT              nEventId;
 
 public:
     TYPEINFO();
-                        SfxEventHint( USHORT nId,
-                                      const String& rArgs,
-                                      SfxObjectShell *pObj = 0  )
-                        :   nEventId(nId),
-                            pObjShell(pObj),
-                            _aArgs( rArgs ),
-                            _bAddToHistory(FALSE)
-                        {}
-                        SfxEventHint( USHORT nId, SfxObjectShell *pObj = 0 )
-                        :   nEventId(nId),
-                            pObjShell(pObj),
-                            _bAddToHistory(FALSE)
+    SfxEventHint( USHORT nId, const ::rtl::OUString& aName, SfxObjectShell *pObj = 0 )
+                        :   pObjShell(pObj),
+                            aEventName(aName),
+                            nEventId(nId)
                         {}
 
-    const String& GetArgs() const { return _aArgs;}
-
     USHORT              GetEventId() const
                         { return nEventId; }
 
+    ::rtl::OUString     GetEventName() const
+                        { return aEventName; }
+
     SfxObjectShell*     GetObjShell() const
                         { return pObjShell; }
 };
@@ -82,8 +75,6 @@ class SfxNamedHint : public SfxHint
     String              _aEventName;
     SfxObjectShell*     _pObjShell;
     String              _aArgs;
-    BOOL                _bDummy;
-    BOOL                _bAddToHistory;
 
 public:
                         TYPEINFO();
@@ -93,15 +84,13 @@ public:
                                       SfxObjectShell *pObj = 0  )
                         :   _aEventName( rName ),
                             _pObjShell( pObj),
-                            _aArgs( rArgs ),
-                            _bAddToHistory( FALSE )
+                            _aArgs( rArgs )
                         {}
 
                         SfxNamedHint( const String& rName,
                                       SfxObjectShell *pObj = 0 )
                         :   _aEventName( rName ),
-                            _pObjShell( pObj ),
-                            _bAddToHistory( FALSE )
+                            _pObjShell( pObj )
                         {}
 
     const String&       GetArgs() const { return _aArgs;}
diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx
index 51362c14c309..cfe8629cd0cf 100644
--- a/sfx2/inc/sfx2/evntconf.hxx
+++ b/sfx2/inc/sfx2/evntconf.hxx
@@ -118,36 +118,9 @@ public:
 
 class SFX2_DLLPUBLIC SfxEventConfiguration
 {
-friend class SfxEventConfigItem_Impl;
-
-    SvxMacroTableDtor*      pAppTable;
-    SvxMacroTableDtor*      pDocTable;
-    sal_Bool                bIgnoreConfigure;
-
 public:
-                            SfxEventConfiguration();
-                            ~SfxEventConfiguration();
-
-    void                    ConfigureEvent(USHORT nId, const SvxMacro&,
-                                SfxObjectShell* pObjSh);
-    void                    ConfigureEvent(USHORT nId, const String& rMacro,
-                                SfxObjectShell* pObjSh);
-
-    SvxMacroTableDtor*      GetDocEventTable(SfxObjectShell*);
-
-    static void             RegisterEvent( USHORT nId, const String& rName,
-                                           const String& rMacroName );
-
-    SAL_DLLPRIVATE BOOL Warn_Impl( SfxObjectShell *pDoc, const SvxMacro* pMacro );
-    SAL_DLLPRIVATE void PropagateEvent_Impl( SfxObjectShell *pDoc,
-                                                     USHORT nId,
-                                                     const SvxMacro* pMacro );
-    SAL_DLLPRIVATE static rtl::OUString GetEventName_Impl( ULONG nID );
-    SAL_DLLPRIVATE static ULONG GetEventId_Impl( const rtl::OUString& rEventName );
-    SAL_DLLPRIVATE ::com::sun::star::uno::Any CreateEventData_Impl( const SvxMacro *pMacro );
-
-    SAL_DLLPRIVATE static ULONG GetPos_Impl( USHORT nID, sal_Bool &rFound );
-    SAL_DLLPRIVATE static ULONG GetPos_Impl( const String& rName, sal_Bool &rFound );
+    static void                         ConfigureEvent( ::rtl::OUString aName, const SvxMacro&, SfxObjectShell* pObjSh);
+    static SvxMacro*                    ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp );
 };
 
 #endif
diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx
index f9377f9908ea..e6dc185ef919 100644
--- a/sfx2/inc/sfx2/filedlghelper.hxx
+++ b/sfx2/inc/sfx2/filedlghelper.hxx
@@ -151,7 +151,8 @@ public:
         SD_INSERT_SOUND,                // insert sound in draw
         SD_INSERT_VIDEO,                // insert video in draw
         SD_EXPORT,                      // export in draw
-        SI_EXPORT                       // export in impress
+        SI_EXPORT,                      // export in impress
+        SW_EXPORT                       // export in writer
     };
 
 private:
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 546a9b7a5243..0cea8e5be8ea 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -43,6 +43,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
+#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -236,10 +237,6 @@ private:
 
 //REMOVE        sal_Bool                    SaveInfoAndConfig_Impl( SvStorageRef pNewStg );
 
-    SAL_DLLPRIVATE sal_uInt16 ImplCheckSignaturesInformation(
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >& aInfos );
-
-
 //#endif
 
 protected:
@@ -733,8 +730,11 @@ public:
     SAL_DLLPRIVATE void BreakMacroSign_Impl( sal_Bool bBreakMacroSing );
     SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
     SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
+    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 static SEQUENCE< OUSTRING > GetEventNames_Impl();
+    SAL_DLLPRIVATE SEQUENCE< OUSTRING > GetEventNames_Impl();
     SAL_DLLPRIVATE void InitBasicManager_Impl();
     SAL_DLLPRIVATE SfxObjectShell_Impl* Get_Impl() { return pImp; }
 
@@ -797,6 +797,13 @@ public:
     SAL_DLLPRIVATE SfxAcceleratorManager* GetAccMgr_Impl();
     SAL_DLLPRIVATE SfxToolBoxConfig* GetToolBoxConfig_Impl();
     SAL_DLLPRIVATE sal_uInt16 ImplGetSignatureState( sal_Bool bScriptingContent = FALSE );
+
+    SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
+        ImplAnalyzeSignature(
+            sal_Bool bScriptingContent,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
+                = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
+
     SAL_DLLPRIVATE void ImplSign( sal_Bool bScriptingContent = FALSE );
     SAL_DLLPRIVATE sal_Bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
 //#endif
diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc
index 1b92186b3769..e02f30c5b9be 100644
--- a/sfx2/inc/sfx2/sfx.hrc
+++ b/sfx2/inc/sfx2/sfx.hrc
@@ -111,6 +111,9 @@
 #define SFX_EVENT_SAVEDOCFAILED     (EVENT_SFX_START + 28)
 #define SFX_EVENT_SAVETODOCFAILED   (EVENT_SFX_START + 29)
 
+#define SFX_EVENT_TITLECHANGED      (EVENT_SFX_START + 30)
+#define SFX_EVENT_MODECHANGED       (EVENT_SFX_START + 31)
+
 // Events f"ur Controls etc.
 #define SFX_EVENT_MOUSEOVER_OBJECT     ( EVENT_SFX_START + 100 )
 #define SFX_EVENT_MOUSECLICK_OBJECT    ( EVENT_SFX_START + 101 )
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 324080484c81..6ef67b6a009a 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -1513,7 +1513,7 @@ private:
     SAL_DLLPRIVATE void impl_store( const   OUSTRING&                   sURL            ,
                         const   SEQUENCE< PROPERTYVALUE >&  seqArguments    ,
                                 sal_Bool                    bSaveTo         ) ;
-    SAL_DLLPRIVATE void postEvent_Impl( ULONG nEventID );
+    SAL_DLLPRIVATE void postEvent_Impl( ::rtl::OUString );
     SAL_DLLPRIVATE String getEventName_Impl( long nID );
     SAL_DLLPRIVATE void NotifyStorageListeners_Impl();
        SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler );
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 2ce5db197b38..849be49a94c2 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -140,8 +140,10 @@
 //#define SID_TITLE             (SID_SFX_START + 307)
 
 #define SID_CONTEXT                         (SID_SFX_START + 310)
-#define SID_CURRENTTIME                     (SID_SFX_START + 311)
-#define SID_CURRENTDATE                     (SID_SFX_START + 312)
+
+#define SID_PASTE_SPECIAL                   (SID_SFX_START + 311)
+#define SID_CLIPBOARD_FORMAT_ITEMS          (SID_SFX_START + 312)
+
 #define SID_VERSION_VISIBLE                 (SID_SFX_START + 313)
 #define SID_PASTE_UNFORMATTED               (SID_SFX_START + 314)
 #define SID_PRINTER_NOTFOUND_WARN           (SID_SFX_START + 320)
@@ -871,6 +873,7 @@
 #define SID_HELP_PI                         (SID_SFX_START + 962)
 #define SID_BASIC_ENABLED                   (SID_SFX_START + 964)
 #define SID_EXPORT_DIALOG                   (SID_SFX_START + 965)
+#define SID_IMPORT_DIALOG                   (SID_SFX_START + 966)

 
 #define SID_BASICBREAK                      (SID_SFX_START +1521)
 
diff --git a/sfx2/inc/sfx2/signaturestate.hxx b/sfx2/inc/sfx2/signaturestate.hxx
index 48c06fee623b..be035ef25818 100644
--- a/sfx2/inc/sfx2/signaturestate.hxx
+++ b/sfx2/inc/sfx2/signaturestate.hxx
@@ -36,7 +36,12 @@
 #define SIGNATURESTATE_NOSIGNATURES             (sal_Int16)0
 #define SIGNATURESTATE_SIGNATURES_OK            (sal_Int16)1
 #define SIGNATURESTATE_SIGNATURES_BROKEN        (sal_Int16)2
-#define SIGNATURESTATE_SIGNATURES_INVALID       (sal_Int16)3    // State was SIGNATURES_OK, but doc is modified now
-#define SIGNATURESTATE_SIGNATURES_NOTVALIDATED  (sal_Int16)4    // signature is OK, but certificate could not be validated
+// State was SIGNATURES_OK, but doc is modified now
+#define SIGNATURESTATE_SIGNATURES_INVALID       (sal_Int16)3
+// signature is OK, but certificate could not be validated
+#define SIGNATURESTATE_SIGNATURES_NOTVALIDATED  (sal_Int16)4
+//signatur and certificate are ok,but not al files are signed, as was the case in
+//OOo 2.x - OOo 3.1.1. This state is only used  together with document signatures.
+#define SIGNATURESTATE_SIGNATURES_PARTIAL_OK    (sal_Int16)5
 
 #endif // SFX2_SIGNATURESTATE_HXX
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 84612c0bc8e2..ec2255215506 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -39,6 +39,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <svtools/lstner.hxx>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
 #include "shell.hxx"
 #include <tools/gen.hxx>
@@ -79,6 +80,9 @@ class NotifyEvent;
 #define SFX_PRINTER_CHG_ORIENTATION_FLAG  3
 #define SFX_PRINTER_CHG_SIZE_FLAG         4
 
+#define SFX_PRINTERROR_NONE          0
+#define SFX_PRINTERROR_BUSY          1
+
 enum SfxScrollingMode
 {
     SCROLLING_NO,
@@ -311,6 +315,8 @@ public:
     void                        SetAdditionalPrintOptions( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& );
     void                        ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, sal_Bool, sal_Bool );
 
+    void                        AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, BOOL );
+
 #if _SOLAR__PRIVATE
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
     SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );