diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2017-09-19 15:37:04 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2017-09-21 09:49:12 +0200 |
commit | 71ee09947d5a71105d64fd225bb3672dfa7ce834 (patch) | |
tree | 81103520450ac1742f100dcc21526a1543cf74dc /sfx2/classification | |
parent | f22ad61038d5bf10dbe9f2ce0bdf0ef996be72f6 (diff) |
TSCP: add advanced classification dialog
This adds a advanced classification dialog, which enables the user
to manually construct a header/footer message from classification
properties in cases where the user needs more control. All the
text is inserted as fields into the end document and can be changed
by changing the document properties. The simple classification
still functions as it did before, which is what most users will
want to use in this case.
The BAF policy has been extended with new xml extension elements:
- loext:Marking
- loext:IntellectualPropertyPart
- loext:IntellectualPropertyPartNumber
They are used to fill the values in the advanced classification
dialog.
Change-Id: Ie2d638d69b8a9b0799cff9c2b785eb789f8af1d5
Reviewed-on: https://gerrit.libreoffice.org/42474
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sfx2/classification')
-rw-r--r-- | sfx2/classification/baf.xsd | 38 | ||||
-rw-r--r-- | sfx2/classification/baf_loext.xsd | 19 | ||||
-rw-r--r-- | sfx2/classification/example.xml | 7 | ||||
-rw-r--r-- | sfx2/classification/example_sl-SI.xml | 7 |
4 files changed, 48 insertions, 23 deletions
diff --git a/sfx2/classification/baf.xsd b/sfx2/classification/baf.xsd index 778cfbec6036..a0bae6cc9ff1 100644 --- a/sfx2/classification/baf.xsd +++ b/sfx2/classification/baf.xsd @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xal="urn:oasis:names:tc:ciq:xal:3" xmlns:xnl="urn:oasis:names:tc:ciq:xnl:3" xmlns="urn:tscp:names:baf:1.1" targetNamespace="urn:tscp:names:baf:1.1"> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xal="urn:oasis:names:tc:ciq:xal:3" xmlns:xnl="urn:oasis:names:tc:ciq:xnl:3" xmlns="urn:tscp:names:baf:1.1" targetNamespace="urn:tscp:names:baf:1.1"> <xs:import namespace="urn:oasis:names:tc:ciq:xal:3" schemaLocation="xAL.xsd"/> <xs:import namespace="urn:oasis:names:tc:ciq:xnl:3" schemaLocation="xNL.xsd"/> - <!-- -Business Authorization ---> + <xs:import namespace="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" schemaLocation="baf_loext.xsd"/> + + <!-- Business Authorization --> <xs:complexType name="BusinessAuthorization"> <xs:sequence> <xs:element ref="PolicyAuthorityName"/> @@ -31,6 +31,9 @@ Business Authorization <xs:complexType> <xs:sequence> <xs:element ref="BusinessAuthorizationCategory" maxOccurs="unbounded"/> + <xs:element ref="loext:Marking" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="loext:IntellectualPropertyPart" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="loext:IntellectualPropertyPartNumber" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> @@ -38,6 +41,9 @@ Business Authorization <xs:complexType> <xs:sequence> <xs:element ref="BusinessAuthorizationCategory" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="loext:Marking" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="loext:IntellectualPropertyPart" minOccurs="0" maxOccurs="unbounded"/> + <xs:element ref="loext:IntellectualPropertyPartNumber" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> </xs:element> @@ -51,24 +57,20 @@ Business Authorization <xs:restriction base="xs:date"/> </xs:simpleType> </xs:element> - <!-- -Business Authorization Category ---> + <!-- Business Authorization Category --> <xs:element name="BusinessAuthorizationCategory"> <xs:complexType> <xs:sequence> <xs:element ref="AccessRules" minOccurs="0" maxOccurs="1"/> <xs:element ref="HandlingRules" minOccurs="0" maxOccurs="1"/> - <xs:element ref="LabelingRules"/> - <xs:element ref="ImpactLevel"/> + <xs:element ref="LabelingRules"/> + <xs:element ref="ImpactLevel"/> </xs:sequence> <xs:attribute name="Identifier" type="xs:anyURI" use="required"/> <xs:attribute name="Name" type="xs:string" use="optional"/> </xs:complexType> </xs:element> - <!-- -Impact Level ---> + <!-- Impact Level --> <xs:element name="ImpactLevel"> <xs:complexType> <xs:sequence> @@ -83,9 +85,7 @@ Impact Level <xs:element name="ConfidentalityValue" type="xs:string"/> <xs:element name="IntegrityValue" type="xs:string"/> <xs:element name="AvailabilityValue" type="xs:string"/> - <!-- -Handling Rule ---> + <!-- Handling Rule --> <xs:complexType name="HandlingRule" abstract="true"/> <xs:complexType name="SecureWEBTransmission"> <xs:complexContent> @@ -127,9 +127,7 @@ Handling Rule <xs:extension base="HandlingRule"/> </xs:complexContent> </xs:complexType> - <!-- -Labeling Rule ---> + <!-- Labeling Rule --> <xs:element name="VisualMarkingPart"> <xs:complexType> <xs:sequence> @@ -141,9 +139,7 @@ Labeling Rule </xs:element> <xs:element name="Identifier"/> <xs:element name="Value"/> - <!-- -Others ---> + <!-- Others --> <xs:element name="WorkEffortsScope"> <xs:complexType> <xs:sequence> diff --git a/sfx2/classification/baf_loext.xsd b/sfx2/classification/baf_loext.xsd new file mode 100644 index 000000000000..593eb01173d5 --- /dev/null +++ b/sfx2/classification/baf_loext.xsd @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" targetNamespace="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"> + <!-- Markings --> + <xs:element name="Marking"> + <xs:complexType> + <xs:attribute name="Name" type="xs:string" use="optional"/> + </xs:complexType> + </xs:element> + <xs:element name="IntellectualPropertyPart"> + <xs:complexType> + <xs:attribute name="Name" type="xs:string" use="optional"/> + </xs:complexType> + </xs:element> + <xs:element name="IntellectualPropertyPartNumber"> + <xs:complexType> + <xs:attribute name="Name" type="xs:string" use="optional"/> + </xs:complexType> + </xs:element> +</xs:schema> diff --git a/sfx2/classification/example.xml b/sfx2/classification/example.xml index f2647f903a8c..82098031ff91 100644 --- a/sfx2/classification/example.xml +++ b/sfx2/classification/example.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1"> +<baf:BusinessAuthorization xmlns:baf="urn:tscp:names:baf:1.1" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"> <!-- Translators: this string can be localized --> <baf:PolicyAuthorityName>TSCP Example Policy Authority</baf:PolicyAuthorityName> <!-- Translators: this string can be localized --> @@ -78,6 +78,11 @@ <baf:ConfidentalityValue>3</baf:ConfidentalityValue> </baf:ImpactLevel> </baf:BusinessAuthorizationCategory> + <loext:Marking Name="Example Marking" /> + <loext:IntellectualPropertyPart Name="Example First IP Part" /> + <loext:IntellectualPropertyPart Name="Example Second IP Part" /> + <loext:IntellectualPropertyPartNumber Name="1" /> + <loext:IntellectualPropertyPartNumber Name="2" /> </baf:Included> </baf:BusinessAuthorization> <!-- vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sfx2/classification/example_sl-SI.xml b/sfx2/classification/example_sl-SI.xml index 1d1983679d83..99e04a7aab71 100644 --- a/sfx2/classification/example_sl-SI.xml +++ b/sfx2/classification/example_sl-SI.xml @@ -33,7 +33,7 @@ </baf:VisualMarkingPart> <baf:VisualMarkingPart> <baf:Identifier>Document: Footer</baf:Identifier> - <baf:Value>Ta vsebina ima oznako zaupno. Ne razširjajte je zunaj brez poslovne odobritve.</baf:Value> + <baf:Value>Ta vsebina ima oznako zaupno. Ne razširjajte je zunaj brez poslovne odobritve.</baf:Value> </baf:VisualMarkingPart> <baf:VisualMarkingPart> <baf:Identifier>Document: Watermark</baf:Identifier> @@ -65,6 +65,11 @@ <baf:ConfidentalityValue>3</baf:ConfidentalityValue> </baf:ImpactLevel> </baf:BusinessAuthorizationCategory> + <loext:Marking Name="Primer oznake" /> + <loext:IntellectualPropertyPart Name="Primer - del intelektualne lastnine ena" /> + <loext:IntellectualPropertyPart Name="Primer - del intelektualne lastnine dve" /> + <loext:IntellectualPropertyPartNumber Name="1" /> + <loext:IntellectualPropertyPartNumber Name="2" /> </baf:Included> </baf:BusinessAuthorization> <!-- vim:set shiftwidth=4 softtabstop=4 expandtab: |