[Libreoffice-commits] core.git: bin/findunusedcode config_host.mk.in configure.ac desktop/Pagein_common.mk distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeCoverity.conf distro-configs/LibreOfficeEmscripten.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf instsetoo_native/inc_openoffice officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk postprocess/Rdb_services.mk README.Solaris RepositoryExternal.mk Repository.mk scp2/InstallModule_gnome.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source setup_native/scripts setup_native/source shell/Library_gconfbe.mk shell/Module_shell.mk shell/README shell/source
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Fri Oct 16 06:50:52 PDT 2015
README.Solaris | 2
Repository.mk | 1
RepositoryExternal.mk | 27
bin/findunusedcode | 1
config_host.mk.in | 4
configure.ac | 41
desktop/Pagein_common.mk | 1
distro-configs/LibreOfficeAndroid.conf | 2
distro-configs/LibreOfficeAndroidAarch64.conf | 2
distro-configs/LibreOfficeAndroidX86.conf | 2
distro-configs/LibreOfficeCoverity.conf | 1
distro-configs/LibreOfficeEmscripten.conf | 2
distro-configs/LibreOfficeLinux.conf | 1
distro-configs/LibreOfficeOpenBSD.conf | 1
instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 26
officecfg/Configuration_officecfg.mk | 3
officecfg/registry/data/org/openoffice/Office/Common.xcu | 70
officecfg/registry/data/org/openoffice/Office/Recovery.xcu | 11
officecfg/registry/data/org/openoffice/VCL.xcu | 1
postprocess/CustomTarget_registry.mk | 15
postprocess/Rdb_services.mk | 3
scp2/InstallModule_gnome.mk | 1
scp2/InstallScript_setup_osl.mk | 2
scp2/Module_scp2.mk | 2
scp2/source/gnome/file_gnome.scp | 2
setup_native/scripts/fake-db.spec | 2
setup_native/source/packinfo/packinfo_office.txt | 2
shell/Library_gconfbe.mk | 38
shell/Module_shell.mk | 6
shell/README | 2
shell/source/backends/gconfbe/gconfaccess.cxx | 845 ------------
shell/source/backends/gconfbe/gconfaccess.hxx | 114 -
shell/source/backends/gconfbe/gconfbackend.cxx | 210 --
shell/source/backends/gconfbe/gconfbe1.component | 25
34 files changed, 8 insertions(+), 1460 deletions(-)
New commits:
commit 3cf557c12d27f1b2250e69a543136da098112d80
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 16 12:15:55 2015 +0100
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/README.Solaris b/README.Solaris
index fdc1cca..ce460d9 100644
--- a/README.Solaris
+++ b/README.Solaris
@@ -32,7 +32,7 @@ pkg install pkg:/developer/documentation-tool/doxygen at 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
diff --git a/Repository.mk b/Repository.mk
index 9d27892..925d109 100644
--- a/Repository.mk
+++ b/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) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c6bfa12..ccc22b8 100644
--- a/RepositoryExternal.mk
+++ b/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),)
diff --git a/bin/findunusedcode b/bin/findunusedcode
index a9d5411..9758ed4 100755
--- a/bin/findunusedcode
+++ b/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
diff --git a/config_host.mk.in b/config_host.mk.in
index 7789313..947bbd4 100644
--- a/config_host.mk.in
+++ b/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@
diff --git a/configure.ac b/configure.ac
index 12fd51c..e5350de 100644
--- a/configure.ac
+++ b/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.]),
@@ -10004,24 +9994,6 @@ 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 ===================================================================
ENABLE_DBUS=""
@@ -11229,19 +11201,6 @@ 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 ===================================================================
AC_MSG_CHECKING([whether to enable evolution 2 support])
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 8a43f2e..fe42ca7 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -62,7 +62,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
avmedia \
helplinker \
sax \
- gconfbe1 \
fsstorage \
desktopbe1 \
localebe1 \
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 8963f06..37c03d8 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -1,11 +1,9 @@
--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
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index 05abdfc..8daaa9c 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -1,11 +1,9 @@
--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
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index bf7085b..41015e7 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -1,11 +1,9 @@
--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
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index 66218a1..63f55c4 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/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
diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
index 86d5e6c..6171fa7 100644
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ b/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
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 8969911..e10970d 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/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
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 5cdcc8e..f86084c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/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
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
deleted file mode 100644
index 4be8766..0000000
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/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
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 9ccf49a..1768f4e 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/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 \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 8940778..29f81ae 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/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>
diff --git a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
index cbb0077..559a8e8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu
+++ b/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>
diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu
index 28e24e7..00609c5 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/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">
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 0ea2c67..897ad6a 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/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
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 8ae952e..9c0d768 100644
--- a/postprocess/Rdb_services.mk
+++ b/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 \
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 686f6c1..a2d1c88 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/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 \
))
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index 68acb561..593b1af 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/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)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index c577a10..5acaa0c 100644
--- a/scp2/Module_scp2.mk
+++ b/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)),\
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index c7a13c8..f64ad42 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/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);
diff --git a/setup_native/scripts/fake-db.spec b/setup_native/scripts/fake-db.spec
index bf88468..a7a5c31 100644
--- a/setup_native/scripts/fake-db.spec
+++ b/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
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 0eade32..1aa52fd 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/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"
diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk
deleted file mode 100644
index 78e184e..0000000
--- a/shell/Library_gconfbe.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- 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:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index aa4700f..44d0a61 100644
--- a/shell/Module_shell.mk
+++ b/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 \
diff --git a/shell/README b/shell/README
index e8bf311..1a02c24 100644
--- a/shell/README
+++ b/shell/README
@@ -1 +1 @@
-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.
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
deleted file mode 100644
index ec2c0ca..0000000
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ /dev/null
@@ -1,845 +0,0 @@
-/* -*- 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/macros.h>
-#include <sal/config.h>
-
-#include <string.h>
-
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "osl/file.hxx"
-#include "osl/security.hxx"
-#include "osl/thread.h"
-#include "rtl/strbuf.hxx"
-#include "rtl/ustrbuf.hxx"
-
-#include "gconfaccess.hxx"
-
-#define GCONF_PROXY_MODE_KEY "/system/proxy/mode"
-
-#ifdef ENABLE_LOCKDOWN
-#define GCONF_AUTO_SAVE_KEY "/apps/openoffice/auto_save"
-#define GCONF_USER_AUTO_SAVE_KEY "/apps/openoffice/user_auto_save"
-#endif
-
-namespace gconfaccess {
-
-namespace {
-
-namespace uno = css::uno ;
-
-
-GConfClient* getGconfClient()
-{
- static GConfClient* mClient= 0;
- if (mClient == NULL)
- {
-#if !GLIB_CHECK_VERSION(2,36,0)
- /* initialize glib object type library */
- g_type_init();
-#endif
-
- GError* aError = NULL;
- if (!gconf_init(0, NULL, &aError))
- {
- OUString msg("GconfBackend:GconfLayer: Cannot Initialize Gconf connection - " +
- OUString::createFromAscii(aError->message));
-
- g_error_free(aError);
- aError = NULL;
- throw uno::RuntimeException(msg);
- }
-
- mClient = gconf_client_get_default();
- if (!mClient)
- {
- throw uno::RuntimeException("GconfBackend:GconfLayer: Cannot Initialize Gconf connection");
- }
-
- static const char * const PreloadValuesList[] =
- {
- "/desktop/gnome/interface",
- "/system/proxy",
- "/system/http_proxy/host",
- "/desktop/gnome/url-handlers/mailto",
-#ifdef ENABLE_LOCKDOWN
- "/apps/openoffice",
- "/desktop/gnome/lockdown",
- "/apps/openoffice/lockdown",
-#endif // ENABLE_LOCKDOWN
- NULL
- };
- int i = 0;
- while( PreloadValuesList[i] != NULL )
- gconf_client_preload( mClient, PreloadValuesList[i++], GCONF_CLIENT_PRELOAD_ONELEVEL, NULL );
- }
-
- return mClient;
-}
-
-static OUString xdg_user_dir_lookup (const char *type)
-{
- char *config_home;
- char *p;
- bool bError = false;
-
- osl::Security aSecurity;
- oslFileHandle handle;
- OUString aHomeDirURL;
- OUString aDocumentsDirURL;
- OUString aConfigFileURL;
- OUStringBuffer aUserDirBuf;
-
- if (!aSecurity.getHomeDir( aHomeDirURL ) )
- {
- osl::FileBase::getFileURLFromSystemPath(OUString("/tmp"), aDocumentsDirURL);
- return aDocumentsDirURL;
- }
-
- config_home = getenv ("XDG_CONFIG_HOME");
- if (config_home == NULL || config_home[0] == 0)
- {
- aConfigFileURL = aHomeDirURL + "/.config/user-dirs.dirs";
- }
- else
- {
- aConfigFileURL = OUString::createFromAscii(config_home) + "/user-dirs.dirs";
- }
-
- if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, osl_File_OpenFlag_Read))
- {
- rtl::ByteSequence seq;
- while (osl_File_E_None == osl_readLine(handle , reinterpret_cast<sal_Sequence **>(&seq)))
- {
- /* Remove newline at end */
- int relative = 0;
- int len = seq.getLength();
- if(len>0 && seq[len-1] == '\n')
- seq[len-1] = 0;
-
- p = reinterpret_cast<char *>(seq.getArray());
- while (*p == ' ' || *p == '\t')
- p++;
- if (strncmp (p, "XDG_", 4) != 0)
- continue;
- p += 4;
- if (strncmp (p, type, strlen (type)) != 0)
- continue;
- p += strlen (type);
- if (strncmp (p, "_DIR", 4) != 0)
- continue;
- p += 4;
- while (*p == ' ' || *p == '\t')
- p++;
- if (*p != '=')
- continue;
- p++;
- while (*p == ' ' || *p == '\t')
- p++;
- if (*p != '"')
- continue;
- p++;
- if (strncmp (p, "$HOME/", 6) == 0)
- {
- p += 6;
- relative = 1;
- }
- else if (*p != '/')
- continue;
- if (relative)
- {
- aUserDirBuf = OUStringBuffer(aHomeDirURL + "/");
- }
- else
- {
- aUserDirBuf = OUStringBuffer();
- }
- while (*p && *p != '"')
- {
- if ((*p == '\\') && (*(p+1) != 0))
- p++;
- aUserDirBuf.append((sal_Unicode)*p++);
- }
- }//end of while
- osl_closeFile(handle);
- }
- else
- bError = true;
- if (aUserDirBuf.getLength()>0 && !bError)
- {
- aDocumentsDirURL = aUserDirBuf.makeStringAndClear();
- osl::Directory aDocumentsDir( aDocumentsDirURL );
- if( osl::FileBase::E_None == aDocumentsDir.open() )
- return aDocumentsDirURL;
- }
- /* Use fallbacks historical compatibility if nothing else exists */
- return aHomeDirURL + "/" + OUString::createFromAscii(type);
-}
-
-uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
-{
- switch( pGconfValue->type )
- {
- case GCONF_VALUE_BOOL:
- return uno::makeAny( (bool) gconf_value_get_bool( pGconfValue ) );
-
- case GCONF_VALUE_INT:
- return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) );
-
- case GCONF_VALUE_STRING:
- return uno::makeAny( OStringToOUString( OString(
- gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) );
-
- default:
- fprintf( stderr, "makeAnyOfGconfValue: Type not handled.\n" );
- break;
- }
-
- return uno::Any();
-}
-
-
-
-static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight)
-{
- OString aFont( gconf_value_get_string( pGconfValue ) );
- aFont = aFont.trim();
- sal_Int32 nIdx = aFont.lastIndexOf( ' ' );
- if (nIdx < 1) { // urk
- rHeight = 12;
- nIdx = aFont.getLength();
- } else {
- OString aSize = aFont.copy( nIdx + 1 );
- rHeight = static_cast<sal_Int16>( aSize.toInt32() );
- }
-
- rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 );
-}
-
-
-
-uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfValue )
-{
-
- switch( rValue.nSettingId )
- {
- case SETTING_PROXY_MODE:
- {
- OUString aProxyMode;
- uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
- aOriginalValue >>= aProxyMode;
-
- if( aProxyMode == "manual" )
- return uno::makeAny( (sal_Int32) 1 );
- else if( aProxyMode == "none" )
- return uno::makeAny( (sal_Int32) 0 );
- }
- break;
-
- case SETTING_NO_PROXY_FOR:
- {
- OStringBuffer aBuffer;
- if( (GCONF_VALUE_LIST == pGconfValue->type) && (GCONF_VALUE_STRING == gconf_value_get_list_type(pGconfValue)) )
- {
- GSList * list = gconf_value_get_list(pGconfValue);
- for(; list; list = g_slist_next(list))
- {
- aBuffer.append(gconf_value_get_string(static_cast<GConfValue *>(list->data)) + OString(";"));
- }
- // Remove trailing ";"
- aBuffer.setLength(aBuffer.getLength()-1);
- return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
- }
- else
- g_warning( "unexpected type for ignore_hosts" );
- }
- break;
-
- case SETTING_MAILER_PROGRAM:
- {
- OUString aMailer;
- uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
- aOriginalValue >>= aMailer;
- sal_Int32 nIndex = 0;
- return uno::makeAny( aMailer.getToken( 0, ' ', nIndex ) );
- }
-
-#ifdef ENABLE_LOCKDOWN
- // "short" values need to be returned a sal_Int16
- case SETTING_FONT_ANTI_ALIASING_MIN_PIXEL:
- case SETTING_SYMBOL_SET:
- {
- sal_Int32 nShortValue(0);
- uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
- aOriginalValue >>= nShortValue;
- return uno::makeAny( (sal_Int16) nShortValue );
- }
- break;
-#endif // ENABLE_LOCKDOWN
-
- // "boolean" values that need a string to be returned
- case SETTING_ENABLE_ACCESSIBILITY:
-#ifdef ENABLE_LOCKDOWN
- case SETTING_DISABLE_PRINTING:
-#endif // ENABLE_LOCKDOWN
- {
- bool bBooleanValue = false;
- uno::Any aOriginalValue = makeAnyOfGconfValue( pGconfValue );
- aOriginalValue >>= bBooleanValue;
- return uno::makeAny( OUString::boolean( bBooleanValue ) );
- }
-
- case SETTING_WORK_DIRECTORY:
- {
- OUString aDocumentsDirURL = xdg_user_dir_lookup("Documents");
-
- return uno::makeAny( aDocumentsDirURL );
- }
-
- case SETTING_TEMPLATE_DIRECTORY:
- {
- OUString aTemplatesDirURL = xdg_user_dir_lookup("Templates");
-
- return uno::makeAny( aTemplatesDirURL );
- }
-
- case SETTING_USER_GIVENNAME:
- {
- OUString aCompleteName( OStringToOUString(
- g_get_real_name(), osl_getThreadTextEncoding() ) );
- sal_Int32 nIndex = 0;
- OUString aGivenName;
- do
- aGivenName = aCompleteName.getToken( 0, ' ', nIndex );
- while ( nIndex == 0 );
-
- return uno::makeAny( aGivenName );
-
- }
-
- case SETTING_USER_SURNAME:
- {
- OUString aCompleteName( OStringToOUString(
- g_get_real_name(), osl_getThreadTextEncoding() ) );
- sal_Int32 nIndex = 0;
- OUString aSurname;
- do
- aSurname = aCompleteName.getToken( 0, ' ', nIndex );
- while ( nIndex >= 0 );
-
- return uno::makeAny( aSurname );
- }
-
- case SETTING_SOURCEVIEWFONT_NAME:
- case SETTING_SOURCEVIEWFONT_HEIGHT:
- {
- OUString aName;
- sal_Int16 nHeight;
-
- splitFontName (pGconfValue, aName, nHeight);
- if (rValue.nSettingId == SETTING_SOURCEVIEWFONT_NAME)
- return uno::makeAny( aName );
- else
- return uno::makeAny( nHeight );
- }
-
-
- default:
- fprintf( stderr, "Unhandled setting to translate.\n" );
- break;
- }
-
- return uno::Any();
-}
-
-
-
-bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const ConfigurationValue &rValue )
-{
- switch( rValue.nDependsOn )
- {
- case SETTING_PROXY_MODE:
- {
- GConfValue* pGconfValue = gconf_client_get( pClient, GCONF_PROXY_MODE_KEY, NULL );
-
- if ( pGconfValue != NULL )
- {
- bool bOk = g_ascii_strcasecmp( "manual", gconf_value_get_string( pGconfValue ) ) == 0;
- gconf_value_free( pGconfValue );
- if (bOk) return true;
- }
- }
- break;
-
- case SETTING_WORK_DIRECTORY:
- {
- OUString aDocumentsDirURL = xdg_user_dir_lookup("Documents");
- osl::Directory aDocumentsDir( aDocumentsDirURL );
-
- if( osl::FileBase::E_None == aDocumentsDir.open() )
- return true;
- }
- break;
-
- case SETTING_TEMPLATE_DIRECTORY:
- {
- OUString aTemplatesDirURL = xdg_user_dir_lookup("Templates");
- osl::Directory aTemplatesDir( aTemplatesDirURL );
-
- if( osl::FileBase::E_None == aTemplatesDir.open() )
- return true;
- }
- break;
-
- case SETTING_USER_GIVENNAME:
- {
- OUString aCompleteName( OStringToOUString(
- g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( aCompleteName != "Unknown" )
- return true;
- }
- break;
-
- case SETTING_USER_SURNAME:
- {
- OUString aCompleteName( OStringToOUString(
- g_get_real_name(), osl_getThreadTextEncoding() ) );
- if( aCompleteName != "Unknown" )
- {
- if( aCompleteName.trim().indexOf( ' ' ) != -1 )
- return true;
- }
- }
- break;
-
-#ifdef ENABLE_LOCKDOWN
- case SETTING_AUTO_SAVE:
- {
- GConfValue* pGconfValue = gconf_client_get( pClient, GCONF_AUTO_SAVE_KEY, NULL );
-
- if( ( pGconfValue != NULL ) )
- {
- bool bOk = gconf_value_get_bool( pGconfValue );
- gconf_value_free( pGconfValue );
- if (bOk) return true;
- }
- }
- break;
- case SETTING_USER_AUTO_SAVE:
- {
- GConfValue* pGconfValue = gconf_client_get( pClient, GCONF_USER_AUTO_SAVE_KEY, NULL );
-
- if( ( pGconfValue != NULL ) )
- {
- bool bOk = gconf_value_get_bool( pGconfValue );
- gconf_value_free( pGconfValue );
- if (bOk) return true;
- }
- }
- break;
-#endif // ENABLE_LOCKDOWN
-
- default:
- fprintf( stderr, "Unhandled setting to check dependency.\n" );
- break;
- }
-
- return false;
-}
-
-}
-
-ConfigurationValue const ConfigurationValues[] =
-{
- {
- SETTING_ENABLE_ACCESSIBILITY,
- "/desktop/gnome/interface/accessibility",
- RTL_CONSTASCII_STRINGPARAM("EnableATToolSupport"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_PROXY_MODE,
- GCONF_PROXY_MODE_KEY,
- RTL_CONSTASCII_STRINGPARAM("ooInetProxyType"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_PROXY_HTTP_HOST,
- "/system/http_proxy/host",
- RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyName"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_PROXY_HTTP_PORT,
- "/system/http_proxy/port",
- RTL_CONSTASCII_STRINGPARAM("ooInetHTTPProxyPort"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_PROXY_HTTPS_HOST,
- "/system/proxy/secure_host",
- RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyName"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_PROXY_HTTPS_PORT,
- "/system/proxy/secure_port",
- RTL_CONSTASCII_STRINGPARAM("ooInetHTTPSProxyPort"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_PROXY_FTP_HOST,
- "/system/proxy/ftp_host",
- RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyName"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_PROXY_FTP_PORT,
- "/system/proxy/ftp_port",
- RTL_CONSTASCII_STRINGPARAM("ooInetFTPProxyPort"),
- false,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_NO_PROXY_FOR,
- "/system/http_proxy/ignore_hosts",
- RTL_CONSTASCII_STRINGPARAM("ooInetNoProxy"),
- true,
- SETTING_PROXY_MODE
- },
-
- {
- SETTING_MAILER_PROGRAM,
- "/desktop/gnome/url-handlers/mailto/command",
- RTL_CONSTASCII_STRINGPARAM("ExternalMailer"),
- true,
- SETTINGS_LAST
- },
- {
- SETTING_SOURCEVIEWFONT_NAME,
- "/desktop/gnome/interface/monospace_font_name",
- RTL_CONSTASCII_STRINGPARAM("SourceViewFontName"),
- true,
- SETTINGS_LAST
- },
- {
- SETTING_SOURCEVIEWFONT_HEIGHT,
- "/desktop/gnome/interface/monospace_font_name",
- RTL_CONSTASCII_STRINGPARAM("SourceViewFontHeight"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_WORK_DIRECTORY,
- "/desktop/gnome/url-handlers/mailto/command", // dummy
- RTL_CONSTASCII_STRINGPARAM("WorkPathVariable"),
- true,
- SETTING_WORK_DIRECTORY, // so that the existence of the dir can be checked
- },
-
- {
- SETTING_TEMPLATE_DIRECTORY,
- "/desktop/gnome/url-handlers/mailto/command", // dummy
- RTL_CONSTASCII_STRINGPARAM("TemplatePathVariable"),
- true,
- SETTING_TEMPLATE_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"),
- true,
- SETTING_USER_GIVENNAME
- },
-
- {
- SETTING_USER_SURNAME,
- "/desktop/gnome/url-handlers/mailto/command", // dummy
- RTL_CONSTASCII_STRINGPARAM("sn"),
- true,
- SETTING_USER_SURNAME
- },
-
-#ifdef ENABLE_LOCKDOWN
- {
- SETTING_WRITER_DEFAULT_DOC_FORMAT,
- "/apps/openoffice/writer_default_document_format",
- RTL_CONSTASCII_STRINGPARAM("TextDocumentSetupFactoryDefaultFilter"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_IMPRESS_DEFAULT_DOC_FORMAT,
- "/apps/openoffice/impress_default_document_format",
- RTL_CONSTASCII_STRINGPARAM("PresentationDocumentSetupFactoryDefaultFilter"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_CALC_DEFAULT_DOC_FORMAT,
- "/apps/openoffice/calc_default_document_format",
- RTL_CONSTASCII_STRINGPARAM("SpreadsheetDocumentSetupFactoryDefaultFilter"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_AUTO_SAVE,
- GCONF_AUTO_SAVE_KEY,
- RTL_CONSTASCII_STRINGPARAM("AutoSaveEnabled"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_USER_AUTO_SAVE,
- GCONF_USER_AUTO_SAVE_KEY,
- RTL_CONSTASCII_STRINGPARAM("UserAutoSaveEnabled"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_AUTO_SAVE_INTERVAL,
- "/apps/openoffice/auto_save_interval",
- RTL_CONSTASCII_STRINGPARAM("AutoSaveTimeIntervall"),
- false,
- SETTING_AUTO_SAVE
- },
-
- {
- SETTING_DISABLE_PRINTING,
- "/desktop/gnome/lockdown/disable_printing",
- RTL_CONSTASCII_STRINGPARAM("DisablePrinting"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_USE_SYSTEM_FILE_DIALOG,
- "/apps/openoffice/use_system_file_dialog",
- RTL_CONSTASCII_STRINGPARAM("UseSystemFileDialog"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_PRINTING_MODIFIES_DOCUMENT,
- "/apps/openoffice/printing_modifies_doc",
- RTL_CONSTASCII_STRINGPARAM("PrintingModifiesDocument"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_SHOW_ICONS_IN_MENUS,
- "/apps/openoffice/show_menu_icons",
- RTL_CONSTASCII_STRINGPARAM("ShowIconsInMenues"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_SHOW_INACTIVE_MENUITEMS,
- "/apps/openoffice/show_menu_inactive_items",
- RTL_CONSTASCII_STRINGPARAM("DontHideDisabledEntry"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_SHOW_FONT_PREVIEW,
- "/apps/openoffice/show_font_preview",
- RTL_CONSTASCII_STRINGPARAM("ShowFontBoxWYSIWYG"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_SHOW_FONT_HISTORY,
- "/apps/openoffice/show_font_history",
- RTL_CONSTASCII_STRINGPARAM("FontViewHistory"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_USE_SYSTEM_FONT,
- "/apps/openoffice/use_system_font",
- RTL_CONSTASCII_STRINGPARAM("AccessibilityIsSystemFont"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_USE_FONT_ANTI_ALIASING,
- "/apps/openoffice/use_font_anti_aliasing",
- RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingEnabled"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_FONT_ANTI_ALIASING_MIN_PIXEL,
- "/apps/openoffice/font_anti_aliasing_min_pixel",
- RTL_CONSTASCII_STRINGPARAM("FontAntiAliasingMinPixelHeight"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_WARN_CREATE_PDF,
- "/apps/openoffice/lockdown/warn_info_create_pdf",
- RTL_CONSTASCII_STRINGPARAM("WarnCreatePDF"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_WARN_PRINT_DOC,
- "/apps/openoffice/lockdown/warn_info_printing",
- RTL_CONSTASCII_STRINGPARAM("WarnPrintDoc"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_WARN_SAVEORSEND_DOC,
- "/apps/openoffice/lockdown/warn_info_saving",
- RTL_CONSTASCII_STRINGPARAM("WarnSaveOrSendDoc"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_WARN_SIGN_DOC,
- "/apps/openoffice/lockdown/warn_info_signing",
- RTL_CONSTASCII_STRINGPARAM("WarnSignDoc"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_REMOVE_PERSONAL_INFO,
- "/apps/openoffice/lockdown/remove_personal_info_on_save",
- RTL_CONSTASCII_STRINGPARAM("RemovePersonalInfoOnSaving"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_RECOMMEND_PASSWORD,
- "/apps/openoffice/lockdown/recommend_password_on_save",
- RTL_CONSTASCII_STRINGPARAM("RecommendPasswordProtection"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_UNDO_STEPS,
- "/apps/openoffice/undo_steps",
- RTL_CONSTASCII_STRINGPARAM("UndoSteps"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_SYMBOL_SET,
- "/apps/openoffice/icon_size",
- RTL_CONSTASCII_STRINGPARAM("SymbolSet"),
- true,
- SETTINGS_LAST
- },
-
- {
- SETTING_MACRO_SECURITY_LEVEL,
- "/apps/openoffice/lockdown/macro_security_level",
- RTL_CONSTASCII_STRINGPARAM("MacroSecurityLevel"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_CREATE_BACKUP,
- "/apps/openoffice/create_backup",
- RTL_CONSTASCII_STRINGPARAM("CreateBackup"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_WARN_ALIEN_FORMAT,
- "/apps/openoffice/warn_alien_format",
- RTL_CONSTASCII_STRINGPARAM("WarnAlienFormat"),
- false,
- SETTINGS_LAST
- },
-
-#endif // ENABLE_LOCKDOWN
-};
-
-std::size_t const nConfigurationValues =
- sizeof ConfigurationValues / sizeof ConfigurationValues[0];
-
-css::beans::Optional< css::uno::Any > getValue(ConfigurationValue const & data)
-{
- GConfClient* pClient = getGconfClient();
- if( ( data.nDependsOn == SETTINGS_LAST ) || isDependencySatisfied( pClient, data ) )
- {
- GConfValue* pGconfValue = gconf_client_get( pClient, data.GconfItem, NULL );
-
- if( pGconfValue != NULL )
- {
- css::uno::Any value;
- if( data.bNeedsTranslation )
- value = translateToOOo( data, pGconfValue );
- else
- value = makeAnyOfGconfValue( pGconfValue );
-
- gconf_value_free( pGconfValue );
-
- return css::beans::Optional< css::uno::Any >(true, value);
- }
- }
- return css::beans::Optional< css::uno::Any >();
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
deleted file mode 100644
index bad128d..0000000
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- 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: */
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
deleted file mode 100644
index 5b14ab3..0000000
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- 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: */
diff --git a/shell/source/backends/gconfbe/gconfbe1.component b/shell/source/backends/gconfbe/gconfbe1.component
deleted file mode 100644
index d28f624..0000000
--- a/shell/source/backends/gconfbe/gconfbe1.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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>
More information about the Libreoffice-commits
mailing list