[Libreoffice-commits] .: vcl/unx

[Tomáš Chvátal]

 vcl/unx/generic/plugadapt/salplug.cxx |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 966981dd77b5e6c091b9e2615a8191353897a9b2
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Feb 28 21:19:45 2012 +0100

    Actually there is no need to have if and elseif with same action.

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index eb9e90c..6bc7d89 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;
                 }