diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-06 14:24:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-07 15:39:22 +0100 |
| commit | 29202a16d9f1934684c7d0978112849f2a21fe2f (patch) | |
| tree | f72219d0804dd6ba45e0f1e5b02603be5ef5d5c3 /officecfg | |
| parent | 2c3bf6bfc244517a0134e320acaa1f720703d8f2 (diff) | |
Resolves: tdf#89905 don't copy palettes from shared to user
make this a multi-path element with a shared read-only location
and a user read/write location and don't copy the presets, instead
just keep them in the shared location
Now an admin can copy extra palettes into the shared location
and they magically appear in the user deployments
Change-Id: I7585789c0c59941094f6128368df94b834d3c2a2
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Paths.xcu | 3 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index 6d739e67d72f..965a629ac790 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -124,6 +124,9 @@ </node> </node> <node oor:name="Palette" oor:op="fuse" oor:mandatory="true"> + <node oor:name="InternalPaths"> + <node oor:name="$(insturl)/@LIBO_SHARE_FOLDER@/palette" oor:op="fuse"/> + </node> <prop oor:name="WritePath"> <value>$(userurl)/config</value> </prop> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 0bc0dc8bd54a..8922889bc932 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1642,12 +1642,15 @@ </info> <value>$(progpath)</value> </prop> - <prop oor:name="Palette" oor:type="xs:string" oor:nillable="false"> + <prop oor:name="Palette" oor:type="oor:string-list" oor:nillable="false"> <info> <desc>Specifies the path to the palette files *.SOB to *.SOF containing user-defined colors and patterns.</desc> </info> - <value>$(userurl)/config</value> + <value> + <it>$(insturl)/@LIBO_SHARE_FOLDER@/palette</it> + <it>$(userurl)/config</it> + </value> </prop> <prop oor:name="Plugin" oor:type="oor:string-list" oor:nillable="false"> <info> |