[Libreoffice-commits] .: vcl/source

[Joseph Powers]

 vcl/source/window/splitwin.cxx |   55 +++++------------------------------------
 1 file changed, 7 insertions(+), 48 deletions(-)

New commits:
commit 4d9c75adf6cae7b30d917322e0dd2212a6597e1e
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Fri Feb 18 17:29:18 2011 -0800

    Remove DECLARE_LIST( ImplSplitList, SplitWindow* )

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 75c8163..a9abf1c 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,6 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
-#include <tools/list.hxx>
 #include <tools/debug.hxx>
 #include <tools/rcid.h>
 #include <vcl/event.hxx>
@@ -45,7 +44,6 @@
 #include <vcl/splitwin.hxx>
 
 
-
 // =======================================================================
 
 // Achtung: Darf keine Objekte enthalten, da mit memmove/memcpy gearbeitet wird
@@ -95,10 +93,6 @@ struct ImplSplitSet
 #define SPLIT_WINDOW			((USHORT)0x0004)
 #define SPLIT_NOSPLIT			((USHORT)0x8000)
 
-// -----------------------------------------------------------------------
-
-DECLARE_LIST( ImplSplitList, SplitWindow* )
-
 // =======================================================================
 
 static void ImplCalcBorder( WindowAlign eAlign, BOOL bNoAlign,
@@ -161,42 +155,7 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
         aDecoView.DrawFrame( aRect, FRAME_DRAW_DOUBLEIN );
     }
     else
-    {/*
-        if ( pWin->meAlign == WINDOWALIGN_BOTTOM )
-        {
-            pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-            pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-            pWin->SetLineColor( rStyleSettings.GetLightColor() );
-            pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-        }
-        else
-        {
-            pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-            pWin->DrawLine( Point( 0, 0 ), Point( nDX-1, 0 ) );
-            pWin->SetLineColor( rStyleSettings.GetLightColor() );
-            pWin->DrawLine( Point( 0, 1 ), Point( nDX-1, 1 ) );
-            if ( (pWin->meAlign == WINDOWALIGN_LEFT) || (pWin->meAlign == WINDOWALIGN_RIGHT) )
-            {
-                if ( pWin->meAlign == WINDOWALIGN_LEFT )
-                {
-                    pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-                    pWin->DrawLine( Point( 0, 0 ), Point( 0, nDY-1 ) );
-                    pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-1, nDY-2 ) );
-                    pWin->SetLineColor( rStyleSettings.GetLightColor() );
-                    pWin->DrawLine( Point( 1, 1 ), Point( 1, nDY-3 ) );
-                    pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-                }
-                else
-                {
-                    pWin->SetLineColor( rStyleSettings.GetShadowColor() );
-                    pWin->DrawLine( Point( nDX-2, 0 ), Point( nDX-2, nDY-3 ) );
-                    pWin->DrawLine( Point( 0, nDY-2 ), Point( nDX-2, nDY-2 ) );
-                    pWin->SetLineColor( rStyleSettings.GetLightColor() );
-                    pWin->DrawLine( Point( nDX-1, 0 ), Point( nDX-1, nDY-1 ) );
-                    pWin->DrawLine( Point( 0, nDY-1 ), Point( nDX-1, nDY-1 ) );
-                }
-            }
-        }*/
+    {
         if ( pWin->meAlign == WINDOWALIGN_BOTTOM )
         {
             pWin->SetLineColor( rStyleSettings.GetShadowColor() );
@@ -1506,7 +1465,7 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
 {
     Size aSize( aNewSize );
     long nSplitSize = mpMainSet->mnSplitSize-2;
-    
+
     if ( mbAutoHide || mbFadeOut )
         nSplitSize += SPLITWIN_SPLITSIZEEXLN;
 
@@ -1531,7 +1490,7 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
         {
             long	nDelta = 0;
             Point	aPos = GetPosPixel();
-            
+
             if ( mbHorz )
                 nCurSize = aNewSize.Height()-mnTopBorder-mnBottomBorder;
             else
@@ -1942,7 +1901,7 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
                     pSVData->maCtrlData.mpSplitHPinImgList->InsertFromHorizontalBitmap
                         ( ResId( SV_RESID_BITMAP_SPLITHPIN, *pResMgr ), 4, &aNonAlphaMask );
                 }
-                }	
+                }
             pImageList = pSVData->maCtrlData.mpSplitHPinImgList;
         }
         else
@@ -1959,7 +1918,7 @@ void SplitWindow::ImplDrawAutoHide( BOOL bInPaint )
                 }
             }
             pImageList = pSVData->maCtrlData.mpSplitVPinImgList;
-                }		
+                }
 
         // Image ermitteln und zurueckgeben
         USHORT nId;
@@ -2687,7 +2646,7 @@ long SplitWindow::PreNotify( NotifyEvent& rNEvt )
             Rectangle aFadeOutRect;
             ImplGetFadeInRect( aFadeInRect );
             ImplGetFadeOutRect( aFadeOutRect );
-            
+
             if ( aFadeInRect.IsInside( GetPointerPosPixel() ) != aFadeInRect.IsInside( GetLastPointerPosPixel() ) )
                 Invalidate( aFadeInRect );
             if ( aFadeOutRect.IsInside( GetPointerPosPixel() ) != aFadeOutRect.IsInside( GetLastPointerPosPixel() ) )