drop gconf integration as per ESC decision

Conflicts:
	shell/source/backends/gconfbe/gconfbackend.cxx

Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

README.Solaris

@@ -32,7 +32,7 @@ pkg install pkg:/developer/documentation-tool/doxygen@1.5.7.1-0.175.0.0.0.2.537
 Compiling
 ---------
 
-CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --disable-gconf --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
+CC="gcc" CXX="g++" ./autogen.sh --with-num-cpus=2 --with-max-jobs=4 --without-junit --disable-mozilla --with-system-curl --without-help --disable-cups --without-java --with-system-cairo --with-lang= --enable-gio --disable-gnome-vfs --disable-gstreamer --without-fonts --with-system-dicts --disable-mozilla --without-system-mozilla --disable-xmlsec --with-system-openssl
 
 gmake
 

Repository.mk

@@ -250,7 +250,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 	$(if $(ENABLE_EVOAB2),evoab) \
 	$(if $(ENABLE_GTK),vclplug_gtk) \
 	$(if $(ENABLE_GTK3),vclplug_gtk3) \
-	$(if $(ENABLE_GCONF),gconfbe1) \
 	$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
 	$(if $(ENABLE_GIO),losessioninstall) \
 	$(if $(ENABLE_GIO),ucpgio1) \

RepositoryExternal.mk

@@ -3066,33 +3066,6 @@ endef
 endif # ENABLE_TDE
 
 
-ifeq ($(ENABLE_GCONF),TRUE)
-
-define gb_LinkTarget__use_gconf
-$(call gb_LinkTarget_set_include,$(1),\
-	$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS)))) \
-	$$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
-	$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(GCONF_CFLAGS))) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(GCONF_LIBS) \
-)
-
-endef
-
-else # !ENABLE_GCONF
-
-define gb_LinkTarget__use_gconf
-
-endef
-
-endif # ENABLE_GCONF
-
-
 # PYTHON
 # extra python_headers external because pyuno wrapper must not link python
 ifneq ($(SYSTEM_PYTHON),)

bin/findunusedcode

@@ -17,7 +17,6 @@ echo "--without-doxygen
 --enable-extension-integration
 --enable-graphite
 --enable-evolution2
---enable-lockdown
 --enable-online-update
 --enable-dbgutil
 --enable-werror

config_host.mk.in

@@ -128,7 +128,6 @@ export ENABLE_DIRECTX=@ENABLE_DIRECTX@
 export ENABLE_EOT=@ENABLE_EOT@
 export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
-export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_ORCUS=@ENABLE_ORCUS@
@@ -146,7 +145,6 @@ export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
 export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
-export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
@@ -199,8 +197,6 @@ export FREEHAND_LIBS=$(gb_SPACE)@FREEHAND_LIBS@
 export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@
 export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@
 export GCC_VERSION=@GCC_VERSION@
-export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
-export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
 export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
 export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
 export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@

configure.ac

@@ -1000,11 +1000,6 @@ AC_ARG_ENABLE(fetch-external,
         [Disables fetching external tarballs from web sources.])
 )
 
-AC_ARG_ENABLE(lockdown,
-    AS_HELP_STRING([--disable-lockdown],
-        [Disables the gconf integration work in LibreOffice.]),
-)
-
 AC_ARG_ENABLE(pch,
     AS_HELP_STRING([--enable-pch],
         [Enables precompiled header support for C++. Forced default on Windows/VC build])
@@ -1198,11 +1193,6 @@ AC_ARG_ENABLE(sdremote-bluetooth,
         [Determines whether to build sdremote with bluetooth support.
          Requires dbus on Linux.]))
 
