diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 09:47:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:57 +0100 |
| commit | 5a44320a4d8c7893f596ba2ad1ef2db33fdc8b5c (patch) | |
| tree | 2f0d98f746276c9847ee40a105f87363cd319470 /officecfg | |
| parent | 526f80404c87a41fe46cf5694b32b469875e5c6d (diff) | |
Related: fdo#30763 always fill in default name under GNOME
regardless of whether lockdown is in effect.
Change-Id: I3c5d3aba89f8cedb6e3e4bd2ecc1af954a953306
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 2 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/UserProfile.xcu | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 637d84598494..682a3e25a4a7 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -161,7 +161,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Setup-math.xcu \ org/openoffice/Setup-report.xcu \ org/openoffice/Setup-start.xcu \ - org/openoffice/UserProfile-gconflockdown.xcu \ + org/openoffice/UserProfile-unixdesktop.xcu \ org/openoffice/VCL-gconflockdown.xcu \ org/openoffice/VCL-unixdesktop.xcu \ org/openoffice/Office/Accelerators-macosx.xcu \ diff --git a/officecfg/registry/data/org/openoffice/UserProfile.xcu b/officecfg/registry/data/org/openoffice/UserProfile.xcu index 4e4ec41515f1..d0d297928161 100644 --- a/officecfg/registry/data/org/openoffice/UserProfile.xcu +++ b/officecfg/registry/data/org/openoffice/UserProfile.xcu @@ -28,18 +28,13 @@ <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd"> <oor:component-data oor:name="UserProfile" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <node oor:name="Data"> - <prop oor:name="apartment" oor:type="xs:string"> - <value/> + <prop oor:name="givenname"> + <value install:module="unixdesktop" oor:external= + "com.sun.star.configuration.backend.DesktopBackend givenname"/> </prop> - <prop oor:name="fathersname" oor:type="xs:string"> - <value/> - </prop> - <prop oor:name="givenname" install:module="gconflockdown"> - <value oor:external= - "com.sun.star.configuration.backend.GconfBackend givenname"/> - </prop> - <prop oor:name="sn" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend sn"/> + <prop oor:name="sn"> + <value install:module="unixdesktop" oor:external= + "com.sun.star.configuration.backend.DesktopBackend sn"/> </prop> </node> </oor:component-data> |