summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdoashp.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/svdraw/svdoashp.cxx')
-rw-r--r--svx/source/svdraw/svdoashp.cxx84
1 files changed, 42 insertions, 42 deletions
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6a8221136f7c..30791ce216d4 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -632,7 +632,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
fObjectRotation( 0.0 ),
mpLastShadowGeometry(0L)
{
- bTextFrame = TRUE;
+ bTextFrame = sal_True;
}
SdrObjCustomShape::~SdrObjCustomShape()
@@ -1623,17 +1623,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=TRUE;
- rInfo.bRotate90Allowed =TRUE;
- rInfo.bMirrorFreeAllowed=TRUE;
- rInfo.bMirror45Allowed =TRUE;
- rInfo.bMirror90Allowed =TRUE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =TRUE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoContortion =TRUE;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_True;
+ rInfo.bRotate90Allowed =sal_True;
+ rInfo.bMirrorFreeAllowed=sal_True;
+ rInfo.bMirror45Allowed =sal_True;
+ rInfo.bMirror90Allowed =sal_True;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_True;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoContortion =sal_True;
// #i37011#
if ( mXRenderedCustomShape.is() )
@@ -1680,9 +1680,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
mXRenderedCustomShape.clear();
}
-UINT16 SdrObjCustomShape::GetObjIdentifier() const
+sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
{
- return UINT16(OBJ_CUSTOMSHAPE);
+ return sal_uInt16(OBJ_CUSTOMSHAPE);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1998,9 +1998,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FAST
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
{
- INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+ sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
// #i25616#
if(!LineIsOutsideGeometry())
@@ -2020,7 +2020,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
@@ -2052,7 +2052,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
for(a = 0; a < pSource->GetCount(); a++)
{
SdrGluePoint aCopy((*pSource)[a]);
- aCopy.SetUserDefined(FALSE);
+ aCopy.SetUserDefined(sal_False);
aNewList.Insert(aCopy);
}
@@ -2067,9 +2067,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
Polygon aPoly( aRect );
if( nShearWink )
{
- USHORT nPointCount=aPoly.GetSize();
- for (USHORT i=0; i<nPointCount; i++)
- ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE );
+ sal_uInt16 nPointCount=aPoly.GetSize();
+ for (sal_uInt16 i=0; i<nPointCount; i++)
+ ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False );
}
if ( aGeo.nDrehWink )
aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
@@ -2464,7 +2464,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
}
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
+ bSnapRectDirty=sal_True;
}
FASTBOOL SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
@@ -2481,7 +2481,7 @@ FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
}
DragCreateObject( rStat );
SetRectsDirty();
- return TRUE;
+ return sal_True;
}
FASTBOOL SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
@@ -2527,7 +2527,7 @@ FASTBOOL SdrObjCustomShape::IsAutoGrowHeight() const
const SfxItemSet& rSet = GetMergedItemSet();
FASTBOOL bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowHeight && IsVerticalWriting() )
- bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+ bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
return bIsAutoGrowHeight;
}
FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const
@@ -2535,7 +2535,7 @@ FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const
const SfxItemSet& rSet = GetMergedItemSet();
FASTBOOL bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowWidth && !IsVerticalWriting() )
- bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+ bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
return bIsAutoGrowWidth;
}
@@ -2659,7 +2659,7 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
{
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
// !!! hier sollte ich wohl auch noch mal die Optimierung mit
// bPortionInfoChecked usw einbauen
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -2696,9 +2696,9 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
long nWdtGrow = nWdt-(rR.Right()-rR.Left());
long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
if ( nWdtGrow == 0 )
- bWdtGrow = FALSE;
+ bWdtGrow = sal_False;
if ( nHgtGrow == 0 )
- bHgtGrow=FALSE;
+ bHgtGrow=sal_False;
if ( bWdtGrow || bHgtGrow )
{
if ( bWdtGrow )
@@ -2738,11 +2738,11 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt )
@@ -2969,13 +2969,13 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
SdrTextObj::TakeTextAnchorRect( rAnchorRect );
}
void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
- Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const
+ Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const
{
Rectangle aAnkRect; // Rect innerhalb dem geankert wird
TakeTextAnchorRect(aAnkRect);
SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
- ULONG nStat0=rOutliner.GetControlWord();
+ sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -3012,7 +3012,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pPara)
{
- BOOL bHitTest = FALSE;
+ sal_Bool bHitTest = sal_False;
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
@@ -3023,7 +3023,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if( bHitTest )
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pPara);
}
}
@@ -3034,7 +3034,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetControlWord(nStat0);
SdrText* pText = getActiveText();
@@ -3104,7 +3104,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject
{
SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
SetBoundRectDirty();
- SetRectsDirty(TRUE);
+ SetRectsDirty(sal_True);
InvalidateRenderGeometry();
}
@@ -3148,7 +3148,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
return basegfx::B2DPolyPolygon();
}
-SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const
{
// #i37011#
SdrObject* pRetval = 0L;
@@ -3319,7 +3319,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
GeoStat aGeoStat;
aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
- Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+ Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
}
// rotation?
@@ -3367,8 +3367,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
@@ -3389,8 +3389,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
Point aRef2( aRef1.X() + 1000, aRef1.Y() );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 07:23:09 +0000