-AC_ARG_ENABLE(gconf,
-    AS_HELP_STRING([--disable-gconf],
-        [Determines whether to use the GConf support.]),
-,enable_gconf=yes)
-
 AC_ARG_ENABLE(gio,
     AS_HELP_STRING([--disable-gio],
         [Determines whether to use the GIO support.]),
@@ -10003,24 +9993,6 @@ if test -z "$build_vcl_plugins"; then
 fi
 AC_MSG_NOTICE([VCLplugs to be built: $build_vcl_plugins])
 
-dnl ===================================================================
-dnl GCONF check
-dnl ===================================================================
-
-ENABLE_GCONF=
-AC_MSG_CHECKING([whether to enable GConf support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "iOS" -a "$enable_gconf" = "yes"; then
-    ENABLE_GCONF="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( GCONF, gconf-2.0 gobject-2.0 )
-    GCONF_CFLAGS=$(printf '%s' "$GCONF_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(GCONF_LIBS)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(ENABLE_GCONF)
-
 dnl ===================================================================
 dnl check for dbus support
 dnl ===================================================================
@@ -11228,19 +11200,6 @@ AC_SUBST(KDE_GLIB_CFLAGS)
 AC_SUBST(KDE_GLIB_LIBS)
 AC_SUBST(KDE_HAVE_GLIB)
 
-dnl ===================================================================
-dnl Test for the enabling the lockdown pieces
-dnl ===================================================================
-AC_MSG_CHECKING([whether to enable the lockdown pieces])
-ENABLE_LOCKDOWN=
-if test -n "$enable_lockdown" -a "$enable_lockdown" != "no"; then
-    ENABLE_LOCKDOWN=TRUE
-    AC_MSG_RESULT([yes])
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(ENABLE_LOCKDOWN)
-
 dnl ===================================================================
 dnl Test whether to include Evolution 2 support
 dnl ===================================================================

desktop/Pagein_common.mk

@@ -62,7 +62,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
     avmedia \
     helplinker \
     sax \
-    gconfbe1 \
     fsstorage \
     desktopbe1 \
     localebe1 \

distro-configs/LibreOfficeAndroid.conf

 --host=arm-linux-androideabi
 --disable-cairo-canvas
 --disable-cups
---disable-gconf
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
---disable-lockdown
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python

distro-configs/LibreOfficeAndroidAarch64.conf

 --host=aarch64-linux-android
 --disable-cairo-canvas
 --disable-cups
---disable-gconf
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
---disable-lockdown
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python

distro-configs/LibreOfficeAndroidX86.conf

 --host=i686-linux-androideabi
 --disable-cairo-canvas
 --disable-cups
---disable-gconf
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
---disable-lockdown
 --disable-odk
 --disable-postgresql-sdbc
 --disable-python

distro-configs/LibreOfficeCoverity.conf

@@ -14,7 +14,6 @@
 --without-system-libmwaw
 --enable-dbus
 --enable-extension-integration
---enable-lockdown
 --enable-kde4
 --enable-evolution2
 --enable-scripting-beanshell

distro-configs/LibreOfficeEmscripten.conf

@@ -5,7 +5,6 @@
 
 # Disable unnecessary stuff
 --disable-cups
---disable-gconf
 --disable-dconf
 --disable-gio
 --disable-dbus
@@ -13,7 +12,6 @@
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
---disable-lockdown
 --disable-odk
 --disable-postgresql-sdbc
 --disable-firebird-sdbc

distro-configs/LibreOfficeLinux.conf

@@ -20,7 +20,6 @@
 --enable-dbus
 --enable-extension-integration
 --enable-odk
---enable-lockdown
 --enable-kde4
 --disable-gtk3
 --enable-gstreamer-0-10

distro-configs/LibreOfficeOpenBSD.conf

@@ -6,7 +6,6 @@
 --disable-odk
 --disable-randr-link
 --enable-gstreamer-0-10
---enable-lockdown
 --enable-ext-wiki-publisher
 --enable-python=system
 --with-alloc=system

instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh

-#!/bin/sh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-cat > /dev/null
-[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
-if [[ "${OS}" == "AIX" ]]; then
-  echo "libgconf-2.a(libgconf-2.so.4${mark64})"
-else
-  echo "libgconf-2.so.4${mark64}"
-fi

officecfg/Configuration_officecfg.mk

@@ -69,7 +69,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Setup-reportbuilder.xcu \
 	org/openoffice/Setup-start.xcu \
 	org/openoffice/UserProfile-unixdesktop.xcu \
-	org/openoffice/VCL-gconflockdown.xcu \
 	org/openoffice/VCL-unixdesktop.xcu \
 	org/openoffice/Office/Accelerators-macosx.xcu \
 	org/openoffice/Office/Accelerators-reportbuilder.xcu \
@@ -83,7 +82,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Office/Common-math.xcu \
 	org/openoffice/Office/Common-unx.xcu \
 	org/openoffice/Office/Common-unixdesktop.xcu \
-	org/openoffice/Office/Common-gconflockdown.xcu \
 	org/openoffice/Office/Common-macosx.xcu \
 	org/openoffice/Office/Common-wnt.xcu \
 	org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
@@ -111,7 +109,6 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
 	org/openoffice/Office/Embedding-base.xcu \
 	org/openoffice/Office/Embedding-reportbuilder.xcu \
 	org/openoffice/Office/Embedding-writer.xcu \
-	org/openoffice/Office/Recovery-gconflockdown.xcu \
 	org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
 	org/openoffice/Office/UI/Controller-reportbuilder.xcu \
 	org/openoffice/TypeDetection/UISort-writer.xcu \

officecfg/registry/data/org/openoffice/Office/Common.xcu

@@ -96,22 +96,6 @@
         <value xml:lang="zh-TW">13</value>
       </prop>
     </node>
-    <node oor:name="FontAntiAliasing" install:module="gconflockdown">
-      <prop oor:name="Enabled">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingEnabled"/>
-      </prop>
-      <prop oor:name="MinPixelHeight">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingMinPixelHeight"/>
-      </prop>
-    </node>
-    <node oor:name="Menu" install:module="gconflockdown">
-      <prop oor:name="DontHideDisabledEntry">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend DontHideDisabledEntry"/>
-      </prop>
-      <prop oor:name="ShowIconsInMenues">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend ShowIconsInMenues"/>
-      </prop>
-    </node>
   </node>
   <node oor:name="Help">
     <node oor:name="StartCenter">
@@ -548,14 +532,10 @@
   </node>
   <node oor:name="Misc">
     <prop oor:name="UseSystemFileDialog">
-      <value install:module="gconflockdown" oor:external="com.sun.star.configuration.backend.GconfBackend UseSystemFileDialog"/>
     </prop>
     <prop oor:name="UseSystemPrintDialog" install:module="macosx">
       <value>true</value>
     </prop>
-    <prop oor:name="SymbolSet" install:module="gconflockdown">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend SymbolSet"/>
-    </prop>
     <prop oor:name="TemplateRepositoryUrls">
       <value/>
     </prop>
@@ -615,12 +595,6 @@
       <prop oor:name="SaveBackwardCompatibleODF" oor:type="xs:boolean">
         <value>false</value>
       </prop>
-      <prop oor:name="CreateBackup" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend CreateBackup"/>
-      </prop>
-      <prop oor:name="WarnAlienFormat" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnAlienFormat"/>
-      </prop>
     </node>
     <node oor:name="ODF">
       <prop oor:name="DefaultVersion" oor:type="xs:short">
@@ -633,27 +607,6 @@
       <prop oor:name="HyperlinksWithCtrlClick" oor:type="xs:boolean">
         <value>true</value>
       </prop>
-      <prop oor:name="MacroSecurityLevel" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend MacroSecurityLevel"/>
-      </prop>
-      <prop oor:name="RecommendPasswordProtection" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend RecommendPasswordProtection"/>
-      </prop>
-      <prop oor:name="RemovePersonalInfoOnSaving" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend RemovePersonalInfoOnSaving"/>
-      </prop>
-      <prop oor:name="WarnCreatePDF" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnCreatePDF"/>
-      </prop>
-      <prop oor:name="WarnPrintDoc" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnPrintDoc"/>
-      </prop>
-      <prop oor:name="WarnSaveOrSendDoc" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnSaveOrSendDoc"/>
-      </prop>
-      <prop oor:name="WarnSignDoc" install:module="gconflockdown">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnSignDoc"/>
-      </prop>
     </node>
   </node>
   <node oor:name="Path">
@@ -679,28 +632,5 @@
         <value oor:external="com.sun.star.configuration.backend.DesktopBackend SourceViewFontHeight"/>
       </prop>
     </node>
-    <node oor:name="View" install:module="gconflockdown">
-      <prop oor:name="History">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend FontViewHistory"/>
-      </prop>
-      <prop oor:name="ShowFontBoxWYSIWYG">
-        <value oor:external="com.sun.star.configuration.backend.GconfBackend ShowFontBoxWYSIWYG"/>
-      </prop>
-    </node>
-  </node>
-  <node oor:name="Accessibility" install:module="gconflockdown">
-    <prop oor:name="IsSystemFont">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend AccessibilityIsSystemFont"/>
-    </prop>
-  </node>
-  <node oor:name="Print" install:module="gconflockdown">
-    <prop oor:name="PrintingModifiesDocument">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend PrintingModifiesDocument"/>
-    </prop>
-  </node>
-  <node oor:name="Undo" install:module="gconflockdown">
-    <prop oor:name="Steps">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend UndoSteps"/>
-    </prop>
   </node>
 </oor:component-data>

officecfg/registry/data/org/openoffice/Office/Recovery.xcu

@@ -17,15 +17,4 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" oor:package="org.openoffice.Office" oor:name="Recovery">
-  <node oor:name="AutoSave" install:module="gconflockdown">
-    <prop oor:name="Enabled">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend AutoSaveEnabled"/>
-    </prop>
-    <prop oor:name="UserAutoSaveEnabled">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend UserAutoSaveEnabled"/>
-    </prop>
-    <prop oor:name="TimeIntervall">
-      <value oor:external="com.sun.star.configuration.backend.GconfBackend AutoSaveTimeIntervall"/>
-    </prop>
-  </node>
 </oor:component-data>

officecfg/registry/data/org/openoffice/VCL.xcu

@@ -28,7 +28,6 @@
     <node oor:name="DesktopManagement" oor:op="replace">
       <prop oor:name="DisablePrinting" oor:type="xs:string" oor:op="replace">
         <value>false</value>
-        <value install:module="gconflockdown" oor:external="com.sun.star.configuration.backend.GconfBackend DisablePrinting"/>
       </prop>
     </node>
     <node oor:name="Transfer" oor:op="replace">

postprocess/CustomTarget_registry.mk

@@ -431,22 +431,11 @@ postprocess_FILES_postgresql := $(call gb_XcuModuleTarget_get_target,connectivit
 postprocess_DRIVERS += postgresql
 endif
 
-ifeq ($(USING_X11), TRUE)
-ifneq (,$(or $(filter TRUETRUE,$(ENABLE_GCONF)$(ENABLE_LOCKDOWN))$(filter TRUE,$(ENABLE_GIO))))
+ifneq (,$(and $(USING_X11), $(ENABLE_GIO)))
 postprocess_XCDS += gnome.xcd
 postprocess_DEPS_gnome := main
-ifeq ($(ENABLE_GCONF)$(ENABLE_LOCKDOWN),TRUETRUE)
-postprocess_FILES_gnome += \
-	$(postprocess_MOD)/org/openoffice/Office/Common-gconflockdown.xcu \
-	$(postprocess_MOD)/org/openoffice/Office/Recovery-gconflockdown.xcu \
-	$(postprocess_MOD)/org/openoffice/VCL-gconflockdown.xcu
+postprocess_FILES_gnome += $(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu
 endif
-ifeq ($(ENABLE_GIO),TRUE)
-postprocess_FILES_gnome += \
-	$(postprocess_MOD)/org/openoffice/ucb/Configuration-gio.xcu
-endif
-endif
-endif # $(USING_X11) == TRUE
 
 ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
 postprocess_XCDS += onlineupdate.xcd

postprocess/Rdb_services.mk

@@ -192,9 +192,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(ENABLE_OPENGL_CANVAS), \
         canvas/source/opengl/oglcanvas \
 	) \
-	$(if $(ENABLE_GCONF), \
-		shell/source/backends/gconfbe/gconfbe1 \
-	) \
 	$(if $(ENABLE_GIO), \
 		shell/source/sessioninstall/losessioninstall \
 		ucb/source/ucp/gio/ucpgio \

scp2/InstallModule_gnome.mk

@@ -13,7 +13,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
 	ENABLE_GIO \
-	ENABLE_LOCKDOWN \
     ENABLE_GTK \
 ))
 

scp2/InstallScript_setup_osl.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(WITH_EXTENSION_INTEGRATION),\
 		scp2/extensions \
 	) \
-	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		scp2/gnome \
 	) \
 	$(if $(filter TRUE,$(ENABLE_KDE4)),\

scp2/Module_scp2.mk

@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 			InstallModule_winexplorerext \
 		) \
 	) \
-	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		InstallModule_gnome \
 	) \
 	$(if $(filter TRUE,$(ENABLE_KDE4)),\

scp2/source/gnome/file_gnome.scp

@@ -17,7 +17,7 @@
  */
 #include "macros.inc"
 
-#if (defined ENABLE_GCONF && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+#if defined ENABLE_GIO
 File gid_File_Share_Registry_Gnome_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);

setup_native/scripts/fake-db.spec

@@ -28,8 +28,6 @@ AutoReqProv: no
 #BuildRoot: %{_tmppath}/%{name}-root
 Provides: libgnomevfs-2.so.0
 Provides: libgnomevfs-2.so.0()(64bit)
-Provides: libgconf-2.so.4
-Provides: libgconf-2.so.4()(64bit)
 Provides: libfreetype.so.6
 Provides: libfreetype.so.6()(64bit)
 Provides: /bin/sh

setup_native/source/packinfo/packinfo_office.txt

@@ -41,7 +41,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWgnome-
 packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-gnome-integration"
 freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
 requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
-findrequires = "find-requires-gnome.sh"
+findrequires = ""
 copyright = "2015 The Document Foundation"
 solariscopyright = "solariscopyrightfile"
 vendor = "The Document Foundation"

shell/Library_gconfbe.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,gconfbe1))
-
-ifeq ($(ENABLE_LOCKDOWN),TRUE)
-$(eval $(call gb_Library_add_defs,gconfbe1,\
-	-DENABLE_LOCKDOWN \
-))
-endif
-
-$(eval $(call gb_Library_use_sdk_api,gconfbe1))
-
-$(eval $(call gb_Library_use_externals,gconfbe1,\
-	boost_headers \
-	gconf \
-))
-
-$(eval $(call gb_Library_use_libraries,gconfbe1,\
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1))
-
-$(eval $(call gb_Library_add_exception_objects,gconfbe1,\
-    shell/source/backends/gconfbe/gconfaccess \
-    shell/source/backends/gconfbe/gconfbackend \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:

shell/Module_shell.mk

@@ -30,12 +30,6 @@ $(eval $(call gb_Module_add_targets,shell,\
 endif
 endif
 
-ifeq ($(ENABLE_GCONF),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\
-	Library_gconfbe \
-))
-endif
-
 ifeq ($(ENABLE_KDE4),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_kde4be \

shell/README

-System helpers - launching URI, recently used files, system integration, external mailer support, gconf integration etc.
+System helpers - launching URI, recently used files, system integration, external mailer support etc.

shell/source/backends/gconfbe/gconfaccess.hxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX
-#define INCLUDED_SHELL_SOURCE_BACKENDS_GCONFBE_GCONFACCESS_HXX
-
-#include "sal/config.h"
-
-#include <cstddef>
-
-#include "com/sun/star/beans/Optional.hpp"
-#include "gconf/gconf-client.h"
-#include "sal/types.h"
-
-namespace com { namespace sun { namespace star { namespace uno {
-    class Any;
-} } } }
-
-namespace gconfaccess {
-
-enum ConfigurationSetting
-{
-    SETTING_PROXY_MODE,
-    SETTING_PROXY_HTTP_HOST,
-    SETTING_PROXY_HTTP_PORT,
-    SETTING_PROXY_HTTPS_HOST,
-    SETTING_PROXY_HTTPS_PORT,
-    SETTING_PROXY_FTP_HOST,
-    SETTING_PROXY_FTP_PORT,
-    SETTING_NO_PROXY_FOR,
-    SETTING_ENABLE_ACCESSIBILITY,
-    SETTING_MAILER_PROGRAM,
-    SETTING_WORK_DIRECTORY,
-    SETTING_TEMPLATE_DIRECTORY,
-    SETTING_SOURCEVIEWFONT_NAME,
-    SETTING_SOURCEVIEWFONT_HEIGHT,
-    SETTING_USER_GIVENNAME,
-    SETTING_USER_SURNAME,
-
-#ifdef ENABLE_LOCKDOWN
-
-    SETTING_DISABLE_PRINTING,
-    SETTING_USE_SYSTEM_FILE_DIALOG,
-    SETTING_PRINTING_MODIFIES_DOCUMENT,
-    SETTING_SHOW_ICONS_IN_MENUS,
-    SETTING_SHOW_INACTIVE_MENUITEMS,
-    SETTING_SHOW_FONT_PREVIEW,
-    SETTING_SHOW_FONT_HISTORY,
-    SETTING_SAVE_DOCUMENT_WINDOWS,
-    SETTING_SAVE_DOCUMENT_VIEW_INFO,
-    SETTING_USE_SYSTEM_FONT,
-    SETTING_USE_FONT_ANTI_ALIASING,
-    SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
-    SETTING_WARN_CREATE_PDF,
-    SETTING_WARN_PRINT_DOC,
-    SETTING_WARN_SAVEORSEND_DOC,
-    SETTING_WARN_SIGN_DOC,
-    SETTING_REMOVE_PERSONAL_INFO,
-    SETTING_RECOMMEND_PASSWORD,
-    SETTING_UNDO_STEPS,
-    SETTING_SYMBOL_SET,
-    SETTING_MACRO_SECURITY_LEVEL,
-    SETTING_CREATE_BACKUP,
-    SETTING_WARN_ALIEN_FORMAT,
-    SETTING_AUTO_SAVE,
-    SETTING_USER_AUTO_SAVE,
-    SETTING_AUTO_SAVE_INTERVAL,
-    SETTING_WRITER_DEFAULT_DOC_FORMAT,
-    SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
-    SETTING_CALC_DEFAULT_DOC_FORMAT,
-
-#endif // ENABLE_LOCKDOWN
-
-    SETTINGS_LAST
-};
-
-struct ConfigurationValue
-{
-    const ConfigurationSetting nSettingId;
-    const gchar *GconfItem;
-    const char *OOoConfItem;
-    const sal_Int32 nOOoConfItemLen;
-    const bool bNeedsTranslation;
-    const ConfigurationSetting nDependsOn;
-};
-
-extern ConfigurationValue const ConfigurationValues[];
-
-extern std::size_t const nConfigurationValues;
-
-com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue(
-    ConfigurationValue const & data);
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/backends/gconfbe/gconfbackend.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sal/config.h"
-
-#include <cstddef>
-
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/beans/Optional.hpp"
-#include "com/sun/star/beans/PropertyVetoException.hpp"
-#include "com/sun/star/beans/UnknownPropertyException.hpp"
-#include "com/sun/star/beans/XPropertyChangeListener.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/beans/XPropertySetInfo.hpp"
-#include "com/sun/star/beans/XVetoableChangeListener.hpp"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "com/sun/star/lang/WrappedTargetException.hpp"
-#include "com/sun/star/lang/XMultiComponentFactory.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/uno/XCurrentContext.hpp"
-#include "cppuhelper/factory.hxx"
-#include <cppuhelper/implbase.hxx>
-#include "cppuhelper/implementationentry.hxx"
-#include "cppuhelper/weak.hxx"
-#include "rtl/string.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "sal/types.h"
-#include "uno/current_context.hxx"
-
-#include "gconfaccess.hxx"
-
-namespace {
-
-OUString SAL_CALL getServiceImplementationName() {
-    return OUString(
-            "com.sun.star.comp.configuration.backend.GconfBackend");
-}
-
-css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() {
-    OUString name(
-            "com.sun.star.configuration.backend.GconfBackend");
-    return css::uno::Sequence< OUString >(&name, 1);
-}
-
-class Service:
-    public cppu::WeakImplHelper<
-        css::lang::XServiceInfo, css::beans::XPropertySet >,
-    private boost::noncopyable
-{
-public:
-    Service();
-
-private:
-    virtual ~Service() {}
-
-    virtual OUString SAL_CALL getImplementationName()
-        throw (css::uno::RuntimeException, std::exception) override
-    { return getServiceImplementationName(); }
-
-    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
-        throw (css::uno::RuntimeException, std::exception) override
-    { return ServiceName == getSupportedServiceNames()[0]; }
-
-    virtual css::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override
-    { return getServiceSupportedServiceNames(); }
-
-    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
-    getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override
-    { return css::uno::Reference< css::beans::XPropertySetInfo >(); }
-
-    virtual void SAL_CALL setPropertyValue(
-        OUString const &, css::uno::Any const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::beans::PropertyVetoException,
-            css::lang::IllegalArgumentException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-
-    virtual css::uno::Any SAL_CALL getPropertyValue(
-        OUString const & PropertyName)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
-
-    virtual void SAL_CALL addPropertyChangeListener(
-        OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
-    {}
-
-    virtual void SAL_CALL removePropertyChangeListener(
-        OUString const &,
-        css::uno::Reference< css::beans::XPropertyChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
-    {}
-
-    virtual void SAL_CALL addVetoableChangeListener(
-        OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
-    {}
-
-    virtual void SAL_CALL removeVetoableChangeListener(
-        OUString const &,
-        css::uno::Reference< css::beans::XVetoableChangeListener > const &)
-        throw (
-            css::beans::UnknownPropertyException,
-            css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override
-    {}
-
-    bool enabled_;
-};
-
-Service::Service(): enabled_(false) {
-    css::uno::Reference< css::uno::XCurrentContext > context(
-        css::uno::getCurrentContext());
-    if (context.is()) {
-        OUString desktop;
-        context->getValueByName(
-            OUString("system.desktop-environment")) >>=
-            desktop;
-        enabled_ = desktop == "GNOME";
-    }
-}
-
-void Service::setPropertyValue(OUString const &, css::uno::Any const &)
-    throw (
-        css::beans::UnknownPropertyException, css::beans::PropertyVetoException,
-        css::lang::IllegalArgumentException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
-{
-    throw css::lang::IllegalArgumentException(
-        OUString("setPropertyValue not supported"),
-        static_cast< cppu::OWeakObject * >(this), -1);
-}
-
-css::uno::Any Service::getPropertyValue(OUString const & PropertyName)
-    throw (
-        css::beans::UnknownPropertyException, css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
-{
-    for (std::size_t i = 0; i < gconfaccess::nConfigurationValues; ++i)
-    {
-        if (PropertyName.equalsAsciiL(
-                gconfaccess::ConfigurationValues[i].OOoConfItem,
-                gconfaccess::ConfigurationValues[i].nOOoConfItemLen))
-        {
-            return css::uno::makeAny(
-                enabled_
-                ? gconfaccess::getValue(gconfaccess::ConfigurationValues[i])
-                : css::beans::Optional< css::uno::Any >());
-        }
-    }
-    throw css::beans::UnknownPropertyException(
-        PropertyName, static_cast< cppu::OWeakObject * >(this));
-}
-
-css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
-    SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
-        const &)
-{
-    return static_cast< cppu::OWeakObject * >(new Service);
-}
-
-static cppu::ImplementationEntry const services[] = {
-    { &createInstance, &getServiceImplementationName,
-      &getServiceSupportedServiceNames, &cppu::createSingleComponentFactory, 0,
-      0 },
-    { 0, 0, 0, 0, 0, 0 }
-};
-
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL gconfbe1_component_getFactory(
-    char const * pImplName, void * pServiceManager, void * pRegistryKey)
-{
-    return cppu::component_getFactoryHelper(
-        pImplName, pServiceManager, pRegistryKey, services);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

shell/source/backends/gconfbe/gconfbe1.component

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="gconfbe1" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.configuration.backend.GconfBackend">
-    <service name="com.sun.star.configuration.backend.GconfBackend"/>
-  </implementation>
-</component>