diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 11:22:41 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 12:04:10 +0100 |
| commit | 2e1724da5c319161059074f61019f38719682b0b (patch) | |
| tree | 7b5591e87b0a8c91e35cfe9490c2754f19bd34d7 /sd | |
| parent | reduce static_initialization_and_destruction chain (diff) | |
| download | core-2e1724da5c319161059074f61019f38719682b0b.tar.gz core-2e1724da5c319161059074f61019f38719682b0b.zip | |
WaE: unsafe mix of bool and sal_Bool
Change-Id: I2caca314d87264261ccc4400b6f93bed960e8c6a
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/motionpathtag.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 10 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 56cd83c904fd..dcb28ca69ee5 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -526,7 +526,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl ) if(bNewObj) aPt = mrView.GetSnapPos(aPt,mrView.GetSdrPageView()); - sal_Bool bClosed0(mpPathObj->IsClosedObj()); + bool bClosed0(mpPathObj->IsClosedObj()); sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj, sal_True); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index a414aa39c2e5..c0f468cda2a3 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -914,7 +914,7 @@ sal_Bool SdXShape::IsPresObj() const throw() /** checks if this presentation object is empty */ -sal_Bool SdXShape::IsEmptyPresObj() const throw() +bool SdXShape::IsEmptyPresObj() const throw() { SdrObject* pObj = mpShape->GetSdrObject(); if( (pObj != NULL) && pObj->IsEmptyPresObj() ) @@ -922,7 +922,7 @@ sal_Bool SdXShape::IsEmptyPresObj() const throw() // check if the object is in edit, than its temporarely not empty SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj ); if( pTextObj == 0 ) - return sal_True; + return true; OutlinerParaObject* pParaObj = pTextObj->GetEditOutlinerParaObject(); if( pParaObj ) @@ -931,11 +931,11 @@ sal_Bool SdXShape::IsEmptyPresObj() const throw() } else { - return sal_True; + return true; } } - return sal_False; + return false; } OUString SdXShape::GetPlaceholderText() const @@ -958,7 +958,7 @@ OUString SdXShape::GetPlaceholderText() const /** sets/reset the empty status of a presentation object */ -void SdXShape::SetEmptyPresObj( sal_Bool bEmpty ) throw() +void SdXShape::SetEmptyPresObj( bool bEmpty ) throw() { // only possible if this actually *is* a presentation object if( !IsPresObj() ) diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 08c376f5ff53..972f723ee7c0 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -64,8 +64,8 @@ private: sal_Bool IsPresObj() const throw(); void SetPresObj( sal_Bool bPresObj ) throw(); - sal_Bool IsEmptyPresObj() const throw(); - void SetEmptyPresObj( sal_Bool bEmpty ) throw(); + bool IsEmptyPresObj() const throw(); + void SetEmptyPresObj( bool bEmpty ) throw(); sal_Bool IsMasterDepend() const throw(); void SetMasterDepend( sal_Bool bDepend ) throw(); |