summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2019-10-08 11:46:05 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-04 03:49:47 +0100
commita9efad231578789603b8a4fb11d7072b281d3fac (patch)
tree3509103e1c5a1c2e2efbd1b4e50d94a52769b45a
parentdde86a86a61fe44f7897daf1e074f3a2d7f14a1c (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>
-rw-r--r--offapi/com/sun/star/frame/XModel2.idl1
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx8
2 files changed, 9 insertions, 0 deletions
diff --git a/offapi/com/sun/star/frame/XModel2.idl b/offapi/com/sun/star/frame/XModel2.idl
index 4221a527c380..b616d938e8ec 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 caa45967c99f..5b0caae5aa54 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1135,6 +1135,14 @@ void SAL_CALL SfxBaseModel::setArgs(const Sequence<beans::PropertyValue>& aArgs)
ok = true;
}
}
+ else if (rArg.Name == "EncryptionData")
+ {
+ if (rArg.Value >>= bValue)
+ {
+ pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA, rArg.Value));
+ ok = true;
+ }
+ }
if (!ok)
{
throw lang::IllegalArgumentException("Setting property not supported: " + rArg.Name,