remove KDE3 support, --enable-kde and --enable-kdeab

With the new RHEL6-era baseline TDF can finally ship KDE4 support.

Change-Id: I227278b576a3ed2f2aaa751d41b469ca92dc78b3
Reviewed-on: https://gerrit.libreoffice.org/18267Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

Repository.mk

@@ -251,20 +251,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
-	$(if $(ENABLE_KDE),kdebe1) \
 	$(if $(ENABLE_KDE4),kde4be1) \
 	$(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
-		$(if $(ENABLE_KDE),vclplug_kde) \
 		$(if $(ENABLE_KDE4),vclplug_kde4) \
 	) \
 ))
 
-$(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
-	$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
-		kdefilepicker \
-	) \
-))
-
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
 	sm \
 	smd \
@@ -363,8 +355,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	itg \
 	iti \
 	$(if $(ENABLE_JAVA),jdbc) \
-	$(if $(ENABLE_KAB),kab1) \
-	$(if $(ENABLE_KAB),kabdrv1) \
 	ldapbe2 \
 	localebe1 \
 	log \

RepositoryExternal.mk

@@ -3010,38 +3010,6 @@ endef
 
 endif # WITH_MOZAB4WIN
 
-ifeq ($(ENABLE_KDE),TRUE)
-
-define gb_LinkTarget__use_kde
-$(call gb_LinkTarget_set_include,$(1),\
-	$(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KDE_CFLAGS)))) \
-	$$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
-	$(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KDE_CFLAGS))) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(KDE_LIBS) \
-)
-
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-	-Wno-shadow \
-)
-endif
-
-endef
-
-else # !ENABLE_KDE
-
-define gb_LinkTarget__use_kde
-
-endef
-
-endif # ENABLE_KDE
-
 
 ifeq ($(ENABLE_KDE4),TRUE)
 

bin/distro-install-file-lists

@@ -226,15 +226,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
     mv_file_between_flists tde_list.txt common_list.txt $INSTALLDIR/program/libtdeabdrv1l..so
     add_used_directories tde_list.txt common_list.txt
 
-    # kde subpackage
-    test -f $DESTDIR/gid_Module_Optional_Kde && cp $DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/kdefilepicker
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/fps_kdelo.so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kdel..so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkab1l..so
-    mv_file_between_flists kde_list.txt common_list.txt $INSTALLDIR/program/libkabdrv1l..so
-    add_used_directories kde_list.txt common_list.txt
-
     # create kde4 subpackage
     mv_file_between_flists kde4_list.txt kde_list.txt    $INSTALLDIR/program/kde4be1lo.so
     mv_file_between_flists kde4_list.txt common_list.txt $INSTALLDIR/program/libvclplug_kde4l..so
@@ -421,7 +412,6 @@ else
     create_package_directory gid_Module_Pyuno                       pkg/python-uno
     create_package_directory gid_Module_Optional_Gnome              pkg/libreoffice-gnome
     create_package_directory gid_Module_Optional_Tde                pkg/libreoffice-tde
-    create_package_directory gid_Module_Optional_Kde                pkg/libreoffice-kde
 
     create_package_directory gid_Module_Root_Files_2                pkg/libreoffice-common
     create_package_directory gid_Module_Root_Files_3                pkg/libreoffice-common
@@ -493,7 +483,7 @@ else
       fi &&
       ( cd pkg/libreoffice-common/$d
         find -maxdepth 1 \
-           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
+           -regex '\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)' \
            -exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
       ); \
     done

config_host.mk.in

@@ -147,9 +147,7 @@ export ENABLE_GTK=@ENABLE_GTK@
 export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_JAVA=@ENABLE_JAVA@
-export ENABLE_KAB=@ENABLE_KAB@
 export ENABLE_KDE4=@ENABLE_KDE4@
-export ENABLE_KDE=@ENABLE_KDE@
 export ENABLE_LIBLANGTAG=@ENABLE_LIBLANGTAG@
 export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
@@ -312,11 +310,9 @@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
 export KDE4_CFLAGS=$(gb_SPACE)@KDE4_CFLAGS@
 export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
