diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-09 15:28:29 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-07-21 23:22:46 +0200 |
| commit | d3c6ac6d0f23df56644008ccb6aa2c8fa37ab1b5 (patch) | |
| tree | 8f5e5a004c937d5a85fd66ff72834a977b645ace /svtools | |
| parent | 49d17d392b7c7a309b3d9264643881656d386eb1 (diff) | |
tdf#125922 rename kde5 to kf5 + plasma5
Just as the gtk3 plugin isn't named GNOME, rename kde5 to kf5, as
it is based on the KDE frameworks 5 libraries.
This also includes:
* a convenience alias to load the kf5 VCL plugin in case someone
requests the kde5 plugin.
* keep convenience kde5 configure switch, but warn about it
* rename detected desktop from kde5 to plasma5
Change-Id: I6764a05b81a5edbf284484c234fee2649aacf735
Reviewed-on: https://gerrit.libreoffice.org/75313
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/uno/fpicker.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx index e367a326e5c7..8ca591e1f692 100644 --- a/svtools/source/uno/fpicker.cxx +++ b/svtools/source/uno/fpicker.cxx @@ -39,9 +39,7 @@ static OUString FilePicker_getSystemPickerServiceName() { #ifdef UNX OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); - if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde5")) - return OUString ("com.sun.star.ui.dialogs.KDE5FilePicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) + if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) return OUString ("com.sun.star.ui.dialogs.AquaFilePicker"); else return OUString ("com.sun.star.ui.dialogs.SystemFilePicker"); @@ -113,9 +111,7 @@ static OUString FolderPicker_getSystemPickerServiceName() { #ifdef UNX OUString aDesktopEnvironment (Application::GetDesktopEnvironment()); - if (aDesktopEnvironment.equalsIgnoreAsciiCase("kde5")) - return OUString("com.sun.star.ui.dialogs.KDEFolderPicker"); - else if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) + if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx")) return OUString("com.sun.star.ui.dialogs.AquaFolderPicker"); #endif return OUString("com.sun.star.ui.dialogs.SystemFolderPicker"); |