[Libreoffice-commits] core.git: 2 commits - svx/source
Takeshi Abe
tabe at fixedpoint.jp
Sun Apr 7 07:59:12 PDT 2013
svx/source/svdraw/svdoashp.cxx | 34 ++++++++++++++---------------
svx/source/svdraw/svdoattr.cxx | 2 -
svx/source/svdraw/svdobj.cxx | 4 +--
svx/source/svdraw/svdocirc.cxx | 4 +--
svx/source/svdraw/svdoedge.cxx | 8 +++---
svx/source/svdraw/svdograf.cxx | 8 +++---
svx/source/svdraw/svdoole2.cxx | 14 +++++------
svx/source/svdraw/svdopath.cxx | 48 ++++++++++++++++++++---------------------
8 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit 8d11a1e522b83bdf1c9d0f952a5415359dee6851
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Apr 7 23:53:53 2013 +0900
keep them local
Change-Id: I5c76e2a423199a892ad541edded7127659fe310c
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 680239b..3f3288d 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1671,12 +1671,12 @@ SdrPathObj::~SdrPathObj()
impDeleteDAC();
}
-bool ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
+static bool lcl_ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
{
return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0L).count());
}
-Rectangle ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon)
+static Rectangle lcl_ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon)
{
basegfx::B2DRange aRange(basegfx::tools::getRange(rPolyPolygon));
@@ -1687,7 +1687,7 @@ Rectangle ImpGetBoundRect(const basegfx::B2DPolyPolygon& rPolyPolygon)
void SdrPathObj::ImpForceLineWink()
{
- if(OBJ_LINE == meKind && ImpIsLine(GetPathPoly()))
+ if(OBJ_LINE == meKind && lcl_ImpIsLine(GetPathPoly()))
{
const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
@@ -1734,8 +1734,8 @@ void SdrPathObj::ImpForceKind()
}
}
- if (meKind==OBJ_LINE && !ImpIsLine(GetPathPoly())) meKind=OBJ_PLIN;
- if (meKind==OBJ_PLIN && ImpIsLine(GetPathPoly())) meKind=OBJ_LINE;
+ if (meKind==OBJ_LINE && !lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_PLIN;
+ if (meKind==OBJ_PLIN && lcl_ImpIsLine(GetPathPoly())) meKind=OBJ_LINE;
bClosedObj=IsClosed();
@@ -1768,7 +1768,7 @@ void SdrPathObj::ImpForceKind()
// #i10659# for SdrTextObj, keep aRect up to date
if(GetPathPoly().count())
{
- aRect = ImpGetBoundRect(GetPathPoly());
+ aRect = lcl_ImpGetBoundRect(GetPathPoly());
}
}
@@ -1868,7 +1868,7 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName) const
{
sal_uInt16 nId(STR_ObjNameSingulLINE);
- if(ImpIsLine(GetPathPoly()))
+ if(lcl_ImpIsLine(GetPathPoly()))
{
const basegfx::B2DPolygon aPoly(GetPathPoly().getB2DPolygon(0L));
const basegfx::B2DPoint aB2DPoint0(aPoly.getB2DPoint(0L));
@@ -2416,7 +2416,7 @@ void SdrPathObj::RecalcSnapRect()
{
if(GetPathPoly().count())
{
- maSnapRect = ImpGetBoundRect(GetPathPoly());
+ maSnapRect = lcl_ImpGetBoundRect(GetPathPoly());
}
}
@@ -2510,7 +2510,7 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum)
if(GetPathPoly().count())
{
// #i10659# for SdrTextObj, keep aRect up to date
- aRect = ImpGetBoundRect(GetPathPoly());
+ aRect = lcl_ImpGetBoundRect(GetPathPoly());
}
}
commit 93dc48ae47201cbcc9f30623bf1150f57d9353a6
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Apr 7 23:05:56 2013 +0900
sal_Bool to bool
Change-Id: Iac3b6fbe42ae0ffd9229935b46d1352987f99596
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0346823..424c799 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -183,9 +183,9 @@ static MSO_SPT ImpGetCustomShapeType( const SdrObjCustomShape& rCustoShape )
return eRetValue;
};
-static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
+static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
MSO_SPT eShapeType( ImpGetCustomShapeType( rCustoShape ) );
switch( eShapeType )
{
@@ -193,7 +193,7 @@ static sal_Bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
case mso_sptBorderCallout1 : // 2 diag
case mso_sptBorderCallout2 : // 3
{
- bRet = sal_True;
+ bRet = true;
}
break;
default: break;
@@ -220,12 +220,12 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
// look for used stuff
SdrObjListIter aIterator(rOriginal);
- sal_Bool bLineUsed(sal_False);
- sal_Bool bAllFillUsed(sal_False);
- sal_Bool bSolidFillUsed(sal_False);
- sal_Bool bGradientFillUsed(sal_False);
- sal_Bool bHatchFillUsed(sal_False);
- sal_Bool bBitmapFillUsed(sal_False);
+ bool bLineUsed(false);
+ bool bAllFillUsed(false);
+ bool bSolidFillUsed(false);
+ bool bGradientFillUsed(false);
+ bool bHatchFillUsed(false);
+ bool bBitmapFillUsed(false);
while(aIterator.IsMore())
{
@@ -238,7 +238,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
if(XLINE_NONE != eLineStyle)
{
- bLineUsed = sal_True;
+ bLineUsed = true;
}
}
@@ -246,22 +246,22 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
{
if(!bSolidFillUsed && XFILL_SOLID == eFillStyle)
{
- bSolidFillUsed = sal_True;
+ bSolidFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bGradientFillUsed && XFILL_GRADIENT == eFillStyle)
{
- bGradientFillUsed = sal_True;
+ bGradientFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bHatchFillUsed && XFILL_HATCH == eFillStyle)
{
- bHatchFillUsed = sal_True;
+ bHatchFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
if(!bBitmapFillUsed && XFILL_BITMAP == eFillStyle)
{
- bBitmapFillUsed = sal_True;
+ bBitmapFillUsed = true;
bAllFillUsed = (bSolidFillUsed && bGradientFillUsed && bHatchFillUsed && bBitmapFillUsed);
}
}
@@ -2494,7 +2494,7 @@ Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool
bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
- sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
+ bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
if ( bRet )
{
// taking care of handles that should not been changed
@@ -2523,7 +2523,7 @@ bool SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
- sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
+ bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
if ( bRet )
{
Rectangle aBoundRect0;
@@ -2724,7 +2724,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pPara)
{
- sal_Bool bHitTest = sal_False;
+ bool bHitTest = false;
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 6607c13..7b20fd9 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -127,7 +127,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
- sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
+ bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
if(bDataChg)
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c997592..0d6d8f2ad 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -953,8 +953,8 @@ void SdrObject::BroadcastObjectChange() const
if( pModel && pModel->isLocked() )
return;
- sal_Bool bPlusDataBroadcast(pPlusData && pPlusData->pBroadcast);
- sal_Bool bObjectChange(IsInserted() && pModel);
+ bool bPlusDataBroadcast(pPlusData && pPlusData->pBroadcast);
+ bool bObjectChange(IsInserted() && pModel);
if(bPlusDataBroadcast || bObjectChange)
{
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 7cfbae0..fec1d31 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1083,8 +1083,8 @@ void SdrCircObj::ImpSetAttrToCircInfo()
sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
- sal_Bool bKindChg = meCircleKind != eNewKind;
- sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
+ bool bKindChg = meCircleKind != eNewKind;
+ bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
if(bKindChg || bWinkChg)
{
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 6c1c864..240b2d9 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -231,8 +231,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
}
else if(eKind == SDREDGE_THREELINES)
{
- sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
- sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+ bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+ bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
if(bHor1)
{
@@ -301,8 +301,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
}
else if(eKind == SDREDGE_THREELINES)
{
- sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
- sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+ bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+ bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
n = 2;
nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y();
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3f7a14e..78a8e27 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -114,7 +114,7 @@ public:
const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
void DataChanged( const Graphic& rGraphic );
- sal_Bool Connect() { return 0 != GetRealObject(); }
+ bool Connect() { return 0 != GetRealObject(); }
void UpdateAsynchron();
void RemoveGraphicUpdater();
};
@@ -127,7 +127,7 @@ public:
void SAL_CALL Terminate( void );
- sal_Bool GraphicLinkChanged( const String& rFileName ){ return maFileName != rFileName; };
+ bool GraphicLinkChanged( const String& rFileName ){ return maFileName != rFileName; };
protected:
@@ -474,8 +474,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
GraphicType eType = GetGraphicType();
MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() );
const Size aDestSize( GetLogicRect().GetSize() );
- const sal_Bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
- const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
+ const bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
+ const bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
// Need cropping info earlier
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index c1ee6cf..3029917 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -603,7 +603,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
- sal_Bool Connect() { return GetRealObject() != NULL; }
+ bool Connect() { return GetRealObject() != NULL; }
};
// -----------------------------------------------------------------------------
@@ -677,8 +677,8 @@ public:
SdrLightEmbeddedClient_Impl* pLightClient; // must be registered as client only using AddOwnLightClient() call
// New local var to avoid repeated loading if load of OLE2 fails
- sal_Bool mbLoadingOLEObjectFailed;
- sal_Bool mbConnected;
+ bool mbLoadingOLEObjectFailed;
+ bool mbConnected;
SdrEmbedObjectLink* mpObjectLink;
String maLinkURL;
@@ -687,8 +687,8 @@ public:
: pGraphicObject( NULL )
, pLightClient ( NULL )
// init to start situation, loading did not fail
- , mbLoadingOLEObjectFailed( sal_False )
- , mbConnected( sal_False )
+ , mbLoadingOLEObjectFailed( false )
+ , mbConnected( false )
, mpObjectLink( NULL )
{
}
@@ -1683,7 +1683,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
// the client is required to get access to scaling
SfxInPlaceClient* pClient = SfxInPlaceClient::GetClient( dynamic_cast<SfxObjectShell*>(pModel->GetPersist()), xObjRef.GetObject() );
- sal_Bool bHasOwnClient =
+ bool bHasOwnClient =
( mpImpl->pLightClient
&& xObjRef->getClientSite() == uno::Reference< embed::XEmbeddedClient >( mpImpl->pLightClient ) );
@@ -1991,7 +1991,7 @@ void SdrOle2Obj::GetObjRef_Impl()
// loop trying to load it again and again.
if( xObjRef.is() )
{
- mpImpl->mbLoadingOLEObjectFailed = sal_True;
+ mpImpl->mbLoadingOLEObjectFailed = true;
}
// For math objects, set closed state to transparent
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 2114653..680239b 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -103,18 +103,18 @@ struct ImpSdrPathDragData : public SdrDragStatUserData
sal_uInt16 nNextNextPnt0;
bool bEliminate; // delete point? (is set by MovDrag)
- sal_Bool mbMultiPointDrag;
+ bool mbMultiPointDrag;
const XPolyPolygon maOrig;
XPolyPolygon maMove;
std::vector<SdrHdl*> maHandles;
public:
- ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag);
+ ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, bool bMuPoDr, const SdrDragStat& rDrag);
void ResetPoly(const SdrPathObj& rPO);
- sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; }
+ bool IsMultiPointDrag() const { return mbMultiPointDrag; }
};
-ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag)
+ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, bool bMuPoDr, const SdrDragStat& rDrag)
: aXP(5),
mbMultiPointDrag(bMuPoDr),
maOrig(rPO.GetPathPoly()),
@@ -543,10 +543,10 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
if(!pHdl)
return sal_False;
- sal_Bool bMultiPointDrag(sal_True);
+ bool bMultiPointDrag(true);
if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum()))
- bMultiPointDrag = sal_False;
+ bMultiPointDrag = false;
if(bMultiPointDrag)
{
@@ -567,7 +567,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
}
if(nSelectedPoints <= 1)
- bMultiPointDrag = sal_False;
+ bMultiPointDrag = false;
}
((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag);
@@ -605,7 +605,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex];
XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex];
const sal_uInt16 nPointCount(rOrig.GetPointCount());
- sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]);
+ bool bClosed(rOrig[0] == rOrig[nPointCount-1]);
// move point itself
rMove[nPointIndex] = rOrig[nPointIndex] + aDelta;
@@ -1062,13 +1062,13 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
{
sal_uInt16 nPntMax(nPntAnz - 1);
sal_Bool bIsClosed(IsClosed(meObjectKind));
- sal_Bool bPt1(nPntNum > 0);
- sal_Bool bPt2(nPntNum < nPntMax);
+ bool bPt1(nPntNum > 0);
+ bool bPt2(nPntNum < nPntMax);
if(bIsClosed && nPntAnz > 2)
{
- bPt1 = sal_True;
- bPt2 = sal_True;
+ bPt1 = true;
+ bPt2 = true;
}
sal_uInt16 nPt1,nPt2;
@@ -1084,10 +1084,10 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
nPt2 = 0;
if(bPt1 && rXPoly.IsControl(nPt1))
- bPt1 = sal_False; // don't display
+ bPt1 = false; // don't display
if(bPt2 && rXPoly.IsControl(nPt2))
- bPt2 = sal_False; // of bezier data
+ bPt2 = false; // of bezier data
if(bPt1)
{
@@ -1671,7 +1671,7 @@ SdrPathObj::~SdrPathObj()
impDeleteDAC();
}
-sal_Bool ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
+bool ImpIsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
{
return (1L == rPolyPolygon.count() && 2L == rPolyPolygon.getB2DPolygon(0L).count());
}
@@ -1901,7 +1901,7 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName) const
}
else if(OBJ_PLIN == meKind || OBJ_POLY == meKind)
{
- const sal_Bool bClosed(OBJ_POLY == meKind);
+ const bool bClosed(OBJ_POLY == meKind);
sal_uInt16 nId(0);
if(mpDAC && mpDAC->IsCreating())
More information about the Libreoffice-commits
mailing list