From 9c51e81ad2ac9ee38bb4f841bc27c6a40c8cec99 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 19 Jun 2006 19:51:41 +0000 Subject: INTEGRATION: CWS warnings01 (1.46.62); FILE MERGED 2006/04/20 14:51:14 sb 1.46.62.6: #i53898# Made code compile and/or warning-free again after resync to SRC680m162. 2006/04/07 19:07:21 sb 1.46.62.5: RESYNC: (1.47-1.48); FILE MERGED 2006/01/25 19:44:51 sb 1.46.62.4: RESYNC: (1.46-1.47); FILE MERGED 2005/11/15 15:13:22 pl 1.46.62.3: #i55991# removed warnings 2005/10/26 13:41:57 pl 1.46.62.2: #i55991# removed warnings for linux platform 2005/10/25 17:37:26 pl 1.46.62.1: #i55991# removed warnings for linux platform --- svtools/source/contnr/svimpbox.cxx | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'svtools/source/contnr/svimpbox.cxx') diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index fc8a92aff8a3..444c547c92f4 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: svimpbox.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: kz $ $Date: 2006-02-06 12:57:02 $ + * last change: $Author: hr $ $Date: 2006-06-19 20:51:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,8 +48,6 @@ #include #endif -#pragma hdrstop - #define _SVTREEBX_CXX #include #ifndef _SVLBOX_HXX @@ -87,17 +85,16 @@ sal_Int32 SvImpLBox::s_nImageRefCount = 0; SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) : + pTabBar( NULL ), aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ), aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ), aScrBarBox( pLBView ), aOutputSize( 0, 0 ), aSelEng( pLBView, (FunctionSet*)0 ), aFctSet( this, &aSelEng, pLBView ), - pIntlWrapper( NULL ), // #102891# ----------------------- - pTabBar( NULL ), nExtendedWinBits( 0 ), - bAreChildrenTransient( sal_True ) - + bAreChildrenTransient( sal_True ), + pIntlWrapper( NULL ) // #102891# ----------------------- { osl_incrementInterlockedCount(&s_nImageRefCount); pView = pLBView; @@ -223,7 +220,6 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry ) { DBG_ASSERT( pEntry, "Moved Entry is invalid!" ); - short nDepth = pView->pModel->GetDepth( pEntry ); SvLBoxContextBmp* pBmpItem = static_cast< SvLBoxContextBmp* >( pEntry->GetFirstItem( SV_ITEM_ID_LBOXCONTEXTBMP ) ); short nExpWidth = (short)pBmpItem->GetBitmap1().GetSizePixel().Width(); short nColWidth = (short)pBmpItem->GetBitmap2().GetSizePixel().Width(); @@ -342,7 +338,7 @@ void SvImpLBox::Clear() // Painten, Navigieren, Scrollen // ********************************************************************* -IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, pScrollBar ) +IMPL_LINK_INLINE_START( SvImpLBox, EndScrollHdl, ScrollBar *, EMPTYARG ) { if( nFlags & F_ENDSCROLL_SET_VIS_SIZE ) { @@ -1038,7 +1034,10 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, BOOL bMoveToTop ) { if( !pView->IsExpanded( pParent ) ) { - BOOL bRet = pView->Expand( pParent ); + #ifdef DBG_UTIL + BOOL bRet = + #endif + pView->Expand( pParent ); DBG_ASSERT(bRet,"Not expanded!"); } pParent = pView->GetParent( pParent ); @@ -1409,10 +1408,10 @@ void SvImpLBox::FillView() { if( !pStartEntry ) { - USHORT nVisibleCount = (USHORT)(pView->GetVisibleCount()); + USHORT nVisibleViewCount = (USHORT)(pView->GetVisibleCount()); USHORT nTempThumb = (USHORT)aVerSBar.GetThumbPos(); - if( nTempThumb >= nVisibleCount ) - nTempThumb = nVisibleCount - 1; + if( nTempThumb >= nVisibleViewCount ) + nTempThumb = nVisibleViewCount - 1; pStartEntry = (SvLBoxEntry*)(pView->GetEntryAtVisPos(nTempThumb)); } if( pStartEntry ) @@ -1924,7 +1923,6 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry ) // ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt long nY = GetEntryLine( pEntry ); BOOL bEntryVisible = IsLineVisible( nY ); - BOOL bPrevEntryVisible = IsLineVisible(nY-pView->GetEntryHeight()); if( bEntryVisible ) { ShowCursor( FALSE ); // falls sich Cursor nach unten verschiebt @@ -2726,7 +2724,6 @@ void __EXPORT SvImpLBox::GetFocus() SvLBoxEntry* pEntry = pView->FirstSelected(); while( pEntry ) { - SvViewData* pViewData = pView->GetViewData( pEntry ); InvalidateEntry( pEntry ); pEntry = pView->NextSelected( pEntry ); } @@ -2760,7 +2757,7 @@ void __EXPORT SvImpLBox::LoseFocus() SvLBoxEntry* pEntry = pView->FirstSelected(); while( pEntry ) { - SvViewData* pViewData = pView->GetViewData( pEntry ); + //SvViewData* pViewData = pView->GetViewData( pEntry ); //pViewData->SetCursored( TRUE ); InvalidateEntry( pEntry ); pEntry = pView->NextSelected( pEntry ); @@ -3160,7 +3157,6 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) BOOL bClickedIsSelected = FALSE; // collect the currently selected entries - INT32 nSelectedEntries = pView->GetSelectionCount(); SvLBoxEntry* pSelected = pView->FirstSelected(); while( pSelected ) { @@ -3216,7 +3212,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) pView->MakeVisible( pSelected ); } - aPopupPos = pView->GetFocusRect( pSelected, pView->GetEntryPos( pSelected ).Y() ).Center(); + aPopupPos = pView->GetFocusRect( pSelected, pView->GetEntryPosition( pSelected ).Y() ).Center(); } else aPopupPos = Point( 0, 0 ); @@ -3306,7 +3302,7 @@ void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry ) pView->Select( pEntry, TRUE ); } -IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, pTimer ) +IMPL_LINK( SvImpLBox, EditTimerCall, Timer *, EMPTYARG ) { if( pView->IsInplaceEditingEnabled() ) { @@ -3350,7 +3346,7 @@ BOOL SvImpLBox::RequestHelp( const HelpEvent& rHEvt ) if( !pItem || pItem->IsA() != SV_ITEM_ID_LBOXSTRING ) return FALSE; - aPos = GetEntryPos( pEntry ); + aPos = GetEntryPosition( pEntry ); aPos.X() = pView->GetTabPos( pEntry, pTab ); //pTab->GetPos(); Size aSize( pItem->GetSize( pView, pEntry ) ); SvLBoxTab* pNextTab = NextTab( pTab ); -- cgit v1.2.3