diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-11 15:23:07 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-14 07:50:32 +0200 |
commit | 13bc4094dadb6accfbe00ba93dee178c22922c56 (patch) | |
tree | e22f2a6b63a84b95123b706aa1a75259126cb261 /svx | |
parent | fae4102573d184696a1fe1394258ec9ad3a895dc (diff) |
svx: sal_Bool->bool
Change-Id: I673d022c01b7d076120c026b236a37735b5043b0
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdopath.cxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unottabl.cxx | 2 | ||||
-rw-r--r-- | svx/source/xml/xmleohlp.cxx | 50 | ||||
-rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 18 | ||||
-rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 8 | ||||
-rw-r--r-- | svx/source/xoutdev/_xpoly.cxx | 30 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 28 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr2.cxx | 8 | ||||
-rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 6 | ||||
-rw-r--r-- | svx/source/xoutdev/xpool.cxx | 4 |
11 files changed, 80 insertions, 80 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 266b33837d3e..811bd4ab2b0f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1298,7 +1298,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrTypeHdl_Impl, void *, EMPTYARG) } SfxItemPool* pPool = 0; - const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, sal_Bool(bGradient)); + const XFillFloatTransparenceItem aGradientItem(pPool, aTmpGradient, bGradient); GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L ); return( 0L ); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 537e6c472a23..4e9c2c087396 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -368,13 +368,13 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const { if (nCircRelWink>=0) { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False); + sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),false); aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH); if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd; return aXP; } else { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False); + sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),false); sal_uInt16 nAnz=aXP.GetPointCount(); for (sal_uInt16 nNum=nAnz/2; nNum>0;) { nNum--; // reverse XPoly's order of points diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 18538e84de22..202784fcb4c1 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -74,7 +74,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() { XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem(); - pNewItem->SetEnabled( sal_True ); + pNewItem->SetEnabled( true ); return pNewItem; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 2eff25cd2a00..c5ac758f07ca 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -219,13 +219,13 @@ void SvXMLEmbeddedObjectHelper::splitObjectURL(const OUString& _aURLNoPar, } } -sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( +bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( const OUString& rURLStr, OUString& rContainerStorageName, OUString& rObjectStorageName, - sal_Bool bInternalToExternal, - sal_Bool *pGraphicRepl, - sal_Bool *pOasisFormat ) const + bool bInternalToExternal, + bool *pGraphicRepl, + bool *pOasisFormat ) const { // internal URL: vnd.sun.star.EmbeddedObject:<object-name> // or: vnd.sun.star.EmbeddedObject:<path>/<object-name> @@ -239,13 +239,13 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( // it is also possible to have additional arguments at the end of URL: <main URL>[?<name>=<value>[,<name>=<value>]*] if( pGraphicRepl ) - *pGraphicRepl = sal_False; + *pGraphicRepl = false; if( pOasisFormat ) - *pOasisFormat = sal_True; // the default value + *pOasisFormat = true; // the default value if( rURLStr.isEmpty() ) - return sal_False; + return false; // get rid of arguments sal_Int32 nPos = rURLStr.indexOf( '?' ); @@ -264,7 +264,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if ( aToken.equalsIgnoreAsciiCase( "oasis=false" ) ) { if ( pOasisFormat ) - *pOasisFormat = sal_False; + *pOasisFormat = false; break; } else @@ -278,12 +278,12 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( { nPos = aURLNoPar.indexOf( ':' ); if( -1 == nPos ) - return sal_False; + return false; sal_Bool bObjUrl = aURLNoPar.startsWith( XML_EMBEDDEDOBJECT_URL_BASE ); bool bGrUrl = !bObjUrl && aURLNoPar.startsWith( XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE ); if( !(bObjUrl || bGrUrl) ) - return sal_False; + return false; sal_Int32 nPathStart = nPos + 1; nPos = aURLNoPar.lastIndexOf( '/' ); @@ -298,7 +298,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( rObjectStorageName = aURLNoPar.copy( nPos+1 ); } else - return sal_False; + return false; if( bGrUrl ) { @@ -309,7 +309,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( : maReplacementGraphicsContainerStorageName60; if( pGraphicRepl ) - *pGraphicRepl = sal_True; + *pGraphicRepl = true; } @@ -322,10 +322,10 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( if( -1 != rContainerStorageName.indexOf( '/' ) ) { OSL_FAIL( "SvXMLEmbeddedObjectHelper: invalid path name" ); - return sal_False; + return false; } - return sal_True; + return true; } uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( @@ -364,7 +364,7 @@ uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerSt return mxContainerStorage; } -sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( +bool SvXMLEmbeddedObjectHelper::ImplReadObject( const OUString& rContainerStorageName, OUString& rObjName, const SvGlobalName *pClassId, @@ -376,7 +376,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( uno::Reference < embed::XStorage > xCntnrStor( ImplGetContainerStorage( rContainerStorageName ) ); if( !xCntnrStor.is() && !pTemp ) - return sal_False; + return false; OUString aSrcObjName( rObjName ); comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer(); @@ -417,7 +417,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( } catch ( uno::Exception& ) { - return sal_False; + return false; } } else @@ -428,7 +428,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( } catch ( uno::Exception& ) { - return sal_False; + return false; } } } @@ -444,7 +444,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // area. rContainer.GetEmbeddedObject( aName ); - return sal_True; + return true; } OUString SvXMLEmbeddedObjectHelper::ImplInsertEmbeddedObjectURL( @@ -561,7 +561,7 @@ SvXMLEmbeddedObjectHelper* SvXMLEmbeddedObjectHelper::Create( const uno::Reference < embed::XStorage >& rRootStorage, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode, - sal_Bool bDirect ) + bool bDirect ) { (void)bDirect; @@ -644,14 +644,14 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( } else { - sal_Bool bGraphicRepl = sal_False; - sal_Bool bOasisFormat = sal_True; + bool bGraphicRepl = false; + bool bOasisFormat = true; Reference < XInputStream > xStrm; OUString aContainerStorageName, aObjectStorageName; if( ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, - sal_True, - &bGraphicRepl, + true, + &bGraphicRepl, &bOasisFormat ) ) { try @@ -733,7 +733,7 @@ sal_Bool SAL_CALL SvXMLEmbeddedObjectHelper::hasByName( const OUString& rURLStr OUString aContainerStorageName, aObjectStorageName; if( !ImplGetStorageNames( rURLStr, aContainerStorageName, aObjectStorageName, - sal_True ) ) + true ) ) return sal_False; comphelper::EmbeddedObjectContainer& rContainer = mpDocPersist->getEmbeddedObjectContainer(); diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index d9b84e3cf4d4..24d47a79376c 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -354,7 +354,7 @@ SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, ::com::sun::star::document::XBinaryStreamResolver >( maMutex ) { - Init( NULL, eCreateMode, sal_False ); + Init( NULL, eCreateMode, false ); } SvXMLGraphicHelper::SvXMLGraphicHelper() : @@ -371,7 +371,7 @@ void SAL_CALL SvXMLGraphicHelper::disposing() { } -sal_Bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, +bool SvXMLGraphicHelper::ImplGetStreamNames( const OUString& rURLStr, OUString& rPictureStorageName, OUString& rPictureStreamName ) { @@ -433,7 +433,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const OUString& rPictureStorageName, const OUString& rPictureStreamName, - sal_Bool bTruncate ) + bool bTruncate ) { SvxGraphicHelperStream_Impl aRet; aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName ); @@ -496,7 +496,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName const OUString& rPictureStreamName ) { Graphic aGraphic; - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) ); if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); @@ -507,7 +507,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const OUString& rPictureStorageName return aGraphic; } -sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, +bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageName, const OUString& rPictureStreamName, const OUString& rGraphicId, bool bUseGfxLink ) @@ -517,7 +517,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const OUString& rPictureStorageNa if( aGrfObject.GetType() != GRAPHIC_NONE ) { - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, false ) ); if( aStream.xStream.is() ) { Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() ); @@ -739,7 +739,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - sal_Bool bDirect ) + bool bDirect ) { mxRootStorage = rXMLStorage; meCreateMode = eCreateMode; @@ -748,7 +748,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - sal_Bool bDirect ) + bool bDirect ) { SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper; @@ -763,7 +763,7 @@ SvXMLGraphicHelper* SvXMLGraphicHelper::Create( SvXMLGraphicHelperMode eCreateMo SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper; pThis->acquire(); - pThis->Init( NULL, eCreateMode, sal_False ); + pThis->Init( NULL, eCreateMode, false ); return pThis; } 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; |