-export KDE_CFLAGS=$(gb_SPACE)@KDE_CFLAGS@
 export KDE_GLIB_CFLAGS=$(gb_SPACE)@KDE_GLIB_CFLAGS@
 export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
 export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
-export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@

config_host/config_vclplug.h.in

@@ -8,7 +8,6 @@ Settings about which X11 desktops have support enabled.
 #define CONFIG_VCLPLUG_H
 
 #define ENABLE_GTK 0
-#define ENABLE_KDE 0
 #define ENABLE_KDE4 0
 #define ENABLE_TDE 0
 #define ENABLE_GIO 0

connectivity/Configuration_kab.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_Configuration_Configuration,driver_kab))
-
-$(eval $(call gb_Configuration_add_spool_modules,driver_kab,connectivity/registry/kab,\
-	org/openoffice/Office/DataAccess/Drivers-kab.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,driver_kab,connectivity/registry/kab,\
-	org/openoffice/Office/DataAccess/Drivers.xcu \
-))
-
-# vim: set noet sw=4 ts=4:

connectivity/Library_kab1.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,kab1))
-
-$(eval $(call gb_Library_use_externals,kab1, \
-    boost_headers \
-    kde \
-))
-
-$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
-
-$(eval $(call gb_Library_use_sdk_api,kab1))
-
-$(eval $(call gb_Library_set_include,kab1,\
-	-I$(SRCDIR)/connectivity/source/inc \
-	$$(INCLUDE) \
-	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_use_libraries,kab1,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	dbtools \
-	sal \
-	salhelper \
-	tl \
-))
-
-$(eval $(call gb_Library_add_exception_objects,kab1,\
-	connectivity/source/drivers/kab/KDriver \
-	connectivity/source/drivers/kab/KServices \
-))
-
-# vim: set noet sw=4 ts=4:

connectivity/Library_kabdrv1.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,kabdrv1))
-
-$(eval $(call gb_Library_use_sdk_api,kabdrv1))
-
-$(eval $(call gb_Library_use_externals,kabdrv1,\
-	boost_headers \
-	kde \
-))
-
-$(eval $(call gb_Library_set_include,kabdrv1,\
-	-I$(SRCDIR)/connectivity/source/inc \
-	$$(INCLUDE) \
-	-I$(WORKDIR)/YaccTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_add_libs,kabdrv1,\
-	-lkabc \
-))
-
-$(eval $(call gb_Library_use_libraries,kabdrv1,\
-	cppu \
-	cppuhelper \
-	sal \
-	salhelper \
-	dbtools \
-	comphelper \
-))
-
-$(eval $(call gb_Library_add_exception_objects,kabdrv1,\
-	connectivity/source/drivers/kab/KColumns \
-	connectivity/source/drivers/kab/KTable \
-	connectivity/source/drivers/kab/KTables \
-	connectivity/source/drivers/kab/KCatalog \
-	connectivity/source/drivers/kab/KResultSet \
-	connectivity/source/drivers/kab/KStatement \
-	connectivity/source/drivers/kab/KPreparedStatement \
-	connectivity/source/drivers/kab/KDatabaseMetaData \
-	connectivity/source/drivers/kab/KConnection \
-	connectivity/source/drivers/kab/KResultSetMetaData \
-	connectivity/source/drivers/kab/kcondition \
-	connectivity/source/drivers/kab/korder \
-	connectivity/source/drivers/kab/kfields \
-	connectivity/source/drivers/kab/KDEInit \
-))
-
-# vim: set noet sw=4 ts=4:

connectivity/Module_connectivity.mk

@@ -45,14 +45,6 @@ endif
 
 ifneq ($(OS),WNT)
 
-ifeq ($(ENABLE_KAB),TRUE)
-$(eval $(call gb_Module_add_targets,connectivity,\
-	Configuration_kab \
-	Library_kab1 \
-	Library_kabdrv1 \
-))
-endif
-
 ifeq ($(ENABLE_TDEAB),TRUE)
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_tdeab \

connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu

