diff options
Diffstat (limited to 'sc/source/ui/miscdlgs/conflictsdlg.cxx')
-rw-r--r-- | sc/source/ui/miscdlgs/conflictsdlg.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 5ff5ca570ee4..51f457788d27 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -43,7 +43,7 @@ // struct ScConflictsListEntry //============================================================================= -bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const +bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { ScChangeActionList::const_iterator aEnd = maSharedActions.end(); for ( ScChangeActionList::const_iterator aItr = maSharedActions.begin(); aItr != aEnd; ++aItr ) @@ -57,7 +57,7 @@ bool ScConflictsListEntry::HasSharedAction( ULONG nSharedAction ) const return false; } -bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const +bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const { ScChangeActionList::const_iterator aEnd = maOwnActions.end(); for ( ScChangeActionList::const_iterator aItr = maOwnActions.begin(); aItr != aEnd; ++aItr ) @@ -76,7 +76,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const // class ScConflictsListHelper //============================================================================= -//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ) +//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, sal_uLong nSharedAction ) //UNUSED2008-05 { //UNUSED2008-05 ScConflictsList::const_iterator aEnd = rConflictsList.end(); //UNUSED2008-05 for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -90,7 +90,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const //UNUSED2008-05 return false; //UNUSED2008-05 } -bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ) +bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::const_iterator aEnd = rConflictsList.end(); for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -104,7 +104,7 @@ bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG return false; } -ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction ) +ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsList& rConflictsList, sal_uLong nSharedAction ) { ScConflictsList::iterator aEnd = rConflictsList.end(); for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -118,7 +118,7 @@ ScConflictsListEntry* ScConflictsListHelper::GetSharedActionEntry( ScConflictsLi return NULL; } -ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, ULONG nOwnAction ) +ScConflictsListEntry* ScConflictsListHelper::GetOwnActionEntry( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::iterator aEnd = rConflictsList.end(); for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) @@ -178,8 +178,8 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL // class ScConflictsFinder //============================================================================= -ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ULONG nEndShared, - ULONG nStartOwn, ULONG nEndOwn, ScConflictsList& rConflictsList ) +ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, + sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) :mpTrack( pTrack ) ,mnStartShared( nStartShared ) ,mnEndShared( nEndShared ) @@ -229,7 +229,7 @@ ScConflictsListEntry* ScConflictsFinder::GetIntersectingEntry( const ScChangeAct return NULL; } -ScConflictsListEntry* ScConflictsFinder::GetEntry( ULONG nSharedAction, const ScChangeActionList& rOwnActions ) +ScConflictsListEntry* ScConflictsFinder::GetEntry( sal_uLong nSharedAction, const ScChangeActionList& rOwnActions ) { // try to get a list entry which already contains the shared action ScConflictsListEntry* pEntry = ScConflictsListHelper::GetSharedActionEntry( mrConflictsList, nSharedAction ); @@ -444,9 +444,9 @@ ScConflictsListBox::~ScConflictsListBox() { } -//UNUSED2008-05 ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const +//UNUSED2008-05 sal_uLong ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const //UNUSED2008-05 { -//UNUSED2008-05 ULONG nPos = 0; +//UNUSED2008-05 sal_uLong nPos = 0; //UNUSED2008-05 SvLBoxEntry* pEntry = GetRootLevelParent( First() ); //UNUSED2008-05 while ( pEntry ) //UNUSED2008-05 { @@ -566,7 +566,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen if ( pAction && pDoc ) { String aDesc; - pAction->GetDescription( aDesc, pDoc, TRUE, false ); + pAction->GetDescription( aDesc, pDoc, sal_True, false ); aString += aDesc; aString += '\t'; @@ -582,7 +582,7 @@ String ScConflictsDlg::GetActionString( const ScChangeAction* pAction, ScDocumen DateTime aDateTime = pAction->GetDateTime(); aString += ScGlobal::pLocaleData->getDate( aDateTime ); aString += ' '; - aString += ScGlobal::pLocaleData->getTime( aDateTime, FALSE ); + aString += ScGlobal::pLocaleData->getTime( aDateTime, sal_False ); aString += '\t'; } @@ -606,7 +606,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) { if ( bSelectHandle ) { - maLbConflicts.SelectAll( FALSE ); + maLbConflicts.SelectAll( sal_False ); } if ( !maLbConflicts.IsSelected( pRootEntry ) ) { @@ -662,7 +662,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) ScTabView* pTabView = mpViewData->GetView(); pTabView->DoneBlockMode(); - BOOL bContMark = FALSE; + sal_Bool bContMark = sal_False; SvLBoxEntry* pEntry = maLbConflicts.FirstSelected(); while ( pEntry ) { @@ -678,9 +678,9 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) const ScBigRange& rBigRange = ( static_cast< const ScChangeAction* >( pAction ) )->GetBigRange(); if ( rBigRange.IsValid( mpOwnDoc ) ) { - BOOL bSetCursor = !maLbConflicts.NextSelected( pEntry ); + sal_Bool bSetCursor = !maLbConflicts.NextSelected( pEntry ); pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark ); - bContMark = TRUE; + bContMark = sal_True; } } } @@ -735,9 +735,9 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) SetConflictAction( pRootEntry, eConflictAction ); pRootEntry = maLbConflicts.NextSibling( pRootEntry ); } - maLbConflicts.SetUpdateMode( FALSE ); + maLbConflicts.SetUpdateMode( sal_False ); maLbConflicts.Clear(); - maLbConflicts.SetUpdateMode( TRUE ); + maLbConflicts.SetUpdateMode( sal_True ); SetPointer( Pointer( POINTER_ARROW ) ); EndDialog( RET_OK ); } |