diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2012-02-28 21:19:45 +0100 |
|---|---|---|
| committer | Tomas Chvatal <tchvatal@suse.cz> | 2012-02-28 21:19:45 +0100 |
| commit | 966981dd77b5e6c091b9e2615a8191353897a9b2 (patch) | |
| tree | c7d7f9ef1427bfd19156472706c2891ecd7b2a6d /vcl | |
| parent | 24f4cd9983aa2bc9d642c40a8fef19d7fe7b98a6 (diff) | |
Actually there is no need to have if and elseif with same action.
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index eb9e90cd1b5b..6bc7d89390f7 100644 --- a/vcl/unx/generic/plugadapt/salplug.cxx +++ b/vcl/unx/generic/plugadapt/salplug.cxx @@ -90,19 +90,13 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals * not access the 'gnome_accessibility_module_shutdown' anymore. * So make sure libgtk+ & co are still mapped into memory when * atk-bridge's atexit handler gets called. + * #i109007# KDE3 seems to have the same problem. + * And same applies for KDE4. */ if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk")) || - rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")) ) - { - pCloseModule = NULL; - } - /* - * #i109007# KDE3 seems to have the same problem; an atexit cleanup - * handler, which cannot be resolved anymore if the plugin is already unloaded. - * Same applies for kde4. - */ - else if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) || - rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ) + rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")) || + rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) || + rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde4")) ) { pCloseModule = NULL; } |