diff options
| author | rezso <rezso@rezso.net> | 2018-09-04 02:29:33 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-09-04 09:55:47 +0200 |
| commit | 97836184c61075c4d25b85fff0e24874020632cd (patch) | |
| tree | baa635a7a2608041ed13330c1b3f08fa8579bd1d /vcl/unx/generic/plugadapt/salplug.cxx | |
| parent | 6b669c9d9ee61c5c37c384c3a546467a048f5636 (diff) | |
remove unsupported TDE and KDE3 desktops from desktopdetect and salplug
Change-Id: I7b8468c3c451e67f30cacc80196ca7f46c2a000c
Reviewed-on: https://gerrit.libreoffice.org/59959
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/unx/generic/plugadapt/salplug.cxx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index cadfb34842ae..bce722b6ed6c 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -197,8 +197,6 @@ static SalInstance* autodetect_plugin() else if ( desktop == DESKTOP_GNOME || desktop == DESKTOP_UNITY || desktop == DESKTOP_XFCE || - desktop == DESKTOP_KDE3 || - desktop == DESKTOP_TDE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; else if( desktop == DESKTOP_KDE4 || desktop == DESKTOP_KDE5 ) @@ -238,7 +236,7 @@ SalInstance *CreateSalInstance() // fallback, try everything static const char* const pPlugin[] = { - "gtk3", "gtk", "kde5", "kde4", "kde", "tde", "gen" }; + "gtk3", "gtk", "kde5", "kde4", "gen" }; for ( int i = 0; !pInst && i != SAL_N_ELEMENTS(pPlugin); ++i ) pInst = tryInstance( OUString::createFromAscii( pPlugin[ i ] ) ); @@ -297,8 +295,7 @@ const OUString& SalGetDesktopEnvironment() // Order to match desktops.hxx' DesktopType static const char * const desktop_strings[] = { "none", "unknown", "GNOME", "UNITY", - "XFCE", "MATE", "TDE", - "KDE", "KDE4", "KDE5" }; + "XFCE", "MATE", "KDE4", "KDE5" }; static OUString aRet; if( aRet.isEmpty()) { |