summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2017-08-04 16:10:43 +0200
committerTomaž Vajngerl <quikee@gmail.com>2017-08-07 14:27:55 +0200
commit3e493d337819204ca9c7302efbd7b34c282956a2 (patch)
tree337dcfd80a8ba7961872a3c73cb3504421a35809 /officecfg
parent5ebd60e7d912704ff9e2936e673ffaa6f39a9a2f (diff)
TSCP: simplify toolbar to only one combo box + configuration
Previously we had 3 comboboxes each for different classification policies. This simplifies it to just use one classification policy and which policy it will be used can be set in LO configuration. By default this is the "IntellectualProperty" policy, which is the one most users will probably be interested in. Change-Id: I1fc69c2123b04ecf58a6775e5bcda3b5316414a3 Reviewed-on: https://gerrit.libreoffice.org/40768 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu5
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs11
2 files changed, 16 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index f84bd1a8eeb6..746553f17dd7 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -542,4 +542,9 @@
<value install:module="unx">true</value>
</prop>
</node>
+ <node oor:name="Classification">
+ <prop oor:name="Policy" oor:type="xs:short">
+ <value>3</value>
+ </prop>
+ </node>
</oor:component-data>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index bbf4f4eea7d1..0793ee4e6ad9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6729,5 +6729,16 @@
<value>true</value>
</prop>
</group>
+ <group oor:name="Classification">
+ <info>
+ <desc>TSCP Classification</desc>
+ </info>
+ <prop oor:name="Policy" oor:type="xs:short" oor:nillable="false">
+ <info>
+ <desc>The policy type used at classification</desc>
+ </info>
+ <value>3</value>
+ </prop>
+ </group>
</component>
</oor:component-schema>