diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-12 10:34:46 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-12 12:36:21 +0100 |
| commit | dd615af367a11749e6490a40b4d9bcfaeebe7046 (patch) | |
| tree | d2b5018583eb19ebf53db3e816b1a571e67345ae /filter | |
| parent | 7a6ce0d408f1cc08f63a05357049082de50a0e31 (diff) | |
comphelper: initial SfxFilterFlags::SUPPORTSSIGNING
Currently digital signatures can be made only on OWN formats. Add a new
flag that can be used to mark filters (only DOCX as a start) which could
also support signing and fix the first place that assumes that only OWN
formats support signing.
Change-Id: If9fbf956b765d75838986762e4d4063a9e8c0b5e
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/cache/constant.hxx | 1 | ||||
| -rw-r--r-- | filter/source/config/cache/filtercache.cxx | 6 | ||||
| -rw-r--r-- | filter/source/config/fragments/filters/MS_Word_2007_XML.xcu | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index c1c37f6a17f4..7e8cc0218a9a 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -120,6 +120,7 @@ #define FLAGNAME_TEMPLATE "TEMPLATE" #define FLAGNAME_TEMPLATEPATH "TEMPLATEPATH" #define FLAGNAME_COMBINED "COMBINED" +#define FLAGNAME_SUPPORTSSIGNING "SUPPORTSSIGNING" /** @short some uno service names. */ diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index dacad0981133..68a26b6188df 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -1935,6 +1935,7 @@ css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(SfxF if (nFlags & SfxFilterFlags::TEMPLATE ) lFlagNames.push_back(FLAGNAME_TEMPLATE ); if (nFlags & SfxFilterFlags::TEMPLATEPATH ) lFlagNames.push_back(FLAGNAME_TEMPLATEPATH ); if (nFlags & SfxFilterFlags::COMBINED ) lFlagNames.push_back(FLAGNAME_COMBINED ); + if (nFlags & SfxFilterFlags::SUPPORTSSIGNING) lFlagNames.push_back(FLAGNAME_SUPPORTSSIGNING); return comphelper::containerToSequence(lFlagNames); } @@ -2025,6 +2026,11 @@ SfxFilterFlags FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequ nField |= SfxFilterFlags::STARTPRESENTATION; continue; } + if (pNames[i] == FLAGNAME_SUPPORTSSIGNING) + { + nField |= SfxFilterFlags::SUPPORTSSIGNING; + continue; + } if (pNames[i] == FLAGNAME_READONLY) { nField |= SfxFilterFlags::OPENREADONLY; diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu index a295ae3d8d25..30bd1bef7485 100644 --- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu +++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <node oor:name="MS Word 2007 XML" oor:op="replace"> - <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER ENCRYPTION PASSWORDTOMODIFY</value></prop> + <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER ENCRYPTION PASSWORDTOMODIFY SUPPORTSSIGNING</value></prop> <prop oor:name="UIComponent"/> <prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop> <prop oor:name="UserData"><value>OXML</value></prop> |