diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-05 13:18:21 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:17 +0200 |
commit | c54b276beb30c36cee4d7cf2ccbd552c526777e7 (patch) | |
tree | c4d6a7f8bc55a32fbc881284027dcc81697cf3ac | |
parent | 96a3ed193691de0761a7754a6477f1196679590d (diff) |
svx: sal_Bool->bool
Change-Id: Ibe154941e00176cde06b1fe69864da4ae6bdee95
-rw-r--r-- | include/svx/imapdlg.hxx | 4 | ||||
-rw-r--r-- | include/svx/insctrl.hxx | 2 | ||||
-rw-r--r-- | include/svx/ipolypolygoneditorcontroller.hxx | 8 | ||||
-rw-r--r-- | include/svx/itemwin.hxx | 24 | ||||
-rw-r--r-- | include/svx/svdpoev.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/animations/motionpathtag.hxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.cxx | 10 | ||||
-rw-r--r-- | svx/source/stbctrls/insctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdpoev.cxx | 10 | ||||
-rw-r--r-- | svx/source/tbxctrls/itemwin.cxx | 30 |
11 files changed, 58 insertions, 60 deletions
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index d6877356cc36..6c671456f3b3 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -113,7 +113,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK( MiscHdl, void* ); void DoOpen(); - sal_Bool DoSave(); + bool DoSave(); public: @@ -121,7 +121,7 @@ public: Window* pParent, const ResId& rResId ); ~SvxIMapDlg(); - void SetExecState( sal_Bool bEnable ); + void SetExecState( bool bEnable ); void SetGraphic( const Graphic& rGraphic ); diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index 411fc8516732..e9fffc41ee9c 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -38,7 +38,7 @@ public: ~SvxInsertStatusBarControl(); private: - sal_Bool bInsert; + bool bInsert; SVX_DLLPRIVATE void DrawItemText_Impl(); }; diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx index ac885ac7c4aa..0f89eca7d010 100644 --- a/include/svx/ipolypolygoneditorcontroller.hxx +++ b/include/svx/ipolypolygoneditorcontroller.hxx @@ -46,20 +46,20 @@ class IPolyPolygonEditorController { public: virtual void DeleteMarkedPoints() = 0; - virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0; + virtual bool IsDeleteMarkedPointsPossible() const = 0; virtual void RipUpAtMarkedPoints() = 0; virtual bool IsRipUpAtMarkedPointsPossible() const = 0; - virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0; + virtual bool IsSetMarkedSegmentsKindPossible() const = 0; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0; - virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0; + virtual bool IsSetMarkedPointsSmoothPossible() const = 0; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0; - virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0; + virtual void CloseMarkedObjects(bool bToggle, bool bOpen ) = 0; virtual bool IsOpenCloseMarkedObjectsPossible() const = 0; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0; diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 584c38296eae..f1b804e5176a 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -34,10 +34,10 @@ class SfxObjectShell; class SvxLineBox : public LineLB { - sal_uInt16 nCurPos; + sal_uInt16 nCurPos; Timer aDelayTimer; Size aLogicalSize; - sal_Bool bRelease; + bool bRelease; SfxObjectShell* mpSh; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -67,10 +67,10 @@ class SvxColorBox : public ColorLB { using Window::Update; - sal_uInt16 nCurPos; + sal_uInt16 nCurPos; Timer aDelayTimer; Size aLogicalSize; - sal_Bool bRelease; + bool bRelease; OUString maCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -135,17 +135,17 @@ public: SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillTypeBox(); - void Selected() { bSelect = sal_True; } - sal_Bool IsRelease() { return bRelease;} + void Selected() { bSelect = true; } + bool IsRelease() { return bRelease;} protected: virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); private: - sal_uInt16 nCurPos; - sal_Bool bSelect; - sal_Bool bRelease; + sal_uInt16 nCurPos; + bool bSelect; + bool bRelease; void ReleaseFocus_Impl(); }; @@ -158,7 +158,7 @@ public: SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillAttrBox(); - sal_Bool IsRelease() { return bRelease;} + bool IsRelease() { return bRelease;} protected: virtual bool PreNotify( NotifyEvent& rNEvt ); @@ -166,8 +166,8 @@ protected: virtual void Select(); private: - sal_uInt16 nCurPos; - sal_Bool bRelease; + sal_uInt16 nCurPos; + bool bRelease; void ReleaseFocus_Impl(); }; diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index 473403592be0..700607c8056c 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -50,18 +50,18 @@ protected: virtual ~SdrPolyEditView(); public: - sal_Bool IsSetMarkedPointsSmoothPossible() const; + bool IsSetMarkedPointsSmoothPossible() const; SdrPathSmoothKind GetMarkedPointsSmooth() const; void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein. - sal_Bool IsSetMarkedSegmentsKindPossible() const; + bool IsSetMarkedSegmentsKindPossible() const; SdrPathSegmentKind GetMarkedSegmentsKind() const; void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); // Moeglicherweise ist das Obj hinterher geloescht: void DeleteMarkedPoints(); - sal_Bool IsDeleteMarkedPointsPossible() const; + bool IsDeleteMarkedPointsPossible() const; void MoveMarkedPoints(const Size& rSiz, bool bCopy=false); void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); @@ -73,7 +73,7 @@ public: // Alle markierten Polylines werden zu Polygonen, alle offenen // Bezierkurven zu geschlossenen. - void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0); + void CloseMarkedObjects(bool bToggle=false, bool bOpen=false); // , long nOpenDistance=0); bool IsOpenCloseMarkedObjectsPossible() const; SdrObjClosedKind GetMarkedObjectsClosedState() const; diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index c29f8dce6ef2..90a3476da99e 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -1137,7 +1137,7 @@ void MotionPathTag::DeleteMarkedPoints() } } -sal_Bool MotionPathTag::IsDeleteMarkedPointsPossible() const +bool MotionPathTag::IsDeleteMarkedPointsPossible() const { return mpPathObj && isSelected() && (GetMarkedPointCount() != 0); } @@ -1153,12 +1153,12 @@ bool MotionPathTag::IsRipUpAtMarkedPointsPossible() const return false; } -sal_Bool MotionPathTag::IsSetMarkedSegmentsKindPossible() const +bool MotionPathTag::IsSetMarkedSegmentsKindPossible() const { if( mpPathObj ) return mrView.IsSetMarkedSegmentsKindPossible(); else - return sal_False; + return false; } SdrPathSegmentKind MotionPathTag::GetMarkedSegmentsKind() const @@ -1187,12 +1187,12 @@ void MotionPathTag::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) } } -sal_Bool MotionPathTag::IsSetMarkedPointsSmoothPossible() const +bool MotionPathTag::IsSetMarkedPointsSmoothPossible() const { if( mpPathObj ) return mrView.IsSetMarkedPointsSmoothPossible(); else - return sal_False; + return false; } SdrPathSmoothKind MotionPathTag::GetMarkedPointsSmooth() const @@ -1240,7 +1240,7 @@ void MotionPathTag::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) } } -void MotionPathTag::CloseMarkedObjects(sal_Bool /*bToggle*/, sal_Bool /*bOpen*/ ) +void MotionPathTag::CloseMarkedObjects(bool /*bToggle*/, bool /*bOpen*/ ) { // not supported for motion path } diff --git a/sd/source/ui/animations/motionpathtag.hxx b/sd/source/ui/animations/motionpathtag.hxx index 7ee43f90eb99..adb037dc3ea9 100644 --- a/sd/source/ui/animations/motionpathtag.hxx +++ b/sd/source/ui/animations/motionpathtag.hxx @@ -62,20 +62,20 @@ public: // IPolyPolygonEditorController virtual void DeleteMarkedPoints(); - virtual sal_Bool IsDeleteMarkedPointsPossible() const; + virtual bool IsDeleteMarkedPointsPossible() const; virtual void RipUpAtMarkedPoints(); virtual bool IsRipUpAtMarkedPointsPossible() const; - virtual sal_Bool IsSetMarkedSegmentsKindPossible() const; + virtual bool IsSetMarkedSegmentsKindPossible() const; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); - virtual sal_Bool IsSetMarkedPointsSmoothPossible() const; + virtual bool IsSetMarkedPointsSmoothPossible() const; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); - virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ); + virtual void CloseMarkedObjects(bool bToggle, bool bOpen ); virtual bool IsOpenCloseMarkedObjectsPossible() const; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const; 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 ); |