diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-10 11:09:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:24 +0200 |
commit | 6c97bc47177adc1c51f69f17e77b9fe2aeade122 (patch) | |
tree | f0ae47f9be3c2a72b3b197681ca65644bf82ecfe /svx/source/engine3d | |
parent | d1bffe3596d21f205cb7a2697bb5142f190b5627 (diff) |
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r-- | svx/source/engine3d/cube3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/dragmt3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/lathe3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/obj3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/polygn3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/sphere3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 22 | ||||
-rw-r--r-- | svx/source/engine3d/view3d1.cxx | 2 |
8 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 25ab29476f2b..024daf287585 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -69,7 +69,7 @@ sal_uInt16 E3dCubeObj::GetObjIdentifier() const // Convert the object into a group object consisting of 6 polygons -SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const +SdrObject *E3dCubeObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index 4abfbcd710cc..9e77190b6b64 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -374,7 +374,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) } long nSnap = 0; - if(!getSdrDragView().IsRotateAllowed(sal_False)) + if(!getSdrDragView().IsRotateAllowed(false)) nSnap = 90; if(nSnap != 0) diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 4f40c8576e5a..dec0b7987448 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -115,7 +115,7 @@ E3dLatheObj* E3dLatheObj::Clone() const // Convert the object to group object consisting of n polygons -SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const +SdrObject *E3dLatheObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 24a802c83777..653f117ce0a0 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -225,7 +225,7 @@ SdrAttrObj* E3dObject::GetBreakObj() // SetRectsDirty must be done through the local SdrSubList -void E3dObject::SetRectsDirty(sal_Bool bNotMyself) +void E3dObject::SetRectsDirty(bool bNotMyself) { // call parent SdrAttrObj::SetRectsDirty(bNotMyself); diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index a0cd8e738321..4fefa881e9ab 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -218,7 +218,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText // Convert the object into a group object consisting of 6 polygons -SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const +SdrObject *E3dPolygonObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 8454600aa89f..edea521824bd 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -95,7 +95,7 @@ sal_uInt16 E3dSphereObj::GetObjIdentifier() const // Convert the object into a group object consisting of n polygons -SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const +SdrObject *E3dSphereObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index dc68ab1b719e..645adc8006be 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -397,7 +397,7 @@ SdrModel* E3dView::GetMarkedObjModel() const if(pScene && !IsObjMarked(pScene) && GetSdrPageView()) { - ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True); + ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), false, true); } } } @@ -441,9 +441,9 @@ SdrModel* E3dView::GetMarkedObjModel() const // When pasting objects have to integrated if a scene is inserted, but // not the scene itself -sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) +bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { - sal_Bool bRetval = sal_False; + bool bRetval = false; // Get list Point aPos(rPos); @@ -451,7 +451,7 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs ImpGetPasteObjList(aPos, pDstList); if(!pDstList) - return sal_False; + return false; // Get owner of the list SdrObject* pOwner = pDstList->GetOwnerObj(); @@ -587,7 +587,7 @@ bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs pNewCompoundObj->SetModel(pDstScene->GetModel()); pNewCompoundObj->SetPage(pDstScene->GetPage()); pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer()); - pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True); + pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), true); pDstScene->Insert3DObj(pNewCompoundObj); bRetval = true; @@ -619,8 +619,8 @@ bool E3dView::IsConvertTo3DObjPossible() const bRetval = !bAny3D && ( - IsConvertToPolyObjPossible(sal_False) - || IsConvertToPathObjPossible(sal_False) + IsConvertToPolyObjPossible(false) + || IsConvertToPathObjPossible(false) || IsImportMtfPossible()); return bRetval; } @@ -759,7 +759,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo p3DObj->SetMergedItemSet(aSet); - p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), sal_True); + p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), true); // Insert a new extrude object pScene->Insert3DObj(p3DObj); @@ -968,8 +968,8 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, baseg // all the old objects SdrObject* pRepObj = GetMarkedObjectByIndex(0); SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0); - MarkObj(pRepObj, pPV, sal_True); - ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False); + MarkObj(pRepObj, pPV, true); + ReplaceObjectAtView(pRepObj, *pPV, pScene, false); DeleteMarked(); MarkObj(pScene, pPV); @@ -1184,7 +1184,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) // Start drag, create for 3D objects before possibly drag method -sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, +bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) { diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 8c129ec082ef..c601a5fd76d7 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -115,7 +115,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/ else { // get attributes from all selected objects - MergeAttrFromMarked(aSet, sal_False); + MergeAttrFromMarked(aSet, false); // calc flags for SID_ATTR_3D_INTERN const SdrMarkList& rMarkList = GetMarkedObjectList(); |