-<?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 .
- -->
-<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <node oor:name="Installed" install:module="kab">
-    <node oor:name="sdbc:address:kab" oor:op="replace">
-      <prop oor:name="Driver">
-        <value>com.sun.star.comp.sdbc.kab.Driver</value>
-      </prop>
-      <prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
-        <value xml:lang="en-US">KDE Address Book</value>
-      </prop>
-      <node oor:name="Features">
-        <node oor:name="EscapeDateTime" oor:op="replace">
-          <prop oor:name="Value" oor:type="xs:boolean">
-            <value>true</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-  </node>
-</oor:component-data>

connectivity/source/drivers/kab/kab1.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="kab" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.sdbc.kab.Driver">
-    <service name="com.sun.star.sdbc.Driver"/>
-  </implementation>
-</component>

cui/Library_cui.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_Library_set_precompiled_header,cui,$(SRCDIR)/cui/inc/pch/precom
 $(eval $(call gb_Library_add_defs,cui,\
     $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
     $(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
-    $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
     $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
 ))
 

cui/source/options/optgdlg.cxx

@@ -205,14 +205,6 @@ namespace
                 return OUString();
                 #endif
             }
-            else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("kde") )
-            {
-                #if ENABLE_KDE
-                return OUString("com.sun.star.ui.dialogs.KDEFilePicker");
-                #else
-                return OUString();
-                #endif
-            }
             else if ( rDesktopEnvironment.equalsIgnoreAsciiCase("tde") )
             {
                 #if ENABLE_TDE

desktop/Pagein_common.mk

@@ -30,7 +30,6 @@ $(eval $(call gb_Pagein_add_objects,common,\
     vclplug_gen \
     $(if $(findstring TRUE,$(ENABLE_GTK)),vclplug_gtk) \
     $(if $(findstring TRUE,$(ENABLE_TDE)),vclplug_tde) \
-    $(if $(findstring TRUE,$(ENABLE_KDE)),vclplug_kde) \
     basegfx \
     sot \
     xmlscript \

distro-configs/LibreOfficeLinux.conf

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

distro-configs/OxygenOfficeLinux.conf

@@ -14,7 +14,6 @@
 --enable-split-opt-features
 --with-linker-hash-style=both
 --enable-systray
---enable-kde
 --disable-kde4
 --enable-gtk
 --enable-evolution2

postprocess/CustomTarget_registry.mk

@@ -349,10 +349,6 @@ endif
 ifeq ($(ENABLE_TDEAB),TRUE)
 postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/tdeab)/org/openoffice/Office/DataAccess/Drivers-tdeab.xcu
 endif
-ifeq ($(ENABLE_KAB),TRUE)
-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/kab)/org/openoffice/Office/DataAccess/Drivers-kab.xcu
-postprocess_DRIVERS += kab
-endif
 
 ifneq (,$(SYSTEM_LIBEXTTEXTCAT_DATA))
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-externallibexttextcatdata.xcu

postprocess/Rdb_services.mk

@@ -208,9 +208,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 	$(if $(ENABLE_VLC), \
 		avmedia/source/vlc/avmediavlc \
 	) \
-	$(if $(ENABLE_KDE), \
-		shell/source/backends/kdebe/kdebe1 \
-	) \
 	$(if $(ENABLE_KDE4), \
 		shell/source/backends/kde4be/kde4be1 \
 	) \
@@ -259,9 +256,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 		connectivity/source/drivers/firebird/firebird_sdbc \
 	) \
 	connectivity/source/drivers/flat/flat \
-	$(if $(ENABLE_KAB), \
-		connectivity/source/drivers/kab/kab1 \
-	) \
 	connectivity/source/drivers/mysql/mysql \
 	$(if $(filter MACOSX,$(OS)), \
 		connectivity/source/drivers/macab/macab1 \

scp2/InstallModule_ooo.mk

@@ -19,7 +19,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_GTK \
-	ENABLE_KDE \
 	ENABLE_MACOSX_SANDBOX \
 	ENABLE_NPAPI_FROM_BROWSER \
 	ENABLE_ONLINE_UPDATE \

scp2/InstallScript_setup_osl.mk

@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		scp2/gnome \
 	) \
-	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+	$(if $(filter TRUE,$(ENABLE_KDE4)),\
 		scp2/kde \
 	) \
 	$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\

scp2/Module_scp2.mk

@@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		InstallModule_gnome \
 	) \
