[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - include/sfx2 offapi/com sfx2/source sw/qa

Samuel Mehrbrodt (via logerrit) logerrit at kemper.freedesktop.org
Wed Oct 23 17:38:29 UTC 2019


 include/sfx2/sfxsids.hrc                         |    3 ++-
 include/sfx2/viewsh.hxx                          |    1 +
 offapi/com/sun/star/document/MediaDescriptor.idl |    6 ++++++
 offapi/com/sun/star/frame/XModel2.idl            |    2 ++
 sfx2/source/appl/appuno.cxx                      |   18 ++++++++++++++++++
 sfx2/source/doc/objserv.cxx                      |   10 ++++++----
 sfx2/source/doc/sfxbasemodel.cxx                 |    5 +++++
 sfx2/source/view/viewsh.cxx                      |    9 +++++++++
 sw/qa/python/check_xmodel.py                     |    4 +++-
 9 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit 69405b2cda7bae356f88cb9936ca1d56cc9e02cf
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Oct 23 08:24:31 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Oct 23 19:37:35 2019 +0200

    Add document-level option to lock down save
    
    Change-Id: I40b5e8c780894645e467e3891062c499707d69c7
    Reviewed-on: https://gerrit.libreoffice.org/81359
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit e37b70442ebf9e1628e7da16b7b6acf498897dee)
    Reviewed-on: https://gerrit.libreoffice.org/81392
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index d323147ec456..33da857c096f 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -267,8 +267,9 @@ class SvxSearchItem;
 #define SID_REDACTION_STYLE                 (SID_SFX_START + 1734)
 #define SID_DIALOG_PARENT                   (SID_SFX_START + 1735)
 #define SID_LOCK_PRINT                      (SID_SFX_START + 1736)
+#define SID_LOCK_SAVE                       (SID_SFX_START + 1737)
 
-//      SID_SFX_free_START                  (SID_SFX_START + 1737)
+//      SID_SFX_free_START                  (SID_SFX_START + 1738)
 //      SID_SFX_free_END                    (SID_SFX_START + 3999)
 
 #define SID_OPEN_NEW_VIEW                   (SID_SFX_START + 520)
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 6a82b3cd8189..a1a225aa1b28 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -291,6 +291,7 @@ public:
     bool isContentExtractionLocked();
     bool isExportLocked();
     bool isPrintLocked();
+    bool isSaveLocked();
 
     SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
     SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl b/offapi/com/sun/star/document/MediaDescriptor.idl
index b7ff7c50356a..e6035517f26b 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -582,6 +582,12 @@ service MediaDescriptor
         @since LibreOffice 6.4
      */
     [optional,property] boolean LockPrint;
+
+    /** Setting this option will disable the save function.
+     *
+        @since LibreOffice 6.4
+     */
+    [optional,property] boolean LockSave;
 };
 
 
diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl
index 4424193cdd0f..a979208df08d 100644
--- a/offapi/com/sun/star/frame/XModel2.idl
+++ b/offapi/com/sun/star/frame/XModel2.idl
@@ -146,6 +146,8 @@ interface XModel2 : com::sun::star::frame::XModel
                 <li>com::sun::star::document::MediaDescriptor::LockContentExtraction</li>
                 <li>com::sun::star::document::MediaDescriptor::LockExport</li>
                 <li>com::sun::star::document::MediaDescriptor::LockPrint</li>
+                <li>com::sun::star::document::MediaDescriptor::LockSave</li>
+
             </ul>
 
         @throws com::sun::star::lang::IllegalArgumentException When trying to set an unsupported property
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index bab87d847644..50b9b93f1a17 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -172,6 +172,7 @@ static char const sImageFilter[] = "ImageFilter";
 static char const sLockContentExtraction[] = "LockContentExtraction";
 static char const sLockExport[] = "LockExport";
 static char const sLockPrint[] = "LockPrint";
+static char const sLockSave[] = "LockSave";
 
 static bool isMediaDescriptor( sal_uInt16 nSlotId )
 {
@@ -872,6 +873,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
                 if (bOK)
                     rSet.Put( SfxBoolItem( SID_LOCK_PRINT, bVal ) );
             }
+            else if (aName == sLockSave)
+            {
+                bool bVal = false;
+                bool bOK = (rProp.Value >>= bVal);
+                DBG_ASSERT( bOK, "invalid type for LockSave" );
+                if (bOK)
+                    rSet.Put( SfxBoolItem( SID_LOCK_SAVE, bVal ) );
+            }
 #ifdef DBG_UTIL
             else
                 --nFoundArgs;
