diff options
| author | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2019-10-08 11:46:05 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-04 13:44:35 +0100 |
| commit | a956e0570df356d47fd56bd04205b3e003bb710c (patch) | |
| tree | 65f88dbd71c1257c790db6b3768f9efc6077db26 | |
| parent | 39e2a5ca3ff2d80ebde928bb21d4fa45600b526a (diff) | |
uno: XModel2->setArgs() now able to set "EncryptionData"
setArgs is able to set only limited media descriptor parameters.
Extending this list by one more.
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>
Conflicts:
sfx2/source/doc/sfxbasemodel.cxx
| -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 0c896ad1cb73..4841f0a746ba 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</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 5010d462e419..218dc2eab259 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1099,6 +1099,11 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs) rArg.Value >>= bValue; pMedium->GetItemSet()->Put(SfxBoolItem(SID_LOCK_EDITDOC, bValue)); } + else if (rArg.Name == "EncryptionData") + { + rArg.Value >>= bValue; + pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, rArg.Value)); + } else { throw lang::IllegalArgumentException("Setting property not supported: " + aArgs[i].Name, |