diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 16:01:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 16:01:07 +0000 |
| commit | 5f32746f2ff7b01ec7834ab5e08008bf55bc4f96 (patch) | |
| tree | 0822d2634c04822d6fe8c3da845e096d3bba5ae5 /sd/source/ui/dlg/dlgassim.cxx | |
| parent | bc3dee3207b020d90630fc27edef336be8ecbe98 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.12.38); FILE MERGED
2006/11/27 13:47:57 cl 1.12.38.2: #i69285# warning free code changes for sd project
2006/11/22 12:41:45 cl 1.12.38.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/dlg/dlgassim.cxx')
| -rw-r--r-- | sd/source/ui/dlg/dlgassim.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 9f0e8a3e1636..d8a58379adc9 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dlgassim.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: obo $ $Date: 2006-09-16 18:36:51 $ + * last change: $Author: kz $ $Date: 2006-12-12 17:01:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,17 +78,17 @@ SdPageListControl::SdPageListControl( IMPL_LINK( SdPageListControl, CheckButtonClickHdl, SvLBoxButtonData *, EMPTYARG ) { - SvLBoxTreeList* pModel = GetModel(); - SvLBoxEntry* pEntry = pModel->First(); + SvLBoxTreeList* pTreeModel = GetModel(); + SvLBoxEntry* pEntry = pTreeModel->First(); while( pEntry ) { - if(pModel->IsAtRootDepth(pEntry) && GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) + if(pTreeModel->IsAtRootDepth(pEntry) && GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) return 0; - pEntry = pModel->Next( pEntry ); + pEntry = pTreeModel->Next( pEntry ); } - pEntry = pModel->First(); + pEntry = pTreeModel->First(); SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); return 0; @@ -194,17 +194,17 @@ USHORT SdPageListControl::GetSelectedPage() if ( pSelEntry ) { - SvLBoxTreeList* pModel = GetModel(); - SvLBoxEntry* pEntry = pModel->First(); + SvLBoxTreeList* pTreeModel = GetModel(); + SvLBoxEntry* pEntry = pTreeModel->First(); while( pEntry && pEntry != pSelEntry ) { - if(pModel->IsAtRootDepth(pEntry)) + if(pTreeModel->IsAtRootDepth(pEntry)) nPage++; - pEntry = pModel->Next( pEntry ); + pEntry = pTreeModel->Next( pEntry ); } - if(!pModel->IsAtRootDepth(pSelEntry)) + if(!pTreeModel->IsAtRootDepth(pSelEntry)) nPage--; } return nPage; @@ -213,7 +213,7 @@ USHORT SdPageListControl::GetSelectedPage() BOOL SdPageListControl::IsPageChecked( USHORT nPage ) { SvLBoxEntry* pEntry = GetModel()->GetEntry(nPage); - return pEntry?GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED: FALSE; + return pEntry?(BOOL)(GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED): FALSE; } void SdPageListControl::DataChanged( const DataChangedEvent& rDCEvt ) |