summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-05 13:18:21 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:17 +0200
commitc54b276beb30c36cee4d7cf2ccbd552c526777e7 (patch)
treec4d6a7f8bc55a32fbc881284027dcc81697cf3ac /svx
parent96a3ed193691de0761a7754a6477f1196679590d (diff)
svx: sal_Bool->bool
Change-Id: Ibe154941e00176cde06b1fe69864da4ae6bdee95
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/imapdlg.cxx10
-rw-r--r--svx/source/stbctrls/insctrl.cxx2
-rw-r--r--svx/source/svdraw/svdpoev.cxx10
-rw-r--r--svx/source/tbxctrls/itemwin.cxx30
4 files changed, 25 insertions, 27 deletions
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index e0c8971f5d68..c1307f584458 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -252,7 +252,7 @@ bool SvxIMapDlg::Close()
// Enabled or disable all Controls
-void SvxIMapDlg::SetExecState( sal_Bool bEnable )
+void SvxIMapDlg::SetExecState( bool bEnable )
{
pOwnData->bExecState = bEnable;
}
@@ -504,7 +504,7 @@ void SvxIMapDlg::DoOpen()
}
}
-sal_Bool SvxIMapDlg::DoSave()
+bool SvxIMapDlg::DoSave()
{
::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -514,7 +514,7 @@ sal_Bool SvxIMapDlg::DoSave()
const OUString aNCSAFilter( IMAP_NCSA_FILTER );
SdrModel* pModel = pIMapWnd->GetSdrModel();
const sal_Bool bChanged = pModel->IsChanged();
- sal_Bool bRet = false;
+ bool bRet = false;
aDlg.AddFilter( aCERNFilter, IMAP_CERN_TYPE );
aDlg.AddFilter( aNCSAFilter, IMAP_NCSA_TYPE );
@@ -546,7 +546,7 @@ sal_Bool SvxIMapDlg::DoSave()
}
else
{
- return sal_False;
+ return false;
}
INetURLObject aURL( aDlg.GetPath() );
@@ -570,7 +570,7 @@ sal_Bool SvxIMapDlg::DoSave()
delete pOStm;
pModel->SetChanged( bChanged );
- bRet = sal_True;
+ bRet = true;
}
}
}
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 81c1a88a3a8c..c0424b7746ba 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -37,7 +37,7 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
- bInsert( sal_True )
+ bInsert( true )
{
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 9d20c70a7bb4..f9b0a5b41c69 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -265,7 +265,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
}
}
-sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
+bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
{
ForcePossibilities();
return bSetMarkedPointsSmoothPossible;
@@ -277,7 +277,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const
return eMarkedPointsSmooth;
}
-sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
+bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
{
ForcePossibilities();
return bSetMarkedSegmentsKindPossible;
@@ -289,7 +289,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const
return eMarkedSegmentsKind;
}
-sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
+bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
{
return HasMarkedPoints();
}
@@ -538,7 +538,7 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const
}
}
-void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen)
+void SdrPolyEditView::CloseMarkedObjects(bool bToggle, bool bOpen)
{
if (AreObjectsMarked())
{
@@ -552,7 +552,7 @@ void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
- sal_Bool bClosed=pO->IsClosedObj();
+ bool bClosed=pO->IsClosedObj();
if ((pO->IsPolyObj() && (bClosed==bOpen)) || bToggle)
{
if( bUndo )
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 7217655b2d98..44583b75db7d 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -61,7 +61,7 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB
LineLB( pParent, nBits ),
nCurPos ( 0 ),
aLogicalSize(40,140),
- bRelease ( sal_True ),
+ bRelease ( true ),
mpSh ( NULL ),
mxFrame ( rFrame )
{
@@ -176,7 +176,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt )
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
{
- bRelease = sal_False;
+ bRelease = false;
Select();
}
}
@@ -218,7 +218,7 @@ void SvxLineBox::ReleaseFocus_Impl()
{
if(!bRelease)
{
- bRelease = sal_True;
+ bRelease = true;
return;
}
@@ -270,7 +270,7 @@ SvxColorBox::SvxColorBox(
ColorLB( pParent, nBits ),
nCurPos ( 0 ),
aLogicalSize(45,80),
- bRelease ( sal_True ),
+ bRelease ( true ),
maCommand ( rCommand ),
mxFrame ( rFrame )
{
@@ -382,7 +382,7 @@ bool SvxColorBox::PreNotify( NotifyEvent& rNEvt )
if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
{
- bRelease = sal_False;
+ bRelease = false;
Select();
}
}
@@ -436,7 +436,7 @@ void SvxColorBox::ReleaseFocus_Impl()
{
if(!bRelease)
{
- bRelease = sal_True;
+ bRelease = true;
return;
}
@@ -636,8 +636,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) :
FillTypeLB( pParent, nBits | WB_TABSTOP ),
nCurPos ( 0 ),
- bSelect ( sal_False ),
- bRelease(sal_True)
+ bSelect ( false ),
+ bRelease( true )
{
SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT ));
Fill();
@@ -671,7 +671,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
if ( !bSelect )
SelectEntryPos( nCurPos );
else
- bSelect = sal_False;
+ bSelect = false;
}
return FillTypeLB::PreNotify( rNEvt );
@@ -693,9 +693,9 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
( (Link&)GetSelectHdl() ).Call( this );
break;
case KEY_TAB:
- bRelease = sal_False;
+ bRelease = false;
( (Link&)GetSelectHdl() ).Call( this );
- bRelease = sal_True;
+ bRelease = true;
break;
case KEY_ESCAPE:
@@ -726,11 +726,9 @@ void SvxFillTypeBox::ReleaseFocus_Impl()
SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) :
-
FillAttrLB( pParent, nBits | WB_TABSTOP ),
-
nCurPos( 0 ),
- bRelease( sal_True )
+ bRelease( true )
{
SetPosPixel( Point( 90, 0 ) );
@@ -778,9 +776,9 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
nHandled = true;
break;
case KEY_TAB:
- bRelease = sal_False;
+ bRelease = false;
GetSelectHdl().Call( this );
- bRelease = sal_True;
+ bRelease = true;
break;
case KEY_ESCAPE:
SelectEntryPos( nCurPos );