summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-19 14:11:04 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:08 +0200
commit1a1fe47731bed27e974094a86b16f91e768c6dc0 (patch)
tree4ac085ccc6ba0b00ce21772a3bdb0594dfd7f607 /svtools
parentcafdef8109f11435542f41d336f44771b6ced02e (diff)
svtools: sal_Bool->bool
Change-Id: I0c2e9314d85860831b29db76c89c8776c1b071b9
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx184
-rw-r--r--svtools/source/brwbox/brwbox2.cxx148
-rw-r--r--svtools/source/brwbox/brwbox3.cxx4
-rw-r--r--svtools/source/brwbox/datwin.cxx6
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx20
5 files changed, 181 insertions, 181 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 90dabe17e69e..051ce1a17394 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -63,7 +63,7 @@ namespace
void BrowseBox::ConstructImpl( BrowserMode nMode )
{
OSL_TRACE( "BrowseBox: %p->ConstructImpl", this );
- bMultiSelection = sal_False;
+ bMultiSelection = false;
pColSel = 0;
pDataWin = 0;
pVScroll = 0;
@@ -76,26 +76,26 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
InitSettings_Impl( this );
InitSettings_Impl( pDataWin );
- bBootstrapped = sal_False;
+ bBootstrapped = false;
nDataRowHeight = 0;
nTitleLines = 1;
nFirstCol = 0;
nTopRow = 0;
nCurRow = BROWSER_ENDOFSELECTION;
nCurColId = 0;
- bResizing = sal_False;
+ bResizing = false;
bSelect = false;
- bSelecting = sal_False;
- bScrolling = sal_False;
- bSelectionIsVisible = sal_False;
- bNotToggleSel = sal_False;
- bRowDividerDrag = sal_False;
- bHit = sal_False;
- mbInteractiveRowHeight = sal_False;
- bHideSelect = sal_False;
+ bSelecting = false;
+ bScrolling = false;
+ bSelectionIsVisible = false;
+ bNotToggleSel = false;
+ bRowDividerDrag = false;
+ bHit = false;
+ mbInteractiveRowHeight = false;
+ bHideSelect = false;
bHideCursor = TRISTATE_FALSE;
nRowCount = 0;
- m_bFocusOnlyCursor = sal_True;
+ m_bFocusOnlyCursor = true;
m_aCursorColor = COL_TRANSPARENT;
m_nCurrentMode = 0;
nControlAreaWidth = USHRT_MAX;
@@ -324,7 +324,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
}
}
-void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
+void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze )
{
// never unfreeze the handle-column
@@ -338,7 +338,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
return;
// doesn't the state change?
- if ( (*pCols)[ nItemPos ]->IsFrozen() == bFreeze )
+ if ( (*pCols)[ nItemPos ]->IsFrozen() == (bFreeze ? 1 : 0) )
return;
// remark the column selection
@@ -602,7 +602,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
return;
// do we want to display the change immediately?
- sal_Bool bUpdate = GetUpdateMode() &&
+ bool bUpdate = GetUpdateMode() &&
( (*pCols)[ nItemPos ]->IsFrozen() || nItemPos >= nFirstCol );
if ( bUpdate )
@@ -631,8 +631,8 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
// actually scroll+invalidate
pDataWin->SetClipRegion();
- sal_Bool bSelVis = bSelectionIsVisible;
- bSelectionIsVisible = sal_False;
+ bool bSelVis = bSelectionIsVisible;
+ bSelectionIsVisible = false;
if( GetBackground().IsScrollable() )
{
@@ -764,7 +764,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
CHILD,
Any(),
makeAny( CreateAccessibleColumnHeader( nPos ) ),
- sal_True
+ true
);
}
}
@@ -907,9 +907,9 @@ long BrowseBox::ScrollColumns( long nCols )
// implicitly hides cursor while scrolling
StartScroll();
- bScrolling = sal_True;
- sal_Bool bScrollable = pDataWin->GetBackground().IsScrollable();
- sal_Bool bInvalidateView = sal_False;
+ bScrolling = true;
+ bool bScrollable = pDataWin->GetBackground().IsScrollable();
+ bool bInvalidateView = false;
// scrolling one column to the right?
if ( nCols == 1 )
@@ -920,7 +920,7 @@ long BrowseBox::ScrollColumns( long nCols )
if ( !bScrollable )
{
- bInvalidateView = sal_True;
+ bInvalidateView = true;
}
else
{
@@ -966,7 +966,7 @@ long BrowseBox::ScrollColumns( long nCols )
if ( !bScrollable )
{
- bInvalidateView = sal_True;
+ bInvalidateView = true;
}
else
{
@@ -1033,7 +1033,7 @@ long BrowseBox::ScrollColumns( long nCols )
getDataWindow()->Update();
Update();
}
- bScrolling = sal_False;
+ bScrolling = false;
EndScroll();
return nCols;
@@ -1112,7 +1112,7 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
else
{
// invalidate the specific field
- aRect = GetFieldRectPixel( nRow, nColId, sal_False );
+ aRect = GetFieldRectPixel( nRow, nColId, false );
}
getDataWindow()->Invalidate( aRect );
}
@@ -1183,7 +1183,7 @@ void BrowseBox::Clear()
}
}
-void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection )
+void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeepSelection )
{
if (nRow < 0)
@@ -1195,7 +1195,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
return;
// adjust total row count
- sal_Bool bLastRow = nRow >= nRowCount;
+ bool bLastRow = nRow >= nRowCount;
nRowCount += nNumRows;
DoHideCursor( "RowInserted" );
@@ -1239,9 +1239,9 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
// adjust the cursor
if ( nCurRow == BROWSER_ENDOFSELECTION )
- GoToRow( 0, sal_False, bKeepSelection );
+ GoToRow( 0, false, bKeepSelection );
else if ( nRow <= nCurRow )
- GoToRow( nCurRow += nNumRows, sal_False, bKeepSelection );
+ GoToRow( nCurRow += nNumRows, false, bKeepSelection );
// adjust the vertical scrollbar
if ( bDoPaint )
@@ -1273,7 +1273,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
CHILD,
makeAny( CreateAccessibleRowHeader( i ) ),
Any(),
- sal_False
+ false
);
}
}
@@ -1288,7 +1288,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
-void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
+void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
{
if ( nRow < 0 )
@@ -1444,7 +1444,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
CHILD,
Any(),
makeAny( CreateAccessibleRowHeader( i ) ),
- sal_False
+ false
);
}
}
@@ -1460,29 +1460,29 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
-sal_Bool BrowseBox::GoToRow( long nRow)
+bool BrowseBox::GoToRow( long nRow)
{
- return GoToRow(nRow, sal_False, sal_False);
+ return GoToRow(nRow, false, false);
}
-sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSelection )
+bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection )
{
long nOldCurRow = nCurRow;
// nothing to do?
if ( nRow == nCurRow && ( bMultiSelection || uRow.nSel == nRow ) )
- return sal_True;
+ return true;
// out of range?
if ( nRow < 0 || nRow >= nRowCount )
- return sal_False;
+ return false;
// not allowed?
if ( ( !bRowColMove && !IsCursorMoveAllowed( nRow, nCurColId ) ) )
- return sal_False;
+ return false;
if ( getDataWindow()->bNoScrollBack && nRow < nTopRow )
nRow = nTopRow;
@@ -1501,11 +1501,11 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele
DoHideCursor( "GoToRow" );
// must we scroll?
- sal_Bool bWasVisible = bSelectionIsVisible;
+ bool bWasVisible = bSelectionIsVisible;
if (! bMultiSelection)
{
if( !bKeepSelection )
- bSelectionIsVisible = sal_False;
+ bSelectionIsVisible = false;
}
if ( nRow < nTopRow )
ScrollRows( nRow - nTopRow );
@@ -1549,34 +1549,34 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele
else
bSelect = true;
}
- return sal_True;
+ return true;
}
-sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId)
+bool BrowseBox::GoToColumnId( sal_uInt16 nColId)
{
- return GoToColumnId(nColId,sal_True,sal_False);
+ return GoToColumnId(nColId, true, false);
}
-sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove)
+bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove)
{
if (!bColumnCursor)
- return sal_False;
+ return false;
// allowed?
if (!bRowColMove && !IsCursorMoveAllowed( nCurRow, nColId ) )
- return sal_False;
+ return false;
- if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, sal_True)))
+ if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, true)))
{
sal_uInt16 nNewPos = GetColumnPos(nColId);
BrowserColumn* pColumn = (nNewPos < pCols->size()) ? (*pCols)[ nNewPos ] : NULL;
DBG_ASSERT( pColumn, "no column object - invalid id?" );
if ( !pColumn )
- return sal_False;
+ return false;
DoHideCursor( "GoToColumnId" );
nCurColId = nColId;
@@ -1584,7 +1584,7 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_
sal_uInt16 nFirstPos = nFirstCol;
sal_uInt16 nWidth = (sal_uInt16)pColumn->Width();
sal_uInt16 nLastPos = GetColumnAtXPosPixel(
- pDataWin->GetSizePixel().Width()-nWidth, sal_False );
+ pDataWin->GetSizePixel().Width()-nWidth, false );
sal_uInt16 nFrozen = FrozenColCount();
if ( bMakeVisible && nLastPos &&
nNewPos >= nFrozen && ( nNewPos < nFirstPos || nNewPos > nLastPos ) )
@@ -1598,34 +1598,34 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_
DoShowCursor( "GoToColumnId" );
if (!bRowColMove)
CursorMoved();
- return sal_True;
+ return true;
}
- return sal_True;
+ return true;
}
-sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
+bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
{
// out of range?
if ( nRow < 0 || nRow >= nRowCount )
- return sal_False;
+ return false;
if (!bColumnCursor)
- return sal_False;
+ return false;
// nothing to do ?
if ( nRow == nCurRow && ( bMultiSelection || uRow.nSel == nRow ) &&
- nColId == nCurColId && IsFieldVisible(nCurRow, nColId, sal_True))
- return sal_True;
+ nColId == nCurColId && IsFieldVisible(nCurRow, nColId, true))
+ return true;
// allowed?
if (!IsCursorMoveAllowed(nRow, nColId))
- return sal_False;
+ return false;
DoHideCursor( "GoToRowColumnId" );
- sal_Bool bMoved = GoToRow(nRow, sal_True) && GoToColumnId(nColId, sal_True, sal_True);
+ bool bMoved = GoToRow(nRow, true) && GoToColumnId(nColId, true, true);
DoShowCursor( "GoToRowColumnId" );
if (bMoved)
@@ -1728,14 +1728,14 @@ void BrowseBox::SelectAll()
SELECTION_CHANGED,
Any(),
Any(),
- sal_True
+ true
); // column header event
commitHeaderBarEvent(
SELECTION_CHANGED,
Any(),
Any(),
- sal_False
+ false
); // row header event
}
}
@@ -1749,7 +1749,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
{
// deselecting is impossible, selecting via cursor
if ( _bSelect )
- GoToRow(nRow, sal_False);
+ GoToRow(nRow, false);
return;
}
@@ -1808,7 +1808,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
SELECTION_CHANGED,
Any(),
Any(),
- sal_False
+ false
); // row header event
}
}
@@ -1824,7 +1824,7 @@ long BrowseBox::GetSelectRowCount() const
-void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_Bool bMakeVisible )
+void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMakeVisible )
{
if ( !bColumnCursor || nNewColPos == BROWSER_INVALIDID )
@@ -1856,7 +1856,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
// only highlight painted areas
pDataWin->Update();
- Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, sal_False ) );
+ Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, false ) );
Rectangle aRect(
Point( aFieldRectPix.Left() - MIN_COLUMNWIDTH, 0 ),
Size( (*pCols)[ nNewColPos ]->Width(),
@@ -1878,7 +1878,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
SELECTION_CHANGED,
Any(),
Any(),
- sal_True
+ true
); // column header event
}
}
@@ -1905,7 +1905,7 @@ long BrowseBox::FirstSelectedColumn( ) const
-long BrowseBox::FirstSelectedRow( sal_Bool bInverse )
+long BrowseBox::FirstSelectedRow( bool bInverse )
{
return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel;
@@ -1946,11 +1946,11 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const
-sal_Bool BrowseBox::MakeFieldVisible
+bool BrowseBox::MakeFieldVisible
(
long nRow, // line number of the field (starting with 0)
sal_uInt16 nColId, // column ID of the field
- sal_Bool bComplete // (== sal_False), sal_True => make visible in its entirety
+ bool bComplete // (== false), true => make visible in its entirety
)
/* [Description]
@@ -1961,10 +1961,10 @@ sal_Bool BrowseBox::MakeFieldVisible
[Returned Value]
- sal_Bool sal_True
+ bool true
The given field is already visible or was already visible.
- sal_False
+ false
The given field could not be made visible or in the case of
'bComplete' could not be made visible in its entirety.
*/
@@ -1974,16 +1974,16 @@ sal_Bool BrowseBox::MakeFieldVisible
if ( !bBootstrapped ||
( aTestSize.Width() == 0 && aTestSize.Height() == 0 ) )
- return sal_False;
+ return false;
// is it visible already?
- sal_Bool bVisible = IsFieldVisible( nRow, nColId, bComplete );
+ bool bVisible = IsFieldVisible( nRow, nColId, bComplete );
if ( bVisible )
- return sal_True;
+ return true;
// calculate column position, field rectangle and painting area
sal_uInt16 nColPos = GetColumnPos( nColId );
- Rectangle aFieldRect = GetFieldRectPixel( nRow, nColId, sal_False );
+ Rectangle aFieldRect = GetFieldRectPixel( nRow, nColId, false );
Rectangle aDataRect = Rectangle( Point(0, 0), pDataWin->GetSizePixel() );
// positioned outside on the left?
@@ -2000,7 +2000,7 @@ sal_Bool BrowseBox::MakeFieldVisible
if ( ScrollColumns( 1 ) != 1 )
// no more need to scroll
break;
- aFieldRect = GetFieldRectPixel( nRow, nColId, sal_False );
+ aFieldRect = GetFieldRectPixel( nRow, nColId, false );
}
// positioned outside above?
@@ -2026,18 +2026,18 @@ sal_Bool BrowseBox::MakeFieldVisible
-sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
- sal_Bool bCompletely ) const
+bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
+ bool bCompletely ) const
{
// hidden by frozen column?
sal_uInt16 nColPos = GetColumnPos( nColumnId );
if ( nColPos >= FrozenColCount() && nColPos < nFirstCol )
- return sal_False;
+ return false;
Rectangle aRect( ImplFieldRectPixel( nRow, nColumnId ) );
if ( aRect.IsEmpty() )
- return sal_False;
+ return false;
// get the visible area
Rectangle aOutRect( Point(0, 0), pDataWin->GetOutputSizePixel() );
@@ -2053,7 +2053,7 @@ sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
- sal_Bool bRelToBrowser) const
+ bool bRelToBrowser) const
{
// get the rectangle relative to DataWin
@@ -2074,7 +2074,7 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
-Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const
+Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const
{
// get the rectangle relative to DataWin
@@ -2132,7 +2132,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
-long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const
+long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const
{
// compute the Y-coordinate
@@ -2160,7 +2160,7 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
-sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
+sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const
{
// accumulate the widths of the visible columns
@@ -2340,17 +2340,17 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
// old behavior: automatically correct NumRows:
if ( nRowCount < GetRowCount() )
{
- RowInserted(nRowCount,GetRowCount() - nRowCount,sal_False);
+ RowInserted(nRowCount,GetRowCount() - nRowCount, false);
}
else if ( nRowCount > GetRowCount() )
{
- RowRemoved(nRowCount-(nRowCount - GetRowCount()),nRowCount - GetRowCount(),sal_False);
+ RowRemoved(nRowCount-(nRowCount - GetRowCount()),nRowCount - GetRowCount(), false);
}
}
-sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
+bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
/* [Description]
@@ -2361,11 +2361,11 @@ sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
This method is not called, if the cursor movement results from removing or
deleting a row/column (thus, in cases where only a "cursor correction" happens).
- The base implementation currently always returns sal_True.
+ The base implementation currently always returns true.
*/
{
- return sal_True;
+ return true;
}
@@ -2467,10 +2467,10 @@ void BrowseBox::LoseFocus()
if ( !bKeepHighlight )
{
ToggleSelection();
- bSelectionIsVisible = sal_False;
+ bSelectionIsVisible = false;
}
- bHasFocus = sal_False;
+ bHasFocus = false;
}
Control::LoseFocus();
}
@@ -2485,12 +2485,12 @@ void BrowseBox::GetFocus()
{
if ( !bSelectionIsVisible )
{
- bSelectionIsVisible = sal_True;
+ bSelectionIsVisible = true;
if ( bBootstrapped )
ToggleSelection();
}
- bHasFocus = sal_True;
+ bHasFocus = true;
DoShowCursor( "GetFocus" );
}
Control::GetFocus();
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index e350e6819dc9..ef7bcd41c779 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -93,7 +93,7 @@ void* BrowseBox::implGetDataFlavors() const
-sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat )
+bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat )
{
if ( static_cast< BrowserDataWin* >( pDataWin )->bCallingDropCallback )
return static_cast< BrowserDataWin* >( pDataWin )->IsDropFormatSupported( _nFormat );
@@ -103,14 +103,14 @@ sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat )
-sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) const
+bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) const
{
return const_cast< BrowseBox* >( this )->IsDropFormatSupported( _nFormat );
}
-sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor )
+bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor )
{
if ( static_cast< BrowserDataWin* >( pDataWin )->bCallingDropCallback )
return static_cast< BrowserDataWin* >( pDataWin )->IsDropFormatSupported( _rFlavor );
@@ -120,7 +120,7 @@ sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor )
-sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) const
+bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) const
{
return const_cast< BrowseBox* >( this )->IsDropFormatSupported( _rFlavor );
}
@@ -153,7 +153,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
}
else if ( STATE_CHANGE_INITSHOW == nStateChange )
{
- bBootstrapped = sal_True; // must be set first!
+ bBootstrapped = true; // must be set first!
Resize();
if ( bMultiSelection )
@@ -166,8 +166,8 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
if ( HasFocus() )
{
- bSelectionIsVisible = sal_True;
- bHasFocus = sal_True;
+ bSelectionIsVisible = true;
+ bHasFocus = true;
}
UpdateScrollbars();
AutoSizeLastColumn();
@@ -194,9 +194,9 @@ void BrowseBox::StateChanged( StateChangedType nStateChange )
else if (STATE_CHANGE_ENABLE == nStateChange)
{
// do we have a handle column?
- sal_Bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId());
+ bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId());
// do we have a header bar?
- sal_Bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar);
+ bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar);
if ( nTitleLines
&& ( !bHeaderBar
@@ -289,7 +289,7 @@ void BrowseBox::EndScroll()
-void BrowseBox::ToggleSelection( sal_Bool bForce )
+void BrowseBox::ToggleSelection( bool bForce )
{
// selection highlight-toggling allowed?
@@ -300,7 +300,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
return;
// only highlight painted areas!
- bNotToggleSel = sal_True;
+ bNotToggleSel = true;
if ( false && !getDataWindow()->bInPaint )
pDataWin->Update();
@@ -350,7 +350,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
{
Rectangle aRect( GetFieldRectPixel(nCurRow,
(*pCols)[ nColId ]->GetId(),
- sal_False ) );
+ false ) );
aRect.Left() -= MIN_COLUMNWIDTH;
aRect.Right() += MIN_COLUMNWIDTH;
aRect.Top() = 0;
@@ -358,7 +358,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
pDataWin->Invalidate( aRect );
}
- bNotToggleSel = sal_False;
+ bNotToggleSel = false;
}
@@ -391,7 +391,7 @@ void BrowseBox::DrawCursor()
Rectangle aCursor;
if ( bColumnCursor )
{
- aCursor = GetFieldRectPixel( nCurRow, nCurColId, sal_False );
+ aCursor = GetFieldRectPixel( nCurRow, nCurColId, false );
aCursor.Left() -= MIN_COLUMNWIDTH;
aCursor.Right() += 1;
aCursor.Bottom() += 1;
@@ -465,13 +465,13 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
-sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
+bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
{
for ( size_t nPos = 0; nPos < pCols->size(); ++nPos )
if ( (*pCols)[ nPos ]->GetId() == nColumnId )
return (*pCols)[ nPos ]->IsFrozen();
- return sal_False;
+ return false;
}
@@ -487,7 +487,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
Range aJustifiedRange( aSelRange );
aJustifiedRange.Justify();
- sal_Bool bSelectThis = ( bSelect != aJustifiedRange.IsInside( rEvt.GetRow() ) );
+ bool bSelectThis = ( bSelect != aJustifiedRange.IsInside( rEvt.GetRow() ) );
if ( aJustifiedRange.IsInside( rEvt.GetRow() ) )
{
@@ -506,8 +506,8 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
else
{
// up and down
- sal_Bool bOldSelecting = bSelecting;
- bSelecting = sal_True;
+ bool bOldSelecting = bSelecting;
+ bSelecting = true;
while ( rEvt.GetRow() < aSelRange.Max() )
{ // ZTC/Mac bug - don't put these statements together!
--aSelRange.Max();
@@ -535,7 +535,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
if ( !bMultiSelection || !IsRowSelected( rEvt.GetRow() ) )
SelectRow( rEvt.GetRow(), true );
- GoToRow( rEvt.GetRow(), sal_False );
+ GoToRow( rEvt.GetRow(), false );
DoShowCursor( "ExpandRowSelection" );
}
@@ -629,8 +629,8 @@ void BrowseBox::Paint( const Rectangle& rRect )
return;
BrowserColumn *pFirstCol = (*pCols)[ 0 ];
- sal_Bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0;
- sal_Bool bHeaderBar = getDataWindow()->pHeaderBar != NULL;
+ bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0;
+ bool bHeaderBar = getDataWindow()->pHeaderBar != NULL;
// draw delimitational lines
if ( !getDataWindow()->bNoHScroll )
@@ -721,7 +721,7 @@ void BrowseBox::PaintRow( OutputDevice&, const Rectangle& )
void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
{
- sal_Bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0;
+ bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0;
// we need pixel coordinates
Size aRealSize = pDev->LogicToPixel(rSize);
@@ -833,7 +833,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->SetClipRegion( pDev->PixelToLogic( aRegion ) );
// do we have to paint the background
- sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && GetDataWindow().IsControlBackground();
+ bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && GetDataWindow().IsControlBackground();
if ( bBackground )
{
Rectangle aRect( aRealPos, aRealSize );
@@ -841,7 +841,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->DrawRect( aRect );
}
- ImplPaintData( *pDev, Rectangle( aRealPos, aRealSize ), sal_True, bDrawSelection );
+ ImplPaintData( *pDev, Rectangle( aRealPos, aRealSize ), true, bDrawSelection );
// restore the column widths/data row height
nDataRowHeight = nOriginalHeight;
@@ -862,7 +862,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
-void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections)
+void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections)
{
Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0);
Size aOverallAreaSize = _bForeignDevice ? _rRect.GetSize() : GetDataWindow().GetOutputSizePixel();
@@ -920,7 +920,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
Size( _rRect.GetSize().Width(), nDataRowHeigt ) );
PaintRow( _rOut, aRowRect );
- sal_Bool bRowSelected = _bDrawSelections
+ bool bRowSelected = _bDrawSelections
&& !bHideSelect
&& IsRowSelected( nRow );
if ( bRowSelected )
@@ -957,7 +957,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
}
// prepare Column-AutoHighlight
- sal_Bool bColAutoHighlight = _bDrawSelections
+ bool bColAutoHighlight = _bDrawSelections
&& bColumnCursor
&& IsColumnSelected( pCol->GetId() );
if ( bColAutoHighlight )
@@ -1121,7 +1121,7 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
Resize();
// MI: who was that? Window::Update();
- ImplPaintData(rWin, rRect, sal_False, sal_True);
+ ImplPaintData(rWin, rRect, false, true);
}
@@ -1146,7 +1146,7 @@ void BrowseBox::UpdateScrollbars()
if (IsZoom())
nCornerSize = (sal_uLong)(nCornerSize * (double)GetZoom());
- sal_Bool bNeedsVScroll = sal_False;
+ bool bNeedsVScroll = false;
long nMaxRows = 0;
if (GetDataRowHeight())
{
@@ -1178,7 +1178,7 @@ void BrowseBox::UpdateScrollbars()
sal_uLong nLastCol = GetColumnAtXPosPixel( aDataWinSize.Width() - 1 );
sal_uInt16 nFrozenCols = FrozenColCount();
- sal_Bool bNeedsHScroll = getDataWindow()->bAutoHScroll
+ bool bNeedsHScroll = getDataWindow()->bAutoHScroll
? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols->size() )
: !getDataWindow()->bNoHScroll;
if ( !bNeedsHScroll )
@@ -1300,10 +1300,10 @@ void BrowseBox::UpdateScrollbars()
-void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
+void BrowseBox::SetUpdateMode( bool bUpdate )
{
- sal_Bool bWasUpdate = IsUpdateMode();
+ bool bWasUpdate = IsUpdateMode();
if ( bWasUpdate == bUpdate )
return;
@@ -1330,7 +1330,7 @@ void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
-sal_Bool BrowseBox::GetUpdateMode() const
+bool BrowseBox::GetUpdateMode() const
{
return getDataWindow()->IsUpdateMode();
@@ -1443,7 +1443,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
if ( pCol->GetId() && std::abs( nR - rEvtPos.X() ) < 2 )
{
// start resizing the column
- bResizing = sal_True;
+ bResizing = true;
nResizeCol = nCol;
nDragX = nResizeX = rEvtPos.X();
SetPointer( Pointer( POINTER_HSPLIT ) );
@@ -1550,7 +1550,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
// end action
SetPointer( Pointer() );
ReleaseMouse();
- bResizing = sal_False;
+ bResizing = false;
}
else
MouseButtonUp( BrowserMouseEvent( (BrowserDataWin*)pDataWin,
@@ -1562,8 +1562,8 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
-sal_Bool bExtendedMode = sal_False;
-sal_Bool bFieldMode = sal_False;
+bool bExtendedMode = false;
+bool bFieldMode = false;
void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
{
@@ -1584,7 +1584,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
if ( bColumnCursor && rEvt.GetColumn() != 0 )
{
if ( rEvt.GetColumn() < pCols->size() )
- SelectColumnPos( rEvt.GetColumn(), sal_True, sal_False);
+ SelectColumnPos( rEvt.GetColumn(), true, false);
}
}
DoubleClick( rEvt );
@@ -1596,7 +1596,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
if ( rEvt.GetClicks() == 1 )
{
// initialise flags
- bHit = sal_False;
+ bHit = false;
a1stPoint =
a2ndPoint = PixelToLogic( rEvt.GetPosPixel() );
@@ -1609,7 +1609,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
}
// while selecting, no cursor
- bSelecting = sal_True;
+ bSelecting = true;
DoHideCursor( "MouseButtonDown" );
// DataRow?
@@ -1646,7 +1646,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
else if ( IsRowSelected( rEvt.GetRow() ) )
{
// wait for Drag&Drop
- bHit = sal_True;
+ bHit = true;
bExtendedMode = MOUSE_MULTISELECT ==
( rEvt.GetMode() & MOUSE_MULTISELECT );
return;
@@ -1678,8 +1678,8 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
if ( IsColumnSelected( rEvt.GetColumn() ) ||
IsRowSelected( rEvt.GetRow() ) )
{
- bHit = sal_True;
- bFieldMode = sal_True;
+ bHit = true;
+ bFieldMode = true;
return;
}
@@ -1699,11 +1699,11 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
SelectAll();
}
else
- SelectColumnId( rEvt.GetColumnId(), sal_True, sal_False );
+ SelectColumnId( rEvt.GetColumnId(), true, false );
}
// turn cursor on again, if necessary
- bSelecting = sal_False;
+ bSelecting = false;
DoShowCursor( "MouseButtonDown" );
if ( bSelect )
Select();
@@ -1740,15 +1740,15 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
}
}
bSelect = true;
- bExtendedMode = sal_False;
- bFieldMode = sal_False;
- bHit = sal_False;
+ bExtendedMode = false;
+ bFieldMode = false;
+ bHit = false;
}
// activate cursor
if ( bSelecting )
{
- bSelecting = sal_False;
+ bSelecting = false;
DoShowCursor( "MouseButtonUp" );
if ( bSelect )
Select();
@@ -1765,13 +1765,13 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt )
-sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
+bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
{
sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
- sal_Bool bShift = rEvt.GetKeyCode().IsShift();
- sal_Bool bCtrl = rEvt.GetKeyCode().IsMod1();
- sal_Bool bAlt = rEvt.GetKeyCode().IsMod2();
+ bool bShift = rEvt.GetKeyCode().IsShift();
+ bool bCtrl = rEvt.GetKeyCode().IsMod1();
+ bool bAlt = rEvt.GetKeyCode().IsMod2();
sal_uInt16 nId = BROWSER_NONE;
@@ -1839,7 +1839,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
{
long nRowsOnPage = pDataWin->GetSizePixel().Height() / GetDataRowHeight();
- sal_Bool bDone = sal_False;
+ bool bDone = false;
switch ( nId )
{
@@ -1850,11 +1850,11 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
case BROWSER_CURSORDOWN:
if ( ( GetCurRow() + 1 ) < nRowCount )
- bDone = GoToRow( GetCurRow() + 1, sal_False );
+ bDone = GoToRow( GetCurRow() + 1, false );
break;
case BROWSER_CURSORUP:
if ( GetCurRow() > 0 )
- bDone = GoToRow( GetCurRow() - 1, sal_False );
+ bDone = GoToRow( GetCurRow() - 1, false );
break;
case BROWSER_SELECTHOME:
if ( GetRowCount() )
@@ -1862,7 +1862,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
DoHideCursor( "BROWSER_SELECTHOME" );
for ( long nRow = GetCurRow(); nRow >= 0; --nRow )
SelectRow( nRow );
- GoToRow( 0, sal_True );
+ GoToRow( 0, true );
DoShowCursor( "BROWSER_SELECTHOME" );
}
break;
@@ -1873,7 +1873,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
long nRows = GetRowCount();
for ( long nRow = GetCurRow(); nRow < nRows; ++nRow )
SelectRow( nRow );
- GoToRow( GetRowCount() - 1, sal_True );
+ GoToRow( GetRowCount() - 1, true );
DoShowCursor( "BROWSER_SELECTEND" );
}
break;
@@ -1884,10 +1884,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
// deselect the current row, if it isn't the first
// and there is no other selected row above
long nRow = GetCurRow();
- sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) ||
+ bool bLocalSelect = ( !IsRowSelected( nRow ) ||
GetSelectRowCount() == 1 || IsRowSelected( nRow - 1 ) );
SelectRow( nRow, bLocalSelect, true );
- bDone = GoToRow( GetCurRow() + 1 , sal_False );
+ bDone = GoToRow( GetCurRow() + 1, false );
if ( bDone )
SelectRow( GetCurRow(), true, true );
}
@@ -1901,19 +1901,19 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
// deselect the current row, if it isn't the first
// and there is no other selected row under
long nRow = GetCurRow();
- sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) ||
+ bool bLocalSelect = ( !IsRowSelected( nRow ) ||
GetSelectRowCount() == 1 || IsRowSelected( nRow + 1 ) );
SelectRow( nCurRow, bLocalSelect, true );
- bDone = GoToRow( nRow - 1 , sal_False );
+ bDone = GoToRow( nRow - 1, false );
if ( bDone )
SelectRow( GetCurRow(), true, true );
}
break;
case BROWSER_CURSORPAGEDOWN:
- bDone = (sal_Bool)ScrollRows( nRowsOnPage );
+ bDone = ScrollRows( nRowsOnPage );
break;
case BROWSER_CURSORPAGEUP:
- bDone = (sal_Bool)ScrollRows( -nRowsOnPage );
+ bDone = ScrollRows( -nRowsOnPage );
break;
case BROWSER_CURSOREND:
if ( bColumnCursor )
@@ -1923,7 +1923,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
break;
}
case BROWSER_CURSORENDOFFILE:
- bDone = GoToRow( nRowCount - 1, sal_False );
+ bDone = GoToRow( nRowCount - 1, false );
break;
case BROWSER_CURSORRIGHT:
if ( bColumnCursor )
@@ -1954,7 +1954,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
break;
}
case BROWSER_CURSORTOPOFFILE:
- bDone = GoToRow( 0, sal_False );
+ bDone = GoToRow( 0, false );
break;
case BROWSER_CURSORLEFT:
if ( bColumnCursor )
@@ -1977,12 +1977,12 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
case BROWSER_ENHANCESELECTION:
if ( GetRowCount() )
SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), true );
- bDone = sal_True;
+ bDone = true;
break;
case BROWSER_SELECT:
if ( GetRowCount() )
SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), false );
- bDone = sal_True;
+ bDone = true;
break;
case BROWSER_MOVECOLUMNLEFT:
case BROWSER_MOVECOLUMNRIGHT:
@@ -1991,19 +1991,19 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
if ( pHeaderBar && pHeaderBar->IsDragable() )
{
sal_uInt16 nColId = GetCurColumnId();
- sal_Bool bColumnSelected = IsColumnSelected(nColId);
+ bool bColumnSelected = IsColumnSelected(nColId);
sal_uInt16 nNewPos = GetColumnPos(nColId);
- sal_Bool bMoveAllowed = sal_False;
+ bool bMoveAllowed = false;
if ( BROWSER_MOVECOLUMNLEFT == nId && nNewPos > 1 )
- --nNewPos,bMoveAllowed = sal_True;
+ --nNewPos,bMoveAllowed = true;
else if ( BROWSER_MOVECOLUMNRIGHT == nId && nNewPos < (ColCount()-1) )
- ++nNewPos,bMoveAllowed = sal_True;
+ ++nNewPos,bMoveAllowed = true;
if ( bMoveAllowed )
{
SetColumnPos( nColId, nNewPos );
ColumnMoved( nColId );
- MakeFieldVisible(GetCurRow(),nColId,sal_True);
+ MakeFieldVisible(GetCurRow(), nColId, true);
if ( bColumnSelected )
SelectColumnId(nColId);
}
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 1d7d3d15a9aa..76f932098db9 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -406,7 +406,7 @@ OUString BrowseBox::GetCellText(long, sal_uInt16 ) const
void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId,
- const Any& rNewValue, const Any& rOldValue, sal_Bool _bColumnHeaderBar )
+ const Any& rNewValue, const Any& rOldValue, bool _bColumnHeaderBar )
{
if ( isAccessibleAlive() )
m_pImpl->m_pAccessible->commitHeaderBarEvent( nEventId,
@@ -433,7 +433,7 @@ void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue
}
-sal_Bool BrowseBox::isAccessibleAlive( ) const
+bool BrowseBox::isAccessibleAlive( ) const
{
return ( NULL != m_pImpl->m_pAccessible ) && m_pImpl->m_pAccessible->isAlive();
}
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index cfe0af7fcb9a..2c4170e46c58 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -406,7 +406,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
return;
Point aEventPos( rEvt.GetMousePosPixel() );
- long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), sal_False);
+ long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), false);
MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT );
if ( COMMAND_CONTEXTMENU == rEvt.GetCommand() && rEvt.IsMouseEvent() &&
nRow < pBox->GetRowCount() && !pBox->IsRowSelected(nRow) )
@@ -552,7 +552,7 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos )
m_nDragRowDividerLimit = nDragRowDividerCurrentPos - nDataRowHeight;
- GetParent()->bRowDividerDrag = sal_True;
+ GetParent()->bRowDividerDrag = true;
GetParent()->ImplStartTracking();
Rectangle aDragSplitRect( 0, m_nDragRowDividerLimit, GetOutputSizePixel().Width(), nDragRowDividerCurrentPos );
@@ -576,7 +576,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
if ( rTEvt.IsTrackingEnded() )
{
HideTracking();
- GetParent()->bRowDividerDrag = sal_False;
+ GetParent()->bRowDividerDrag = false;
GetParent()->ImplEndTracking();
if ( !rTEvt.IsTrackingCanceled() )
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index ec048feff722..fdaf88196f5b 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -238,10 +238,10 @@ namespace svt
}
- sal_Bool EditBrowseBox::SeekRow(long nRow)
+ bool EditBrowseBox::SeekRow(long nRow)
{
nPaintRow = nRow;
- return sal_True;
+ return true;
}
@@ -600,7 +600,7 @@ namespace svt
while ( GetSelectColumnCount( ) )
SelectColumnPos(
sal::static_int_cast< sal_uInt16 >(FirstSelectedColumn()),
- sal_False );
+ false );
Select();
}
}
@@ -861,7 +861,7 @@ namespace svt
}
- sal_Bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const
+ bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const
{
sal_uInt16 nInfo = 0;
@@ -876,7 +876,7 @@ namespace svt
nInfo |= COLCHANGE;
if (nInfo == 0) // nothing happened
- return sal_True;
+ return true;
// save the cell content
if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified())
@@ -884,7 +884,7 @@ namespace svt
// maybe we're not visible ...
EnableAndShow();
aController->GetWindow().GrabFocus();
- return sal_False;
+ return false;
}
EditBrowseBox * pTHIS = const_cast<EditBrowseBox *> (this);
@@ -910,7 +910,7 @@ namespace svt
}
aController->GetWindow().GrabFocus();
}
- return sal_False;
+ return false;
}
if (nNewRow != nEditRow)
@@ -918,7 +918,7 @@ namespace svt
Window& rWindow = GetDataWindow();
if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0)
{
- Rectangle aRect = GetFieldRectPixel(nEditRow, 0, sal_False );
+ Rectangle aRect = GetFieldRectPixel(nEditRow, 0, false );
// status cell should be painted if and only if text is displayed
// note: bPaintStatus is mutable, but Solaris has problems with assigning
// probably because it is part of a bitfield
@@ -936,12 +936,12 @@ namespace svt
{
pTHIS->InvalidateStatusCell(nEditRow);
rWindow.EnablePaint(true);
- return sal_False;
+ return false;
}
else
{
rWindow.EnablePaint(true);
- return sal_True;
+ return true;
}
}
else