CWS-TOOLING: integrate CWS tl78

5 files changed, 34 insertions, 19 deletions

diff --git a/sfx2/inc/brokenpackageint.hxx b/sfx2/inc/brokenpackageint.hxx
index e39c92c599ae..16f332480cf6 100644..100755
--- 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/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/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index d514235cbfa2..95e8f21c8d86 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,9 @@ public:
     void                                            SetSaveVersionOnClose( sal_Bool bSet );
     void                                              ResetFromTemplate( const String& rTemplateName, const String& rFileName );
 
+    sal_uInt32                  GetModifyPasswordHash() const;
+    sal_Bool                    SetModifyPasswordHash( sal_uInt32 nHash );
+
     static sal_uInt32           HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
 
     virtual void                ViewAssigned();
@@ -713,6 +717,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/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 275e5c06a7be..109a60207894 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -306,7 +306,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_MODIFYPASSWORDHASH              (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)