@@ -1095,6 +1104,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
                 nAdditional++;
             if ( rSet.GetItemState( SID_LOCK_PRINT ) == SfxItemState::SET )
                 nAdditional++;
+            if ( rSet.GetItemState( SID_LOCK_SAVE ) == SfxItemState::SET )
+                nAdditional++;
 
             // consider additional arguments
             nProps += nAdditional;
@@ -1258,6 +1269,8 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
                         continue;
                     if ( nId == SID_LOCK_PRINT )
                         continue;
+                    if ( nId == SID_LOCK_SAVE )
+                        continue;
                }
 
                 OString aDbg = "Unknown item detected: " + OString::number(static_cast<sal_Int32>(nId));
@@ -1667,6 +1680,11 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
             pValue[nActProp].Name = sLockPrint;
             pValue[nActProp++].Value <<= static_cast<const SfxBoolItem*>(pItem)->GetValue() ;
         }
+        if ( rSet.GetItemState( SID_LOCK_SAVE, false, &pItem ) == SfxItemState::SET )
+        {
+            pValue[nActProp].Name = sLockSave;
+            pValue[nActProp++].Value <<= static_cast<const SfxBoolItem*>(pItem)->GetValue() ;
+        }
     }
 
     rArgs = aSequ;
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 75f4f0a0f695..43269c45bdf8 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1214,11 +1214,13 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
                 }
             case SID_SAVEDOC:
                 {
-                    if ( !IsReadOnly() )
-                        rSet.Put(SfxStringItem(
-                            nWhich, SfxResId(STR_SAVEDOC)));
-                    else
+                    SfxViewFrame *pFrame = SfxViewFrame::GetFirst(this);
+                    if ( IsReadOnly() || (pFrame && pFrame->GetViewShell()->isSaveLocked()))
+                    {
                         rSet.DisableItem(nWhich);
+                        break;
+                    }
+                    rSet.Put(SfxStringItem(nWhich, SfxResId(STR_SAVEDOC)));
                 }
                 break;
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 9b7b71a0e095..aa94ce4cfa35 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1098,6 +1098,11 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs)
             rArg.Value >>= bValue;
             pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_PRINT, bValue));
         }
+        else if (rArg.Name == "LockSave")
+        {
+            rArg.Value >>= bValue;
+            pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_SAVE, bValue));
+        }
         else
         {
             throw lang::IllegalArgumentException("Setting property not supported: " + rArg.Name,
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 123aa18dcb58..236d173ef140 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1776,6 +1776,15 @@ bool SfxViewShell::isPrintLocked()
     return aArgs.getOrDefault("LockPrint", false);
 }
 
+bool SfxViewShell::isSaveLocked()
+{
+    Reference<XModel> xModel = GetCurrentDocument();
+    if (!xModel.is())
+        return false;
+    comphelper::NamedValueCollection aArgs(xModel->getArgs());
+    return aArgs.getOrDefault("LockSave", true);
+}
+
 Reference < XController > SfxViewShell::GetController() const
 {
     return pImpl->m_pController.get();
diff --git a/sw/qa/python/check_xmodel.py b/sw/qa/python/check_xmodel.py
index 5b1f8722016b..c257ef33fb79 100644
--- a/sw/qa/python/check_xmodel.py
+++ b/sw/qa/python/check_xmodel.py
@@ -35,7 +35,8 @@ class TestXModel(unittest.TestCase):
         p3 = PropertyValue(Name="LockContentExtraction", Value=True)
         p4 = PropertyValue(Name="LockExport", Value=True)
         p5 = PropertyValue(Name="LockPrint", Value=True)
-        xDoc.setArgs([p1, p2, p3, p4, p5])
+        p6 = PropertyValue(Name="LockSave", Value=True)
+        xDoc.setArgs([p1, p2, p3, p4, p5, p6])
 
         # Make sure that all properties are returned with getArgs()
         args = xDoc.getArgs()
@@ -44,6 +45,7 @@ class TestXModel(unittest.TestCase):
         self.assertTrue(p3 in args)
         self.assertTrue(p4 in args)
         self.assertTrue(p5 in args)
+        self.assertTrue(p6 in args)
 
         xDoc.close(True)
 


More information about the Libreoffice-commits mailing list