User: hr Date: 06/06/19 19:54:08 Modified: /dba/dbaccess/source/ui/app/ AppDetailPageHelper.cxx
Log: INTEGRATION: CWS warnings01 (1.11.22); FILE MERGED 2006/06/08 12:00:29 fs 1.11.22.3: no virtual root (introduced bug during recent fix for #i57457#) 2006/05/23 23:47:35 sb 1.11.22.2: RESYNC: (1.11-1.12); FILE MERGED 2006/03/24 15:35:59 fs 1.11.22.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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.12&r2=1.13 Delta lines: +8 -11 -------------------- --- AppDetailPageHelper.cxx 31 Mar 2006 12:12:25 -0000 1.12 +++ AppDetailPageHelper.cxx 20 Jun 2006 02:54:06 -0000 1.13 @@ -302,7 +302,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() @@ -554,7 +554,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; @@ -581,7 +580,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; @@ -593,8 +591,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); @@ -1154,7 +1152,7 @@ } } // ----------------------------------------------------------------------------- -IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, pToolBox) +IMPL_LINK(OAppDetailPageHelper, OnDropdownClickHdl, ToolBox*, /*pToolBox*/) { m_aTBPreview.EndSelection(); @@ -1177,7 +1175,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])); } @@ -1207,9 +1205,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 ) { @@ -1230,7 +1227,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 ] ); @@ -1241,7 +1238,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]
