summaryrefslogtreecommitdiff
path: root/svx/source/xoutdev
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/xoutdev')
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx8
-rw-r--r--svx/source/xoutdev/_xpoly.cxx30
-rw-r--r--svx/source/xoutdev/xattr.cxx28
-rw-r--r--svx/source/xoutdev/xattr2.cxx8
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx6
-rw-r--r--svx/source/xoutdev/xpool.cxx4
6 files changed, 42 insertions, 42 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index bdf732aa5b4a..edd9cc9d7467 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -39,7 +39,7 @@
GraphicFilter* XOutBitmap::pGrfFilter = NULL;
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr )
{
Animation aNewAnim( rAnimation );
@@ -607,14 +607,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
return aRetPoly;
};
-sal_Bool DitherBitmap( Bitmap& rBitmap )
+bool DitherBitmap( Bitmap& rBitmap )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
else
- bRet = sal_False;
+ bRet = false;
return bRet;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 6a9668508b1e..371d44dc12e0 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -274,7 +274,7 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
/// create a ellipse (curve) as Bézier polygon
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
- sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
+ sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, bool bClose)
{
pImpXPolygon = new ImpXPolygon(17);
@@ -470,17 +470,17 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
return *this;
}
-sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
+bool XPolygon::operator==( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return true;
return *rXPoly.pImpXPolygon == *pImpXPolygon;
}
-sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
+bool XPolygon::operator!=( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return false;
return *rXPoly.pImpXPolygon != *pImpXPolygon;
}
@@ -500,13 +500,13 @@ void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
}
/// short path to read the CONTROL flag directly (TODO: better explain what the sense behind this flag is!)
-sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
+bool XPolygon::IsControl(sal_uInt16 nPos) const
{
return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
}
/// short path to read the SMOOTH and SYMMTR flag directly (TODO: better explain what the sense behind these flags is!)
-sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
+bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -526,7 +526,7 @@ double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
return sqrt(fDx * fDx + fDy * fDy);
}
-void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT)
{
Point* pPoints = pImpXPolygon->pPointAry;
double fT2 = fT * fT;
@@ -610,14 +610,14 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
}
if ( nStart > 0 )
- SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
+ SubdivideBezier(nFirst, false, (double)nStart / 900);
if ( nEnd < 900 )
- SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
+ SubdivideBezier(nFirst, true, (double)(nEnd-nStart) / (900-nStart));
SetFlags(nFirst+1, XPOLY_CONTROL);
SetFlags(nFirst+2, XPOLY_CONTROL);
}
-sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
+bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
{
if ( nStart == 3600 ) nStart = 0;
if ( nEnd == 0 ) nEnd = 3600;
@@ -1049,15 +1049,15 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
return *this;
}
-sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return true;
return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
}
-sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return false;
return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f5f3c0dbad37..800542e81ec2 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1017,7 +1017,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
}
@@ -2115,7 +2115,7 @@ bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
-XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
{
}
@@ -2178,7 +2178,7 @@ bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal
TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
-XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
{
}
@@ -2907,7 +2907,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI
return true;
}
-sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
}
@@ -2935,12 +2935,12 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con
TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
- bEnabled( sal_False )
+ bEnabled( false )
{
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -2954,7 +2954,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -2998,7 +2998,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPrese
return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
}
-sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -3022,7 +3022,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
{
- return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
+ return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), true );
}
}
}
@@ -3031,7 +3031,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// #85953# if disabled, force name to empty string
if( !GetName().isEmpty() )
{
- return new XFillFloatTransparenceItem(OUString(), GetGradientValue(), sal_False);
+ return new XFillFloatTransparenceItem(OUString(), GetGradientValue(), false);
}
}
@@ -3334,7 +3334,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
}
@@ -3499,7 +3499,7 @@ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons
TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
-XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
{
}
@@ -3523,7 +3523,7 @@ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con
TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
-XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
{
}
@@ -3665,7 +3665,7 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/)
TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
-XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
{
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 7fabfdb9bfdd..0291ec402e0c 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -547,7 +547,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
-XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
{
}
@@ -746,7 +746,7 @@ bool XFillBmpSizeYItem::HasMetrics() const
TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
{
}
@@ -884,7 +884,7 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation
TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
-XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
{
}
@@ -1022,7 +1022,7 @@ SfxItemPresentation XFillBmpPosOffsetYItem::GetPresentation
TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
-XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
{
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 674f8f63727a..71dbdba847df 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -46,7 +46,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp ) :
eType ( XBITMAP_IMPORT ),
aGraphicObject ( rBmp ),
pPixelArray ( NULL ),
- bGraphicDirty ( sal_False )
+ bGraphicDirty ( false )
{
}
@@ -194,7 +194,7 @@ void XOBitmap::Array2Bitmap()
}
aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
- bGraphicDirty = sal_False;
+ bGraphicDirty = false;
}
// class XFillBitmapItem
@@ -538,7 +538,7 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt
return (bSetName || bSetURL || bSetBitmap);
}
-sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
const GraphicObject& aGraphicObjectA(((XFillBitmapItem*)p1)->GetGraphicObject());
const GraphicObject& aGraphicObjectB(((XFillBitmapItem*)p2)->GetGraphicObject());
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 2630e8b80cf0..765cb8074c1f 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -28,7 +28,7 @@ XOutdevItemPool::XOutdevItemPool(
SfxItemPool* _pMaster,
sal_uInt16 nAttrStart,
sal_uInt16 nAttrEnd,
- sal_Bool bLoadRefCounts)
+ bool bLoadRefCounts)
: SfxItemPool("XOutdevItemPool", nAttrStart, nAttrEnd, 0L, 0L, bLoadRefCounts)
{
// prepare some defaults
@@ -92,7 +92,7 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH -XATTR_START] = new XFillBmpStretchItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX -XATTR_START] = new XFillBmpPosOffsetXItem;
mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY -XATTR_START] = new XFillBmpPosOffsetYItem;
- mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False );
+ mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, false );
mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol);
mppLocalPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem;
mppLocalPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem;
generated by cgit (git 2.34.1) at 2024-07-03 17:58:36 +0000