From 5a44320a4d8c7893f596ba2ad1ef2db33fdc8b5c Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 9 Jul 2012 09:47:52 +0100 Subject: Related: fdo#30763 always fill in default name under GNOME regardless of whether lockdown is in effect. Change-Id: I3c5d3aba89f8cedb6e3e4bd2ecc1af954a953306 --- shell/source/backends/desktopbe/desktopbackend.cxx | 3 +- shell/source/backends/gconfbe/gconfaccess.cxx | 32 +++++++++++----------- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'shell/source') 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, @@ -609,22 +625,6 @@ ConfigurationValue const ConfigurationValues[] = SETTING_AUTO_SAVE }, - { - 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", -- cgit /cp-5.0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/download.lst
AgeCommit message (Expand)Author
2012-12-25fix dbghelp.dll checksumDavid Tardon
2012-12-25convert external to gbuildPeter Foley
2012-12-18Fix the regression in fdo#47499: wrong fill colourFridrich Štrba
2012-12-07also with cppunit_dll.vcxprojMarkus Mohrhard
2012-12-07switch to cppunit tarball with vcproj and vcxproj filesMarkus Mohrhard
2012-12-03Upload libvisio-0.0.23, fixing regression fdo#48601Fridrich Štrba
2012-11-29Uploading libvisio 0.0.22 releaseFridrich Štrba
2012-11-28fix name of liborcus tarballMatúš Kukan
2012-11-28New place to specify the tarball name.Kohei Yoshida
2012-11-27download few tarballs directly without md5sum in nameMatúš Kukan
2012-11-27support for --with-all-tarballsMatúš Kukan