diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-10-23 08:24:31 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-10-23 15:22:16 +0200 |
commit | e37b70442ebf9e1628e7da16b7b6acf498897dee (patch) | |
tree | 4c02f4b4be6c10d4ff2a8b99f4ab057670e4d80b | |
parent | d5d96e04ad8014f3e68351ccb54221d9610b565b (diff) |
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@cib.de>
-rw-r--r-- | include/sfx2/sfxsids.hrc | 3 | ||||
-rw-r--r-- | include/sfx2/viewsh.hxx | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/document/MediaDescriptor.idl | 6 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/XModel2.idl | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appuno.cxx | 18 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 9 | ||||
-rw-r--r-- | sw/qa/python/check_xmodel.py | 4 |
9 files changed, 52 insertions, 6 deletions
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 b68ac819dc27..128d5ced20d6 100644 --- a/offapi/com/sun/star/frame/XModel2.idl +++ b/offapi/com/sun/star/frame/XModel2.idl @@ -145,6 +145,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 79247883dcfc..c633978076d9 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 ) { @@ -870,6 +871,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; @@ -1093,6 +1102,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; @@ -1256,6 +1267,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)); @@ -1663,6 +1676,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 8c7c5ab3f8af..6aa2b644b8f3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1203,11 +1203,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 67bacd79502d..395672aaae97 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1089,6 +1089,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) |