diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-20 11:31:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-20 12:34:34 +0100 |
| commit | 6361a9398584defe9ab8db1e3383e02912e3f24c (patch) | |
| tree | 8690f521e9ae02f53048b2b770fa9dbaba781e50 /vcl/source | |
| parent | 864e752d9e876d29c54aba3b8fd57e4f71a02955 (diff) | |
merge desktop_detector library into vcl library
Noting that the main feature of using a separate library - avoiding
linking against SM and ICE - is no longer a thing, since we have not
used those in some time.
Change-Id: I9ecd6758e97f0fa19b224346aa577a04b46793b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163638
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/salplug.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index 026867e99bf2..feb31dea77d4 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -168,32 +168,11 @@ SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false ) #endif // !STATIC_SAL_INSTANCE #if UNIX_DESKTOP_DETECT -#ifndef DISABLE_DYNLOADING -extern "C" typedef DesktopType Fn_get_desktop_environment(); -#else -extern "C" DesktopType get_desktop_environment(); -#endif DesktopType lcl_get_desktop_environment() { DesktopType ret = DESKTOP_UNKNOWN; -#ifdef DISABLE_DYNLOADING ret = get_desktop_environment(); -#else - OUString aModule(DESKTOP_DETECTOR_DLL_NAME); - oslModule aMod = osl_loadModuleRelative( - reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData, - SAL_LOADMODULE_DEFAULT ); - if( aMod ) - { - Fn_get_desktop_environment * pSym - = reinterpret_cast<Fn_get_desktop_environment *>( - osl_getAsciiFunctionSymbol(aMod, "get_desktop_environment")); - if( pSym ) - ret = pSym(); - } - osl_unloadModule( aMod ); -#endif return ret; } |