diff options
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 2 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/UserProfile.xcu | 17 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 2 | ||||
| -rw-r--r-- | shell/source/backends/desktopbe/desktopbackend.cxx | 3 | ||||
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 32 |
5 files changed, 26 insertions, 30 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> diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 1749b5f345eb..3c63d1f7a586 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -307,6 +307,7 @@ MY_FILES_main += \ $(MY_MOD)/org/openoffice/Office/Common-unx.xcu \ $(MY_MOD)/org/openoffice/Office/Paths-unixdesktop.xcu \ $(MY_MOD)/org/openoffice/Office/Paths-unxwnt.xcu \ + $(MY_MOD)/org/openoffice/UserProfile-unixdesktop.xcu \ $(MY_MOD)/org/openoffice/VCL-unixdesktop.xcu # Inet-unixdesktop.xcu must come after Inet.xcu # VCL-unixdesktop.xcu must come after VCL.xcu @@ -466,7 +467,6 @@ MY_DEPS_gnome = main MY_FILES_gnome += \ $(MY_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \ $(MY_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \ - $(MY_MOD)/org/openoffice/UserProfile-gconflockdown.xcu \ $(MY_MOD)/org/openoffice/VCL-gconflockdown.xcu .END .IF "$(ENABLE_GIO)" == "TRUE" diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index 9b859c98b2d9..e84e09639edd 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -173,7 +173,7 @@ css::uno::Any Default::getPropertyValue(rtl::OUString const & PropertyName) || PropertyName == "SourceViewFontName" || PropertyName == "WorkPathVariable" || PropertyName == "ooInetFTPProxyName" || PropertyName == "ooInetFTPProxyPort" || PropertyName == "ooInetHTTPProxyName" || PropertyName == "ooInetHTTPProxyPort" || PropertyName == "ooInetHTTPSProxyName" || PropertyName == "ooInetHTTPSProxyPort" || PropertyName == "ooInetNoProxy" - || PropertyName == "ooInetProxyType" ) + || PropertyName == "ooInetProxyType" || PropertyName == "givenname" || PropertyName == "sn" ) { return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); } @@ -214,6 +214,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( RTL_CONSTASCII_USTRINGPARAM("system.desktop-environment"))) >>= desktop; } + // Fall back to the default if the specific backend is not available: css::uno::Reference< css::uno::XInterface > backend; if ( desktop == "GNOME" ) { diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 47d4138d62f4..8743bcd55037 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -568,6 +568,22 @@ ConfigurationValue const ConfigurationValues[] = SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked }, + { + SETTING_USER_GIVENNAME, + "/desktop/gnome/url-handlers/mailto/command", // dummy + RTL_CONSTASCII_STRINGPARAM("givenname"), + sal_True, + SETTING_USER_GIVENNAME + }, + + { + SETTING_USER_SURNAME, + "/desktop/gnome/url-handlers/mailto/command", // dummy + RTL_CONSTASCII_STRINGPARAM("sn"), + sal_True, + SETTING_USER_SURNAME + }, + #ifdef ENABLE_LOCKDOWN { SETTING_WRITER_DEFAULT_DOC_FORMAT, @@ -610,22 +626,6 @@ ConfigurationValue const ConfigurationValues[] = }, { - SETTING_USER_GIVENNAME, - "/desktop/gnome/url-handlers/mailto/command", // dummy - RTL_CONSTASCII_STRINGPARAM("givenname"), - sal_True, - SETTING_USER_GIVENNAME - }, - - { - SETTING_USER_SURNAME, - "/desktop/gnome/url-handlers/mailto/command", // dummy - RTL_CONSTASCII_STRINGPARAM("sn"), - sal_True, - SETTING_USER_SURNAME - }, - - { SETTING_DISABLE_PRINTING, "/desktop/gnome/lockdown/disable_printing", RTL_CONSTASCII_STRINGPARAM("DisablePrinting"), |