diff options
author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-10-08 11:46:05 +0300 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-05-25 10:03:37 +0200 |
commit | 99f8714280d3d451cadce63e59aec27f584bc6d3 (patch) | |
tree | 21ac4f9ba50a0103df40b9823115b017ea66d2db | |
parent | 82894d85147840f1f587e9530b12f0058f2ef2c3 (diff) |
sfx2 UNO API: XModel2::setArgs() now also supports "EncryptionData"
XModel2::setArgs() only permits hand-picked set of media descriptor
parameters. Add one more in preparation to API-based MS crypto rework.
Change-Id: I179a1cfc2cdd7b04becba0d7dfe9740d920ae4ee
Reviewed-on: https://gerrit.libreoffice.org/80432
Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Tested-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84434
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r-- | offapi/com/sun/star/frame/XModel2.idl | 1 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl index 4221a527c380..f6cb57d72500 100644 --- a/offapi/com/sun/star/frame/XModel2.idl +++ b/offapi/com/sun/star/frame/XModel2.idl @@ -147,6 +147,7 @@ interface XModel2 : com::sun::star::frame::XModel <li>com::sun::star::document::MediaDescriptor::LockPrint</li> <li>com::sun::star::document::MediaDescriptor::LockSave</li> <li>com::sun::star::document::MediaDescriptor::LockEditDoc</li> + <li>com::sun::star::document::MediaDescriptor::EncryptionData @since LibreOffice 7.0</li> </ul> @throws com::sun::star::lang::IllegalArgumentException When trying to set an unsupported property diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 4cee94d0d95c..d647c80a4d48 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1106,6 +1106,11 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) ok = true; } } + else if (rArg.Name == "EncryptionData") + { + pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, rArg.Value)); + ok = true; + } if (!ok) { throw lang::IllegalArgumentException("Setting property not supported: " + rArg.Name, |