-	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
+	$(if $(filter TRUE,$(ENABLE_KDE4)),\
 		InstallModule_kde \
 	) \
 	$(if $(filter TRUE,$(ENABLE_TDE)),\

shell/Library_kdebe.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,kdebe1))
-
-$(eval $(call gb_Library_add_libs,kdebe1,\
-	-lkio \
-))
-
-$(eval $(call gb_Library_use_sdk_api,kdebe1))
-
-$(eval $(call gb_Library_use_externals,kdebe1,\
-	boost_headers \
-	kde \
-))
-
-$(eval $(call gb_Library_use_libraries,kdebe1,\
-	cppu \
-	cppuhelper \
-	sal \
-))
-
-$(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1))
-
-$(eval $(call gb_Library_add_exception_objects,kdebe1,\
-    shell/source/backends/kdebe/kdeaccess \
-    shell/source/backends/kdebe/kdebackend \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:

shell/Module_shell.mk

@@ -42,23 +42,12 @@ $(eval $(call gb_Module_add_targets,shell,\
 ))
 endif
 
-ifeq ($(ENABLE_KDE),TRUE)
-$(eval $(call gb_Module_add_targets,shell,\
-	Library_kdebe \
-))
-endif
-
 ifeq ($(ENABLE_TDE),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_tdebe \
 ))
 endif
 
-ifneq ($(filter TRUE,$(ENABLE_KDE) $(ENABLE_TDE)),)
-$(eval $(call gb_Module_add_targets,shell,\
-))
-endif
-
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,shell,\

shell/Package_scripts_kde.mk

@@ -9,10 +9,6 @@
 
 $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
 
-ifeq ($(ENABLE_KDE),TRUE)
-$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-endif
-
 ifeq ($(ENABLE_KDE4),TRUE)
 $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
 endif

shell/source/backends/kdebe/kdebe1.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="kdebe1" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.configuration.backend.KDEBackend">
-    <service name="com.sun.star.configuration.backend.KDEBackend"/>
-  </implementation>
-</component>

shell/source/unix/misc/kde-open-url.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 .
-#
-
-# special handling for mailto: uris
-if echo $1 | grep '^mailto:' > /dev/null; then
-  kmailservice "$1" &
-else
-  kfmclient openURL "$1" &
-fi

solenv/gbuild/CppunitTest.mk

@@ -178,7 +178,6 @@ $(call gb_CppunitTest_get_target,$(1)) : $(if $(filter $(2),$(true)), \
     $(call gb_Library_get_target,vclplug_gen) \
         $(if $(ENABLE_GTK),$(call gb_Library_get_target,vclplug_gtk)) \
         $(if $(ENABLE_GTK3),$(call gb_Library_get_target,vclplug_gtk3)) \
-        $(if $(ENABLE_KDE),$(call gb_Library_get_target,vclplug_kde)) \
         $(if $(ENABLE_KDE4),$(call gb_Library_get_target,vclplug_kde4)) \
         $(if $(ENABLE_TDE),$(call gb_Library_get_target,vclplug_tde)))
 endif

sysui/CustomTarget_share.mk

@@ -14,8 +14,6 @@ ifeq ($(ENABLE_GIO),TRUE)
 	brand_URIPARAM := --urls
 else ifeq ($(ENABLE_TDE),TRUE)
 	brand_URIPARAM := --urls
-else ifeq ($(ENABLE_KDE),TRUE)
-	brand_URIPARAM := --urls
 else ifeq ($(ENABLE_KDE4),TRUE)
 	brand_URIPARAM := --urls
 else

vcl/CustomTarget_kde_moc.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_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
-
-$(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
-	$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx
-
-$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
-		$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
-		| $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
-	cat $< | grep -v 'FILTER_OUT_TDE' | $(MOC) -o $@ -f$<
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:

vcl/Executable_kdefilepicker.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_Executable_Executable,kdefilepicker))
-
-$(eval $(call gb_Executable_add_defs,kdefilepicker,\
-	$(KDE_CFLAGS) \
-))
-
-$(eval $(call gb_Executable_use_libraries,kdefilepicker,\
-	sal \
-))
-
-$(eval $(call gb_Executable_add_libs,kdefilepicker,\
-	$(KDE_LIBS) \
-	-lkio -lX11 \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,kdefilepicker,\
-	vcl/unx/kde/fpicker/kdecommandthread \
-	vcl/unx/kde/fpicker/kdefilepicker \
-	vcl/unx/kde/fpicker/kdefpmain \
-	vcl/unx/kde/fpicker/kdemodalityfilter \
-))
-
-$(eval $(call gb_Executable_add_generated_cxxobjects,kdefilepicker,\
-	CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \
-))
-
-# KDE/Qt consider -Wshadow more trouble than benefit
-$(eval $(call gb_Executable_add_cxxflags,kdefilepicker,\
-	-Wno-shadow \
-))
-
-# vim: set noet sw=4 ts=4:

