diff options
Diffstat (limited to 'svx')
66 files changed, 1041 insertions, 1047 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 537fe41b2340..61bc65eeca61 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -241,7 +241,7 @@ void AccessibleShape::UpdateStates (void) // XXX fix_me this has to be done with an extra interface later on if ( m_pShape && maShapeTreeInfo.GetSdrView() ) { - bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True; + bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape); } if (bShapeIsSelected) diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 2204c5bc4924..0a919c949755 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -352,7 +352,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render() double a = nRotateAngle * F_PI18000; pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) ); } - pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), sal_True ); + pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), true ); pRenderedShape->RecalcSnapRect(); } diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index ab9b980452e2..7ebde92e253b 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -85,7 +85,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) if ( nPolyCount ) { pView->MarkAll(); - pView->CombineMarkedObjects( sal_False ); + pView->CombineMarkedObjects( false ); } pModel->SetChanged( false ); @@ -123,13 +123,13 @@ void ContourWindow::InitSdrModel() aSet.Put( XFillColorItem( "", TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( sal_True ); + pView->SetFrameDragSingles( true ); } void ContourWindow::SdrObjCreated( const SdrObject& ) { pView->MarkAll(); - pView->CombineMarkedObjects( sal_False ); + pView->CombineMarkedObjects( false ); } bool ContourWindow::IsContourChanged() const diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index d0a769ba58c9..aa8d603c2260 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -163,11 +163,11 @@ void GraphCtrl::InitSdrModel() // Creating a View pView = new GraphCtrlView( pModel, this ); pView->SetWorkArea( Rectangle( Point(), aGraphSize ) ); - pView->EnableExtendedMouseEventDispatcher( sal_True ); + pView->EnableExtendedMouseEventDispatcher( true ); pView->ShowSdrPage(pView->GetModel()->GetPage(0)); - pView->SetFrameDragSingles( sal_True ); + pView->SetFrameDragSingles( true ); pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC ); - pView->SetEditMode( sal_True ); + pView->SetEditMode( true ); // #i72889# set neeeded flags pView->SetPagePaintingAllowed(false); @@ -394,7 +394,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { // mark last object pView->UnmarkAllObj(); - pView->MarkNextObj(sal_False); + pView->MarkNextObj(false); bProc = true; } @@ -406,7 +406,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( aCode.IsMod1() ) { pView->UnmarkAllObj(); - pView->MarkNextObj(sal_True); + pView->MarkNextObj(true); bProc = true; } @@ -528,7 +528,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if(!bWasNoSnap) ((SdrDragStat&)rDragStat).SetNoSnap(true); if(bWasSnapEnabled) - pView->SetSnapEnabled(sal_False); + pView->SetSnapEnabled(false); pView->MovAction(aEndPoint); pView->EndDragObj(); diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index bd7e209c46f4..d048f8c16d7e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -279,7 +279,7 @@ void IMapWindow::InitSdrModel() aSet.Put( XFillColorItem( "", TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( sal_True ); + pView->SetFrameDragSingles( true ); } void IMapWindow::SdrObjCreated( const SdrObject& rObj ) @@ -591,7 +591,7 @@ void IMapWindow::SetCurrentObjState( sal_Bool bActive ) aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) ); } - pView->SetAttributes( aSet, sal_False ); + pView->SetAttributes( aSet, false ); } } @@ -816,7 +816,7 @@ void IMapWindow::SelectFirstObject() { GrabFocus(); pView->UnmarkAllObj(); - pView->MarkNextObj(sal_True); + pView->MarkNextObj(true); } } @@ -825,7 +825,7 @@ void IMapWindow::StartPolyEdit() GrabFocus(); if( !pView->AreObjectsMarked() ) - pView->MarkNextObj(sal_True); + pView->MarkNextObj(true); const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); 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(); diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index d62dd25807ec..7765c47e75de 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -59,7 +59,7 @@ struct FmFormModelImplData |* \************************************************************************/ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) - : SdrModel(pPool, pPers, LOADREFCOUNTS) + : SdrModel(pPool, pPers, false, LOADREFCOUNTS) , m_pImpl(NULL) , m_pObjShell(0) , m_bOpenInDesignMode(false) @@ -76,7 +76,7 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers) |* \************************************************************************/ FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers) - : SdrModel(rPath, pPool, pPers) + : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS) , m_pImpl(NULL) , m_pObjShell(0) , m_bOpenInDesignMode(false) diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 0a2c7329c2e6..9f00a6b42cb8 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -173,7 +173,7 @@ void FmFormView::MarkListHasChanged() pImpl->m_xWindow->removeFocusListener(pImpl); pImpl->m_xWindow = NULL; } - SetMoveOutside(sal_False); + SetMoveOutside(false); //OLMRefreshAllIAOManagers(); } @@ -229,7 +229,7 @@ void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin) void FmFormView::ChangeDesignMode(bool bDesign) { - if ((bDesign ? 1 : 0) == IsDesignMode()) + if (bDesign == IsDesignMode()) return; FmFormModel* pModel = PTR_CAST(FmFormModel, GetModel()); @@ -380,7 +380,7 @@ SdrModel* FmFormView::GetMarkedObjModel() const } -sal_Bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) +bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { return E3dView::Paste(rMod, rPos, pLst, nOptions); } @@ -515,7 +515,7 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) pImpl->m_xWindow = xWindow; // add as listener to get notified when ESC will be pressed inside the grid pImpl->m_xWindow->addFocusListener(pImpl); - SetMoveOutside(sal_True); + SetMoveOutside(true); //OLMRefreshAllIAOManagers(); xWindow->setFocus(); bDone = sal_True; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 91aefdb3ab39..57f3eeda0253 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1754,14 +1754,14 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) if ( !bMixed ) { // all objects in the group are form objects - m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), sal_True /* unmark! */ ); + m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), true /* unmark! */ ); } } else { if ( pObj->GetObjInventor() == FmFormInventor ) { // this is a form layer object - m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), sal_True /* unmark! */ ); + m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), true /* unmark! */ ); } } } diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 271295451596..4f68afe508ab 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -2092,10 +2092,10 @@ namespace svxform continue; Reference< XFormComponent > xControlModel( pFormObject->GetUnoControlModel(),UNO_QUERY ); - if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != pFormView->IsObjMarked( pSdrObject ) ) + if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) ) { // unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first - pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False ); + pFormView->MarkObj( pSdrObject, pPageView, !bMark, false ); } } // while ( aIter.IsMore() ) if ( bMark ) @@ -2161,9 +2161,9 @@ namespace svxform continue; // mark the object - if ( bMark != pFormView->IsObjMarked( pSdrObject ) ) + if ( bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) ) // unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first - pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False ); + pFormView->MarkObj( pSdrObject, pPageView, !bMark, false ); if ( !bMarkHandles || !bMark ) continue; diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index f173f8b8a2d9..9b2976cec051 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -105,7 +105,7 @@ namespace sdr SdrObject& rObj = GetSdrObject(); rObj.SetBoundRectDirty(); - rObj.SetRectsDirty(sal_True); + rObj.SetRectsDirty(true); } mpStyleSheet = 0L; @@ -157,7 +157,7 @@ namespace sdr SdrObject& rObj = GetSdrObject(); rObj.SetBoundRectDirty(); - rObj.SetRectsDirty(sal_True); + rObj.SetRectsDirty(true); rObj.SetChanged(); } @@ -239,7 +239,7 @@ namespace sdr SdrObject& rObj = GetSdrObject(); rObj.SetBoundRectDirty(); - rObj.SetRectsDirty(sal_True); + rObj.SetRectsDirty(true); } SfxStyleSheet* AttributeProperties::GetStyleSheet() const @@ -514,7 +514,7 @@ namespace sdr // set necessary changes like in RemoveStyleSheet() GetSdrObject().SetBoundRectDirty(); - GetSdrObject().SetRectsDirty(sal_True); + GetSdrObject().SetRectsDirty(true); mpStyleSheet = NULL; } @@ -585,7 +585,7 @@ namespace sdr // in the ItemSet parts because GetBoundRect() may calculate a new Rectangle aBoundRect = rObj.GetLastBoundRect(); - rObj.SetRectsDirty(sal_True); + rObj.SetRectsDirty(true); // tell the object about the change rObj.SetChanged(); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 487718836f21..abd41ed1d448 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -559,7 +559,7 @@ namespace sdr if(SFX_HINT_DATACHANGED == nId) { - rObj.SetPortionInfoChecked(sal_False); + rObj.SetPortionInfoChecked(false); sal_Int32 nText = rTextProvider.getTextCount(); while( --nText > 0 ) @@ -583,7 +583,7 @@ namespace sdr if(SFX_HINT_DYING == nId) { - rObj.SetPortionInfoChecked(sal_False); + rObj.SetPortionInfoChecked(false); sal_Int32 nText = rTextProvider.getTextCount(); while( --nText > 0 ) { diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 570d5f4c75e6..6a7b0f7d43d5 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -114,7 +114,7 @@ using namespace ::com::sun::star; SdrItemPool::SdrItemPool( SfxItemPool* _pMaster, - sal_Bool bLoadRefCounts) + bool bLoadRefCounts) : XOutdevItemPool(_pMaster, SDRATTR_START, SDRATTR_END, bLoadRefCounts) { // prepare some constants diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index da1407a5d027..6be494f89ef7 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -198,11 +198,11 @@ void SdrCreateView::ImpClearVars() nAktIdent=OBJ_NONE; pAktCreate=NULL; pCreatePV=NULL; - bAutoTextEdit=sal_False; - b1stPointAsCenter=sal_False; + bAutoTextEdit=false; + b1stPointAsCenter=false; aAktCreatePointer=Pointer(POINTER_CROSS); - bUseIncompatiblePathCreateInterface=sal_False; - bAutoClosePolys=sal_True; + bUseIncompatiblePathCreateInterface=false; + bAutoClosePolys=true; nAutoCloseDistPix=5; nFreeHandMinDistPix=10; @@ -224,7 +224,7 @@ SdrCreateView::~SdrCreateView() SdrObject::Free( pAktCreate ); } -sal_Bool SdrCreateView::IsAction() const +bool SdrCreateView::IsAction() const { return SdrDragView::IsAction() || pAktCreate!=NULL; } @@ -271,18 +271,18 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const } } -sal_Bool SdrCreateView::CheckEdgeMode() +bool SdrCreateView::CheckEdgeMode() { if (pAktCreate!=NULL) { // is managed by EdgeObj - if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False; + if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return false; } if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE) { ImpClearConnectMarker(); - return sal_False; + return false; } else { @@ -386,10 +386,10 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) ImpSetGlueVisible3(IsEdgeTool()); } -sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, +bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { - sal_Bool bRet=sal_False; + bool bRet=false; UnmarkAllObj(); BrkAction(); @@ -442,7 +442,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c } if (pAktCreate!=NULL) { - if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); + if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, false); // SW uses a naked SdrObject for frame construction. Normally, such an // object should not be created. Since it is possible to use it as a helper @@ -509,7 +509,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c if (pAktCreate->BegCreate(aDragStat)) { ShowCreateObj(/*pOut,sal_True*/); - bRet=sal_True; + bRet=true; } else { @@ -523,12 +523,12 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c return bRet; } -sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) +bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L); } -sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) +bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject) { sal_uInt32 nInvent(nAktInvent); sal_uInt16 nIdent(nAktIdent); @@ -542,7 +542,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject); } -sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, +bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV, @@ -592,9 +592,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt) } } -sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) +bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { - sal_Bool bRet=sal_False; + bool bRet=false; SdrObject* pObjMerk=pAktCreate; SdrPageView* pPVMerk=pCreatePV; @@ -605,7 +605,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND) { BrkCreateObj(); // objects with only a single point don't exist (at least today) - return sal_False; // sal_False = event not interpreted + return false; // sal_False = event not interpreted } bool bPntsEq=nAnz>1; @@ -661,7 +661,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) // delete object, its content is cloned and inserted SdrObject::Free( pObjMerk ); pObjMerk = 0L; - bRet = sal_False; + bRet = false; bSceneIntoScene = true; } } @@ -673,7 +673,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) } pCreatePV=NULL; - bRet=sal_True; // sal_True = event interpreted + bRet=true; // sal_True = event interpreted } else { @@ -693,7 +693,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) HideCreateObj(); ShowCreateObj(); aDragStat.ResetMinMoved(); // NextPoint is at MovCreateObj() - bRet=sal_True; + bRet=true; } } if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) @@ -701,7 +701,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrTextObj* pText=PTR_CAST(SdrTextObj,pObjMerk); if (pText!=NULL && pText->IsTextFrame()) { - SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, sal_True, (SdrOutliner*)0L, (OutlinerView*)0L); + SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L); } } } @@ -878,12 +878,12 @@ void SdrCreateView::HideCreateObj() -sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const +bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(pAktCreate) { rTargetSet.Put(pAktCreate->GetMergedItemSet()); - return sal_True; + return true; } else { @@ -891,13 +891,13 @@ sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHard } } -sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { if(pAktCreate) { pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll); - return sal_True; + return true; } else { @@ -917,12 +917,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const } } -sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { if (pAktCreate!=NULL) { pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return sal_True; + return true; } else { diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 3c0a96bb195d..35753127b286 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -92,7 +92,7 @@ SdrDragView::~SdrDragView() { } -sal_Bool SdrDragView::IsAction() const +bool SdrDragView::IsAction() const { return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction()); } @@ -110,7 +110,7 @@ void SdrDragView::EndAction() { if (mpCurrentSdrDragMethod) { - EndDragObj(sal_False); + EndDragObj(false); } SdrExchangeView::EndAction(); } @@ -156,7 +156,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const } } -sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const +bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const { Rectangle aR; TakeActionRect(aR); @@ -186,25 +186,25 @@ sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const } } } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const +bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { - return sal_False; + return false; } -sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) +bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) { BrkAction(); bool bRet=false; { - SetDragWithCopy(sal_False); + SetDragWithCopy(false); //TODO: aAni.Reset(); mpCurrentSdrDragMethod=NULL; bDragSpecial=false; @@ -278,7 +278,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* // If yes, allow shear even when !IsShearAllowed, // because 3D objects are limited rotations if (!b3DObjSelected && !IsShearAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE); } break; case HDL_UPLFT: case HDL_UPRGT: @@ -286,12 +286,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* { if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT) { - if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False; + if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return false; mpCurrentSdrDragMethod = new SdrDragDistort(*this); } else { - if (!IsRotateAllowed(sal_True)) return sal_False; + if (!IsRotateAllowed(true)) return false; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } break; @@ -299,12 +299,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* { if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE) { // HDL_MOVE is true, even if Obj is hit directly - if (!IsMoveAllowed()) return sal_False; + if (!IsMoveAllowed()) return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsRotateAllowed(sal_True)) return sal_False; + if (!IsRotateAllowed(true)) return false; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } @@ -314,12 +314,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return sal_False; + if (!IsMoveAllowed()) return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False; + if (!IsMirrorAllowed(true,true)) return false; mpCurrentSdrDragMethod = new SdrDragMirror(*this); } } break; @@ -329,13 +329,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { if (!IsMoveAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) - return sal_False; + if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) + return false; mpCurrentSdrDragMethod = new SdrDragCrop(*this); } } @@ -346,13 +346,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsTransparenceAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragGradient(*this, false); } @@ -363,13 +363,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsGradientAllowed()) - return sal_False; + return false; mpCurrentSdrDragMethod = new SdrDragGradient(*this); } @@ -380,12 +380,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return sal_False; + if (!IsMoveAllowed()) return false; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False; + if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return false; mpCurrentSdrDragMethod = new SdrDragCrook(*this); } } break; @@ -395,7 +395,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* // SDRDRAG_MOVE if((eDragHdl == HDL_MOVE) && !IsMoveAllowed()) { - return sal_False; + return false; } else if(eDragHdl == HDL_GLUE) { @@ -411,9 +411,9 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* } else { - if(!IsResizeAllowed(sal_True)) + if(!IsResizeAllowed(true)) { - return sal_False; + return false; } bool bSingleTextObjMark = false; // SJ: #i100490# @@ -456,7 +456,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* { // #i77187# // do not allow move of polygon points if object is move or size protected - return sal_False; + return false; } } @@ -490,7 +490,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* bDragSpecial=false; if (!IsMoveAllowed()) - return sal_False; + return false; bFramDrag=true; mpCurrentSdrDragMethod = new SdrDragMove(*this); @@ -520,7 +520,7 @@ void SdrDragView::MovDragObj(const Point& rPnt) } } -sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy) +bool SdrDragView::EndDragObj(bool bCopy) { bool bRet(false); @@ -587,7 +587,7 @@ sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy) } bInsPolyPoint=false; - SetInsertGluePoint(sal_False); + SetInsertGluePoint(false); return bRet; } @@ -615,7 +615,7 @@ void SdrDragView::BrkDragObj() pInsPointUndo->Undo(); // delete inserted glue point again delete pInsPointUndo; pInsPointUndo=NULL; - SetInsertGluePoint(sal_False); + SetInsertGluePoint(false); } eDragHdl=HDL_MOVE; @@ -628,9 +628,9 @@ bool SdrDragView::IsInsObjPointPossible() const return pMarkedObj!=NULL && pMarkedObj->IsPolyObj(); } -sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, sal_Bool bNewObj, OutputDevice* pOut) +bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut) { - sal_Bool bRet(sal_False); + bool bRet(false); if(pMarkedObj && pMarkedObj->ISA(SdrPathObj)) { @@ -652,11 +652,11 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con if(bIdxZwang) { - mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj, sal_True); + mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj, true); } else { - mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, sal_True); + mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, true); } if(bClosed0 != pMarkedPath->IsClosedObj()) @@ -691,26 +691,26 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con return bRet; } -sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) +bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) { if(IsInsObjPoint()) { sal_uInt32 nNextPnt(mnInsPointNum); Point aPnt(aDragStat.GetNow()); - sal_Bool bOk=EndDragObj(sal_False); - if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND) + bool bOk=EndDragObj(false); + if (bOk && eCmd!=SDRCREATE_FORCEEND) { // Ret=True means: Action is over. - bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin)); + bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin)); } return bOk; - } else return sal_False; + } else return false; } -sal_Bool SdrDragView::IsInsGluePointPossible() const +bool SdrDragView::IsInsGluePointPossible() const { - sal_Bool bRet=sal_False; + bool bRet=false; if (IsInsGluePointMode() && AreObjectsMarked()) { if (GetMarkedObjectCount()==1) @@ -719,20 +719,20 @@ sal_Bool SdrDragView::IsInsGluePointPossible() const const SdrObject* pObj=GetMarkedObjectByIndex(0); if (!HAS_BASE(SdrEdgeObj,pObj)) { - bRet=sal_True; + bRet=true; } } else { - bRet=sal_True; + bRet=true; } } return bRet; } -sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) +bool SdrDragView::BegInsGluePoint(const Point& rPnt) { - sal_Bool bRet=sal_False; + bool bRet=false; SdrObject* pObj; SdrPageView* pPV; sal_uIntPtr nMarkNum; @@ -761,7 +761,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) } if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) { - SetInsertGluePoint(sal_True); + SetInsertGluePoint(true); bRet=BegDragObj(rPnt,NULL,pHdl,0); if (bRet) { @@ -770,7 +770,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) } else { - SetInsertGluePoint(sal_False); + SetInsertGluePoint(false); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -783,7 +783,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) else { // no glue points possible for this object (e. g. Edge) - SetInsertGluePoint(sal_False); + SetInsertGluePoint(false); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -825,7 +825,7 @@ void SdrDragView::HideDragObj() -void SdrDragView::SetNoDragXorPolys(sal_Bool bOn) +void SdrDragView::SetNoDragXorPolys(bool bOn) { if (IsNoDragXorPolys()!=bOn) { @@ -852,7 +852,7 @@ void SdrDragView::SetNoDragXorPolys(sal_Bool bOn) } } -void SdrDragView::SetDragStripes(sal_Bool bOn) +void SdrDragView::SetDragStripes(bool bOn) { if (mpCurrentSdrDragMethod && aDragStat.IsShown()) { @@ -866,14 +866,14 @@ void SdrDragView::SetDragStripes(sal_Bool bOn) } } -sal_Bool SdrDragView::IsOrthoDesired() const +bool SdrDragView::IsOrthoDesired() const { if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod))) { return bOrthoDesiredOnMarked; } - return sal_False; + return false; } void SdrDragView::SetMarkHandles() diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index a2e509779fd4..29abc34bb9b5 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -120,9 +120,9 @@ SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos) #include <svx/svdogrp.hxx> #include <svx/scene3d.hxx> -sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const +bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const { - sal_Bool bDelAll(sal_True); + bool bDelAll(true); sal_uInt32 nObjAnz(pOL->GetObjCount()); for(sal_uInt32 nObjNum(nObjAnz); nObjNum > 0 && bDelAll;) @@ -136,14 +136,14 @@ sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const { if(!ImpDelLayerCheck(pSubOL, nDelID)) { - bDelAll = sal_False; + bDelAll = false; } } else { if(pObj->GetLayer() != nDelID) { - bDelAll = sal_False; + bDelAll = false; } } } @@ -373,86 +373,86 @@ void SdrEditView::ModelHasChanged() bPossibilitiesDirty=true; } -sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const +bool SdrEditView::IsResizeAllowed(bool bProp) const { ForcePossibilities(); - if (bResizeProtect) return sal_False; + if (bResizeProtect) return false; if (bProp) return bResizePropAllowed; return bResizeFreeAllowed; } -sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const +bool SdrEditView::IsRotateAllowed(bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return sal_False; + if (bMoveProtect) return false; if (b90Deg) return bRotate90Allowed; return bRotateFreeAllowed; } -sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const +bool SdrEditView::IsMirrorAllowed(bool b45Deg, bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return sal_False; + if (bMoveProtect) return false; if (b90Deg) return bMirror90Allowed; if (b45Deg) return bMirror45Allowed; return bMirrorFreeAllowed && !bMoveProtect; } -sal_Bool SdrEditView::IsTransparenceAllowed() const +bool SdrEditView::IsTransparenceAllowed() const { ForcePossibilities(); return bTransparenceAllowed; } -sal_Bool SdrEditView::IsGradientAllowed() const +bool SdrEditView::IsGradientAllowed() const { ForcePossibilities(); return bGradientAllowed; } -sal_Bool SdrEditView::IsShearAllowed() const +bool SdrEditView::IsShearAllowed() const { ForcePossibilities(); - if (bResizeProtect) return sal_False; + if (bResizeProtect) return false; return bShearAllowed; } -sal_Bool SdrEditView::IsEdgeRadiusAllowed() const +bool SdrEditView::IsEdgeRadiusAllowed() const { ForcePossibilities(); return bEdgeRadiusAllowed; } -sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const +bool SdrEditView::IsCrookAllowed(bool bNoContortion) const { // CrookMode missing here (no rotations allowed when shearing ...) ForcePossibilities(); if (bNoContortion) { - if (!bRotateFreeAllowed) return sal_False; + if (!bRotateFreeAllowed) return false; return !bMoveProtect && bMoveAllowed; } else { return !bResizeProtect && bContortionPossible; } } -sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const +bool SdrEditView::IsDistortAllowed(bool bNoContortion) const { ForcePossibilities(); if (bNoContortion) { - return sal_False; + return false; } else { return !bResizeProtect && bContortionPossible; } } -sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const +bool SdrEditView::IsCombinePossible(bool bNoPolyPoly) const { ForcePossibilities(); if (bNoPolyPoly) return bCombineNoPolyPolyPossible; else return bCombinePossible; } -sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const +bool SdrEditView::IsDismantlePossible(bool bMakeLines) const { ForcePossibilities(); if (bMakeLines) return bDismantleMakeLinesPossible; @@ -597,8 +597,8 @@ void SdrEditView::CheckPossibilities() bCombineNoPolyPolyPossible = bCombinePossible; } - if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False); - if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True); + if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, false); + if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, true); // check OrthoDesiredOnMarked if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=true; // check ImportMtf @@ -953,19 +953,19 @@ void SdrEditView::CopyMarkedObj() -sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions) +bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions) { if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) { SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,true); if (nLayer==SDRLAYER_NOTFOUND) nLayer=0; if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) { SdrObject::Free( pObj ); // Layer locked or invisible - return sal_False; + return false; } pObj->NbcSetLayer(nLayer); } if ((nOptions & SDRINSERT_SETDEFATTR)!=0) { - if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); + if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false); pObj->SetMergedItemSet(aDefaultAttr); } if (!pObj->IsInserted()) { @@ -983,10 +983,10 @@ sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_ if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj(); MarkObj(pObj,&rPV); } - return sal_True; + return true; } -void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark) +void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark) { if(IsTextEdit()) { @@ -1016,7 +1016,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj)); if( IsObjMarked( pOldObj ) ) - MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ ); + MarkObj( pOldObj, &rPV, true /*unmark!*/ ); pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum()); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 4f3bd09846dc..9c1bcd1c03b9 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -67,7 +67,7 @@ -void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy) +void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense."); if (rRect.IsEmpty()) return; @@ -301,8 +301,8 @@ long SdrEditView::GetMarkedObjRotate() const } return nRetval; - //sal_Bool b1st=sal_True; - //sal_Bool bOk=sal_True; + //sal_Bool b1st=true; + //sal_Bool bOk=true; //long nWink=0; //sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); //for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { @@ -310,8 +310,8 @@ long SdrEditView::GetMarkedObjRotate() const // SdrObject* pO=pM->GetMarkedSdrObj(); // long nWink2=pO->GetRotateAngle(); // if (b1st) nWink=nWink2; - // else if (nWink2!=nWink) bOk=sal_False; - // b1st=sal_False; + // else if (nWink2!=nWink) bOk=false; + // b1st=false; //} //if (!bOk) nWink=0; //return nWink; @@ -434,7 +434,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b EndUndo(); } -void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy) +void SdrEditView::MirrorMarkedObjHorizontal(bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -442,7 +442,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy) MirrorMarkedObj(aCenter,aPt2,bCopy); } -void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy) +void SdrEditView::MirrorMarkedObjVertical(bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -506,7 +506,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo } void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, - SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect) + SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect) { SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO); bool bDone = false; @@ -558,7 +558,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa // for all others or if bNoContortion Point aCtr0(pO->GetSnapRect().Center()); Point aCtr1(aCtr0); - sal_Bool bRotOk(sal_False); + bool bRotOk(false); double nSin(0.0), nCos(1.0); double nWink(0.0); @@ -589,7 +589,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM Rectangle aMarkRect(GetMarkedObjRect()); const bool bUndo = IsUndoEnabled(); - bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False); + bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(false); if( bUndo ) { @@ -627,7 +627,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM EndUndo(); } -void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion) +void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion) { SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO); @@ -704,7 +704,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto -void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) +void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/) { // bReplaceAll has no effect here Rectangle aAllSnapRect(GetMarkedObjRect()); @@ -725,10 +725,10 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /* long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); SetRef2(Point(GetRef2().X(),n)); } - long nAllPosX=0; sal_Bool bAllPosX=false; - long nAllPosY=0; sal_Bool bAllPosY=false; - long nAllWdt=0; sal_Bool bAllWdt=false; - long nAllHgt=0; sal_Bool bAllHgt=false; + long nAllPosX=0; bool bAllPosX=false; + long nAllPosY=0; bool bAllPosY=false; + long nAllWdt=0; bool bAllWdt=false; + long nAllHgt=0; bool bAllHgt=false; bool bDoIt=false; if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,true,&pPoolItem)==SFX_ITEM_SET) { nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue(); @@ -790,7 +790,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /* } } -void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const +void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr has no effect here. // TODO: Take into account the origin and PvPos. @@ -806,7 +806,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO bool bVisible = true, bVisibleDC = false; SdrLayerID nLayerId=0; bool bLayerDC=false; OUString aObjName; - sal_Bool bObjNameDC=false,bObjNameSet=false; + bool bObjNameDC=false,bObjNameSet=false; long nSnapPosX=0; bool bSnapPosXDC=false; long nSnapPosY=0; bool bSnapPosYDC=false; long nSnapWdt=0; bool bSnapWdtDC=false; @@ -907,7 +907,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO } } -SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const +SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const { SfxItemSet aSet(pMod->GetItemPool()); MergeAttrFromMarked(aSet,bOnlyHardAttr); @@ -922,7 +922,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const return aSet; } -void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const +void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const { sal_uInt32 nMarkAnz(GetMarkedObjectCount()); @@ -940,12 +940,12 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false)) rAttr.InvalidateItem(nWhich); else - rAttr.MergeValue(rSet.Get(nWhich), sal_True); + rAttr.MergeValue(rSet.Get(nWhich), true); } else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false)) { const SfxPoolItem& rItem = rSet.Get(nWhich); - rAttr.MergeValue(rItem, sal_True); + rAttr.MergeValue(rItem, true); } nWhich = aIter.NextWhich(); @@ -953,7 +953,7 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) } } -void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll) +void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll) { if (AreObjectsMarked()) { @@ -998,7 +998,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll) } // To make Undo reconstruct text attributes correctly after Format.Standard - sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); + bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); // save additional geometry information when paragraph or character attributes // are changed and the geometrical shape of the text object might be changed @@ -1198,7 +1198,7 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const return pRet; } -void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { if (AreObjectsMarked()) { @@ -1233,12 +1233,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDo -sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const +bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) { rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), false); - return sal_True; + return true; } else { @@ -1246,11 +1246,11 @@ sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAt } } -sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool SdrEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { if (GetMarkedObjectCount()!=0) { SetAttrToMarked(rSet,bReplaceAll); - return sal_True; + return true; } else { return SdrMarkView::SetAttributes(rSet,bReplaceAll); } @@ -1265,11 +1265,11 @@ SfxStyleSheet* SdrEditView::GetStyleSheet() const } } -sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { if (GetMarkedObjectCount()!=0) { SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr); - return sal_True; + return true; } else { return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } @@ -1287,7 +1287,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const if (AreObjectsMarked()) { - SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // because of AutoGrowHeight and corner radius + SfxItemSet aMarkAttr(GetAttrFromMarked(false)); // because of AutoGrowHeight and corner radius Rectangle aRect(GetMarkedObjRect()); // restore position to that before calc hack aRect -= GetGridOffset(); @@ -1370,7 +1370,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const } SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH); - sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); if (eState==SFX_ITEM_DONTCARE) { aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH); } else if (eState==SFX_ITEM_SET) { @@ -1497,7 +1497,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nShearAngle=0; long nShearX=0; long nShearY=0; - sal_Bool bShearVert=sal_False; + bool bShearVert=false; bool bChgPos=false; bool bChgSiz=false; @@ -1580,13 +1580,13 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) // AutoGrow if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,true,&pPoolItem)) { - sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow)); bSetAttr=true; } if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,true,&pPoolItem)) { - sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow)); bSetAttr=true; } @@ -1603,7 +1603,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects()); if (bSetAttr) { - SetAttrToMarked(aSetAttr,sal_False); + SetAttrToMarked(aSetAttr,false); } // change size and height @@ -1742,16 +1742,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) -sal_Bool SdrEditView::IsAlignPossible() const +bool SdrEditView::IsAlignPossible() const { // at least two selected objects, at least one of them movable ForcePossibilities(); sal_uIntPtr nAnz=GetMarkedObjectCount(); - if (nAnz==0) return sal_False; // nothing selected! + if (nAnz==0) return false; // nothing selected! if (nAnz==1) return bMoveAllowed; // align single object to page return bOneOrMoreMovable; // otherwise: MarkCount>=2 } -void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects) +void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool bBoundRects) { if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE) return; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 0a3bb17adc4a..2c755b046c10 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -564,14 +564,14 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) pDest->SetMergedItemSet(aSet); pDest->NbcSetLayer(pSource->GetLayer()); - pDest->NbcSetStyleSheet(pSource->GetStyleSheet(), sal_True); + pDest->NbcSetStyleSheet(pSource->GetStyleSheet(), true); } } -sal_Bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const { // new condition IsLine() to be able to combine simple Lines - sal_Bool bIsLine(sal_False); + bool bIsLine(false); const SdrPathObj* pPath = PTR_CAST(SdrPathObj,pObj); @@ -586,7 +586,7 @@ sal_Bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const return (aInfo.bCanConvToPath || aInfo.bCanConvToPoly || bIsLine); } -sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const { SdrObjList* pOL = pObj->GetSubList(); @@ -601,7 +601,7 @@ sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const // all members of a group have to be convertible if(!ImpCanConvertForCombine1(pObj1)) { - return sal_False; + return false; } } } @@ -609,14 +609,14 @@ sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const { if(!ImpCanConvertForCombine1(pObj)) { - return sal_False; + return false; } } - return sal_True; + return true; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, sal_Bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const { basegfx::B2DPolyPolygon aRetval; SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); @@ -665,7 +665,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, s return aRetval; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, sal_Bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const { SdrObjList* pOL = pObj->GetSubList(); @@ -1020,8 +1020,8 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) // since now basegfx::tools::adaptiveSubdivide() is used, it is no longer // necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old // mechanisms. In a next step the polygon clipper will even be able to clip curves... - // ConvertMarkedToPolyObj(sal_True); - ConvertMarkedToPathObj(sal_True); + // ConvertMarkedToPolyObj(true); + ConvertMarkedToPathObj(true); OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)"); for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) @@ -1139,7 +1139,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) pInsOL->InsertObject(pPath, nInsPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); - MarkObj(pPath, pInsPV, sal_False, sal_True); + MarkObj(pPath, pInsPV, false, true); } aRemove.ForceSort(); @@ -1174,7 +1174,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) } } -void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) +void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) { // #105899# Start of Combine-Undo put to front, else ConvertMarkedToPolyObj would // create a 2nd Undo-action and Undo-Comment. @@ -1195,8 +1195,8 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // using ConvertMarkedToPathObj without changing the previous fix. // #i21250# - // Instead of simply passing sal_True as LineToArea, use bNoPolyPoly as info - // if this command is a 'Combine' or a 'Connect' command. On Connect it's sal_True. + // Instead of simply passing true as LineToArea, use bNoPolyPoly as info + // if this command is a 'Combine' or a 'Connect' command. On Connect it's true. // To not concert line segments with a set line width to polygons in that case, // use this info. Do not convert LineToArea on Connect commands. // ConvertMarkedToPathObj(!bNoPolyPoly); @@ -1207,9 +1207,9 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // used for merge. // LineToArea is never necessary, both commands are able to take over the // set line style and to display it correctly. Thus, i will use a - // ConvertMarkedToPathObj with a sal_False in any case. Only drawback is that + // ConvertMarkedToPathObj with a false in any case. Only drawback is that // simple polygons will be changed to curves, but with no information loss. - ConvertMarkedToPathObj(sal_False /* bLineToArea */); + ConvertMarkedToPathObj(false /* bLineToArea */); // continue as before basegfx::B2DPolyPolygon aPolyPolygon; @@ -1243,7 +1243,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // unfortunately ConvertMarkedToPathObj has converted all // involved polygon data to curve segments, even if not necessary. // It is better to try to reduce to more simple polygons. - basegfx::B2DPolyPolygon aTmpPoly(basegfx::tools::simplifyCurveSegments(ImpGetPolyPolygon(pObj, sal_True))); + basegfx::B2DPolyPolygon aTmpPoly(basegfx::tools::simplifyCurveSegments(ImpGetPolyPolygon(pObj, true))); aPolyPolygon.insert(0L, aTmpPoly); if(!pInsOL) @@ -1332,7 +1332,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // in the UNDO there is no problem, but as soon as they get deleted, the // MarkList will contain deleted objects -> GPF. UnmarkAllObj(pInsPV); - MarkObj(pPath, pInsPV, sal_False, sal_True); + MarkObj(pPath, pInsPV, false, true); } // build an UndoComment from the objects actually used @@ -1350,15 +1350,15 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // Dismantle -sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, sal_Bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) const { - sal_Bool bCan(sal_False); + bool bCan(false); const sal_uInt32 nPolygonCount(rPpolyPolygon.count()); if(nPolygonCount >= 2L) { // #i69172# dismantle makes sense with 2 or more polygons in a polyPolygon - bCan = sal_True; + bCan = true; } else if(bMakeLines && 1L == nPolygonCount) { @@ -1368,17 +1368,17 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg if(nPointCount > 2L) { - bCan = sal_True; + bCan = true; } } return bCan; } -sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const { bool bOtherObjs(false); // true=objects other than PathObj's existent - bool bMin1PolyPoly(false); // sal_True=at least 1 PolyPolygon with more than one Polygon existent + bool bMin1PolyPoly(false); // true=at least 1 PolyPolygon with more than one Polygon existent SdrObjList* pOL = pObj->GetSubList(); if(pOL) @@ -1452,7 +1452,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines return bMin1PolyPoly && !bOtherObjs; } -void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines) +void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, bool bMakeLines) { const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj); const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj); @@ -1480,7 +1480,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true)); - MarkObj(pPath, pPV, sal_False, sal_True); + MarkObj(pPath, pPV, false, true); rPos++; } else @@ -1515,7 +1515,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true)); - MarkObj(pPath, pPV, sal_False, sal_True); + MarkObj(pPath, pPV, false, true); rPos++; } } @@ -1551,7 +1551,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pCandidate, rPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true)); - MarkObj(pCandidate, pPV, sal_False, sal_True); + MarkObj(pCandidate, pPV, false, true); if(pCustomShape->HasText() && !pCustomShape->IsTextPath()) { @@ -1596,14 +1596,14 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pTextObj, rPos + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true)); - MarkObj(pTextObj, pPV, sal_False, sal_True); + MarkObj(pTextObj, pPV, false, true); } } } } } -void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines) +void SdrEditView::DismantleMarkedObjects(bool bMakeLines) { // temporary MarkList SdrMarkList aRemoveMerker; @@ -1844,7 +1844,7 @@ void SdrEditView::UnGroupMarked() nDstCnt++; // No SortCheck when inserting into MarkList, because that would // provoke a RecalcOrdNums() each time because of pObj->GetOrdNum(): - aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False); + aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),false); } if( bUndo ) @@ -1875,7 +1875,7 @@ void SdrEditView::UnGroupMarked() if (nCount!=0) { - GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Because of the sorting above, aNewMark is reversed + GetMarkedObjectListWriteAccess().Merge(aNewMark,true); // Because of the sorting above, aNewMark is reversed MarkListHasChanged(); } } @@ -1884,7 +1884,7 @@ void SdrEditView::UnGroupMarked() // ConvertToPoly -SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea) +SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea) { SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea); if (pNewObj!=NULL) @@ -1906,7 +1906,7 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bo return pNewObj; } -void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) +void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea) { bool bMrkChg=false; if (AreObjectsMarked()) { @@ -1959,14 +1959,14 @@ void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) } } -void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea) +void SdrEditView::ConvertMarkedToPathObj(bool bLineToArea) { - ImpConvertTo(sal_True, bLineToArea); + ImpConvertTo(true, bLineToArea); } -void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) +void SdrEditView::ConvertMarkedToPolyObj(bool bLineToArea) { - ImpConvertTo(sal_False, bLineToArea); + ImpConvertTo(false, bLineToArea); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 9e42ed049675..78f472215f07 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -100,7 +100,7 @@ SdrObjEditView::~SdrObjEditView() -sal_Bool SdrObjEditView::IsAction() const +bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); } @@ -214,7 +214,7 @@ void SdrObjEditView::ModelHasChanged() pTextEditOutliner->SetControlWord(nStat); Rectangle aAnchorRect; pTextObj->TakeTextAnchorRect(aAnchorRect); - pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True); + pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, true); } for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); @@ -518,17 +518,17 @@ SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const return GetModel() ? dynamic_cast< SdrUndoManager* >(GetModel()->GetSdrUndoManager()) : 0; } -sal_Bool SdrObjEditView::SdrBeginTextEdit( +bool SdrObjEditView::SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV, Window* pWin, - sal_Bool bIsNewObj, SdrOutliner* pGivenOutliner, + bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, - sal_Bool bDontDeleteOutliner, sal_Bool bOnlyOneView, - sal_Bool bGrabFocus) + bool bDontDeleteOutliner, bool bOnlyOneView, + bool bGrabFocus) { SdrEndTextEdit(); if( dynamic_cast< SdrTextObj* >( pObj ) == 0 ) - return sal_False; // currently only possible with text objects + return false; // currently only possible with text objects if(bGrabFocus && pWin) { @@ -627,10 +627,10 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" ); if( !pTextObj ) - return sal_False; + return false; // switch off any running TextAnimations - pTextObj->SetTextAnimationAllowed(sal_False); + pTextObj->SetTextAnimationAllowed(false); // remember old cursor if (pTextEditOutliner->GetViewCount()!=0) @@ -648,7 +648,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( Rectangle aTextRect; Rectangle aAnchorRect; pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, true, - &aAnchorRect /* Give sal_True here, not sal_False */); + &aAnchorRect /* Give true here, not false */); if ( !pTextObj->IsContourTextFrame() ) { @@ -670,7 +670,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y()); pTextEditCursorMerker=pWin->GetCursor(); - aHdl.SetMoveOutside(sal_True); + aHdl.SetMoveOutside(true); // #i72757# // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary @@ -690,8 +690,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if( i2 == nCount ) pTextEditOutliner->InsertView(pTextEditOutlinerView,0); - aHdl.SetMoveOutside(sal_False); - aHdl.SetMoveOutside(sal_True); + aHdl.SetMoveOutside(false); + aHdl.SetMoveOutside(true); // register all windows as OutlinerViews with the Outliner if(!bOnlyOneView) @@ -770,7 +770,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( } } - return sal_True; // ran fine, let TextEdit run now + return true; // ran fine, let TextEdit run now } else { @@ -810,12 +810,12 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( mxTextEditObj.reset(0); pTextEditPV=NULL; pTextEditWin=NULL; - aHdl.SetMoveOutside(sal_False); + aHdl.SetMoveOutside(false); - return sal_False; + return false; } -SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) +SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) { SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); @@ -886,7 +886,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) if (pTEOutliner!=NULL) { - sal_Bool bModified=pTEOutliner->IsModified(); + bool bModified=pTEOutliner->IsModified(); if (pTEOutlinerView!=NULL) { pTEOutlinerView->HideCursor(); @@ -992,7 +992,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) // Switch on any TextAnimation again after TextEdit if(pTEObj->ISA(SdrTextObj)) { - ((SdrTextObj*)pTEObj)->SetTextAnimationAllowed(sal_True); + ((SdrTextObj*)pTEObj)->SetTextAnimationAllowed(true); } // #i72757# @@ -1036,7 +1036,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) if (pTEWin!=NULL) { pTEWin->SetCursor(pTECursorMerker); } - aHdl.SetMoveOutside(sal_False); + aHdl.SetMoveOutside(false); if (eRet!=SDRENDTEXTEDIT_UNCHANGED) { GetMarkedObjectListWriteAccess().SetNameDirty(); @@ -1079,7 +1079,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) } -// info about TextEdit. Default is sal_False. +// info about TextEdit. Default is false. bool SdrObjEditView::IsTextEdit() const { return mxTextEditObj.is(); @@ -1126,9 +1126,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin) } } -sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const +bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const { - sal_Bool bOk=sal_False; + bool bOk=false; if(mxTextEditObj.is()) { nTol=ImpGetHitTolLogic(nTol,NULL); @@ -1163,9 +1163,9 @@ sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const return bOk; } -sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const +bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const { - sal_Bool bOk=sal_False; + bool bOk=false; if(mxTextEditObj.is()) { SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get()); @@ -1210,7 +1210,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return sal_True; + return true; } } return SdrGlueEditView::KeyInput(rKEvt,pWin); @@ -1219,7 +1219,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); + bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1244,7 +1244,7 @@ sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return sal_True; + return true; } } } @@ -1254,7 +1254,7 @@ sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); + bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1275,7 +1275,7 @@ sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return sal_True; + return true; } } } @@ -1285,8 +1285,8 @@ sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode(); - sal_Bool bPostIt=bSelMode; + bool bSelMode=pTextEditOutliner->IsInSelectionMode(); + bool bPostIt=bSelMode; if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1307,7 +1307,7 @@ sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return sal_True; + return true; } } } @@ -1320,7 +1320,7 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) if (pTextEditOutlinerView!=NULL) { if (rCEvt.GetCommand()==COMMAND_STARTDRAG) { - sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); + bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); if (!bPostIt && rCEvt.IsMouseEvent()) { Point aPt(rCEvt.GetMousePosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1344,13 +1344,13 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return sal_True; + return true; } } else { pTextEditOutlinerView->Command(rCEvt); - return sal_True; + return true; } } return SdrGlueEditView::Command(rCEvt,pWin); @@ -1358,9 +1358,9 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) -sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const +bool SdrObjEditView::ImpIsTextEditAllSelected() const { - sal_Bool bRet=sal_False; + bool bRet=false; if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL) { if(SdrTextObj::HasTextImpl( pTextEditOutliner ) ) @@ -1372,18 +1372,18 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1)) { if( pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos ) - bRet = sal_True; + bRet = true; } // in case the selection was done backwards if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1)) { if(pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos) - bRet = sal_True; + bRet = true; } } else { - bRet=sal_True; + bRet=true; } } return bRet; @@ -1435,11 +1435,11 @@ sal_uInt16 SdrObjEditView::GetScriptType() const return nScriptType; } -sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const +bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if( mxSelectionController.is() ) if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) ) - return sal_True; + return true; if(IsTextEdit()) { @@ -1468,7 +1468,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr); } - return sal_True; + return true; } else { @@ -1476,11 +1476,11 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar } } -sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { - sal_Bool bRet=sal_False; + bool bRet=false; bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); - sal_Bool bAllTextSelected=ImpIsTextEditAllSelected(); + bool bAllTextSelected=ImpIsTextEditAllSelected(); const SfxItemSet* pSet=&rSet; if (!bTextEdit) @@ -1521,7 +1521,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace } #endif - sal_Bool bOnlyEEItems; + bool bOnlyEEItems; bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems); // everything selected? -> attributes to the border, too // if no EEItems, attributes to the border only @@ -1556,7 +1556,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll); FlushComeBackTimer(); // to set ModeHasChanged immediately - bRet=sal_True; + bRet=true; } } else if (!bOnlyEEItems) @@ -1601,7 +1601,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace } } FlushComeBackTimer(); - bRet=sal_True; + bRet=true; } if(!bNoEEItems) { @@ -1618,7 +1618,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace ImpMakeTextCursorAreaVisible(); } - bRet=sal_True; + bRet=true; } return bRet; } @@ -1644,12 +1644,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const return pSheet; } -sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { if( mxSelectionController.is() ) { if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) ) - return sal_True; + return true; } // if we are currently in edit mode we must also set the stylesheet @@ -1697,7 +1697,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) } } -sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const +bool SdrObjEditView::IsTextEditInSelectionMode() const { return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode(); } @@ -1706,9 +1706,9 @@ sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const // MacroMode -sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) +bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { - sal_Bool bRet=sal_False; + bool bRet=false; BrkMacroObj(); if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { nTol=ImpGetHitTolLogic(nTol,NULL); @@ -1767,7 +1767,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt) aHitRec.pPageView=pMacroPV; aHitRec.bDown=bMacroDown; aHitRec.pOut=pMacroWin; - sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec); + bool bDown=pMacroObj->IsMacroHit(aHitRec); if (bDown) ImpMacroDown(rPnt); else ImpMacroUp(rPnt); } @@ -1783,7 +1783,7 @@ void SdrObjEditView::BrkMacroObj() } } -sal_Bool SdrObjEditView::EndMacroObj() +bool SdrObjEditView::EndMacroObj() { if (pMacroObj!=NULL && bMacroDown) { ImpMacroUp(aMacroDownPos); @@ -1802,7 +1802,7 @@ sal_Bool SdrObjEditView::EndMacroObj() return bRet; } else { BrkMacroObj(); - return sal_False; + return false; } } @@ -2009,7 +2009,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor } else { - const sal_Bool bOnlyHardAttr = sal_False; + const bool bOnlyHardAttr = false; rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) ); } return true; @@ -2110,7 +2110,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !bTextOnly ) { SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) ); - const sal_Bool bReplaceAll = sal_False; + const bool bReplaceAll = false; SetAttrToMarked(aPaintSet, bReplaceAll); } @@ -2138,7 +2138,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !aSel.HasRange() ) pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) ); - const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats; + const bool bRemoveParaAttribs = !bNoParagraphFormats; pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); SfxItemSet aSet( pOLV->GetAttribs() ); SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) ); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 6826c06a5d5b..27f68587d6f7 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -197,9 +197,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj) erase( it ); } -sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) +bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) { - sal_Bool bUnloaded = sal_False; + bool bUnloaded = false; if (pObj) { //#i80528# The old mechanism is completely useless, only taking into account if @@ -460,10 +460,10 @@ namespace sdr -sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE) +bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE) { - sal_Bool bHas=sal_False; - sal_Bool bOnly=sal_True; + bool bHas=false; + bool bOnly=true; bool bLookOnly=pbOnlyEE!=NULL; SfxWhichIter aIter(rSet); sal_uInt16 nWhich=aIter.FirstWhich(); @@ -473,12 +473,12 @@ sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal // Disabled and DontCare are regarded as holes in the Which range. SfxItemState eState=rSet.GetItemState(nWhich); if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) { - if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False; - else bHas=sal_True; + if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=false; + else bHas=true; } nWhich=aIter.NextWhich(); } - if (!bHas) bOnly=sal_False; + if (!bHas) bOnly=false; if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly; return bHas; } @@ -572,7 +572,7 @@ void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount nObjCount = _nObjCount; } -sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) +bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) { nSumCurAction += nAnzActions; nCurAction += nAnzActions; @@ -582,7 +582,7 @@ sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) return pLink->Call(NULL) == 1L; } -sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) +bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) { nSumCurAction += nAnzInserts; nCurInsert += nAnzInserts; @@ -590,7 +590,7 @@ sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) return pLink->Call(NULL) == 1L; } -sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales ) +bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales ) { nSumCurAction += nAnzRescales; return pLink->Call(NULL) == 1L; @@ -606,7 +606,7 @@ void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount ) nInsertCount = _nInsertCount; } -sal_Bool SvdProgressInfo::SetNextObject() +bool SvdProgressInfo::SetNextObject() { nActionCount = 0; nCurAction = 0; diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 62aa11fca68a..d44d2be72d74 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -47,7 +47,7 @@ SdrGlueEditView::~SdrGlueEditView() -void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) +void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { @@ -94,37 +94,40 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { sal_uInt16& nRet=*(sal_uInt16*)pnRet; - sal_Bool& bFirst=*(sal_Bool*)pbFirst; + bool& bFirst=*(bool*)pbFirst; if (nRet!=FUZZY) { - sal_uInt16 nEsc=rGP.GetEscDir(); - sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0; - if (bFirst) { nRet=bOn; bFirst=sal_False; } - else if (nRet!=bOn) nRet=FUZZY; + sal_uInt16 nEsc = rGP.GetEscDir(); + bool bOn = (nEsc & *(sal_uInt16*)pnThisEsc) != 0; + if (bFirst) { + nRet = bOn ? 1 : 0; + bFirst = false; + } + else if (nRet != (bOn ? 1 : 0)) nRet=FUZZY; } } TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const { ForceUndirtyMrkPnt(); - sal_Bool bFirst=sal_True; + bool bFirst=true; sal_uInt16 nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet); + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet); return (TRISTATE)nRet; } static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*) { sal_uInt16 nEsc=rGP.GetEscDir(); - if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc; + if (*(bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc; else nEsc&=~*(sal_uInt16*)pnThisEsc; rGP.SetEscDir(nEsc); } -void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn) +void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn); + ImpDoMarkedGluePoints(ImpSetEscDir,false,&nThisEsc,&bOn); EndUndo(); } @@ -133,10 +136,10 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bO static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { sal_uInt16& nRet=*(sal_uInt16*)pnRet; - sal_Bool& bFirst=*(sal_Bool*)pbFirst; + bool& bFirst=*(bool*)pbFirst; if (nRet!=FUZZY) { bool bOn=rGP.IsPercent(); - if (bFirst) { nRet=sal_uInt16(bOn); bFirst=sal_False; } + if (bFirst) { nRet=sal_uInt16(bOn); bFirst=false; } else if ((nRet!=0)!=bOn) nRet=FUZZY; } } @@ -144,24 +147,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const { ForceUndirtyMrkPnt(); - sal_Bool bFirst=sal_True; + bool bFirst=true; sal_uInt16 nRet=sal_True; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet); + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet); return (TRISTATE)nRet; } static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - rGP.SetPercent(*(sal_Bool*)pbOn); + rGP.SetPercent(*(bool*)pbOn); rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn) +void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn); + ImpDoMarkedGluePoints(ImpSetPercent,false,&bOn); EndUndo(); } @@ -170,9 +173,9 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn) static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { sal_uInt16& nRet=*(sal_uInt16*)pnRet; - sal_Bool& bFirst=*(sal_Bool*)pbFirst; - sal_Bool& bDontCare=*(sal_Bool*)pbDontCare; - sal_Bool bVert=*(sal_Bool*)pbVert; + bool& bFirst=*(bool*)pbFirst; + bool& bDontCare=*(bool*)pbDontCare; + bool bVert=*(bool*)pbVert; if (!bDontCare) { sal_uInt16 nAlg=0; if (bVert) { @@ -180,32 +183,32 @@ static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void } else { nAlg=rGP.GetHorzAlign(); } - if (bFirst) { nRet=nAlg; bFirst=sal_False; } + if (bFirst) { nRet=nAlg; bFirst=false; } else if (nRet!=nAlg) { if (bVert) { nRet=SDRVERTALIGN_DONTCARE; } else { nRet=SDRHORZALIGN_DONTCARE; } - bDontCare=sal_True; + bDontCare=true; } } } -sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const +sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const { ForceUndirtyMrkPnt(); - sal_Bool bFirst=sal_True; - sal_Bool bDontCare=sal_False; + bool bFirst=true; + bool bDontCare=false; sal_uInt16 nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet); + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,true,&bFirst,&bDontCare,&bVert,&nRet); return nRet; } static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - if (*(sal_Bool*)pbVert) { // bVert? + if (*(bool*)pbVert) { // bVert? rGP.SetVertAlign(*(sal_uInt16*)pnAlign); } else { rGP.SetHorzAlign(*(sal_uInt16*)pnAlign); @@ -213,11 +216,11 @@ static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pb rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign) +void SdrGlueEditView::SetMarkedGluePointsAlign(bool bVert, sal_uInt16 nAlign) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign); + ImpDoMarkedGluePoints(ImpSetAlign,false,&bVert,&nAlign); EndUndo(); } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index a225219d9e51..7e53388e9909 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -277,9 +277,9 @@ SdrHdl::SdrHdl(): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(sal_False), - b1PixMore(sal_False), - bPlusHdl(sal_False), + bSelect(false), + b1PixMore(false), + bPlusHdl(false), mbMoveOutside(false), mbMouseOver(false) { @@ -296,9 +296,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(sal_False), - b1PixMore(sal_False), - bPlusHdl(sal_False), + bSelect(false), + b1PixMore(false), + bPlusHdl(false), mbMoveOutside(false), mbMouseOver(false) { @@ -309,7 +309,7 @@ SdrHdl::~SdrHdl() GetRidOfIAObject(); } -void SdrHdl::Set1PixMore(sal_Bool bJa) +void SdrHdl::Set1PixMore(bool bJa) { if(b1PixMore != bJa) { @@ -354,7 +354,7 @@ void SdrHdl::SetPos(const Point& rPnt) } } -void SdrHdl::SetSelected(sal_Bool bJa) +void SdrHdl::SetSelected(bool bJa) { if(bSelect != bJa) { @@ -413,7 +413,7 @@ void SdrHdl::CreateB2dIAObject() BitmapColorIndex eColIndex = LightGreen; BitmapMarkerKind eKindOfMarker = Rect_7x7; - sal_Bool bRot = pHdlList->IsRotateShear(); + bool bRot = pHdlList->IsRotateShear(); if(pObj) eColIndex = (bSelect) ? Cyan : LightCyan; if(bRot) @@ -863,7 +863,7 @@ Pointer SdrHdl::GetPointer() const return Pointer(ePtr); } -sal_Bool SdrHdl::IsFocusHdl() const +bool SdrHdl::IsFocusHdl() const { switch(eKind) { @@ -878,9 +878,9 @@ sal_Bool SdrHdl::IsFocusHdl() const { // if it's an activated TextEdit, it's moved to extended points if(pHdlList && pHdlList->IsMoveOutside()) - return sal_False; + return false; else - return sal_True; + return true; } case HDL_MOVE: // handle to move object @@ -897,12 +897,12 @@ sal_Bool SdrHdl::IsFocusHdl() const case HDL_USER: { - return sal_True; + return true; } default: { - return sal_False; + return false; } } } @@ -918,10 +918,10 @@ void SdrHdl::onMouseLeave() // class SdrHdlColor -SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum) +SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLum) : SdrHdl(rRef, HDL_COLR), aMarkerSize(rSize), - bUseLuminance(bLum) + bUseLuminance(bLum ? 1 : 0) { if(IsUseLuminance()) aCol = GetLuminance(aCol); @@ -1043,7 +1043,7 @@ void SdrHdlColor::CallColorChangeLink() aColorChangeHdl.Call(this); } -void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink) +void SdrHdlColor::SetColor(Color aNew, bool bCallLink) { if(IsUseLuminance()) aNew = GetLuminance(aNew); @@ -1075,7 +1075,7 @@ void SdrHdlColor::SetSize(const Size& rNew) } // class SdrHdlGradient -SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad) +SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS) , pColHdl1(NULL) , pColHdl2(NULL) @@ -1182,11 +1182,11 @@ void SdrHdlGradient::CreateB2dIAObject() IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/) { if(GetObj()) - FromIAOToItem(GetObj(), sal_True, sal_True); + FromIAOToItem(GetObj(), true, true); return 0; } -void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo) +void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool bUndo) { // from IAO positions and colors to gradient const SfxItemSet& rSet = _pObj->GetMergedItemSet(); @@ -1528,13 +1528,13 @@ Pointer ImpEdgeHdl::GetPointer() const return Pointer(POINTER_SSIZE); } -sal_Bool ImpEdgeHdl::IsHorzDrag() const +bool ImpEdgeHdl::IsHorzDrag() const { SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj); if (pEdge==NULL) - return sal_False; + return false; if (nObjHdlNum<=1) - return sal_False; + return false; SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); @@ -1547,11 +1547,11 @@ sal_Bool ImpEdgeHdl::IsHorzDrag() const { long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2; if (nWink==0 || nWink==18000) - return sal_True; + return true; else - return sal_False; + return false; } - return sal_False; + return false; } @@ -1844,7 +1844,7 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2 -void SdrHdlList::TravelFocusHdl(sal_Bool bForward) +void SdrHdlList::TravelFocusHdl(bool bForward) { // security correction if(mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && mnFocusIndex >= GetHdlCount()) @@ -2031,9 +2031,9 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV) aList() { nHdlSize = 3; - bRotateShear = sal_False; - bMoveOutside = sal_False; - bDistortShear = sal_False; + bRotateShear = false; + bMoveOutside = false; + bDistortShear = false; } SdrHdlList::~SdrHdlList() @@ -2057,12 +2057,12 @@ void SdrHdlList::SetHdlSize(sal_uInt16 nSiz) } } -void SdrHdlList::SetMoveOutside(sal_Bool bOn) +void SdrHdlList::SetMoveOutside(bool bOn) { if(bMoveOutside != bOn) { // remember new value - bMoveOutside = bOn; + bMoveOutside = bOn ? 1 : 0; // propagate change to IAOs for(sal_uIntPtr i=0; i<GetHdlCount(); i++) @@ -2073,14 +2073,14 @@ void SdrHdlList::SetMoveOutside(sal_Bool bOn) } } -void SdrHdlList::SetRotateShear(sal_Bool bOn) +void SdrHdlList::SetRotateShear(bool bOn) { bRotateShear = bOn; } -void SdrHdlList::SetDistortShear(sal_Bool bOn) +void SdrHdlList::SetDistortShear(bool bOn) { - bDistortShear = bOn; + bDistortShear = bOn ? 1 : 0; } SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum) @@ -2115,8 +2115,8 @@ void SdrHdlList::Clear() } aList.clear(); - bRotateShear=sal_False; - bDistortShear=sal_False; + bRotateShear=false; + bDistortShear=false; } void SdrHdlList::Sort() @@ -2154,7 +2154,7 @@ sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const return it - aList.begin(); } -void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin) +void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin) { if (pHdl!=NULL) { @@ -2170,7 +2170,7 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin) } } -SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const +SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const { SdrHdl* pRet=NULL; sal_uIntPtr nAnz=GetHdlCount(); @@ -2183,7 +2183,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNe if (bNext) { if (pHdl==pHdl0) - bNext=sal_False; + bNext=false; } else { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 403ac8039c4b..593787219958 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1120,7 +1120,7 @@ void SdrItemBrowser::Undirty() if(pView->AreObjectsMarked()) { SfxItemSet a2ndSet(pView->GetModel()->GetItemPool()); - pView->GetAttributes(a2ndSet, sal_True); + pView->GetAttributes(a2ndSet, true); SetAttributes(&aSet,&a2ndSet); } diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 2d80d61f4e3f..ae50895ecd1d 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -24,15 +24,15 @@ #include "svx/svdglob.hxx" #include "svx/svdstr.hrc" -sal_Bool SetOfByte::IsEmpty() const +bool SetOfByte::IsEmpty() const { for(sal_uInt16 i(0); i < 32; i++) { if(aData[i] != 0) - return sal_False; + return false; } - return sal_True; + return true; } void SetOfByte::operator&=(const SetOfByte& r2ndSet) diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index b329b7f1e267..7914f847dd6a 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -47,8 +47,8 @@ SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView) mpPoints(0L), mpLines(0L), mpGluePoints(0L), - mbCon1(sal_False), - mbCon2(sal_False), + mbCon1(false), + mbCon2(false), mnUser(0) { if(mpSelectedSdrObject) @@ -64,8 +64,8 @@ SdrMark::SdrMark(const SdrMark& rMark) mpPoints(0L), mpLines(0L), mpGluePoints(0L), - mbCon1(sal_False), - mbCon2(sal_False), + mbCon1(false), + mbCon2(false), mnUser(0) { *this = rMark; @@ -193,27 +193,27 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark) return *this; } -sal_Bool SdrMark::operator==(const SdrMark& rMark) const +bool SdrMark::operator==(const SdrMark& rMark) const { - sal_Bool bRet(mpSelectedSdrObject == rMark.mpSelectedSdrObject && mpPageView == rMark.mpPageView && mbCon1 == rMark.mbCon1 && mbCon2 == rMark.mbCon2 && mnUser == rMark.mnUser); + bool bRet(mpSelectedSdrObject == rMark.mpSelectedSdrObject && mpPageView == rMark.mpPageView && mbCon1 == rMark.mbCon1 && mbCon2 == rMark.mbCon2 && mnUser == rMark.mnUser); if((mpPoints != 0L) != (rMark.mpPoints != 0L)) - bRet = sal_False; + bRet = false; if((mpLines != 0L) != (rMark.mpLines != 0L)) - bRet = sal_False; + bRet = false; if((mpGluePoints != 0L) != (rMark.mpGluePoints != 0L)) - bRet = sal_False; + bRet = false; if(bRet && mpPoints && *mpPoints != *rMark.mpPoints) - bRet = sal_False; + bRet = false; if(bRet && mpLines && *mpLines != *rMark.mpLines) - bRet = sal_False; + bRet = false; if(bRet && mpGluePoints && *mpGluePoints != *rMark.mpGluePoints) - bRet = sal_False; + bRet = false; return bRet; } @@ -257,7 +257,7 @@ void SdrMarkList::ImpForceSort() { if(!mbSorted) { - mbSorted = sal_True; + mbSorted = true; sal_uLong nAnz = maList.size(); // remove invalid @@ -293,10 +293,10 @@ void SdrMarkList::ImpForceSort() { // Con1/Con2 Merging if(pCmp->IsCon1()) - pAkt->SetCon1(sal_True); + pAkt->SetCon1(true); if(pCmp->IsCon2()) - pAkt->SetCon2(sal_True); + pAkt->SetCon2(true); // delete pCmp maList.erase(maList.begin() + i); @@ -377,7 +377,7 @@ sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const return CONTAINER_ENTRY_NOTFOUND; } -void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) +void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort) { SetNameDirty(); sal_uLong nAnz(maList.size()); @@ -385,7 +385,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) if(!bChkSort || !mbSorted || nAnz == 0) { if(!bChkSort) - mbSorted = sal_False; + mbSorted = false; maList.push_back(new SdrMark(rMark)); } @@ -400,10 +400,10 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) // This one already exists. // Con1/Con2 Merging if(rMark.IsCon1()) - pLast->SetCon1(sal_True); + pLast->SetCon1(true); if(rMark.IsCon2()) - pLast->SetCon2(sal_True); + pLast->SetCon2(true); } else { @@ -422,13 +422,13 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) if(nNeuNum < nLastNum) { // at some point, we have to sort - mbSorted = sal_False; + mbSorted = false; } } else { // at some point, we have to sort - mbSorted = sal_False; + mbSorted = false; } } } @@ -460,18 +460,18 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum) SetNameDirty(); SdrMark* pKopie = new SdrMark(rNewMark); maList[nNum] = pKopie; - mbSorted = sal_False; + mbSorted = false; } } -void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) +void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse) { sal_uLong nAnz(rSrcList.maList.size()); if(rSrcList.mbSorted) { // merge without forcing a Sort in rSrcList - bReverse = sal_False; + bReverse = false; } if(!bReverse) @@ -493,9 +493,9 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) } } -sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV) +bool SdrMarkList::DeletePageView(const SdrPageView& rPV) { - sal_Bool bChgd(sal_False); + bool bChgd(false); for(std::vector<SdrMark*>::iterator it = maList.begin(); it != maList.end(); ) { @@ -506,7 +506,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV) it = maList.erase(it); delete pMark; SetNameDirty(); - bChgd = sal_True; + bChgd = true; } else ++it; @@ -515,9 +515,9 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV) return bChgd; } -sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) +bool SdrMarkList::InsertPageView(const SdrPageView& rPV) { - sal_Bool bChgd(sal_False); + bool bChgd(false); DeletePageView(rPV); // delete all of them, then append the entire page SdrObject* pObj; const SdrObjList* pOL = rPV.GetObjList(); @@ -526,14 +526,14 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) for(sal_uLong nO(0L); nO < nObjAnz; nO++) { pObj = pOL->GetObj(nO); - sal_Bool bDoIt(rPV.IsObjMarkable(pObj)); + bool bDoIt(rPV.IsObjMarkable(pObj)); if(bDoIt) { SdrMark* pM = new SdrMark(pObj, (SdrPageView*)&rPV); maList.push_back(pM); SetNameDirty(); - bChgd = sal_True; + bChgd = true; } } @@ -552,7 +552,7 @@ const OUString& SdrMarkList::GetMarkDescription() const if(!pTextObj || !pTextObj->IsTextFrame()) { - ((SdrMarkList*)(this))->mbNameOk = sal_False; + ((SdrMarkList*)(this))->mbNameOk = false; } } @@ -596,15 +596,15 @@ const OUString& SdrMarkList::GetMarkDescription() const } const_cast<SdrMarkList*>(this)->maMarkName = aNam; - const_cast<SdrMarkList*>(this)->mbNameOk = sal_True; + const_cast<SdrMarkList*>(this)->mbNameOk = true; } return maMarkName; } -const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const +const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const { - sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk); + bool& rNameOk = (bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk); OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName); sal_uLong nMarkAnz(GetMarkCount()); sal_uLong nMarkPtAnz(0L); @@ -643,14 +643,14 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const if(!pTextObj || !pTextObj->IsTextFrame()) { - rNameOk = sal_False; + rNameOk = false; } } if(!nMarkPtObjAnz) { rName = OUString(); - rNameOk = sal_True; + rNameOk = true; } else if(!rNameOk) { @@ -707,15 +707,15 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const aStr1 = aStr1.replaceFirst("%1", aNam); rName = aStr1; - rNameOk = sal_True; + rNameOk = true; } return rName; } -sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const +bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const { - sal_Bool bFnd(sal_False); + bool bFnd(false); Rectangle aR; for(sal_uLong i(0L); i < GetMarkCount(); i++) @@ -735,7 +735,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const else { rRect = aR; - bFnd = sal_True; + bFnd = true; } } } @@ -744,9 +744,9 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const return bFnd; } -sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const +bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const { - sal_Bool bFnd(sal_False); + bool bFnd(false); for(sal_uLong i(0L); i < GetMarkCount(); i++) { @@ -765,7 +765,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const else { rRect = aR; - bFnd = sal_True; + bFnd = true; } } } @@ -779,7 +779,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const namespace sdr { ViewSelection::ViewSelection() - : mbEdgesOfMarkedNodesDirty(sal_False) + : mbEdgesOfMarkedNodesDirty(false) { } @@ -787,7 +787,7 @@ namespace sdr { if(!mbEdgesOfMarkedNodesDirty) { - mbEdgesOfMarkedNodesDirty = sal_True; + mbEdgesOfMarkedNodesDirty = true; maEdgesOfMarkedNodes.Clear(); maMarkedEdgesOfMarkedNodes.Clear(); maAllMarkedObjects.clear(); @@ -826,11 +826,11 @@ namespace sdr { if(pObj) { - sal_Bool bIsGroup(pObj->IsGroupObject()); + bool bIsGroup(pObj->IsGroupObject()); if(bIsGroup && pObj->ISA(E3dObject) && !pObj->ISA(E3dScene)) { - bIsGroup = sal_False; + bIsGroup = false; } if(bIsGroup) @@ -852,7 +852,7 @@ namespace sdr { if(mbEdgesOfMarkedNodesDirty) { - mbEdgesOfMarkedNodesDirty = sal_False; + mbEdgesOfMarkedNodesDirty = false; maMarkedObjectList.ForceSort(); maEdgesOfMarkedNodes.Clear(); maMarkedEdgesOfMarkedNodes.Clear(); @@ -890,12 +890,12 @@ namespace sdr if(pEdge->GetConnectedNode(true) == pCandidate) { - aM.SetCon1(sal_True); + aM.SetCon1(true); } if(pEdge->GetConnectedNode(false) == pCandidate) { - aM.SetCon2(sal_True); + aM.SetCon2(true); } if(CONTAINER_ENTRY_NOTFOUND == maMarkedObjectList.FindObject(pEdge)) diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index fbf5315cb138..29c13a34edaf 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -204,46 +204,37 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // can't create DrawOutliner OnDemand, because I can't get the Pool, // then (only from 302 onwards!) pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pDrawOutliner, sal_True); + ImpSetOutlinerDefaults(pDrawOutliner, true); pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pHitTestOutliner, sal_True); + ImpSetOutlinerDefaults(pHitTestOutliner, true); ImpCreateTables(); } -SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts): +SdrModel::SdrModel(): aReadDate( DateTime::EMPTY ), maMaPag(), maPages() { - ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); + ImpCtor(NULL, NULL, false, LOADREFCOUNTS); } -SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts): - aReadDate( DateTime::EMPTY ), - maMaPag(), - maPages(), - aTablePath(rPath) -{ - ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); -} - -SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): aReadDate( DateTime::EMPTY ), maMaPag(), maPages() { - ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); } -SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): +SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts): aReadDate( DateTime::EMPTY ), maMaPag(), maPages(), aTablePath(rPath) { - ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts); + ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts); } SdrModel::SdrModel(const SdrModel& /*rSrcModel*/): @@ -278,7 +269,7 @@ SdrModel::~SdrModel() #endif delete pAktUndoGroup; - ClearModel(sal_True); + ClearModel(true); delete pLayerAdmin; @@ -691,7 +682,7 @@ void SdrModel::ImpCreateTables() } } -void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) +void SdrModel::ClearModel(bool bCalledFromDestructor) { if(bCalledFromDestructor) { @@ -795,7 +786,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const return NULL; } -void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit ) +void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) { /************************************************************************** * Initialization of the Outliners for drawing text and HitTest @@ -1775,7 +1766,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, if (bUndo) EndUndo(); } -void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview) +void SdrModel::SetStarDrawPreviewMode(bool bPreview) { if (!bPreview && bStarDrawPreviewMode && GetPageCount()) { @@ -1913,9 +1904,9 @@ void SdrModel::SetCharCompressType( sal_uInt16 nType ) } } -void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled ) +void SdrModel::SetKernAsianPunctuation( bool bEnabled ) { - if( mbKernAsianPunctuation != (bool) bEnabled ) + if( mbKernAsianPunctuation != bEnabled ) { mbKernAsianPunctuation = bEnabled; ImpSetOutlinerDefaults( pDrawOutliner ); @@ -1923,9 +1914,9 @@ void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled ) } } -void SdrModel::SetAddExtLeading( sal_Bool bEnabled ) +void SdrModel::SetAddExtLeading( bool bEnabled ) { - if( mbAddExtLeading != (bool) bEnabled ) + if( mbAddExtLeading != bEnabled ) { mbAddExtLeading = bEnabled; ImpSetOutlinerDefaults( pDrawOutliner ); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 4ecd12bb8c7a..b8ae15db5339 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -65,17 +65,17 @@ class ImplMarkingOverlay // bitfield // A flag to remember if the action is for unmarking. - unsigned mbUnmarking : 1; + bool mbUnmarking : 1; public: - ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, sal_Bool bUnmarking = sal_False); + ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking = false); ~ImplMarkingOverlay(); void SetSecondPosition(const basegfx::B2DPoint& rNewPosition); - sal_Bool IsUnmarking() const { return mbUnmarking; } + bool IsUnmarking() const { return mbUnmarking; } }; -ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, sal_Bool bUnmarking) +ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking) : maSecondPosition(rStartPos), mbUnmarking(bUnmarking) { @@ -209,7 +209,7 @@ void SdrMarkView::ModelHasChanged() -sal_Bool SdrMarkView::IsAction() const +bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } @@ -311,7 +311,7 @@ void SdrMarkView::HideSdrPage() -sal_Bool SdrMarkView::BegMarkObj(const Point& rPnt, sal_Bool bUnmark) +bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark) { BrkAction(); @@ -323,7 +323,7 @@ sal_Bool SdrMarkView::BegMarkObj(const Point& rPnt, sal_Bool bUnmark) aDragStat.NextPoint(); aDragStat.SetMinMove(nMinMovLog); - return sal_True; + return true; } void SdrMarkView::MovMarkObj(const Point& rPnt) @@ -337,9 +337,9 @@ void SdrMarkView::MovMarkObj(const Point& rPnt) } } -sal_Bool SdrMarkView::EndMarkObj() +bool SdrMarkView::EndMarkObj() { - sal_Bool bRetval(sal_False); + bool bRetval(false); if(IsMarkObj()) { @@ -348,7 +348,7 @@ sal_Bool SdrMarkView::EndMarkObj() Rectangle aRect(aDragStat.GetStart(), aDragStat.GetNow()); aRect.Justify(); MarkObj(aRect, mpMarkObjOverlay->IsUnmarking()); - bRetval = sal_True; + bRetval = true; } // cleanup @@ -370,7 +370,7 @@ void SdrMarkView::BrkMarkObj() -sal_Bool SdrMarkView::BegMarkPoints(const Point& rPnt, sal_Bool bUnmark) +bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark) { if(HasMarkablePoints()) { @@ -384,10 +384,10 @@ sal_Bool SdrMarkView::BegMarkPoints(const Point& rPnt, sal_Bool bUnmark) aDragStat.NextPoint(); aDragStat.SetMinMove(nMinMovLog); - return sal_True; + return true; } - return sal_False; + return false; } void SdrMarkView::MovMarkPoints(const Point& rPnt) @@ -402,9 +402,9 @@ void SdrMarkView::MovMarkPoints(const Point& rPnt) } } -sal_Bool SdrMarkView::EndMarkPoints() +bool SdrMarkView::EndMarkPoints() { - sal_Bool bRetval(sal_False); + bool bRetval(false); if(IsMarkPoints()) { @@ -414,7 +414,7 @@ sal_Bool SdrMarkView::EndMarkPoints() aRect.Justify(); MarkPoints(aRect, mpMarkPointsOverlay->IsUnmarking()); - bRetval = sal_True; + bRetval = true; } // cleanup @@ -436,7 +436,7 @@ void SdrMarkView::BrkMarkPoints() -sal_Bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark) +bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark) { if(HasMarkableGluePoints()) { @@ -450,10 +450,10 @@ sal_Bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark) aDragStat.NextPoint(); aDragStat.SetMinMove(nMinMovLog); - return sal_True; + return true; } - return sal_False; + return false; } void SdrMarkView::MovMarkGluePoints(const Point& rPnt) @@ -468,9 +468,9 @@ void SdrMarkView::MovMarkGluePoints(const Point& rPnt) } } -sal_Bool SdrMarkView::EndMarkGluePoints() +bool SdrMarkView::EndMarkGluePoints() { - sal_Bool bRetval(sal_False); + bool bRetval(false); if(IsMarkGluePoints()) { @@ -480,7 +480,7 @@ sal_Bool SdrMarkView::EndMarkGluePoints() aRect.Justify(); MarkGluePoints(&aRect, mpMarkGluePointsOverlay->IsUnmarking()); - bRetval = sal_True; + bRetval = true; } // cleanup @@ -519,7 +519,7 @@ sal_uIntPtr SdrMarkView::GetMarkableObjCount() const return nCount; } -sal_Bool SdrMarkView::HasMarkableObj() const +bool SdrMarkView::HasMarkableObj() const { sal_uIntPtr nCount=0; @@ -556,10 +556,10 @@ void SdrMarkView::showMarkHandles() } } -sal_Bool SdrMarkView::ImpIsFrameHandles() const +bool SdrMarkView::ImpIsFrameHandles() const { sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); - sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; + bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; bool bStdDrag=eDragMode==SDRDRAG_MOVE; if (nMarkAnz==1 && bStdDrag && bFrmHdl) { @@ -569,13 +569,13 @@ sal_Bool SdrMarkView::ImpIsFrameHandles() const sal_uInt16 nIdent=pObj->GetObjIdentifier(); if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE ) { - bFrmHdl=sal_False; + bFrmHdl=false; } } } if (!bStdDrag && !bFrmHdl) { // all other drag modes only with FrameHandles - bFrmHdl=sal_True; + bFrmHdl=true; if (eDragMode==SDRDRAG_ROTATE) { // when rotating, use ObjOwn drag, if there's at least 1 PolyObj for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { @@ -597,7 +597,7 @@ sal_Bool SdrMarkView::ImpIsFrameHandles() const // no FrameHdl for crop if(bFrmHdl && SDRDRAG_CROP == eDragMode) { - bFrmHdl = sal_False; + bFrmHdl = false; } return bFrmHdl; @@ -647,7 +647,7 @@ void SdrMarkView::SetMarkHandles() static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame(); } - sal_Bool bFrmHdl=ImpIsFrameHandles(); + bool bFrmHdl=ImpIsFrameHandles(); if (nMarkAnz>0) { @@ -784,7 +784,7 @@ void SdrMarkView::SetMarkHandles() if (bPoly) { - sal_Bool bSelected=pMrkPnts!=NULL + bool bSelected=pMrkPnts!=NULL && pMrkPnts->find( sal_uInt16(i-nSiz0) ) != pMrkPnts->end(); pHdl->SetSelected(bSelected); if (bPlusHdlAlways || bSelected) @@ -797,7 +797,7 @@ void SdrMarkView::SetMarkHandles() { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pPV); - pPlusHdl->SetPlusHdl(sal_True); + pPlusHdl->SetPlusHdl(true); aHdl.AddHdl(pPlusHdl); } } @@ -936,7 +936,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) (const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE)); XGradient aGrad = aNewItem.GetGradientValue(); - aNewItem.SetEnabled(sal_True); + aNewItem.SetEnabled(true); aGrad.SetStartIntens(100); aGrad.SetEndIntens(100); aNewItem.SetGradientValue(aGrad); @@ -965,9 +965,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, true); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, true); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, false); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Could not get all necessary handles!"); // link them @@ -1007,9 +1007,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, false); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, false); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, true); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Could not get all necessary handles!"); // link them @@ -1249,9 +1249,9 @@ void SdrMarkView::SetMarkRects() void SdrMarkView::SetFrameHandles(bool bOn) { if (bOn!=bForceFrameHandles) { - sal_Bool bOld=ImpIsFrameHandles(); + bool bOld=ImpIsFrameHandles(); bForceFrameHandles=bOn; - sal_Bool bNew=ImpIsFrameHandles(); + bool bNew=ImpIsFrameHandles(); if (bNew!=bOld) { AdjustMarkHdl(); MarkListHasChanged(); @@ -1278,7 +1278,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) -sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const +bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) { @@ -1287,15 +1287,15 @@ sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { // object not selectable or // SdrUnoObj not in DesignMode - return sal_False; + return false; } } - return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True; + return pPV==NULL || pPV->IsObjMarkable(pObj); } -sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const +bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const { - sal_Bool bRet=sal_False; + bool bRet=false; nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { @@ -1310,34 +1310,34 @@ SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* if (bSomeObjChgdFlag) { // recalculate handles, if necessary FlushComeBackTimer(); } - sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; + bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; Point aPt(rPnt); return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0); } -sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep) +bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDeep) { SdrObject* pObj; SdrPageView* pPV; nTol=ImpGetHitTolLogic(nTol,NULL); sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE; if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP; - sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions); + bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions); if (bRet) { - sal_Bool bUnmark=bToggle && IsObjMarked(pObj); + bool bUnmark=bToggle && IsObjMarked(pObj); MarkObj(pObj,pPV,bUnmark); } return bRet; } -sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev) +bool SdrMarkView::MarkNextObj(bool bPrev) { SdrPageView* pPageView = GetSdrPageView(); if(!pPageView) { - return sal_False; + return false; } SortMarkedObjects(); @@ -1375,7 +1375,7 @@ sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev) if(!pMarkObj) { - return sal_False; + return false; } if (nChgMarkNum!=ULONG_MAX) @@ -1383,10 +1383,10 @@ sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev) GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum); } MarkObj(pMarkObj,pPageView); // also calls MarkListHasChanged(), AdjustMarkHdl() - return sal_True; + return true; } -sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev) +bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) { SortMarkedObjects(); nTol=ImpGetHitTolLogic(nTol,NULL); @@ -1408,7 +1408,7 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev) } } // nothing found, in this case, just select an object - if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False); + if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),false); SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj(); SdrObjList* pObjList=pTopObjHit->GetObjList(); @@ -1493,9 +1493,9 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev) return pFndObj!=NULL; } -sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark) +bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark) { - sal_Bool bFnd=sal_False; + bool bFnd=false; Rectangle aR(rRect); SdrObjList* pObjList; BrkAction(); @@ -1515,14 +1515,14 @@ sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark) if (IsObjMarkable(pObj,pPV)) { GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV)); - bFnd=sal_True; + bFnd=true; } } else { sal_uIntPtr nPos=TryToFindMarkedObject(pObj); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); - bFnd=sal_True; + bFnd=true; } } } @@ -1536,7 +1536,7 @@ sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark) return bFnd; } -void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl) +void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bImpNoSetMarkHdl) { if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) { BrkAction(); @@ -1559,7 +1559,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, s } } -sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const +bool SdrMarkView::IsObjMarked(SdrObject* pObj) const { // Hack: Because FindObject() is not const, // I have to cast myself to non-const. @@ -1696,12 +1696,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT return pRet; } -sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const +bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL); } -sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const +bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const { // TODO: lacks a Pass2,Pass3 SortMarkedObjects(); if (ppRootObj!=NULL) *ppRootObj=NULL; @@ -1820,7 +1820,7 @@ sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, return rpObj!=NULL; } -sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const +bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const { SortMarkedObjects(); bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; @@ -1830,7 +1830,7 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND; Point aPt(rPnt); sal_uInt16 nTol=(sal_uInt16)nHitTolLog; - sal_Bool bFnd=sal_False; + bool bFnd=false; sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); sal_uIntPtr nMarkNum; for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { @@ -1861,7 +1861,7 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag aRect.Right ()+=nTol; aRect.Bottom()+=nTol; if (aRect.IsInside(aPt)) { - bFnd=sal_True; + bFnd=true; rpObj=pObj; rpPV=pPV; if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum; @@ -2022,9 +2022,9 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, -sal_Bool SdrMarkView::EnterMarkedGroup() +bool SdrMarkView::EnterMarkedGroup() { - sal_Bool bRet=sal_False; + bool bRet=false; // We enter only the first group found (in only one PageView), because // PageView::EnterGroup calls an AdjustMarkHdl. // TODO: I'll have to prevent that via a flag. @@ -2041,7 +2041,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup() SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsGroupObject()) { if (pPV->EnterGroup(pObj)) { - bRet=sal_True; + bRet=true; bEnter=true; } } @@ -2063,7 +2063,7 @@ void SdrMarkView::MarkListHasChanged() #ifdef DBG_UTIL if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif - sal_Bool bOneEdgeMarked=sal_False; + bool bOneEdgeMarked=false; if (GetMarkedObjectCount()==1) { const SdrObject* pObj=GetMarkedObjectByIndex(0); if (pObj->GetObjInventor()==SdrInventor) { @@ -2076,7 +2076,7 @@ void SdrMarkView::MarkListHasChanged() -void SdrMarkView::SetMoveOutside(sal_Bool bOn) +void SdrMarkView::SetMoveOutside(bool bOn) { aHdl.SetMoveOutside(bOn); } diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 63f9b5ee57d3..8ff28e3d1b07 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -30,7 +30,7 @@ // Point Selection -sal_Bool SdrMarkView::HasMarkablePoints() const +bool SdrMarkView::HasMarkablePoints() const { ForceUndirtyMrkPnt(); bool bRet=false; @@ -66,10 +66,10 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const return nAnz; } -sal_Bool SdrMarkView::HasMarkedPoints() const +bool SdrMarkView::HasMarkedPoints() const { ForceUndirtyMrkPnt(); - sal_Bool bRet=sal_False; + bool bRet=false; if (!ImpIsFrameHandles()) { sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { @@ -100,33 +100,33 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const return nAnz; } -sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const +bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); } -sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) +bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) { return ImpMarkPoint( pHdl, pMark, bUnmark ); } -sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) +bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark) { if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE) - return sal_False; + return false; if (pHdl->IsSelected() != bUnmark) - return sal_False; + return false; SdrObject* pObj=pHdl->GetObj(); if (pObj==NULL || !pObj->IsPolyObj()) - return sal_False; + return false; if (pMark==NULL) { sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) - return sal_False; + return false; pMark=GetSdrMarkByIndex(nMarkNum); } const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); @@ -144,7 +144,7 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar } else { - return sal_False; // error case! + return false; // error case! } } @@ -161,7 +161,7 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pMark->GetPageView()); - pPlusHdl->SetPlusHdl(sal_True); + pPlusHdl->SetPlusHdl(true); aHdl.AddHdl(pPlusHdl); } } @@ -183,15 +183,15 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar aHdl.Sort(); - return sal_True; + return true; } -sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark) +bool SdrMarkView::MarkPoint(SdrHdl& rHdl, bool bUnmark) { - if (&rHdl==NULL) return sal_False; + if (&rHdl==NULL) return false; ForceUndirtyMrkPnt(); - sal_Bool bRet=sal_False; + bool bRet=false; const SdrObject* pObj=rHdl.GetObj(); if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) { sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); @@ -200,7 +200,7 @@ sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark) pM->ForceMarkedPoints(); if (ImpMarkPoint(&rHdl,pM,bUnmark)) { MarkListHasChanged(); - bRet=sal_True; + bRet=true; } } } @@ -208,10 +208,10 @@ sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark) return bRet; } -sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) +bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark) { ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; + bool bChgd=false; SortMarkedObjects(); const SdrObject* pObj0=NULL; const SdrPageView* pPV0=NULL; @@ -242,7 +242,7 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) } Point aPos(pHdl->GetPos()); if (pM!=NULL && (pRect==NULL || pRect->IsInside(aPos))) { - if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True; + if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=true; } } } @@ -253,10 +253,10 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) return bChgd; } -sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) +bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, bool /*bPrev*/) { ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; + bool bChgd=false; SortMarkedObjects(); if (bChgd) { @@ -318,7 +318,7 @@ void SdrMarkView::ImpSetPointsRects() const void SdrMarkView::UndirtyMrkPnt() const { - sal_Bool bChg=sal_False; + bool bChg=false; sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -335,7 +335,7 @@ void SdrMarkView::UndirtyMrkPnt() const if( it != pPts->end() ) { pPts->erase(it, pPts->end() ); - bChg = sal_True; + bChg = true; } } else @@ -344,7 +344,7 @@ void SdrMarkView::UndirtyMrkPnt() const if(pPts && !pPts->empty()) { pPts->clear(); - bChg = sal_True; + bChg = true; } } } @@ -362,7 +362,7 @@ void SdrMarkView::UndirtyMrkPnt() const sal_uInt16 nId=*it; if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) { pPts->erase(it++); - bChg=sal_True; + bChg=true; } else ++it; @@ -370,7 +370,7 @@ void SdrMarkView::UndirtyMrkPnt() const } else { if (pPts!=NULL && !pPts->empty()) { pPts->clear(); // object doesn't have any glue points (any more) - bChg=sal_True; + bChg=true; } } } @@ -381,9 +381,9 @@ void SdrMarkView::UndirtyMrkPnt() const -sal_Bool SdrMarkView::HasMarkableGluePoints() const +bool SdrMarkView::HasMarkableGluePoints() const { - sal_Bool bRet=sal_False; + bool bRet=false; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); @@ -399,7 +399,7 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const { if((*pGPL)[a].IsUserDefined()) { - bRet = sal_True; + bRet = true; } } } @@ -408,10 +408,10 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const return bRet; } -sal_Bool SdrMarkView::HasMarkedGluePoints() const +bool SdrMarkView::HasMarkedGluePoints() const { ForceUndirtyMrkPnt(); - sal_Bool bRet=sal_False; + bool bRet=false; sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -421,11 +421,11 @@ sal_Bool SdrMarkView::HasMarkedGluePoints() const return bRet; } -sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) +bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark) { - if (!IsGluePointEditMode() && !bUnmark) return sal_False; + if (!IsGluePointEditMode() && !bUnmark) return false; ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; + bool bChgd=false; SortMarkedObjects(); sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { @@ -436,7 +436,7 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) if (bUnmark && pRect==NULL) { // UnmarkAll if (pPts!=NULL && !pPts->empty()) { pPts->clear(); - bChgd=sal_True; + bChgd=true; } } else { if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) { @@ -453,11 +453,11 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) pPts=pM->ForceMarkedGluePoints(); bool bContains = pPts->find( rGP.GetId() ) != pPts->end(); if (!bUnmark && !bContains) { - bChgd=sal_True; + bChgd=true; pPts->insert(rGP.GetId()); } if (bUnmark && bContains) { - bChgd=sal_True; + bChgd=true; pPts->erase(rGP.GetId()); } } @@ -473,23 +473,23 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) return bChgd; } -sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const +bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { SdrObject* pObj0=rpObj; sal_uInt16 nId0=rnId; rpObj=NULL; rpPV=NULL; rnId=0; - if (!IsGluePointEditMode()) return sal_False; - sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; + if (!IsGluePointEditMode()) return false; + bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; OutputDevice* pOut=(OutputDevice*)pActualOutDev; if (pOut==NULL) pOut=GetFirstOutputDevice(); - if (pOut==NULL) return sal_False; + if (pOut==NULL) return false; SortMarkedObjects(); sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz; if (bNext) { nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0); - if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False; + if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return false; if (!bBack) nMarkNum++; } while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) { @@ -510,21 +510,21 @@ sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uI rpObj=pObj; rnId=(*pGPL)[nNum].GetId(); rpPV=pPV; - return sal_True; + return true; } } } - bNext=sal_False; // HitNextGluePoint only for the first Obj + bNext=false; // HitNextGluePoint only for the first Obj if (bBack) nMarkNum++; } - return sal_False; + return false; } -sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark) +bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, bool bUnmark) { - if (!IsGluePointEditMode()) return sal_False; + if (!IsGluePointEditMode()) return false; ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; + bool bChgd=false; if (pObj!=NULL) { sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj); if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) { @@ -533,11 +533,11 @@ sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const if (pPts!=NULL) { bool bContains = pPts->find( nId ) != pPts->end(); if (!bUnmark && !bContains) { - bChgd=sal_True; + bChgd=true; pPts->insert(nId); } if (bUnmark && bContains) { - bChgd=sal_True; + bChgd=true; pPts->erase(nId); } } @@ -552,10 +552,10 @@ sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const return bChgd; } -sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const +bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - sal_Bool bRet=sal_False; + bool bRet=false; sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting to NonConst if (nPos!=CONTAINER_ENTRY_NOTFOUND) { const SdrMark* pM=GetSdrMarkByIndex(nPos); @@ -580,10 +580,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons return NULL; } -sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) +bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/) { ForceUndirtyMrkPnt(); - sal_Bool bChgd=sal_False; + bool bChgd=false; SortMarkedObjects(); if (bChgd) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index db996ba1ef13..dee596023efa 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -205,7 +205,7 @@ static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape ) SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet) { SdrObject* pRetval = 0L; - const sal_Bool bShadow(((SdrShadowItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue()); + const bool bShadow(((SdrShadowItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue()); if(bShadow) { @@ -458,7 +458,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const if(pSdrObject) { const SfxItemSet& rOriginalSet = GetObjectItemSet(); - const sal_Bool bShadow(((SdrShadowItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue()); + const bool bShadow(((SdrShadowItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue()); if(bShadow) { @@ -472,10 +472,10 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const return mpLastShadowGeometry; } -sal_Bool SdrObjCustomShape::IsTextPath() const +bool SdrObjCustomShape::IsTextPath() const { const OUString sTextPath( "TextPath" ); - sal_Bool bTextPathOn = sal_False; + bool bTextPathOn = false; SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath ); if ( pAny ) @@ -483,9 +483,9 @@ sal_Bool SdrObjCustomShape::IsTextPath() const return bTextPathOn; } -sal_Bool SdrObjCustomShape::UseNoFillStyle() const +bool SdrObjCustomShape::UseNoFillStyle() const { - sal_Bool bRet = sal_False; + bool bRet = false; OUString sShapeType; const OUString sType( "Type" ); SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); @@ -497,9 +497,9 @@ sal_Bool SdrObjCustomShape::UseNoFillStyle() const return bRet; } -sal_Bool SdrObjCustomShape::IsMirroredX() const +bool SdrObjCustomShape::IsMirroredX() const { - sal_Bool bMirroredX = sal_False; + bool bMirroredX = false; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const OUString sMirroredX( "MirroredX" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); @@ -507,9 +507,9 @@ sal_Bool SdrObjCustomShape::IsMirroredX() const *pAny >>= bMirroredX; return bMirroredX; } -sal_Bool SdrObjCustomShape::IsMirroredY() const +bool SdrObjCustomShape::IsMirroredY() const { - sal_Bool bMirroredY = sal_False; + bool bMirroredY = false; SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const OUString sMirroredY( "MirroredY" ); com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); @@ -517,7 +517,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const *pAny >>= bMirroredY; return bMirroredY; } -void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) +void SdrObjCustomShape::SetMirroredX( const bool bMirrorX ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const OUString sMirroredX( "MirroredX" ); @@ -527,7 +527,7 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX ) aGeometryItem.SetPropertyValue( aPropVal ); SetMergedItem( aGeometryItem ); } -void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY ) +void SdrObjCustomShape::SetMirroredY( const bool bMirrorY ) { SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const OUString sMirroredY( "MirroredY" ); @@ -567,9 +567,9 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const return fExtraTextRotateAngle; } -sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const +bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const { - sal_Bool bRet = sal_False; + bool bRet = false; Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() ); if ( xCustomShapeEngine.is() ) @@ -578,12 +578,12 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const if ( aR.Width > 1 && aR.Height > 1 ) { rTextBound = Rectangle( Point( aR.X, aR.Y ), Size( aR.Width, aR.Height ) ); - bRet = sal_True; + bRet = true; } } return bRet; } -basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed ) +basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const bool bBezierAllowed ) { basegfx::B2DPolyPolygon aRetval; Reference< XCustomShapeEngine > xCustomShapeEngine( pCustomShape->GetCustomShapeEngine() ); @@ -751,21 +751,21 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X ) { const OUString sMirroredX( "MirroredX" ); - sal_Bool bMirroredX = sal_True; + bool bMirroredX = true; rPropValues[ n ].Name = sMirroredX; rPropValues[ n++ ].Value <<= bMirroredX; } if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y ) { const OUString sMirroredY( "MirroredY" ); - sal_Bool bMirroredY = sal_True; + bool bMirroredY = true; rPropValues[ n ].Name = sMirroredY; rPropValues[ n++ ].Value <<= bMirroredY; } if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED ) { const OUString sSwitched( "Switched" ); - sal_Bool bSwitched = sal_True; + bool bSwitched = true; rPropValues[ n ].Name = sSwitched; rPropValues[ n++ ].Value <<= bSwitched; } @@ -855,7 +855,7 @@ SdrObjCustomShape::SdrObjCustomShape() : mpLastShadowGeometry(0L) { bClosedObj = true; // custom shapes may be filled - bTextFrame = sal_True; + bTextFrame = true; } SdrObjCustomShape::~SdrObjCustomShape() @@ -1106,9 +1106,9 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) SetMergedItem( aGeometryItem ); } -sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) const +bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) const { - sal_Bool bIsDefaultGeometry = sal_False; + bool bIsDefaultGeometry = false; PropertyValue aPropVal; OUString sShapeType; @@ -1134,7 +1134,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) { if ( ( aViewBox.Width == pDefCustomShape->nCoordWidth ) && ( aViewBox.Height == pDefCustomShape->nCoordHeight ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } break; @@ -1156,11 +1156,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ i ].Second, pDefCustomShape->pVertices[ i ].nValB ); } if ( seqCoordinates1 == seqCoordinates2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( ( pDefCustomShape->nVertices == 0 ) || ( pDefCustomShape->pVertices == 0 ) ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1181,11 +1181,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints2[ i ].Second, pDefCustomShape->pGluePoints[ i ].nValB ); } if ( seqGluePoints1 == seqGluePoints2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( pDefCustomShape->nGluePoints == 0 ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1212,7 +1212,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) lcl_ShapeSegmentFromBinary( rSegInfo, nSDat ); } if ( seqSegments1 == seqSegments2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else @@ -1224,13 +1224,13 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) && ( seqSegments1[ 1 ].Command == EnhancedCustomShapeSegmentCommand::LINETO ) && ( seqSegments1[ 2 ].Command == EnhancedCustomShapeSegmentCommand::CLOSESUBPATH ) && ( seqSegments1[ 3 ].Command == EnhancedCustomShapeSegmentCommand::ENDSUBPATH ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } } } else if ( pDefCustomShape && ( ( pDefCustomShape->nElements == 0 ) || ( pDefCustomShape->pElements == 0 ) ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1244,11 +1244,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) if ( *pAny >>= nStretchX ) { if ( pDefCustomShape->nXRef == nStretchX ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( pDefCustomShape->nXRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1262,11 +1262,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) if ( *pAny >>= nStretchY ) { if ( pDefCustomShape->nYRef == nStretchY ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( pDefCustomShape->nYRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1287,11 +1287,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) seqEquations2[ i ] = EnhancedCustomShape2d::GetEquation( pData->nFlags, pData->nVal[ 0 ], pData->nVal[ 1 ], pData->nVal[ 2 ] ); if ( seqEquations1 == seqEquations2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( ( pDefCustomShape->nCalculation == 0 ) || ( pDefCustomShape->pCalculation == 0 ) ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1315,11 +1315,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].BottomRight.Second, pRectangles->nPairB.nValB ); } if ( seqTextFrames1 == seqTextFrames2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( ( pDefCustomShape->nTextRect == 0 ) || ( pDefCustomShape->pTextRect == 0 ) ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; @@ -1344,11 +1344,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) lcl_ShapePropertiesFromDFF( pData, rPropValues ); } if ( seqHandles1 == seqHandles2 ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } } else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == 0 ) ) ) - bIsDefaultGeometry = sal_True; + bIsDefaultGeometry = true; } break; } @@ -1564,12 +1564,12 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) || ( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) ) { - SetMirroredX( IsMirroredX() == sal_False ); + SetMirroredX( IsMirroredX() == false ); } if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) || ( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) ) { - SetMirroredY( IsMirroredY() == sal_False ); + SetMirroredY( IsMirroredY() == false ); } } @@ -1599,8 +1599,8 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co } void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, double cs ) { - sal_Bool bMirroredX = IsMirroredX(); - sal_Bool bMirroredY = IsMirroredY(); + bool bMirroredX = IsMirroredX(); + bool bMirroredY = IsMirroredY(); fObjectRotation = fmod( fObjectRotation, 360.0 ); if ( fObjectRotation < 0 ) @@ -1777,8 +1777,8 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() aNewList.Insert(aCopy); } - sal_Bool bMirroredX = IsMirroredX(); - sal_Bool bMirroredY = IsMirroredY(); + bool bMirroredX = IsMirroredX(); + bool bMirroredY = IsMirroredY(); long nShearWink = aGeo.nShearWink; double fTan = aGeo.nTan; @@ -1957,8 +1957,8 @@ bool SdrObjCustomShape::beginSpecialDrag(SdrDragStat& rDrag) const void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect, SdrObjCustomShape* pObj ) const { Rectangle aOld( pObj->aRect ); - sal_Bool bOldMirroredX( pObj->IsMirroredX() ); - sal_Bool bOldMirroredY( pObj->IsMirroredY() ); + bool bOldMirroredX( pObj->IsMirroredX() ); + bool bOldMirroredY( pObj->IsMirroredY() ); Rectangle aNewRect( rNewRect ); aNewRect.Justify(); @@ -2068,7 +2068,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point aDestination, const pObj->aRect.Move( nXDiff, nYDiff ); pObj->aOutRect.Move( nXDiff, nYDiff ); pObj->maSnapRect.Move( nXDiff, nYDiff ); - pObj->SetRectsDirty(sal_True); + pObj->SetRectsDirty(true); pObj->InvalidateRenderGeometry(); for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() ) ; @@ -2222,7 +2222,7 @@ bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const { - return GetLineGeometry( this, sal_False ); + return GetLineGeometry( this, false ); } @@ -2250,7 +2250,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const is that the SdrAutoGrowWidthItem and SdrAutoGrowHeightItem are not exchanged if the vertical writing mode has been changed */ -void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) +void SdrObjCustomShape::SetVerticalWriting( bool bVertical ) { ForceOutlinerParaObject(); @@ -2546,7 +2546,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) } return bRet; } -sal_Bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl ) +bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl ) { return SdrTextObj::BegTextEdit( rOutl ); } @@ -2803,7 +2803,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject { SdrTextObj::NbcSetOutlinerParaObject( pTextObject ); SetBoundRectDirty(); - SetRectsDirty(sal_True); + SetRectsDirty(true); InvalidateRenderGeometry(); } @@ -2845,7 +2845,7 @@ OUString SdrObjCustomShape::TakeObjNamePlural() const basegfx::B2DPolyPolygon SdrObjCustomShape::TakeXorPoly() const { - return GetLineGeometry( (SdrObjCustomShape*)this, sal_False ); + return GetLineGeometry( (SdrObjCustomShape*)this, false ); } basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const @@ -2856,7 +2856,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const return basegfx::B2DPolyPolygon(); } -SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrObjCustomShape::DoConvertToPolyObj(bool bBezier, bool bAddText) const { // #i37011# SdrObject* pRetval = 0L; @@ -2883,7 +2883,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText if(pRetval) { - const sal_Bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue()); + const bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue()); if(bShadow) { pRetval->SetMergedItem(SdrShadowItem(true)); @@ -2899,7 +2899,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText return pRetval; } -void SdrObjCustomShape::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr ) +void SdrObjCustomShape::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr ) { // #i40944# InvalidateRenderGeometry(); @@ -3058,7 +3058,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, } // taking fObjectRotation instead of aGeo.nWink -sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const +bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // get turn and shear double fRotate = fObjectRotation * F_PI180; @@ -3067,8 +3067,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba // get aRect, this is the unrotated snaprect Rectangle aRectangle(aRect); - sal_Bool bMirroredX = IsMirroredX(); - sal_Bool bMirroredY = IsMirroredY(); + bool bMirroredX = IsMirroredX(); + bool bMirroredY = IsMirroredY(); if ( bMirroredX || bMirroredY ) { // we have to retrieve the unmirrored rect @@ -3165,7 +3165,7 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate, aTranslate); - return sal_False; + return false; } sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact() diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 9ebd5409aa3e..ba7e8b1aad6e 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -131,7 +131,7 @@ void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { Rectangle aBoundRect = GetLastBoundRect(); SetBoundRectDirty(); - SetRectsDirty(sal_True); + SetRectsDirty(true); // This may have led to object change SetChanged(); @@ -152,12 +152,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const return nRetval; } -sal_Bool SdrAttrObj::HasFill() const +bool SdrAttrObj::HasFill() const { return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE; } -sal_Bool SdrAttrObj::HasLine() const +bool SdrAttrObj::HasLine() const { return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 60b3ff96b62d..c368553177c3 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -535,7 +535,7 @@ SdrObjPlusData* SdrObject::NewPlusData() const return new SdrObjPlusData; } -void SdrObject::SetRectsDirty(sal_Bool bNotMyself) +void SdrObject::SetRectsDirty(bool bNotMyself) { if (!bNotMyself) { SetBoundRectDirty(); @@ -1773,7 +1773,7 @@ Point SdrObject::GetSnapPoint(sal_uInt32 i) const return GetPoint(i); } -sal_Bool SdrObject::IsPolyObj() const +bool SdrObject::IsPolyObj() const { return false; } @@ -1843,7 +1843,7 @@ OString SdrObject::stringify() const return aString.makeStringAndClear(); } -sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/) +bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/) { return false; } @@ -2367,7 +2367,7 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHar SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect0); } -void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr) +void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) { // only allow graphic and presentation styles for shapes if( pNewStyleSheet && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PARA) && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PAGE) ) @@ -2842,7 +2842,7 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const -SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const +SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } @@ -3175,7 +3175,7 @@ void SdrObject::notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. -sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const +bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // any kind of SdrObject, just use SnapRect Rectangle aRectangle(GetSnapRect()); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 3a91a5630981..ecdb33d51b45 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -194,16 +194,16 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj); SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // default size: 3 points = 2 lines - mbSpecialTextBoxShadow(sal_False), - mbFixedTail(sal_False) + mbSpecialTextBoxShadow(false), + mbFixedTail(false) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // default size: 3 points = 2 lines - mbSpecialTextBoxShadow(sal_False), - mbFixedTail(sal_False) + mbSpecialTextBoxShadow(false), + mbFixedTail(false) { aTailPoly[0]=maFixedTailPos=rTail; } @@ -738,10 +738,10 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo) aTailPoly=rCGeo.aTailPoly; } -SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrCaptionObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier, bAddText); - SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier); + SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), false, bBezier); SdrObject* pRet=(pTail!=NULL) ? pTail : pRect; if (pTail!=NULL && pRect!=NULL) { bool bInsRect = true; diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 21d47318ab62..cb39bb5dc865 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -808,7 +808,7 @@ void SdrCircObj::NbcMove(const Size& aSiz) MoveRect(aOutRect,aSiz); MoveRect(maSnapRect,aSiz); SetXPolyDirty(); - SetRectsDirty(sal_True); + SetRectsDirty(true); } void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) @@ -1144,7 +1144,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() } } -SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrCircObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True); const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink)); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 70a6c2d890fd..ce6d78bd9c5f 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -1018,7 +1018,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec if (aBewR1.Right()>aBewR2.Left()) { /* Cases 2.8, 2.9: Case 2.8: always going around on the outside - (bDirect=sal_False). + (bDirect=false). Case 2.9 could also be a direct connection (in the case that the BewareRects overlap only slightly and @@ -1079,7 +1079,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // overlap on y axis; cases 2.1, 2.8, 2.9 if (aBewR1.Bottom()>aBewR2.Top()) { /* Cases 2.8, 2.9 - Case 2.8 always going around on the outside (bDirect=sal_False). + Case 2.8 always going around on the outside (bDirect=false). Case 2.9 could also be a direct connection (in the case that the BewareRects overlap only slightly and @@ -1753,10 +1753,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const if (nPntAnz!=0) { if (nHdlNum==0) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY); - if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True); + if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(true); } else if (nHdlNum==1) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY); - if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True); + if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(true); } else { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) { @@ -2368,11 +2368,11 @@ void SdrEdgeObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear } } -SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrEdgeObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(pEdgeTrack->getB2DPolygon()); - SdrObject* pRet = ImpConvertMakeObj(aPolyPolygon, sal_False, bBezier); + SdrObject* pRet = ImpConvertMakeObj(aPolyPolygon, false, bBezier); if(bAddText) { @@ -2395,9 +2395,9 @@ Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const else return (*pEdgeTrack)[nAnz-1]; } -sal_Bool SdrEdgeObj::IsPolyObj() const +bool SdrEdgeObj::IsPolyObj() const { - return sal_False; + return false; } sal_uInt32 SdrEdgeObj::GetPointCount() const @@ -2477,7 +2477,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo) aEdgeInfo =rEGeo.aEdgeInfo; } -Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const +Point SdrEdgeObj::GetTailPoint( bool bTail ) const { if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0) { @@ -2502,7 +2502,7 @@ Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const } -void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt ) +void SdrEdgeObj::SetTailPoint( bool bTail, const Point& rPt ) { ImpSetTailPoint( bTail, rPt ); SetChanged(); @@ -2513,7 +2513,7 @@ void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt ) 0 <= nId <= 3 : One of the default points is chosen nId >= 4 : A user defined glue point is chosen */ -void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ ) +void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ ) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect(); @@ -2547,7 +2547,7 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ /** this method is used by the api to return a glue point id for a connection. See setGluePointId for possible return values */ -sal_Int32 SdrEdgeObj::getGluePointIndex( sal_Bool bTail ) +sal_Int32 SdrEdgeObj::getGluePointIndex( bool bTail ) { SdrObjConnection& rConn1 = GetConnection( bTail ); sal_Int32 nId = -1; @@ -2570,7 +2570,7 @@ void SdrEdgeObj::NbcSetAnchorPos(const Point& rPnt) ImpDirtyEdgeTrack(); } -sal_Bool SdrEdgeObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const +bool SdrEdgeObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const { // use base method from SdrObject, it's not rotatable and // a call to GetSnapRect() is used. That's what we need for Connector. diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 403e57d8c1da..89f700244168 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1062,7 +1062,7 @@ GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedSvg() const return aRetval; } -SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText ) const +SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const { SdrObject* pRetval = NULL; GraphicType aGraphicType(GetGraphicType()); diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 59255e269d05..603860b10040 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -766,7 +766,7 @@ void SdrObjGroup::ReformatText() pSub->ReformatAllTextObjects(); } -SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrObjGroup::DoConvertToPolyObj(bool bBezier, bool bAddText) const { SdrObject* pGroup = new SdrObjGroup; pGroup->SetModel(GetModel()); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index c4f2b1a9f4b0..0eace2ffb8dd 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -636,7 +636,7 @@ void SdrMeasureObj::UndirtyText() const rOutliner.Clear(); // cast to nonconst three times ((SdrMeasureObj*)this)->aTextSize=aSiz; - ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False; + ((SdrMeasureObj*)this)->bTextSizeDirty=false; ((SdrMeasureObj*)this)->bTextDirty=false; } } @@ -1111,9 +1111,9 @@ Point SdrMeasureObj::GetSnapPoint(sal_uInt32 i) const else return aPt2; } -sal_Bool SdrMeasureObj::IsPolyObj() const +bool SdrMeasureObj::IsPolyObj() const { - return sal_True; + return true; } sal_uInt32 SdrMeasureObj::GetPointCount() const @@ -1158,7 +1158,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo) SetTextDirty(); } -SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { // get XOR Poly as base XPolyPolygon aTmpPolyPolygon(TakeXorPoly()); @@ -1277,7 +1277,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) co } } -sal_Bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl) +bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl) { UndirtyText(); return SdrTextObj::BegTextEdit(rOutl); @@ -1383,7 +1383,7 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const // implemented since currently it is derived from SdrTextObj which uses // a functionality based on SnapRect which is not useful here -sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const +bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // handle the same as a simple line since the definition is based on two points const basegfx::B2DRange aRange(aPt1.X(), aPt1.Y(), aPt2.X(), aPt2.Y()); @@ -1427,7 +1427,7 @@ sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf // build return value matrix rMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix(aScale, aTranslate); - return sal_True; + return true; } void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& /*rPolyPolygon*/) diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index ccfafc397f74..b237dfc6cc8a 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -314,7 +314,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject() xPersist->storeOwn(); if ( xModifiable.is() ) - xModifiable->setModified( sal_True ); + xModifiable->setModified( true ); } @@ -547,7 +547,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl { // the calculation of the object area has not changed the object size // it should be done here then - //SfxBooleanFlagGuard aGuard( m_bResizeNoScale, sal_True ); + //SfxBooleanFlagGuard aGuard( m_bResizeNoScale, true ); // new size of the object area without scaling Size aNewObjSize( Fraction( aNewLogicRect.GetWidth() ) / m_aScaleWidth, @@ -614,7 +614,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), pObj(pObject) { - SetSynchron( sal_False ); + SetSynchron( false ); } @@ -899,9 +899,9 @@ void SdrOle2Obj::Connect() -sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() +bool SdrOle2Obj::UpdateLinkURL_Impl() { - sal_Bool bResult = sal_False; + bool bResult = false; if ( mpImpl->mpObjectLink ) { @@ -930,7 +930,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl() xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() ); mpImpl->maLinkURL = aNewLinkURL; - bResult = sal_True; + bResult = true; if ( nCurState != embed::EmbedStates::LOADED ) xObjRef->changeState( nCurState ); @@ -1132,7 +1132,7 @@ void SdrOle2Obj::Connect_Impl() pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER) { // Kein RefDevice oder RefDevice kein Printer - sal_Bool bModified = (*ppObjRef)->IsModified(); + bool bModified = (*ppObjRef)->IsModified(); Printer* pPrinter = (Printer*) pModel->GetRefDevice(); (*ppObjRef)->OnDocumentPrinterChanged( pPrinter ); (*ppObjRef)->SetModified( bModified ); @@ -1241,7 +1241,7 @@ void SdrOle2Obj::Disconnect_Impl() { try { - xClose->close( sal_True ); + xClose->close( true ); } catch ( util::CloseVetoException& ) { @@ -1353,7 +1353,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC } } -SdrObject* SdrOle2Obj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { // #i118485# missing converter added if(GetModel()) @@ -1915,21 +1915,21 @@ void SdrOle2Obj::NbcMove(const Size& rSize) -sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) +bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { - sal_Bool bResult = sal_False; + bool bResult = false; sal_Int32 nState = xObj->getCurrentState(); if ( nState == embed::EmbedStates::LOADED ) { // the object is already unloaded - bResult = sal_True; + bResult = true; } else { uno::Reference < util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY ); if ( !xModifiable.is() ) - bResult = sal_True; + bResult = true; else { sal_Int64 nMiscStatus = xObj->getStatus( nAspect ); @@ -1939,7 +1939,7 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded !( xModifiable.is() && xModifiable->isModified() ) && !( nState == embed::EmbedStates::INPLACE_ACTIVE || nState == embed::EmbedStates::UI_ACTIVE || nState == embed::EmbedStates::ACTIVE ) ) { - bResult = sal_True; + bResult = true; } } } @@ -1949,16 +1949,16 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded -sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) +bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ) { - sal_Bool bResult = sal_False; + bool bResult = false; if ( CanUnloadRunningObj( xObj, nAspect ) ) { try { xObj->changeState( embed::EmbedStates::LOADED ); - bResult = sal_True; + bResult = true; } catch( ::com::sun::star::uno::Exception& ) { @@ -1976,9 +1976,9 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb -sal_Bool SdrOle2Obj::Unload() +bool SdrOle2Obj::Unload() { - sal_Bool bUnloaded = sal_False; + bool bUnloaded = false; if( xObjRef.is() ) { @@ -1988,11 +1988,11 @@ sal_Bool SdrOle2Obj::Unload() //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount(); // prevent Unload if there are external references //if( nRefCount > 2 ) - // return sal_False; + // return false; //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" ); } else - bUnloaded = sal_True; + bUnloaded = true; if ( pModel && xObjRef.is() ) { @@ -2031,7 +2031,7 @@ void SdrOle2Obj::GetObjRef_Impl() if( !IsEmptyPresObj() ) { // remember modified status of model - const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False); + const bool bWasChanged = pModel && pModel->IsChanged(); // perhaps preview not valid anymore // This line changes the modified state of the model @@ -2059,9 +2059,9 @@ void SdrOle2Obj::GetObjRef_Impl() //TODO/LATER: printerchange notification /* // prevent SetModified (don't want no update here) - sal_Bool bWasEnabled = (*ppObjRef)->IsEnableSetModified(); + bool bWasEnabled = (*ppObjRef)->IsEnableSetModified(); if ( bWasEnabled ) - (*ppObjRef)->EnableSetModified( sal_False ); + (*ppObjRef)->EnableSetModified( false ); // Kein RefDevice oder RefDevice kein Printer Printer* pPrinter = (Printer*) pModel->GetRefDevice(); @@ -2107,7 +2107,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const -sal_Bool SdrOle2Obj::IsChart() const +bool SdrOle2Obj::IsChart() const { if ( !m_bTypeAsked ) { @@ -2130,7 +2130,7 @@ void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrS } -sal_Bool SdrOle2Obj::IsCalc() const +bool SdrOle2Obj::IsCalc() const { if ( !xObjRef.is() ) return false; @@ -2144,10 +2144,10 @@ sal_Bool SdrOle2Obj::IsCalc() const || SvGlobalName(SO3_SC_OLE_EMBED_CLASSID_8) == aObjClsId || SvGlobalName(SO3_SC_CLASSID) == aObjClsId ) { - return sal_True; + return true; } - return sal_False; + return false; } @@ -2160,12 +2160,12 @@ uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const } -sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ) +bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize ) { // TODO/LEAN: to avoid rounding errors scaling always uses the VisArea. // If we don't cache it for own objects also we must load the object here if ( !xObjRef.is() || !pModel ) - return sal_False; + return false; MapMode aMapMode( pModel->GetScaleUnit() ); aObjAreaSize = xObjRef.GetSize( &aMapMode ); @@ -2178,11 +2178,11 @@ sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScal Kuerzen(aScaleHeight, 10); Kuerzen(aScaleWidth, 10); - return sal_True; + return true; } -sal_Bool SdrOle2Obj::AddOwnLightClient() +bool SdrOle2Obj::AddOwnLightClient() { // The Own Light Client must be registered in object only using this method! if ( !SfxInPlaceClient::GetClient( dynamic_cast<SfxObjectShell*>(pModel->GetPersist()), xObjRef.GetObject() ) @@ -2200,17 +2200,17 @@ sal_Bool SdrOle2Obj::AddOwnLightClient() mpImpl->pLightClient->SetSizeScale( aScaleWidth, aScaleHeight ); try { xObjRef->setClientSite( mpImpl->pLightClient ); - return sal_True; + return true; } catch( uno::Exception& ) {} } } - return sal_False; + return false; } - return sal_True; + return true; } diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 43480971c0d0..537e6c472a23 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1824,7 +1824,7 @@ void SdrPathObj::ImpForceKind() } } -void SdrPathObj::ImpSetClosed(sal_Bool bClose) +void SdrPathObj::ImpSetClosed(bool bClose) { if(bClose) { @@ -2153,7 +2153,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const } pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum()); - pHdl->SetPlusHdl(sal_True); + pHdl->SetPlusHdl(true); } } } @@ -2488,9 +2488,9 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const return Point(FRound(aB2DPoint.getX()), FRound(aB2DPoint.getY())); } -sal_Bool SdrPathObj::IsPolyObj() const +bool SdrPathObj::IsPolyObj() const { - return sal_True; + return true; } sal_uInt32 SdrPathObj::GetPointCount() const @@ -2548,13 +2548,13 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum) } } -sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim) +sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim) { sal_uInt32 nNewHdl; if(bNewObj) { - nNewHdl = NbcInsPoint(0L, rPos, sal_True, bHideHim); + nNewHdl = NbcInsPoint(0L, rPos, true, bHideHim); } else { @@ -2573,14 +2573,14 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_B nPolyIndex += GetPathPoly().getB2DPolygon(a).count(); } - nNewHdl = NbcInsPoint(nPolyIndex, rPos, sal_False, bHideHim); + nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, bHideHim); } ImpForceKind(); return nNewHdl; } -sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, sal_Bool bNewObj, sal_Bool /*bHideHim*/) +sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bool bNewObj, bool /*bHideHim*/) { sal_uInt32 nNewHdl; @@ -2741,7 +2741,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) return pNewObj; } -SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrPathObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { // #i89784# check for FontWork with activated HideContour const drawinglayer::attribute::SdrTextAttribute aText( @@ -2841,7 +2841,7 @@ void SdrPathObj::ToggleClosed() } // for friend class SdrPolyEditView in some compilers: -void SdrPathObj::SetRectsDirty(sal_Bool bNotMyself) +void SdrPathObj::SetRectsDirty(bool bNotMyself) { SdrTextObj::SetRectsDirty(bNotMyself); } @@ -2875,7 +2875,7 @@ void SdrPathObj::impDeleteDAC() const // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. -sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const +bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const { double fRotate(0.0); double fShearX(0.0); @@ -3001,7 +3001,7 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate, aTranslate); - return sal_True; + return true; } // Sets the base geometry of the object using infos contained in the homogeneous 3x3 matrix. diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 09ff4b176cb5..54d4ea3643e5 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -579,7 +579,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const return aGP; } -SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrRectObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius())); { // TODO: this is only for the moment, until we have the new TakeContour() @@ -596,7 +596,7 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const // when used with bAddText==false from other converters if((bAddText && !IsTextFrame()) || HasFill() || HasLine()) { - pRet = ImpConvertMakeObj(aPolyPolygon, sal_True, bBezier); + pRet = ImpConvertMakeObj(aPolyPolygon, true, bBezier); } if(bAddText) diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 61779a33237a..07e4e9d9f3da 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -91,21 +91,21 @@ SdrTextObj::SdrTextObj() pFormTextBoundRect(NULL), eTextKind(OBJ_TEXT) { - bTextSizeDirty=sal_False; - bTextFrame=sal_False; - bNoShear=sal_False; - bNoRotate=sal_False; - bNoMirror=sal_False; - bDisableAutoWidthOnDragging=sal_False; - - mbInEditMode = sal_False; - mbTextHidden = sal_False; - mbTextAnimationAllowed = sal_True; + bTextSizeDirty=false; + bTextFrame=false; + bNoShear=false; + bNoRotate=false; + bNoMirror=false; + bDisableAutoWidthOnDragging=false; + + mbInEditMode = false; + mbTextHidden = false; + mbTextAnimationAllowed = true; maTextEditOffset = Point(0, 0); // #i25616# mbSupportTextIndentingOnLineWidthChange = true; - mbInDownScale = sal_False; + mbInDownScale = false; } SdrTextObj::SdrTextObj(const Rectangle& rNewRect) @@ -116,18 +116,18 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect) pFormTextBoundRect(NULL), eTextKind(OBJ_TEXT) { - bTextSizeDirty=sal_False; - bTextFrame=sal_False; - bNoShear=sal_False; - bNoRotate=sal_False; - bNoMirror=sal_False; - bDisableAutoWidthOnDragging=sal_False; + bTextSizeDirty=false; + bTextFrame=false; + bNoShear=false; + bNoRotate=false; + bNoMirror=false; + bDisableAutoWidthOnDragging=false; ImpJustifyRect(aRect); - mbInEditMode = sal_False; - mbTextHidden = sal_False; - mbTextAnimationAllowed = sal_True; - mbInDownScale = sal_False; + mbInEditMode = false; + mbTextHidden = false; + mbTextAnimationAllowed = true; + mbInDownScale = false; maTextEditOffset = Point(0, 0); // #i25616# @@ -141,17 +141,17 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=sal_False; - bTextFrame=sal_True; - bNoShear=sal_True; - bNoRotate=sal_False; - bNoMirror=sal_True; - bDisableAutoWidthOnDragging=sal_False; - - mbInEditMode = sal_False; - mbTextHidden = sal_False; - mbTextAnimationAllowed = sal_True; - mbInDownScale = sal_False; + bTextSizeDirty=false; + bTextFrame=true; + bNoShear=true; + bNoRotate=false; + bNoMirror=true; + bDisableAutoWidthOnDragging=false; + + mbInEditMode = false; + mbTextHidden = false; + mbTextAnimationAllowed = true; + mbInDownScale = false; maTextEditOffset = Point(0, 0); // #i25616# @@ -166,18 +166,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=sal_False; - bTextFrame=sal_True; - bNoShear=sal_True; - bNoRotate=sal_False; - bNoMirror=sal_True; - bDisableAutoWidthOnDragging=sal_False; + bTextSizeDirty=false; + bTextFrame=true; + bNoShear=true; + bNoRotate=false; + bNoMirror=true; + bDisableAutoWidthOnDragging=false; ImpJustifyRect(aRect); - mbInEditMode = sal_False; - mbTextHidden = sal_False; - mbTextAnimationAllowed = sal_True; - mbInDownScale = sal_False; + mbInEditMode = false; + mbTextHidden = false; + mbTextAnimationAllowed = true; + mbInDownScale = false; maTextEditOffset = Point(0, 0); // #i25616# @@ -237,7 +237,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr) rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=sal_False; + bTextSizeDirty=false; } void SdrTextObj::SetText(const OUString& rStr) @@ -260,7 +260,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=sal_False; + bTextSizeDirty=false; } void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat) @@ -288,7 +288,7 @@ const Size& SdrTextObj::GetTextSize() const } // casting to nonconst twice ((SdrTextObj*)this)->aTextSize=aSiz; - ((SdrTextObj*)this)->bTextSizeDirty=sal_False; + ((SdrTextObj*)this)->bTextSizeDirty=false; } return aTextSize; } @@ -299,7 +299,7 @@ bool SdrTextObj::IsAutoGrowHeight() const return false; // AutoGrow only together with TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if(bRet) { @@ -311,7 +311,7 @@ bool SdrTextObj::IsAutoGrowHeight() const if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN) { - bRet = sal_False; + bRet = false; } } } @@ -324,9 +324,9 @@ bool SdrTextObj::IsAutoGrowWidth() const return false; // AutoGrow only together with TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); - sal_Bool bInEditMOde = IsInEditMode(); + bool bInEditMOde = IsInEditMode(); if(!bInEditMOde && bRet) { @@ -338,7 +338,7 @@ bool SdrTextObj::IsAutoGrowWidth() const if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT) { - bRet = sal_False; + bRet = false; } } } @@ -357,7 +357,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); - sal_Bool bInEditMode = IsInEditMode(); + bool bInEditMode = IsInEditMode(); if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK) { @@ -389,7 +389,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons // Take care for vertical text animation here SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); - sal_Bool bInEditMode = IsInEditMode(); + bool bInEditMode = IsInEditMode(); // Take care for vertical text animation here if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK) @@ -552,7 +552,7 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) // bDisableAutoHeightOnDragging if vertical. if(IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = sal_False; + bDisableAutoWidthOnDragging = false; SetObjectItem(SdrTextAutoGrowHeightItem(false)); } @@ -571,7 +571,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) // when not vertical. if(!IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = sal_False; + bDisableAutoWidthOnDragging = false; SetObjectItem(SdrTextAutoGrowWidthItem(false)); } @@ -580,7 +580,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) return false; } -void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const +void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L; @@ -603,7 +603,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho // test if shadow needs to be avoided for TakeContour() const SfxItemSet& rSet = GetObjectItemSet(); - sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); + bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue(); // #i33696# // Remember TextObject currently set at the DrawOutliner, it WILL be @@ -710,7 +710,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo long nWdt=nAnkWdt; long nHgt=nAnkHgt; - sal_Bool bInEditMode = IsInEditMode(); + bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) { @@ -1387,7 +1387,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec if (!IsTextFrame()) { // the SnapRect keeps its size - SetRectsDirty(sal_True); + SetRectsDirty(true); } // always invalidate BoundRect on change @@ -1412,7 +1412,7 @@ void SdrTextObj::NbcReformatText() { // the SnapRect keeps its size SetBoundRectDirty(); - SetRectsDirty(sal_True); + SetRectsDirty(true); } SetTextSizeDirty(); ActionChanged(); @@ -1485,7 +1485,7 @@ void SdrTextObj::ForceOutlinerParaObject() } } -sal_Bool SdrTextObj::IsVerticalWriting() const +bool SdrTextObj::IsVerticalWriting() const { if(pEdtOutl) { @@ -1498,10 +1498,10 @@ sal_Bool SdrTextObj::IsVerticalWriting() const return pOutlinerParaObject->IsVertical(); } - return sal_False; + return false; } -void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) +void SdrTextObj::SetVerticalWriting(bool bVertical) { OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); if( !pOutlinerParaObject && bVertical ) @@ -1516,8 +1516,8 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) { // get item settings const SfxItemSet& rSet = GetObjectItemSet(); - sal_Bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue(); - sal_Bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue(); + bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue(); + bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue(); // Also exchange hor/ver adjust items SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); @@ -1578,7 +1578,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical) // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. -sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const +bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const { // get turn and shear double fRotate = (aGeo.nDrehWink / 100.0) * F_PI180; @@ -1632,7 +1632,7 @@ sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:: basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate, aTranslate); - return sal_False; + return false; } // sets the base geometry of the object using infos contained in the homogeneous 3x3 matrix. @@ -1879,7 +1879,7 @@ bool SdrTextObj::IsFitToSize() const return (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); } -void SdrTextObj::SetTextAnimationAllowed(sal_Bool bNew) +void SdrTextObj::SetTextAnimationAllowed(bool bNew) { if(mbTextAnimationAllowed != bNew) { @@ -1903,13 +1903,13 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) else if (IsAutoFit() && !mbInDownScale) { OSL_ASSERT(pEdtOutl); - mbInDownScale = sal_True; + mbInDownScale = true; // sucks that we cannot disable paints via // pEdtOutl->SetUpdateMode(FALSE) - but EditEngine skips // formatting as well, then. ImpAutoFitText(*pEdtOutl); - mbInDownScale = sal_False; + mbInDownScale = false; } } } @@ -1965,20 +1965,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // The concept of the text object: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attributes/Variations: -// - sal_Bool text frame / graphics object with caption -// - sal_Bool FontWork (if it is not a text frame and not a ContourTextFrame) -// - sal_Bool ContourTextFrame (if it is not a text frame and not Fontwork) +// - bool text frame / graphics object with caption +// - bool FontWork (if it is not a text frame and not a ContourTextFrame) +// - bool ContourTextFrame (if it is not a text frame and not Fontwork) // - long rotation angle (if it is not FontWork) // - long text frame margins (if it is not FontWork) -// - sal_Bool FitToSize (if it is not FontWork) -// - sal_Bool AutoGrowingWidth/Height (if it is not FitToSize and not FontWork) +// - bool FitToSize (if it is not FontWork) +// - bool AutoGrowingWidth/Height (if it is not FitToSize and not FontWork) // - long Min/MaxFrameWidth/Height (if AutoGrowingWidth/Height) // - enum horizontal text anchoring left,center,right,justify/block,Stretch(ni) // - enum vertical text anchoring top, middle, bottom, block, stretch(ni) // - enum ticker text (if it is not FontWork) -// Every derived object is either a text frame (bTextFrame=sal_True) -// or a drawing object with a caption (bTextFrame=sal_False). +// Every derived object is either a text frame (bTextFrame=true) +// or a drawing object with a caption (bTextFrame=false). // Default anchoring for text frames: // SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP @@ -2007,8 +2007,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // ContourTextFrame: // - long rotation angle // - long text frame margins (maybe later) -// - sal_Bool FitToSize (maybe later) -// - sal_Bool AutoGrowingWidth/Height (maybe much later) +// - bool FitToSize (maybe later) +// - bool AutoGrowingWidth/Height (maybe much later) // - long Min/MaxFrameWidth/Height (maybe much later) // - enum horizontal text anchoring (maybe later, for now: left, centered) // - enum vertical text anchoring (maybe later, for now: top) diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 56c43ea014aa..9ab93331df46 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -80,7 +80,7 @@ namespace ::com::sun::star::lang::Locale maLocale; // bitfield - unsigned mbRTL : 1; + bool mbRTL : 1; public: impPathTextPortion(DrawPortionInfo& rInfo) diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index eb5d9d8dd51c..0d9c70d87dff 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -35,12 +35,12 @@ bool SdrTextObj::HasTextEdit() const return true; } -sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) +bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) { - if (pEdtOutl!=NULL) return sal_False; // Textedit might already run in another View! + if (pEdtOutl!=NULL) return false; // Textedit might already run in another View! pEdtOutl=&rOutl; - mbInEditMode = sal_True; + mbInEditMode = true; sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) @@ -115,7 +115,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) rOutl.UpdateFields(); rOutl.ClearModifyFlag(); - return sal_True; + return true; } void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const @@ -264,7 +264,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) // need to end edit mode early since SetOutlinerParaObject already // uses GetCurrentBoundRect() which needs to take the text into account // to work correct - mbInEditMode = sal_False; + mbInEditMode = false; SetOutlinerParaObject(pNewText); } @@ -274,7 +274,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); - mbInEditMode = sal_False; + mbInEditMode = false; } sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const @@ -327,7 +327,7 @@ void SdrTextObj::ImpSetTextEditParams() const if (bContourFrame) { Rectangle aAnchorRect; TakeTextAnchorRect(aAnchorRect); - ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True); + ImpSetContourPolygon(*pEdtOutl,aAnchorRect, true); } if (bUpdMerk) pEdtOutl->SetUpdateMode(true); } diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 5da632bcce9f..409af9f24c07 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -106,7 +106,7 @@ void SdrTextObj::NbcMove(const Size& rSiz) MoveRect(aRect,rSiz); MoveRect(aOutRect,rSiz); MoveRect(maSnapRect,rSiz); - SetRectsDirty(sal_True); + SetRectsDirty(true); } void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) @@ -420,7 +420,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const -SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const +SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { if(bAddText) { @@ -435,7 +435,7 @@ bool SdrTextObj::ImpCanConvTextToCurve() const return !IsOutlText(); } -SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr) const +SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr) const { SdrObjKind ePathKind = bClosed ? OBJ_PATHFILL : OBJ_PATHLINE; basegfx::B2DPolyPolygon aB2DPolyPolygon(rPolyPolygon); @@ -471,7 +471,7 @@ SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPol pPathObj->ClearMergedItem(); pPathObj->SetMergedItemSet(GetObjectItemSet()); pPathObj->GetProperties().BroadcastItemChange(aC); - pPathObj->NbcSetStyleSheet(GetStyleSheet(), sal_True); + pPathObj->NbcSetStyleSheet(GetStyleSheet(), true); } } } diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 66866e59dec8..dc1466d05419 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -154,7 +154,7 @@ namespace TYPEINIT1(SdrUnoObj, SdrRectObj); -SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel) +SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { @@ -169,7 +169,7 @@ SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel) SdrUnoObj::SdrUnoObj(const OUString& rModelName, const uno::Reference< lang::XMultiServiceFactory >& rxSFac, - sal_Bool _bOwnUnoControlModel) + bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 3f383ae4c153..22c6b38535fc 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -532,7 +532,7 @@ Point SdrVirtObj::GetSnapPoint(sal_uInt32 i) const return aP; } -sal_Bool SdrVirtObj::IsPolyObj() const +bool SdrVirtObj::IsPolyObj() const { return rRefObj.IsPolyObj(); } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 19511a45ed93..b6ab6401421e 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -152,11 +152,11 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView) aPgOrg.X()=mpPage->GetLftBorder(); aPgOrg.Y()=mpPage->GetUppBorder(); } - mbHasMarked = sal_False; + mbHasMarked = false; aLayerVisi.SetAll(); aLayerPrn.SetAll(); - mbVisible = sal_False; + mbVisible = false; pAktList = NULL; pAktGroup = NULL; SetAktGroupAndList(NULL, mpPage); @@ -221,7 +221,7 @@ void SdrPageView::ModelHasChanged() if (GetAktGroup()!=NULL) CheckAktGroup(); } -sal_Bool SdrPageView::IsReadOnly() const +bool SdrPageView::IsReadOnly() const { return (0L == GetPage() || GetView().GetModel()->IsReadOnly() || GetPage()->IsReadOnly() || GetObjList()->IsReadOnly()); } @@ -230,7 +230,7 @@ void SdrPageView::Show() { if(!IsVisible()) { - mbVisible = sal_True; + mbVisible = true; InvalidateAllWin(); for(sal_uInt32 a(0L); a < GetView().PaintWindowCount(); a++) @@ -245,7 +245,7 @@ void SdrPageView::Hide() if(IsVisible()) { InvalidateAllWin(); - mbVisible = sal_False; + mbVisible = false; ClearPageWindows(); } } @@ -649,20 +649,20 @@ bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const return bRet; } -sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const +bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { if(pObj) { // excluded from selection? if(pObj->IsMarkProtect()) { - return sal_False; + return false; } // only visible are selectable if( !pObj->IsVisible() ) { - return sal_False; + return false; } if(pObj->ISA(SdrObjGroup)) @@ -673,7 +673,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const if(pObjList && pObjList->GetObjCount()) { - sal_Bool bGroupIsMarkable(sal_False); + bool bGroupIsMarkable(false); for(sal_uInt32 a(0L); !bGroupIsMarkable && a < pObjList->GetObjCount(); a++) { @@ -682,7 +682,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const // call recursively if(IsObjMarkable(pCandidate)) { - bGroupIsMarkable = sal_True; + bGroupIsMarkable = true; } } @@ -692,7 +692,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { // #i43302# // Allow empty groups to be selected to be able to delete them - return sal_True; + return true; } } else @@ -703,7 +703,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const } } - return sal_False; + return false; } void SdrPageView::SetPageOrigin(const Point& rOrg) @@ -793,13 +793,13 @@ void SdrPageView::SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList) } } -sal_Bool SdrPageView::EnterGroup(SdrObject* pObj) +bool SdrPageView::EnterGroup(SdrObject* pObj) { - sal_Bool bRet(sal_False); + bool bRet(false); if(pObj && pObj->IsGroupObject()) { - sal_Bool bGlueInvalidate(GetView().ImpIsGlueVisible()); + bool bGlueInvalidate(GetView().ImpIsGlueVisible()); if(bGlueInvalidate) { @@ -839,7 +839,7 @@ sal_Bool SdrPageView::EnterGroup(SdrObject* pObj) GetView().GlueInvalidate(); } - bRet = sal_True; + bRet = true; } return bRet; @@ -849,7 +849,7 @@ void SdrPageView::LeaveOneGroup() { if(GetAktGroup()) { - sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); + bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); @@ -887,7 +887,7 @@ void SdrPageView::LeaveAllGroup() { if(GetAktGroup()) { - sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); + bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 8ed86f255c5f..892f49025ad2 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -201,7 +201,7 @@ void SdrPaintView::ImpClearVars() aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl)); if (pMod) - SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True); + SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), true); maGridColor = Color( COL_BLACK ); } @@ -344,7 +344,7 @@ void SdrPaintView::ModelHasChanged() -sal_Bool SdrPaintView::IsAction() const +bool SdrPaintView::IsAction() const { return false; } @@ -370,7 +370,7 @@ void SdrPaintView::TakeActionRect(Rectangle&) const } -// info about TextEdit. Default is sal_False. +// info about TextEdit. Default is false. bool SdrPaintView::IsTextEdit() const { return false; @@ -526,7 +526,7 @@ bool SdrPaintView::IsLayerVisible(const OUString& rName) const return false; } -void SdrPaintView::SetLayerLocked(const OUString& rName, sal_Bool bLock) +void SdrPaintView::SetLayerLocked(const OUString& rName, bool bLock) { if(mpPageView) { @@ -544,7 +544,7 @@ bool SdrPaintView::IsLayerLocked(const OUString& rName) const return false; } -void SdrPaintView::SetLayerPrintable(const OUString& rName, sal_Bool bPrn) +void SdrPaintView::SetLayerPrintable(const OUString& rName, bool bPrn) { if(mpPageView) { @@ -927,7 +927,7 @@ void SdrPaintView::InvalidateAllWin() } } -void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) +void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix) { const sal_uInt32 nWindowCount(PaintWindowCount()); @@ -1000,7 +1000,7 @@ bool SdrPaintView::IsGroupEntered() const return false; } -void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) +void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bReplaceAll*/) { // bReplaceAll has no effect here at all. bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); @@ -1019,7 +1019,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /* } } -void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const +void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr has no effect here at all. bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); @@ -1031,7 +1031,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnl } } -void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll) +void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll) { #ifdef DBG_UTIL { @@ -1061,7 +1061,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll) #endif } -void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { if (pDefaultStyleSheet) EndListening(*pDefaultStyleSheet); @@ -1084,7 +1084,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDo #endif } -sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const +bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { if(bOnlyHardAttr || !pDefaultStyleSheet) { @@ -1097,13 +1097,13 @@ sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardA rTargetSet.Put(aDefaultAttr, false); } MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr); - return sal_True; + return true; } -sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) +bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) { SetDefaultAttr(rSet,bReplaceAll); - return sal_True; + return true; } SfxStyleSheet* SdrPaintView::GetStyleSheet() const @@ -1111,16 +1111,16 @@ SfxStyleSheet* SdrPaintView::GetStyleSheet() const return GetDefaultStyleSheet(); } -sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) +bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return sal_True; + return true; } #ifdef DBG_UTIL -void SdrPaintView::ShowItemBrowser(sal_Bool bShow) +void SdrPaintView::ShowItemBrowser(bool bShow) { if (bShow) { if (pItemBrowser==NULL) { @@ -1192,7 +1192,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/) { } -void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable ) +void SdrPaintView::SetAnimationEnabled( bool bEnable ) { SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE ); } @@ -1318,7 +1318,7 @@ void SdrPaintView::SetBufferedOverlayAllowed(bool bNew) } } -sal_Bool SdrPaintView::IsPagePaintingAllowed() const +bool SdrPaintView::IsPagePaintingAllowed() const { return mbPagePaintingAllowed; } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index f9b0a5b41c69..50f9f50b5466 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -41,8 +41,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE; - bSetMarkedPointsSmoothPossible=sal_False; - bSetMarkedSegmentsKindPossible=sal_False; + bSetMarkedPointsSmoothPossible=false; + bSetMarkedSegmentsKindPossible=false; } void SdrPolyEditView::ImpClearVars() @@ -385,7 +385,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints() pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj)); - MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True); + MarkObj(pNeuObj, pM->GetPageView(), false, true); } if(nNewPt0Idx) diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 4f1238a027ce..823e2193d332 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -222,7 +222,7 @@ SdrSnapView::~SdrSnapView() -sal_Bool SdrSnapView::IsAction() const +bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); } @@ -424,7 +424,7 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const dy = 0; } } - sal_Bool bRet=SDRSNAP_NOTSNAPPED; + sal_uInt16 bRet=SDRSNAP_NOTSNAPPED; if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED; if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED; rPnt.X()=x+dx; @@ -461,7 +461,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes -sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt) +bool SdrSnapView::BegSetPageOrg(const Point& rPnt) { BrkAction(); @@ -470,7 +470,7 @@ sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt) mpPageOriginOverlay = new ImplPageOriginOverlay(*this, aStartPos); aDragStat.Reset(GetSnapPos(rPnt,NULL)); - return sal_True; + return true; } void SdrSnapView::MovSetPageOrg(const Point& rPnt) @@ -484,9 +484,9 @@ void SdrSnapView::MovSetPageOrg(const Point& rPnt) } } -sal_Bool SdrSnapView::EndSetPageOrg() +bool SdrSnapView::EndSetPageOrg() { - sal_Bool bRet(sal_False); + bool bRet(false); if(IsSetPageOrg()) { @@ -496,7 +496,7 @@ sal_Bool SdrSnapView::EndSetPageOrg() { Point aPnt(aDragStat.GetNow()); pPV->SetPageOrigin(aPnt); - bRet = sal_True; + bRet = true; } // cleanup @@ -518,7 +518,7 @@ void SdrSnapView::BrkSetPageOrg() -sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const +bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=NULL; nTol=ImpGetHitTolLogic(nTol,&rOut); @@ -531,16 +531,16 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe if (nIndex!=SDRHELPLINE_NOTFOUND) { rpPV=pPV; rnHelpLineNum=nIndex; - return sal_True; + return true; } } - return sal_False; + return false; } // start HelpLine drag for new HelpLine -sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) +bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) { - sal_Bool bRet(sal_False); + bool bRet(false); if(!bHlplFixed) { @@ -559,7 +559,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) aDragStat.Reset(GetSnapPos(aHelpLinePos, pPV)); aDragStat.SetMinMove(ImpGetMinMovLogic(-3, 0L)); - bRet = sal_True; + bRet = true; } } @@ -567,9 +567,9 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) } // start HelpLine drag with existing HelpLine -sal_Bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind) +bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind) { - sal_Bool bRet(sal_False); + bool bRet(false); BrkAction(); @@ -579,7 +579,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKin basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, 0L, 0, eNewKind); aDragStat.Reset(GetSnapPos(rPnt, 0L)); - bRet = sal_True; + bRet = true; } return bRet; @@ -616,9 +616,9 @@ void SdrSnapView::MovDragHelpLine(const Point& rPnt) } } -sal_Bool SdrSnapView::EndDragHelpLine() +bool SdrSnapView::EndDragHelpLine() { - sal_Bool bRet(sal_False); + bool bRet(false); if(IsDragHelpLine()) { @@ -635,7 +635,7 @@ sal_Bool SdrSnapView::EndDragHelpLine() aChangedHelpLine.SetPos(aPnt); pPageView->SetHelpLine(mpHelpLineOverlay->GetHelpLineNumber(), aChangedHelpLine); - bRet = sal_True; + bRet = true; } else { @@ -648,7 +648,7 @@ sal_Bool SdrSnapView::EndDragHelpLine() SdrHelpLine aNewHelpLine(mpHelpLineOverlay->GetHelpLineKind(), aPnt); pPageView->InsertHelpLine(aNewHelpLine); - bRet = sal_True; + bRet = true; } } } diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 940e83ec5aec..8e010d143e87 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -50,7 +50,7 @@ static void ImplUnmarkObject( SdrObject* pObj ) SdrViewIter aIter( pObj ); for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() ) { - pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True ); + pView->MarkObj( pObj, pView->GetSdrPageView(), true ); } } @@ -150,12 +150,12 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const { case SDRREPFUNC_OBJ_NONE : return false; case SDRREPFUNC_OBJ_DELETE : return rView.AreObjectsMarked(); - case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(sal_False); - case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(sal_True); - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(sal_False); - case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(sal_True); - case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(sal_False); - case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(sal_False); + case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(false); + case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(true); + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(false); + case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(true); + case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(false); + case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(false); case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible(); case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible(); case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible(); @@ -175,12 +175,12 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView) { case SDRREPFUNC_OBJ_NONE : break; case SDRREPFUNC_OBJ_DELETE : rView.DeleteMarked(); break; - case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(sal_False); break; - case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(sal_True); break; - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(sal_False); break; - case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(sal_True); break; - case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(sal_False); break; - case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(sal_False); break; + case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(false); break; + case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(true); break; + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(false); break; + case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(true); break; + case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(false); break; + case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(false); break; case SDRREPFUNC_OBJ_GROUP : rView.GroupMarked(); break; case SDRREPFUNC_OBJ_UNGROUP : rView.UnGroupMarked(); break; case SDRREPFUNC_OBJ_PUTTOTOP : rView.PutMarkedToTop(); break; @@ -527,7 +527,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView) { if(pRepeatSet) { - rView.SetAttrToMarked(*pRepeatSet, sal_False); + rView.SetAttrToMarked(*pRepeatSet, false); } } @@ -1164,7 +1164,7 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) , pOldText(NULL) , pNewText(NULL) , bNewTextAvailable(false) - , bEmptyPresObj(sal_False) + , bEmptyPresObj(false) , mnText(nText) { SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText); @@ -1739,7 +1739,7 @@ OUString SdrUndoPageRemoveMasterPage::GetComment() const SdrUndoPageChangeMasterPage::SdrUndoPageChangeMasterPage(SdrPage& rChangedPage) : SdrUndoPageMasterPage(rChangedPage), - mbNewHadMasterPage(sal_False) + mbNewHadMasterPage(false) { } @@ -1748,7 +1748,7 @@ void SdrUndoPageChangeMasterPage::Undo() // remember values from new page if(mrPage.TRG_HasMasterPage()) { - mbNewHadMasterPage = sal_True; + mbNewHadMasterPage = true; maNewSet = mrPage.TRG_GetMasterPageVisibleLayers(); maNewMasterPageNumber = mrPage.TRG_GetMasterPage().GetPageNum(); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index a7e73b1ada11..9b5fa6f2c989 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -180,7 +180,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) SetActualWin(pWin); sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin); if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) { - bRet=sal_True; + bRet=true; switch (rKEvt.GetKeyCode().GetFullFunction()) { case KEYFUNC_CUT : Cut(); break; case KEYFUNC_COPY : Yank(); break; @@ -204,7 +204,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break; case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break; case KEY_MOD1+KEY_A: MarkAll(); break; - default: bRet=sal_False; + default: bRet=false; } // switch } } // switch @@ -266,7 +266,7 @@ sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) return bRet; } -sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const +bool SdrView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const { return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr); } @@ -328,17 +328,17 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // #i73628# Use a non-changeable copy of he logic position const Point aLocalLogicPosition(rLogicPos); - sal_Bool bEditMode=IsEditMode(); + bool bEditMode=IsEditMode(); bool bPointMode=bEditMode && HasMarkablePoints(); - sal_Bool bGluePointMode=IsGluePointEditMode(); + bool bGluePointMode=IsGluePointEditMode(); bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible(); bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible(); - sal_Bool bIsTextEdit=IsTextEdit(); - sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); - sal_Bool bTextEditSel=IsTextEditInSelectionMode(); - sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + bool bIsTextEdit=IsTextEdit(); + bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); + bool bTextEditSel=IsTextEditInSelectionMode(); + bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; SdrHitKind eHit=SDRHIT_NONE; SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL; SdrPageView* pPV=NULL; @@ -350,7 +350,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (bTextEditHit || bTextEditSel) { eHit=SDRHIT_TEXTEDIT; - bTextEditHit=sal_True; + bTextEditHit=true; } else if (pHdl!=NULL) { @@ -412,8 +412,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT) { bool bRoot=pObj->HasMacro(); - sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro(); - sal_Bool bMid=sal_False; // Have we hit upon a grouped group with a macro? + bool bDeep=pObj!=pHitObj && pHitObj->HasMacro(); + bool bMid=false; // Have we hit upon a grouped group with a macro? SdrObject* pMidObj=NULL; if (pObj!=pHitObj) { @@ -424,7 +424,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co { if (pObjTmp->HasMacro()) { - bMid=sal_True; + bMid=true; pMidObj=pObjTmp; } pObjTmp=pObjTmp->GetUpGroup(); @@ -518,7 +518,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co } sal_Int32 nTolerance(nHitTolLog); - sal_Bool bBoundRectHit(sal_False); + bool bBoundRectHit(false); if(pOut) { @@ -530,7 +530,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co || (aLocalLogicPosition.Y() >= aBoundRect.Top() - nTolerance && aLocalLogicPosition.Y() <= aBoundRect.Top() + nTolerance) || (aLocalLogicPosition.Y() >= aBoundRect.Bottom() - nTolerance && aLocalLogicPosition.Y() <= aBoundRect.Bottom() + nTolerance)) { - bBoundRectHit = sal_True; + bBoundRectHit = true; } if(!bBoundRectHit) @@ -557,12 +557,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co pObj=NULL; pPV=NULL; } - sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; - sal_Bool bMouseDown=rVEvt.bMouseDown; - sal_Bool bMouseUp=rVEvt.bMouseUp; + bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; + bool bMouseDown=rVEvt.bMouseDown; + bool bMouseUp=rVEvt.bMouseUp; SdrEventKind eEvent=SDREVENT_NONE; - sal_Bool bIsAction=IsAction(); + bool bIsAction=IsAction(); if (bIsAction) { @@ -631,9 +631,9 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co else if (eHit==SDRHIT_HANDLE) { eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark - sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE; - sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl); - sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected()); + bool bGlue=pHdl->GetKind()==HDL_GLUE; + bool bPoly=!bGlue && IsPointMarkable(*pHdl); + bool bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; @@ -751,18 +751,18 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co return eHit; } -sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) +bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) { - sal_Bool bRet=sal_False; + bool bRet=false; SdrHitKind eHit=rVEvt.eHit; Point aLogicPos(rVEvt.aLogicPos); - sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; - sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - sal_Bool bMouseDown=rVEvt.bMouseDown; - sal_Bool bMouseUp=rVEvt.bMouseUp; + bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + bool bMouseDown=rVEvt.bMouseDown; + bool bMouseUp=rVEvt.bMouseUp; if (bMouseDown) { if (bMouseLeft) aDragStat.SetMouseDown(true); } else if (bMouseUp) { @@ -794,13 +794,13 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // pHdl==NULL (because of eHit). } switch (rVEvt.eEvent) { - case SDREVENT_NONE: bRet=sal_False; break; - case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events handled by the OutlinerView are not taken into account here. - case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break; - case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break; - case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break; - case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break; - case SDREVENT_ENDMARK : EndAction(); bRet=sal_True; break; + case SDREVENT_NONE: bRet=false; break; + case SDREVENT_TEXTEDIT: bRet=false; break; // Events handled by the OutlinerView are not taken into account here. + case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=true; break; + case SDREVENT_ENDACTION: EndAction(); bRet=true; break; + case SDREVENT_BCKACTION: BckAction(); bRet=true; break; + case SDREVENT_BRKACTION: BrkAction(); bRet=true; break; + case SDREVENT_ENDMARK : EndAction(); bRet=true; break; case SDREVENT_BRKMARK : { BrkAction(); if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) { @@ -810,7 +810,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // 3. deselect any selected objects if (!rVEvt.bAddMark) UnmarkAll(); } - bRet=sal_True; + bRet=true; } break; case SDREVENT_ENDCREATE: { // if necessary, MarkObj SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT; @@ -822,7 +822,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (eHit==SDRHIT_TEXTEDIT) { bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L)); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L)); if(bRet2) { @@ -836,9 +836,9 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } } } - bRet=sal_True; // object is selected and (if necessary) TextEdit is started - } else bRet=sal_False; // canceled Create, nothing else - } else bRet=sal_True; // return sal_True for EndCreate + bRet=true; // object is selected and (if necessary) TextEdit is started + } else bRet=false; // canceled Create, nothing else + } else bRet=true; // return true for EndCreate } break; case SDREVENT_ENDDRAG: { bRet=EndDragObj(IsDragWithCopy()); @@ -846,7 +846,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } break; case SDREVENT_MARKOBJ: { // + (if applicable) BegDrag if (!rVEvt.bAddMark) UnmarkAllObj(); - sal_Bool bUnmark=rVEvt.bUnmark; + bool bUnmark=rVEvt.bUnmark; if (rVEvt.bPrevNextMark) { bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev); } else { @@ -859,7 +859,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } if (!bUnmark) { BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog); - bRet=sal_True; + bRet=true; } } break; case SDREVENT_MARKPOINT: { // + (if applicable) BegDrag @@ -871,7 +871,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog); - bRet=sal_True; + bRet=true; } } break; case SDREVENT_MARKGLUEPOINT: { // + (if applicable) BegDrag @@ -884,7 +884,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId); BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog); - bRet=sal_True; + bRet=true; } } break; case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break; @@ -894,7 +894,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT; if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND; EndInsObjPoint(eCmd); - bRet=sal_True; + bRet=true; } break; case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break; case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break; @@ -913,7 +913,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } bRet = pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType()&& - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L); if(bRet) { @@ -932,10 +932,10 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // left mouse button released? bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; // left mouse button pressed or held? - sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; + bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; pWin->SetPointer(GetPreferredPointer(rVEvt.aLogicPos,pWin, rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1)); - sal_Bool bAction=IsAction(); + bool bAction=IsAction(); if (bLeftDown && bAction) pWin->CaptureMouse(); else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse(); } @@ -943,7 +943,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } #include <editeng/outlobj.hxx> -Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const +Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, bool bLeftDown) const { // Actions if (IsCreateObj()) @@ -1068,7 +1068,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* } switch (eDragMode) { case SDRDRAG_ROTATE: { - if ((bCorner || bMov) && !IsRotateAllowed(sal_True)) + if ((bCorner || bMov) && !IsRotateAllowed(true)) return Pointer(POINTER_NOTALLOWED); // are 3D objects selected? @@ -1087,7 +1087,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* } break; case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: { if (bCorner) { - if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); + if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return Pointer(POINTER_NOTALLOWED); else return Pointer(POINTER_REFHAND); } if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED); @@ -1109,9 +1109,9 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* b45=b90 || (std::abs(aDif.X())==std::abs(aDif.Y())); } bool bNo=false; - if (!IsMirrorAllowed(sal_True,sal_True)) bNo=true; // any mirroring is forbidden - if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=true; // mirroring freely is forbidden - if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=true; // mirroring horizontally/vertically is allowed + if (!IsMirrorAllowed(true,true)) bNo=true; // any mirroring is forbidden + if (!IsMirrorAllowed(false,false) && !b45) bNo=true; // mirroring freely is forbidden + if (!IsMirrorAllowed(true,false) && !b90) bNo=true; // mirroring horizontally/vertically is allowed if (bNo) return Pointer(POINTER_NOTALLOWED); if (b90) { return Pointer(POINTER_MIRROR); @@ -1138,7 +1138,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* case SDRDRAG_CROOK: { if (bCorner || bVertex || bMov) { - if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); + if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return Pointer(POINTER_NOTALLOWED); return Pointer(POINTER_CROOK); } } @@ -1149,7 +1149,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* } default: { - if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED); + if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(POINTER_NOTALLOWED); } } if (pHdl!=NULL) return pHdl->GetPointer(); @@ -1244,7 +1244,7 @@ OUString SdrView::GetStatusText() bool bBrk=false; while (!bBrk) { sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine); - sal_Bool bLastLine=(nParaLine==nParaLineAnz-1); + bool bLastLine=(nParaLine==nParaLineAnz-1); if (nCol>nLen || (!bLastLine && nCol==nLen)) { nCol-=nLen; nLin++; @@ -1409,9 +1409,9 @@ void SdrView::DeleteMarked() } } -sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark) +bool SdrView::BegMark(const Point& rPnt, bool bAddMark, bool bUnmark) { - if (bUnmark) bAddMark=sal_True; + if (bUnmark) bAddMark=true; if (IsGluePointEditMode()) { if (!bAddMark) UnmarkAllGluePoints(); return BegMarkGluePoints(rPnt,bUnmark); @@ -1440,9 +1440,9 @@ void SdrView::onAccessibilityOptionsChanged() { } -void SdrView::SetMasterPagePaintCaching(sal_Bool bOn) +void SdrView::SetMasterPagePaintCaching(bool bOn) { - if(mbMasterPagePaintCaching != (bool) bOn) + if(mbMasterPagePaintCaching != bOn) { mbMasterPagePaintCaching = bOn; diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index f4021a7c2545..52c44a1b3383 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -40,7 +40,7 @@ void SdrViewIter::ImpInitVars() -SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage) { mpPage = pPage; mpModel = (pPage) ? pPage->GetModel() : 0L; @@ -51,7 +51,7 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage) -SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage) +SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage) { mpObject = pObject; mpModel = (pObject) ? pObject->GetModel() : 0L; @@ -69,11 +69,11 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage) -sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const +bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const { if(mpPage) { - sal_Bool bMaster(mpPage->IsMasterPage()); + bool bMaster(mpPage->IsMasterPage()); SdrPage* pPg = pPV->GetPage(); if(pPg == mpPage) @@ -89,7 +89,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const } else { - return sal_True; + return true; } } else @@ -114,24 +114,24 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const if(!aObjLay.IsEmpty()) { - return sal_True; + return true; } // else, look at the next master page of this page... } else { - return sal_True; + return true; } } } } // master page forbidden or no fitting master page found - return sal_False; + return false; } } else { - return sal_True; + return true; } } diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 91f631f5b4fb..0ada28208166 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -62,34 +62,34 @@ SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut): { } -sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const +bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const { - sal_Bool bRet(sal_False); + bool bRet(false); if(!aMaxWorkArea.IsEmpty()) { if(rPt.X()<aMaxWorkArea.Left()) { rPt.X() = aMaxWorkArea.Left(); - bRet = sal_True; + bRet = true; } if(rPt.X()>aMaxWorkArea.Right()) { rPt.X() = aMaxWorkArea.Right(); - bRet = sal_True; + bRet = true; } if(rPt.Y()<aMaxWorkArea.Top()) { rPt.Y() = aMaxWorkArea.Top(); - bRet = sal_True; + bRet = true; } if(rPt.Y()>aMaxWorkArea.Bottom()) { rPt.Y() = aMaxWorkArea.Bottom(); - bRet = sal_True; + bRet = true; } } return bRet; @@ -107,9 +107,9 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst) } } -sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const +bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const { - sal_Bool bRet=sal_False; + bool bRet=false; rLayer=0; if (pObjList!=NULL) { const SdrPage* pPg=pObjList->GetPage(); @@ -125,17 +125,17 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI return bRet; } -sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) +bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { if (rStr.isEmpty()) - return sal_False; + return false; Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return sal_False; + if (pLst==NULL) return false; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + if (!ImpGetPasteLayer(pLst,nLayer)) return false; bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); @@ -147,7 +147,7 @@ sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjL pObj->SetModel(pMod); pObj->SetLayer(nLayer); pObj->NbcSetText(rStr); // SetText before SetAttr, else SetAttr doesn't work! - if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); + if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false); pObj->SetMergedItemSet(aDefaultAttr); @@ -162,17 +162,17 @@ sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjL MapUnit eMap=pMod->GetScaleUnit(); Fraction aMap=pMod->GetScaleFraction(); ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions); - return sal_True; + return true; } -sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) +bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return sal_False; + if (pLst==NULL) return false; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + if (!ImpGetPasteLayer(pLst,nLayer)) return false; bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); @@ -183,7 +183,7 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_ SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect); pObj->SetModel(pMod); pObj->SetLayer(nLayer); - if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False); + if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false); pObj->SetMergedItemSet(aDefaultAttr); @@ -214,20 +214,20 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_ { if(pObj->GetModel()->GetStyleSheetPool() == &pCandidate->GetPool()) { - pObj->NbcSetStyleSheet(pCandidate, sal_True); + pObj->NbcSetStyleSheet(pCandidate, true); } } } } - return sal_True; + return true; } -sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) +bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { const SdrModel* pSrcMod=&rMod; if (pSrcMod==pMod) - return sal_False; // this can't work, right? + return false; // this can't work, right? const bool bUndo = IsUndoEnabled(); @@ -238,7 +238,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL { if( bUndo ) EndUndo(); - return sal_True; + return true; } Point aPos(rPos); @@ -254,7 +254,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL ImpLimitToWorkArea( aPos ); if (pLst==NULL) - return sal_False; + return false; bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) @@ -350,7 +350,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL if (bMark) { // Don't already set Markhandles! // That is instead being done by ModelHasChanged in MarkView. - MarkObj(pNeuObj,pMarkPV,sal_False,sal_True); + MarkObj(pNeuObj,pMarkPV,false,true); } // #i13033# @@ -391,7 +391,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL if( bUndo ) EndUndo(); - return sal_True; + return true; } void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions) @@ -780,26 +780,26 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const -sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) +bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported any more." ); - return sal_False; + return false; } -sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) +bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported any more." ); - return sal_False; + return false; } -sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) +bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index e2722f0555bc..6aa5e5d45265 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -301,7 +301,7 @@ namespace sdr { if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich)) { - sal_Bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue()); + bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue()); sdr::table::SdrTableObj& rObj = (sdr::table::SdrTableObj&)GetSdrObject(); if( rObj.IsVerticalWriting() != bVertical ) diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 1d4dc8a2e7f0..ffb4ed7359b9 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -439,7 +439,7 @@ bool SdrTableObjImpl::ApplyCellStyles() if( xCell.is() && ( xCell->GetStyleSheet() != pStyle ) ) { bChanges = true; - xCell->SetStyleSheet( pStyle, sal_True ); + xCell->SetStyleSheet( pStyle, true ); } } } @@ -690,7 +690,7 @@ void SdrTableObjImpl::UpdateCells( Rectangle& rArea ) { TableModelNotifyGuard aGuard( mxTable.get() ); mpLayouter->updateCells( rArea ); - mxTable->setModified(sal_True); + mxTable->setModified(true); } } @@ -1815,14 +1815,14 @@ Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const -sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) +bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) { if( pEdtOutl != NULL ) - return sal_False; + return false; pEdtOutl=&rOutl; - mbInEditMode = sal_True; + mbInEditMode = true; rOutl.Init( OUTLINERMODE_TEXTOBJECT ); rOutl.SetRefDevice( pModel->GetRefDevice() ); @@ -1852,7 +1852,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.UpdateFields(); rOutl.ClearModifyFlag(); - return sal_True; + return true; } @@ -1899,7 +1899,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); - mbInEditMode = sal_False; + mbInEditMode = false; } @@ -2043,7 +2043,7 @@ void SdrTableObj::ReformatText() -sal_Bool SdrTableObj::IsVerticalWriting() const +bool SdrTableObj::IsVerticalWriting() const { const SvxWritingModeItem* pModeItem = dynamic_cast< const SvxWritingModeItem* >( &GetObjectItem( SDRATTR_TEXTDIRECTION ) ); return pModeItem && pModeItem->GetValue() == com::sun::star::text::WritingMode_TB_RL; @@ -2051,7 +2051,7 @@ sal_Bool SdrTableObj::IsVerticalWriting() const -void SdrTableObj::SetVerticalWriting(sal_Bool bVertical ) +void SdrTableObj::SetVerticalWriting(bool bVertical ) { if( bVertical != IsVerticalWriting() ) { @@ -2091,7 +2091,7 @@ WritingMode SdrTableObj::GetWritingMode() const // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. -sal_Bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const +bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const { return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon ); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 659bf3c8e59d..e3671acd6da6 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -531,7 +531,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) } if( pTableObj->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); RemoveSelection(); @@ -636,7 +636,7 @@ void SvxTableController::onDelete( sal_uInt16 nSId ) getSelectedCells( aStart, aEnd ); if( pTableObj->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); RemoveSelection(); @@ -1024,7 +1024,7 @@ void SvxTableController::MergeMarkedCells() if( pTableObj ) { if( pTableObj->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); TableModelNotifyGuard aGuard( mxTable.get() ); MergeRange( aStart.mnCol, aStart.mnRow, aEnd.mnCol, aEnd.mnRow ); @@ -1058,7 +1058,7 @@ void SvxTableController::SplitMarkedCells() if( pTableObj ) { if( pTableObj->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); TableModelNotifyGuard aGuard( mxTable.get() ); @@ -1537,7 +1537,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction ) { if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); if( bSelect ) { @@ -1683,7 +1683,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const if( pTableObj != mpView->GetTextEditObject() || bEmptyOutliner || !pTableObj->IsTextEditActive( aPos ) ) { if( pTableObj->IsTextEditActive() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); pTableObj->setActiveCell( aPos ); @@ -1692,7 +1692,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const if( pTableObj->IsVerticalWriting() ) pOutl->SetVertical( true ); - if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl)) + if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, true, pOutl)) { maCursorLastPos = maCursorFirstPos = rPos; @@ -2451,7 +2451,7 @@ bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj ) getSelectedCells( aStart, aEnd ); if( mpView->IsTextEdit() ) - mpView->SdrEndTextEdit(sal_True); + mpView->SdrEndTextEdit(true); sal_Int32 nColumns = mxTable->getColumnCount(); sal_Int32 nRows = mxTable->getRowCount(); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 14bf98a507a1..52e91ff8e995 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -273,7 +273,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS { if(CONTAINER_ENTRY_NOTFOUND != pView->TryToFindMarkedObject(pSdrShape)) { - pView->MarkObj(pSdrShape, pView->GetSdrPageView(), sal_True, sal_False); + pView->MarkObj(pSdrShape, pView->GetSdrPageView(), true, false); } } @@ -1903,13 +1903,13 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c bool bCustomShapeGeometry = pObject && aPropertyName == "CustomShapeGeometry"; - sal_Bool bMirroredX = sal_False; - sal_Bool bMirroredY = sal_False; + bool bMirroredX = false; + bool bMirroredY = false; if ( bCustomShapeGeometry ) { - bMirroredX = ( ((SdrObjCustomShape*)pObject)->IsMirroredX() ); - bMirroredY = ( ((SdrObjCustomShape*)pObject)->IsMirroredY() ); + bMirroredX = ((SdrObjCustomShape*)pObject)->IsMirroredX(); + bMirroredY = ((SdrObjCustomShape*)pObject)->IsMirroredY(); } SvxShape::setPropertyValue( aPropertyName, aValue ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 99e95d3cc487..bb1db0d8c8b0 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -829,7 +829,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCre // enter edit mode mpView->SdrEndTextEdit(); - if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, sal_False, (SdrOutliner*)0L, 0L, sal_False, sal_False)) + if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, (SdrOutliner*)0L, 0L, false, false)) { SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); if( pTextObj->IsTextEditActive() ) |