diff options
Diffstat (limited to 'vcl/unx/generic/plugadapt/salplug.cxx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index dc8b58668113..e8a2eeb5d233 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -118,7 +118,11 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals static DesktopType get_desktop_environment() { OUStringBuffer aModName( 128 ); - aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" ); + #ifdef LIBO_MERGELIBS + aModName.appendAscii( SAL_DLLPREFIX"merged" ); + #else + aModName.appendAscii( SAL_DLLPREFIX"desktop_detector" ); + #endif aModName.appendAscii( SAL_DLLPOSTFIX ); OUString aModule = aModName.makeStringAndClear(); |