Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 17 insertions, 17 deletions

diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 8f1e46b46ee5..6b3f694195fd 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -44,7 +44,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 )
@@ -58,7 +58,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 )
@@ -77,7 +77,7 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const
 // class ScConflictsListHelper
 //=============================================================================
 
-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 )
@@ -91,7 +91,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 )
@@ -105,7 +105,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 )
@@ -165,8 +165,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 )
@@ -216,7 +216,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 );
@@ -460,7 +460,7 @@ ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocume
     aHeader += maStrTitleDate;
     maLbConflicts.InsertHeaderEntry( aHeader, HEADERBAR_APPEND, HIB_LEFT | HIB_LEFTIMAGE | HIB_VCENTER );
 
-    maLbConflicts.SetWindowBits( WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
+    maLbConflicts.SetStyle( maLbConflicts.GetStyle() | WB_HASLINES | WB_CLIPCHILDREN | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL );
     maLbConflicts.SetSelectionMode( MULTIPLE_SELECTION );
     maLbConflicts.SetHighlightRange();
 
@@ -512,7 +512,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';
 
@@ -528,7 +528,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, false );
         aString += '\t';
     }
 
@@ -552,7 +552,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle )
     {
         if ( bSelectHandle )
         {
-            maLbConflicts.SelectAll( FALSE );
+            maLbConflicts.SelectAll( false );
         }
         if ( !maLbConflicts.IsSelected( pRootEntry ) )
         {
@@ -608,7 +608,7 @@ IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
 
     ScTabView* pTabView = mpViewData->GetView();
     pTabView->DoneBlockMode();
-    BOOL bContMark = FALSE;
+    sal_Bool bContMark = false;
     SvLBoxEntry* pEntry = maLbConflicts.FirstSelected();
     while ( pEntry )
     {
@@ -624,9 +624,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;
                     }
                 }
             }
@@ -681,9 +681,9 @@ void ScConflictsDlg::KeepAllHandler( bool bMine )
         SetConflictAction( pRootEntry, eConflictAction );
         pRootEntry = maLbConflicts.NextSibling( pRootEntry );
     }
-    maLbConflicts.SetUpdateMode( FALSE );
+    maLbConflicts.SetUpdateMode( false );
     maLbConflicts.Clear();
-    maLbConflicts.SetUpdateMode( TRUE );
+    maLbConflicts.SetUpdateMode( sal_True );
     SetPointer( Pointer( POINTER_ARROW ) );
     EndDialog( RET_OK );
 }