summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:57:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:24:40 +0100
commitbd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (patch)
treea62544334e8f6a22c66c07cae1b560e826fabc82 /svtools
parent9d29f9913faaefe350d7e056330368b3dfa26d49 (diff)
bool improvements
Change-Id: I23e29995bc7af791067de4996923b6279f7f8892
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx36
-rw-r--r--svtools/source/brwbox/brwbox2.cxx36
-rw-r--r--svtools/source/brwbox/brwbox3.cxx4
-rw-r--r--svtools/source/brwbox/datwin.cxx48
-rw-r--r--svtools/source/config/colorcfg.cxx8
-rw-r--r--svtools/source/contnr/imivctl2.cxx14
-rw-r--r--svtools/source/contnr/templwin.cxx2
-rw-r--r--svtools/source/contnr/treelist.cxx2
-rw-r--r--svtools/source/contnr/treelistbox.cxx20
-rw-r--r--svtools/source/control/inettbc.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx4
-rw-r--r--svtools/source/control/toolbarmenu.cxx4
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx2
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx6
-rw-r--r--svtools/source/graphic/grfmgr2.cxx4
-rw-r--r--svtools/source/misc/ehdl.cxx4
-rw-r--r--svtools/source/misc/embedtransfer.cxx2
-rw-r--r--svtools/source/svrtf/parrtf.cxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx2
-rw-r--r--svtools/source/uno/svtxgridcontrol.cxx2
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx4
21 files changed, 104 insertions, 104 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 1f169165a3ad..6ec387356f9d 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -87,7 +87,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
nCurRow = BROWSER_ENDOFSELECTION;
nCurColId = 0;
bResizing = sal_False;
- bSelect = sal_False;
+ bSelect = false;
bSelecting = sal_False;
bScrolling = sal_False;
bSelectionIsVisible = sal_False;
@@ -317,7 +317,7 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn()
DoHideCursor( "ToggleSelectedColumn" );
ToggleSelection();
nSelectedColId = (*pCols)[ pColSel->FirstSelected() ]->GetId();
- pColSel->SelectAll(sal_False);
+ pColSel->SelectAll(false);
}
return nSelectedColId;
}
@@ -798,7 +798,7 @@ void BrowseBox::RemoveColumns()
// correct column selection
if ( pColSel )
{
- pColSel->SelectAll(sal_False);
+ pColSel->SelectAll(false);
pColSel->SetTotalRange( Range( 0, 0 ) );
}
@@ -1573,7 +1573,7 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele
if ( !bSelecting )
Select();
else
- bSelect = sal_True;
+ bSelect = true;
}
return sal_True;
}
@@ -1680,15 +1680,15 @@ void BrowseBox::SetNoSelection()
// unselect all
if ( bMultiSelection )
- uRow.pSel->SelectAll(sal_False);
+ uRow.pSel->SelectAll(false);
else
uRow.nSel = BROWSER_ENDOFSELECTION;
if ( pColSel )
- pColSel->SelectAll(sal_False);
+ pColSel->SelectAll(false);
if ( !bSelecting )
Select();
else
- bSelect = sal_True;
+ bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
@@ -1717,8 +1717,8 @@ void BrowseBox::SelectAll()
// select all rows
if ( pColSel )
- pColSel->SelectAll(sal_False);
- uRow.pSel->SelectAll(sal_True);
+ pColSel->SelectAll(false);
+ uRow.pSel->SelectAll(true);
// don't highlight handle column
BrowserColumn *pFirstCol = (*pCols)[ 0 ];
@@ -1742,7 +1742,7 @@ void BrowseBox::SelectAll()
if ( !bSelecting )
Select();
else
- bSelect = sal_True;
+ bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
@@ -1791,11 +1791,11 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
{
ToggleSelection();
if ( bMultiSelection )
- uRow.pSel->SelectAll(sal_False);
+ uRow.pSel->SelectAll(false);
else
uRow.nSel = BROWSER_ENDOFSELECTION;
if ( pColSel )
- pColSel->SelectAll(sal_False);
+ pColSel->SelectAll(false);
}
// set new selection
@@ -1823,7 +1823,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
if ( !bSelecting )
Select();
else
- bSelect = sal_True;
+ bSelect = true;
// restore screen
OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
@@ -1878,10 +1878,10 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
OSL_TRACE( "BrowseBox: %p->HideCursor", this );
ToggleSelection();
if ( bMultiSelection )
- uRow.pSel->SelectAll(sal_False);
+ uRow.pSel->SelectAll(false);
else
uRow.nSel = BROWSER_ENDOFSELECTION;
- pColSel->SelectAll(sal_False);
+ pColSel->SelectAll(false);
if ( pColSel->Select( nNewColPos, _bSelect ) )
{
@@ -1898,7 +1898,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
if ( !bSelecting )
Select();
else
- bSelect = sal_True;
+ bSelect = true;
if ( isAccessibleAlive() )
{
@@ -2266,9 +2266,9 @@ void BrowseBox::SetMode( BrowserMode nMode )
DBG_ASSERT( !( getDataWindow()->bAutoVScroll && getDataWindow()->bNoVScroll ),
"BrowseBox::SetMode: AutoVScroll *and* NoVScroll?" );
if ( getDataWindow()->bAutoHScroll )
- getDataWindow()->bNoHScroll = sal_False;
+ getDataWindow()->bNoHScroll = false;
if ( getDataWindow()->bAutoVScroll )
- getDataWindow()->bNoVScroll = sal_False;
+ getDataWindow()->bNoVScroll = false;
if ( getDataWindow()->bNoHScroll )
aHScroll.Hide();
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index adc485cc7c69..1760056e3e27 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -317,7 +317,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
// only highlight painted areas!
bNotToggleSel = sal_True;
- if ( sal_False && !getDataWindow()->bInPaint )
+ if ( false && !getDataWindow()->bInPaint )
pDataWin->Update();
// accumulate areas of rows to highlight
@@ -535,7 +535,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
if ( !IsRowSelected( aSelRange.Max() ) )
{
SelectRow( aSelRange.Max(), bSelectThis, sal_True );
- bSelect = sal_True;
+ bSelect = true;
}
}
while ( rEvt.GetRow() > aSelRange.Max() )
@@ -544,7 +544,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
if ( !IsRowSelected( aSelRange.Max() ) )
{
SelectRow( aSelRange.Max(), bSelectThis, sal_True );
- bSelect = sal_True;
+ bSelect = true;
}
}
bSelecting = bOldSelecting;
@@ -569,10 +569,10 @@ void BrowseBox::Resize()
BrowseBox::StateChanged( STATE_CHANGE_INITSHOW );
if ( pCols->empty() )
{
- getDataWindow()->bResizeOnPaint = sal_True;
+ getDataWindow()->bResizeOnPaint = true;
return;
}
- getDataWindow()->bResizeOnPaint = sal_False;
+ getDataWindow()->bResizeOnPaint = false;
// calc the size of the scrollbars
// (we can't ask the scrollbars for their widths cause if we're zoomed they still have to be
@@ -1161,10 +1161,10 @@ void BrowseBox::UpdateScrollbars()
BrowserDataWin *pBDW = (BrowserDataWin*) pDataWin;
if ( pBDW->bInUpdateScrollbars )
{
- pBDW->bHadRecursion = sal_True;
+ pBDW->bHadRecursion = true;
return;
}
- pBDW->bInUpdateScrollbars = sal_True;
+ pBDW->bInUpdateScrollbars = true;
// the size of the corner window (and the width of the VSB/height of the HSB)
sal_uLong nCornerSize = GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -1315,10 +1315,10 @@ void BrowseBox::UpdateScrollbars()
getDataWindow()->pHeaderBar->SetOffset( nWidth );
}
- pBDW->bInUpdateScrollbars = sal_False;
+ pBDW->bInUpdateScrollbars = false;
if ( pBDW->bHadRecursion )
{
- pBDW->bHadRecursion = sal_False;
+ pBDW->bHadRecursion = false;
UpdateScrollbars();
}
}
@@ -1499,7 +1499,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
// event occurred out of data area
if ( rEvt.IsRight() )
pDataWin->Command(
- CommandEvent( Point( 1, LONG_MAX ), COMMAND_CONTEXTMENU, sal_True ) );
+ CommandEvent( Point( 1, LONG_MAX ), COMMAND_CONTEXTMENU, true ) );
else
SetNoSelection();
}
@@ -1661,19 +1661,19 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
{
ToggleSelection();
if ( bMultiSelection )
- uRow.pSel->SelectAll(sal_False);
+ uRow.pSel->SelectAll(false);
else
uRow.nSel = BROWSER_ENDOFSELECTION;
if ( pColSel )
- pColSel->SelectAll(sal_False);
- bSelect = sal_True;
+ pColSel->SelectAll(false);
+ bSelect = true;
}
// expanding mode?
if ( rEvt.GetMode() & MOUSE_RANGESELECT )
{
// select the further touched rows too
- bSelect = sal_True;
+ bSelect = true;
ExpandRowSelection( rEvt );
return;
}
@@ -1696,7 +1696,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() );
SelectRow( rEvt.GetRow(),
!uRow.pSel->IsSelected( rEvt.GetRow() ) );
- bSelect = sal_True;
+ bSelect = true;
return;
}
}
@@ -1706,7 +1706,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
GoToRow( rEvt.GetRow() );
SelectRow( rEvt.GetRow(), sal_True );
aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() );
- bSelect = sal_True;
+ bSelect = true;
}
else // Column/Field-Selection
{
@@ -1721,7 +1721,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
SetNoSelection();
GoToRowColumnId( rEvt.GetRow(), rEvt.GetColumnId() );
- bSelect = sal_True;
+ bSelect = true;
}
}
else
@@ -1777,7 +1777,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
SelectRow( rEvt.GetRow(), sal_True );
}
}
- bSelect = sal_True;
+ bSelect = true;
bExtendedMode = sal_False;
bFieldMode = sal_False;
bHit = sal_False;
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 54ec2a248429..6facb704f34b 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -161,7 +161,7 @@ sal_Int32 BrowseBox::GetAccessibleControlCount() const
Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 )
{
- DBG_ASSERT( sal_False, "BrowseBox::CreateAccessibleControl: to be overwritten!" );
+ DBG_ASSERT( false, "BrowseBox::CreateAccessibleControl: to be overwritten!" );
return NULL;
}
// -----------------------------------------------------------------------------
@@ -400,7 +400,7 @@ void BrowseBox::GrabTableFocus()
// -----------------------------------------------------------------------------
OUString BrowseBox::GetCellText(long, sal_uInt16 ) const
{
- DBG_ASSERT(0,"This method has to be implemented by the derived classes! BUG!!");
+ DBG_ASSERT(false,"This method has to be implemented by the derived classes! BUG!!");
return OUString();
}
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 32bd4059b221..5c6c288369ab 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -192,18 +192,18 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent )
,pEventWin( pParent )
,pCornerWin( 0 )
,pDtorNotify( 0 )
- ,bInPaint( sal_False )
- ,bInCommand( sal_False )
- ,bNoScrollBack( sal_False )
- ,bNoHScroll( sal_False )
- ,bNoVScroll( sal_False )
- ,bUpdateMode( sal_True )
- ,bResizeOnPaint( sal_False )
- ,bUpdateOnUnlock( sal_False )
- ,bInUpdateScrollbars( sal_False )
- ,bHadRecursion( sal_False )
- ,bOwnDataChangedHdl( sal_False )
- ,bCallingDropCallback( sal_False )
+ ,bInPaint( false )
+ ,bInCommand( false )
+ ,bNoScrollBack( false )
+ ,bNoHScroll( false )
+ ,bNoVScroll( false )
+ ,bUpdateMode( true )
+ ,bResizeOnPaint( false )
+ ,bUpdateOnUnlock( false )
+ ,bInUpdateScrollbars( false )
+ ,bHadRecursion( false )
+ ,bOwnDataChangedHdl( false )
+ ,bCallingDropCallback( false )
,nUpdateLock( 0 )
,nCursorHidden( 0 )
,m_nDragRowDividerLimit( 0 )
@@ -233,7 +233,7 @@ void BrowserDataWin::LeaveUpdateLock()
if (bUpdateOnUnlock )
{
Control::Update();
- bUpdateOnUnlock = sal_False;
+ bUpdateOnUnlock = false;
}
}
}
@@ -276,7 +276,7 @@ void BrowserDataWin::Update()
if ( !nUpdateLock )
Control::Update();
else
- bUpdateOnUnlock = sal_True;
+ bUpdateOnUnlock = true;
}
//-------------------------------------------------------------------
@@ -308,9 +308,9 @@ void BrowserDataWin::Paint( const Rectangle& rRect )
aInvalidRegion.push_back( new Rectangle( rRect ) );
return;
}
- bInPaint = sal_True;
+ bInPaint = true;
( (BrowseBox*) GetParent() )->PaintData( *this, rRect );
- bInPaint = sal_False;
+ bInPaint = false;
DoOutstandingInvalidations();
}
else
@@ -364,18 +364,18 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
//-------------------------------------------------------------------
sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent& _rEvt )
{
- bCallingDropCallback = sal_True;
+ bCallingDropCallback = true;
sal_Int8 nReturn = GetParent()->AcceptDrop( BrowserAcceptDropEvent( this, _rEvt ) );
- bCallingDropCallback = sal_False;
+ bCallingDropCallback = false;
return nReturn;
}
//-------------------------------------------------------------------
sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent& _rEvt )
{
- bCallingDropCallback = sal_True;
+ bCallingDropCallback = true;
sal_Int8 nReturn = GetParent()->ExecuteDrop( BrowserExecuteDropEvent( this, _rEvt ) );
- bCallingDropCallback = sal_False;
+ bCallingDropCallback = false;
return nReturn;
}
@@ -409,7 +409,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
{
sal_Bool bDeleted = sal_False;
pDtorNotify = &bDeleted;
- bInCommand = sal_True;
+ bInCommand = true;
MouseButtonDown( aMouseEvt );
if( bDeleted )
return;
@@ -417,20 +417,20 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
if( bDeleted )
return;
pDtorNotify = 0;
- bInCommand = sal_False;
+ bInCommand = false;
}
aEventPos.Y() += GetParent()->GetTitleHeight();
CommandEvent aEvt( aEventPos, rEvt.GetCommand(),
rEvt.IsMouseEvent(), rEvt.GetData() );
- bInCommand = sal_True;
+ bInCommand = true;
sal_Bool bDeleted = sal_False;
pDtorNotify = &bDeleted;
GetParent()->Command( aEvt );
if( bDeleted )
return;
pDtorNotify = 0;
- bInCommand = sal_False;
+ bInCommand = false;
if ( COMMAND_STARTDRAG == rEvt.GetCommand() )
MouseButtonUp( aMouseEvt );
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index a8e5ba89929a..7ba3b11d93b8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -519,12 +519,12 @@ EditableColorConfig::EditableColorConfig() :
m_pImpl(new ColorConfig_Impl),
m_bModified(sal_False)
{
- m_pImpl->BlockBroadcasts(sal_True);
+ m_pImpl->BlockBroadcasts(true);
}
EditableColorConfig::~EditableColorConfig()
{
- m_pImpl->BlockBroadcasts(sal_False);
+ m_pImpl->BlockBroadcasts(false);
if(m_bModified)
m_pImpl->SetModified();
if(m_pImpl->IsModified())
@@ -602,12 +602,12 @@ void EditableColorConfig::Commit()
// -----------------------------------------------------------------------------
void EditableColorConfig::DisableBroadcast()
{
- m_pImpl->BlockBroadcasts(sal_True);
+ m_pImpl->BlockBroadcasts(true);
}
// -----------------------------------------------------------------------------
void EditableColorConfig::EnableBroadcast()
{
- m_pImpl->BlockBroadcasts(sal_False);
+ m_pImpl->BlockBroadcasts(false);
}
// -----------------------------------------------------------------------------
diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 1c5426e8c7b7..6e0a31a80332 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.cxx
@@ -301,9 +301,9 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt
// neighbor in same row?
if( bRight )
pResult = SearchRow(
- nY, nX, sal::static_int_cast< sal_uInt16 >(nCols-1), nX, sal_True, sal_True );
+ nY, nX, sal::static_int_cast< sal_uInt16 >(nCols-1), nX, true, true );
else
- pResult = SearchRow( nY, nX ,0, nX, sal_False, sal_True );
+ pResult = SearchRow( nY, nX ,0, nX, false, true );
if( pResult )
return pResult;
@@ -325,7 +325,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoLeftRight( SvxIconChoiceCtrlEntry* pCt
sal_uInt16 nRowMax = nY;
do
{
- SvxIconChoiceCtrlEntry* pEntry = SearchCol((sal_uInt16)nCurCol,nRowMin,nRowMax,nY,sal_True, sal_False);
+ SvxIconChoiceCtrlEntry* pEntry = SearchCol((sal_uInt16)nCurCol,nRowMin,nRowMax,nY,true, false);
if( pEntry )
return pEntry;
if( nRowMin )
@@ -420,9 +420,9 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlE
// neighbor in same column?
if( bDown )
pResult = SearchCol(
- nX, nY, sal::static_int_cast< sal_uInt16 >(nRows-1), nY, sal_True, sal_True );
+ nX, nY, sal::static_int_cast< sal_uInt16 >(nRows-1), nY, true, true );
else
- pResult = SearchCol( nX, nY ,0, nY, sal_False, sal_True );
+ pResult = SearchCol( nX, nY ,0, nY, false, true );
if( pResult )
return pResult;
@@ -444,7 +444,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlE
sal_uInt16 nColMax = nX;
do
{
- SvxIconChoiceCtrlEntry* pEntry = SearchRow((sal_uInt16)nCurRow,nColMin,nColMax,nX,sal_True, sal_False);
+ SvxIconChoiceCtrlEntry* pEntry = SearchRow((sal_uInt16)nCurRow,nColMin,nColMax,nX,true, false);
if( pEntry )
return pEntry;
if( nColMin )
@@ -684,7 +684,7 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( sal_Bool bOccupyFound )
sal_uLong nStart = 0;
sal_Bool bExpanded = sal_False;
- while( 1 )
+ while( true )
{
const sal_uLong nCount = (sal_uInt16)(_nGridCols * _nGridRows);
for( sal_uLong nCur = nStart; nCur < nCount; nCur++ )
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 955ae3d042f8..95e16bdb286c 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -715,7 +715,7 @@ void SvtFrameWindow_Impl::OpenFile( const OUString& rURL, sal_Bool bPreview, sal
// disabling must be done here, does not work in ctor because
// execute of the dialog will overwrite it
// ( own execute method would help )
- pTextWin->EnableInput( sal_False, sal_True );
+ pTextWin->EnableInput( false, sal_True );
if ( pTextWin->IsReallyVisible() )
{
sal_Bool b = sal_True;
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 3ef468d3f39b..17597f4ca16b 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -1007,7 +1007,7 @@ bool SvTreeList::Remove( const SvTreeListEntry* pEntry )
// Under certain circumstances (which?), the explorer deletes entries
// from the view that it hasn't inserted into the view. We don't want
// to crash, so we catch this case here.
- return sal_False;
+ return false;
}
Broadcast(LISTACTION_REMOVING, const_cast<SvTreeListEntry*>(pEntry));
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 5eafd3acbd40..9f1b47b4dc34 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1680,14 +1680,14 @@ void SvTreeListBox::Resize()
{
DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
- EndEditing( sal_True );
+ EndEditing( true );
Control::Resize();
pImp->Resize();
nFocusWidth = -1;
- pImp->ShowCursor( sal_False );
- pImp->ShowCursor( sal_True );
+ pImp->ShowCursor( false );
+ pImp->ShowCursor( true );
}
/* Cases:
@@ -1727,7 +1727,7 @@ void SvTreeListBox::SetTabs()
{
DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
- EndEditing( sal_True );
+ EndEditing( true );
nTreeFlags &= (~TREEFLAG_RECALCTABS);
nFocusWidth = -1;
const WinBits nStyle( GetStyle() );
@@ -2615,8 +2615,8 @@ void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool )
DBG_CHKTHIS(SvTreeListBox,0);
pImp->SelAllDestrAnch(
bSelect,
- sal_True, // delete anchor,
- sal_True ); // even when using SINGLE_SELECTION, deselect the cursor
+ true, // delete anchor,
+ true ); // even when using SINGLE_SELECTION, deselect the cursor
}
void SvTreeListBox::ModelHasInsertedTree( SvTreeListEntry* pEntry )
@@ -2838,11 +2838,11 @@ void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
DBG_ASSERT(pEntry&&pItem,"EditItemText: Bad params");
if( IsSelected( pEntry ))
{
- pImp->ShowCursor( sal_False );
+ pImp->ShowCursor( false );
SvListView::Select( pEntry, sal_False );
PaintEntry( pEntry );
SvListView::Select( pEntry, sal_True );
- pImp->ShowCursor( sal_True );
+ pImp->ShowCursor( true );
}
pEdEntry = pEntry;
pEdItem = pItem;
@@ -3479,7 +3479,7 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
long nRealWidth = pImp->GetOutputSize().Width();
nRealWidth -= GetMapMode().GetOrigin().X();
- while( 1 )
+ while( true )
{
SvLBoxTab* pNextTab=nNextItem<nTabCount ? aTabs[nNextItem] : 0;
long nStart = GetTabPos( pEntry, pTab );
@@ -4013,7 +4013,7 @@ void SvTreeListBox::EnableContextMenuHandling( void )
{
DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" );
- pImp->bContextMenuHandling = sal_True;
+ pImp->bContextMenuHandling = true;
}
void SvTreeListBox::EnableContextMenuHandling( sal_Bool b )
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index e3a1da1426b1..d527408ce235 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -522,7 +522,7 @@ OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUStrin
aObj.setFinalSlash();
// take base URL and append current input
- bool bWasAbsolute = sal_False;
+ bool bWasAbsolute = false;
#ifdef UNX
// don't support FSYS_MAC under Unix, because here ':' is a valid character for a filename
INetURLObject::FSysStyle eStyle = static_cast< INetURLObject::FSysStyle >( INetURLObject::FSYS_VOS | INetURLObject::FSYS_UNX | INetURLObject::FSYS_DOS );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 88d958a6f87f..f410a7d7c795 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -417,8 +417,8 @@ void TabBar::ImplInit( WinBits nWinStyle )
mbInSelect = sal_False;
mbSelColor = sal_False;
mbSelTextColor = sal_False;
- mbMirrored = sal_False;
- mbMirrored = sal_False;
+ mbMirrored = false;
+ mbMirrored = false;
mbScrollAlwaysEnabled = false;
if ( nWinStyle & WB_3DTAB )
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index f59d0356355a..779975bdc9c7 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -835,7 +835,7 @@ void ToolbarMenu::appendSeparator()
ValueSet* ToolbarMenu::createEmptyValueSetControl()
{
ValueSet* pSet = new ValueSet( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT );
- pSet->EnableFullItemMode( sal_False );
+ pSet->EnableFullItemMode( false );
pSet->SetColor( GetControlBackground() );
pSet->SetHighlightHdl( LINK( this, ToolbarMenu, HighlightHdl ) );
return pSet;
@@ -1009,7 +1009,7 @@ void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool /*bMBDown*/
Size aOutSz = GetOutputSizePixel();
if ( ( nMouseY >= 0 ) && ( nMouseY < aOutSz.Height() ) )
{
- bool bHighlighted = sal_False;
+ bool bHighlighted = false;
const int nEntryCount = mpImpl->maEntryVector.size();
int nEntry;
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index c2f44e936a91..ec4328fb006b 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -28,7 +28,7 @@ PlaceEditDialog::PlaceEditDialog( Window* pParent ) :
get( m_pBTDelete, "delete" );
m_pBTOk->SetClickHdl( LINK( this, PlaceEditDialog, OKHdl) );
- m_pBTOk->Enable( sal_False );
+ m_pBTOk->Enable( false );
m_pEDServerName->SetModifyHdl( LINK( this, PlaceEditDialog, EditHdl) );
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 6176fe09e350..597c741e4995 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -789,7 +789,7 @@ void AssignmentPersistentData::Commit()
if (!m_xDatabaseContext.is())
{
const OUString sContextServiceName("com.sun.star.sdb.DatabaseContext");
- ShowServiceNotAvailableError( this, sContextServiceName, sal_False);
+ ShowServiceNotAvailableError( this, sContextServiceName, false);
return;
}
}
@@ -841,7 +841,7 @@ void AssignmentPersistentData::Commit()
if (!xHandler.is())
{
const OUString sInteractionHandlerServiceName("com.sun.star.task.InteractionHandler");
- ShowServiceNotAvailableError(this, sInteractionHandlerServiceName, sal_True);
+ ShowServiceNotAvailableError(this, sInteractionHandlerServiceName, true);
return;
}
@@ -1216,7 +1216,7 @@ void AssignmentPersistentData::Commit()
catch(const Exception&) { }
if (!xAdminDialog.is())
{
- ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), sal_True);
+ ShowServiceNotAvailableError(this, OUString("com.sun.star.ui.dialogs.AddressBookSourcePilot"), true);
return 1L;
}
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 45c368612b2c..de9fee5c9d7b 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -712,7 +712,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt
}
aOutAlpha.ReleaseAccess( pWriteAccess );
- bRet = sal_True;
+ bRet = true;
}
aAlpha.ReleaseAccess( pReadAccess );
@@ -785,7 +785,7 @@ sal_Bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAt
if( pMAcc )
aMsk.ReleaseAccess( pMAcc );
- bRet = sal_True;
+ bRet = true;
}
aOutMsk.ReleaseAccess( pWriteAccess );
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 204deef4d650..4f269db54910 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -231,14 +231,14 @@ class ResString: public OUString
//-------------------------------------------------------------------------
ResString::ResString(ResId & rId):
- OUString(rId.SetAutoRelease(sal_False).toString()),
+ OUString(rId.SetAutoRelease(false).toString()),
nFlags(0)
{
ResMgr * pResMgr = rId.GetResMgr();
// String ctor temporarily sets global ResManager
if (pResMgr->GetRemainSize())
nFlags = sal_uInt16(pResMgr->ReadShort());
- rId.SetAutoRelease(sal_True);
+ rId.SetAutoRelease(true);
pResMgr->PopContext();
}
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 7ccbfe5c274c..45e621dd7b09 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -100,7 +100,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
// TODO/LATER: Propbably the graphic should be copied here as well
// currently it is handled by the applications
utl::TempFile aTmp;
- aTmp.EnableKillingFile( sal_True );
+ aTmp.EnableKillingFile( true );
uno::Reference < embed::XEmbedPersist > xPers( m_xObj, uno::UNO_QUERY );
if ( xPers.is() )
{
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 4e0f9714a463..4f8a94cb014d 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -318,7 +318,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
{
OStringBuffer aByteString;
- while (1)
+ while (true)
{
char c = (char)GetHexValue();
/*
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 22264ca20331..125754325515 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -283,7 +283,7 @@ namespace svt { namespace table
Reference<XAccessible> TableControl::CreateAccessibleControl( sal_Int32 _nIndex )
{
(void)_nIndex;
- DBG_ASSERT( sal_False, "TableControl::CreateAccessibleControl: to be overwritten!" );
+ DBG_ASSERT( false, "TableControl::CreateAccessibleControl: to be overwritten!" );
return NULL;
}
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 6fadfcc9f50a..261bd72855bf 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -861,7 +861,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno:
Window * pWindow = GetWindow();
if ( pWindow )
{
- pWindow->Enable( bEnable, sal_True );
+ pWindow->Enable( bEnable, true );
pWindow->EnableInput( bEnable );
pWindow->Invalidate();
}
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 35df12b515dc..d6e441f7b95c 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -917,7 +917,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
if( rTree.IsEditingActive() )
{
- rTree.EndEditing(sal_False);
+ rTree.EndEditing(false);
return sal_True;
}
else
@@ -933,7 +933,7 @@ void SAL_CALL TreeControlPeer::cancelEditing( ) throw (RuntimeException)
SolarMutexGuard aGuard;
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
- rTree.EndEditing(sal_False);
+ rTree.EndEditing(false);
}
// -------------------------------------------------------------------