diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-30 19:38:13 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-31 11:34:28 -0400 |
| commit | a2747d0721eb5183d8e92b45626361a21d38c270 (patch) | |
| tree | accbfbf9c4b11262d762630d7c52643adacbf97a /vcl/unx | |
| parent | 8b561c0012546aabbaff33b32a79833997aa8902 (diff) | |
fix vcl with Library_merged
Change-Id: Ie85ba53c59eda5586b70527a518e3f80223fc49e
Diffstat (limited to 'vcl/unx')
| -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(); |