diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-09-02 14:37:23 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 08:18:03 +0000 |
| commit | 72699595aaa3ecb8975050b6dfc6fde437770493 (patch) | |
| tree | 11f1d8416f7d5e7fec2dc0c1cb4f196ea0a290fc /vcl/unx/generic/plugadapt/salplug.cxx | |
| parent | d465e8273f1ee54450f0bf59c41bda93c54b3db4 (diff) | |
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/18267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic/plugadapt/salplug.cxx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 20fa9e8c698a..337e4d494688 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -171,9 +171,6 @@ static SalInstance* autodetect_plugin() #if ENABLE_KDE4 "kde4", #endif -#if ENABLE_KDE - "kde", -#endif "gtk3", "gtk", "gen", 0 }; @@ -182,9 +179,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; |