vcl/source/app/salplug.cxx | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit 8991553851ef07f81c7260cefa966654839684a1
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Oct 18 16:01:26 2024 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Oct 18 18:58:42 2024 +0200
vcl: Drop indirection via lcl_get_desktop_environment
`lcl_get_desktop_environment` just calls
`get_desktop_environment` and returns the result.
Switch callers to use `get_desktop_environment`
right away and drop `lcl_get_desktop_environment`.
Change-Id: If18690a31c8b09631b3a1181e5eac3aad72a0037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175138
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index ed23b18ffa2a..fb43ecd3a101 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -169,13 +169,6 @@ SalInstance* tryInstance( const OUString& rModuleBase,
bool bForce = false )
#if UNIX_DESKTOP_DETECT
-DesktopType lcl_get_desktop_environment()
-{
- DesktopType ret = DESKTOP_UNKNOWN;
- ret = get_desktop_environment();
- return ret;
-}
-
#if !STATIC_SAL_INSTANCE
const char* const* autodetect_plugin_list()
{
@@ -235,7 +228,7 @@ const char* const* autodetect_plugin_list()
};
#endif
- DesktopType desktop = lcl_get_desktop_environment();
+ DesktopType desktop = get_desktop_environment();
const char * const * pList = pStandardFallbackList;
#if ENABLE_HEADLESS
@@ -436,7 +429,7 @@ const OUString& SalGetDesktopEnvironment()
if( aDesktopEnvironment.isEmpty())
{
aDesktopEnvironment = OUString::createFromAscii(
- desktop_strings[lcl_get_desktop_environment()]);
+ desktop_strings[get_desktop_environment()]);
}
#else
static OUString aDesktopEnvironment("unknown");
