Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:46:00 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx
Log: RESYNC: (1.11-1.13); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.9.4.4&r2=1.9.4.5 Delta lines: +12 -19 --------------------- --- AppDetailPageHelper.cxx 25 Apr 2006 13:00:32 -0000 1.9.4.4 +++ AppDetailPageHelper.cxx 4 Jul 2006 07:45:57 -0000 1.9.4.5 @@ -305,7 +305,7 @@ SetUniqueId(UID_APP_DETAILPAGE_HELPER); for (int i=0; i < CONTROL_COUNT; ++i) m_pLists[i] = NULL; - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings(); } // ----------------------------------------------------------------------------- OAppDetailPageHelper::~OAppDetailPageHelper() @@ -557,7 +557,6 @@ sal_Bool bLeafSelected = sal_False; if ( nPos < CONTROL_COUNT && _pEntry ) { - DBTreeListBox& rTree = *m_pLists[nPos]; bLeafSelected = reinterpret_cast<sal_IntPtr>(_pEntry->GetUserData()) != FOLDER_TYPE; } return bLeafSelected; @@ -584,7 +583,6 @@ { SvLBoxEntry* pReturn = NULL; int nPos = getVisibleControlIndex(); - sal_Bool bLeafSelected = sal_False; if ( nPos < CONTROL_COUNT ) pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,TRUE ); return pReturn; @@ -596,8 +594,8 @@ if ( !m_pLists[E_TABLE] ) { - OTableTreeListBox* pTreeView = new OTableTreeListBox(this,getBorderWin()->getView()->getORB() - ,sal_False + OTableTreeListBox* pTreeView = new OTableTreeListBox(this + ,getBorderWin()->getView()->getORB() ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP ,sal_False); pTreeView->SetHelpId(HID_APP_TABLE_TREE); @@ -855,8 +853,6 @@ DBTreeListBox* pTreeView = getCurrentView(); if ( pTreeView ) { - SvLBoxEntry* pSelected = pTreeView->GetSelectedEntry(); - sal_Bool bClearPreview = sal_False; switch( _eType ) { case E_TABLE: @@ -868,7 +864,6 @@ if ( pTreeView ) { SvLBoxEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); - bClearPreview = pSelected == pEntry; if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -879,7 +874,6 @@ if ( pTreeView ) { SvLBoxEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); - bClearPreview = pSelected == pEntry; if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -888,7 +882,7 @@ default: OSL_ENSURE(0,"Invalid element type"); } - if ( bClearPreview && pSelected ) + if ( !pTreeView->GetEntryCount() ) showPreview(NULL); } } @@ -1161,7 +1155,7 @@ } } // ----------------------------------------------------------------------------- -IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, pToolBox) +IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/) { m_aTBPreview.EndSelection(); @@ -1184,7 +1178,7 @@ , SID_DB_APP_VIEW_DOCINFO_PREVIEW }; - for(sal_Int32 i=0; i < sizeof(pActions)/sizeof(pActions[0]);++i) + for(size_t i=0; i < sizeof(pActions)/sizeof(pActions[0]);++i) { aMenu->CheckItem(pActions[i],m_aMenu->IsItemChecked(pActions[i])); } @@ -1214,9 +1208,8 @@ // ----------------------------------------------------------------------------- void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt ) { - KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); + KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); (void)eFunc; USHORT nCode = rKEvt.GetKeyCode().GetCode(); - sal_Bool bHandled = sal_False; if ( KEY_RETURN == nCode ) { @@ -1238,7 +1231,7 @@ (rDCEvt.GetFlags() & SETTINGS_STYLE)) ) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings(); if ( m_pLists[ E_TABLE ] ) { OTableTreeListBox* pTableTree = dynamic_cast< OTableTreeListBox* >( m_pLists[ E_TABLE ] ); @@ -1249,7 +1242,7 @@ } } // ----------------------------------------------------------------------------- -void OAppDetailPageHelper::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) +void OAppDetailPageHelper::ImplInitSettings() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( true ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
