[Libreoffice] [PATCH] Code Cleanup in libs-gui

Hello all,
Although the diff may look frustrated, I've explained what I've done
in log message.
Please feel free to comment :-)

Best regards,
--
Korrawit Pruegsanusak

From 1db8d9dfe64c31b3ff0ea24dccb2122d8be5c216 Mon Sep 17 00:00:00 2001
From: Korrawit Pruegsanusak <detective.conan.1412@gmail.com>
Date: Sun, 29 May 2011 01:40:26 +0700
Subject: [PATCH] Code cleanup

* Remove dead code lying since 2001
* Remove duplicate if checking
* So unindent the code

Released under LGPLv3+/MPL
---
 vcl/win/source/window/salobj.cxx |   71 +++++++++++---------------------------
 1 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index cd4d658..7a2ecc1 100755
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -544,58 +544,27 @@ SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
 
     if ( !pSalData->mbObjClassInit )
     {
-        // #95301# shockwave plugin has bug; expects ASCII functions to be used
-        if ( false )//aSalShlData.mbWNT )
+        WNDCLASSEXA aWndClassEx;
+        aWndClassEx.cbSize                     = sizeof( aWndClassEx );
+        aWndClassEx.style                      = 0;
+        aWndClassEx.lpfnWndProc        = SalSysObjWndProcA;
+        aWndClassEx.cbClsExtra         = 0;
+        aWndClassEx.cbWndExtra         = SAL_OBJECT_WNDEXTRA;
+        aWndClassEx.hInstance          = pSalData->mhInst;
+        aWndClassEx.hIcon                      = 0;
+        aWndClassEx.hIconSm            = 0;
+        aWndClassEx.hCursor            = LoadCursor( 0, IDC_ARROW );
+        aWndClassEx.hbrBackground      = 0;
+        aWndClassEx.lpszMenuName       = 0;
+        aWndClassEx.lpszClassName      = SAL_OBJECT_CLASSNAMEA;
+        if ( RegisterClassExA( &aWndClassEx ) )
         {
-            WNDCLASSEXW aWndClassEx;
-            aWndClassEx.cbSize                 = sizeof( aWndClassEx );
-            aWndClassEx.style                  = 0;
-            aWndClassEx.lpfnWndProc    = SalSysObjWndProcW;
-            aWndClassEx.cbClsExtra             = 0;
-            aWndClassEx.cbWndExtra             = SAL_OBJECT_WNDEXTRA;
-            aWndClassEx.hInstance              = pSalData->mhInst;
-            aWndClassEx.hIcon                  = 0;
-            aWndClassEx.hIconSm                = 0;
-            aWndClassEx.hCursor                = LoadCursor( 0, IDC_ARROW );
-            aWndClassEx.hbrBackground  = 0;
-            aWndClassEx.lpszMenuName   = 0;
-            aWndClassEx.lpszClassName  = SAL_OBJECT_CLASSNAMEW;
-            if ( RegisterClassExW( &aWndClassEx ) )
-            {
-                // Wegen PlugIn's loeschen wir erstmal den Hintergrund
-                aWndClassEx.cbWndExtra         = 0;
-                aWndClassEx.hbrBackground      = (HBRUSH)(COLOR_WINDOW+1);
-                aWndClassEx.lpfnWndProc        = SalSysObjChildWndProcW;
-                aWndClassEx.lpszClassName      = SAL_OBJECT_CHILDCLASSNAMEW;
-                if ( RegisterClassExW( &aWndClassEx ) )
-                    pSalData->mbObjClassInit = TRUE;
-            }
-        }
-        else
-        {
-            WNDCLASSEXA aWndClassEx;
-            aWndClassEx.cbSize                 = sizeof( aWndClassEx );
-            aWndClassEx.style                  = 0;
-            aWndClassEx.lpfnWndProc    = SalSysObjWndProcA;
-            aWndClassEx.cbClsExtra             = 0;
-            aWndClassEx.cbWndExtra             = SAL_OBJECT_WNDEXTRA;
-            aWndClassEx.hInstance              = pSalData->mhInst;
-            aWndClassEx.hIcon                  = 0;
-            aWndClassEx.hIconSm                = 0;
-            aWndClassEx.hCursor                = LoadCursor( 0, IDC_ARROW );
-            aWndClassEx.hbrBackground  = 0;
-            aWndClassEx.lpszMenuName   = 0;
-            aWndClassEx.lpszClassName  = SAL_OBJECT_CLASSNAMEA;
-            if ( RegisterClassExA( &aWndClassEx ) )
-            {
-                // Wegen PlugIn's loeschen wir erstmal den Hintergrund
-                aWndClassEx.cbWndExtra         = 0;
-                aWndClassEx.hbrBackground      = (HBRUSH)(COLOR_WINDOW+1);
-                aWndClassEx.lpfnWndProc        = SalSysObjChildWndProcA;
-                aWndClassEx.lpszClassName      = SAL_OBJECT_CHILDCLASSNAMEA;
-                if ( RegisterClassExA( &aWndClassEx ) )
-                    pSalData->mbObjClassInit = TRUE;
-            }
+            // Wegen PlugIn's loeschen wir erstmal den Hintergrund
+            aWndClassEx.cbWndExtra             = 0;
+            aWndClassEx.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
+            aWndClassEx.lpfnWndProc    = SalSysObjChildWndProcA;
+            aWndClassEx.lpszClassName  = SAL_OBJECT_CHILDCLASSNAMEA;
+            pSalData->mbObjClassInit = TRUE;
         }
     }
 
-- 
1.7.0.4