vcl/Library_vclplug_kde.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/.
-#
-# 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 .
-#
-
-$(eval $(call gb_Library_Library,vclplug_kde))
-
-$(eval $(call gb_Library_set_include,vclplug_kde,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/vcl/inc \
-))
-
-$(eval $(call gb_Library_add_defs,vclplug_kde,\
-    -DVCLPLUG_KDE_IMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_sdk_api,vclplug_kde))
-
-$(eval $(call gb_Library_use_libraries,vclplug_kde,\
-    vclplug_gen \
-    vcl \
-    tl \
-    utl \
-    sot \
-    ucbhelper \
-    basegfx \
-    comphelper \
-    cppuhelper \
-    i18nlangtag \
-    i18nutil \
-    $(if $(ENABLE_JAVA), \
-        jvmaccess) \
-    cppu \
-    sal \
-))
-
-$(eval $(call gb_Library_use_externals,vclplug_kde,\
-	boost_headers \
-	icuuc \
-	kde \
-	glew \
-))
-
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
-	-lX11 \
-	-lXext \
-	-lSM \
-	-lICE \
-))
-
-$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
-    vcl/unx/kde/kdedata \
-    vcl/unx/kde/salnativewidgets-kde \
-	vcl/unx/kde/UnxCommandThread \
-	vcl/unx/kde/UnxFilePicker \
-	vcl/unx/kde/UnxNotifyThread \
-))
-
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_libs,vclplug_kde,\
-	-lm \
-	-ldl \
-	-lpthread \
-))
-endif
-
-# vim: set noet sw=4 ts=4:

vcl/Module_vcl.mk

@@ -73,13 +73,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
     Library_vclplug_tde \
 ))
 endif
-ifneq ($(ENABLE_KDE),)
-$(eval $(call gb_Module_add_targets,vcl,\
-    CustomTarget_kde_moc \
-    Executable_kdefilepicker \
-    Library_vclplug_kde \
-))
-endif
 ifneq ($(ENABLE_KDE4),)
 $(eval $(call gb_Module_add_targets,vcl,\
     CustomTarget_kde4_moc \

vcl/unx/generic/plugadapt/salplug.cxx

@@ -170,9 +170,6 @@ static SalInstance* autodetect_plugin()
         "tde",
 #if ENABLE_KDE4
         "kde4",
-#endif
-#if ENABLE_KDE
-        "kde",
 #endif
         "gtk3", "gtk", "gen", 0
     };
@@ -181,9 +178,6 @@ static SalInstance* autodetect_plugin()
     {
 #if ENABLE_KDE4
         "kde4",
-#endif
-#if ENABLE_KDE
-        "kde",
 #endif
         "gtk3", "gtk", "gen", 0
     };
@@ -208,15 +202,11 @@ static SalInstance* autodetect_plugin()
     else if ( desktop == DESKTOP_GNOME ||
               desktop == DESKTOP_UNITY ||
               desktop == DESKTOP_XFCE  ||
+              desktop == DESKTOP_KDE3 ||
               desktop == DESKTOP_MATE )
         pList = pStandardFallbackList;
     else if( desktop == DESKTOP_TDE )
         pList = pTDEFallbackList;
-    else if( desktop == DESKTOP_KDE3 )
-    {
-        pList = pKDEFallbackList;
-        nListEntry = 1;
-    }
     else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 )
         pList = pKDEFallbackList;