From 94d85ef550ad17efba5dec09290d0e8176a8b455 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Mon, 10 Jan 2011 16:11:35 +0100 Subject: removetooltypes01: #i112600# remove tooltypes from svx --- svx/source/svdraw/svdograf.cxx | 94 +++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'svx/source/svdraw/svdograf.cxx') diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index b299d4c7a2ef..a271eaca5792 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -93,7 +93,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt { Graphic aGraphic; - SfxMedium xMed( rFileName, STREAM_STD_READ, TRUE ); + SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True ); xMed.DownLoad(); SvStream* pInStrm = xMed.GetInStream(); @@ -102,7 +102,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); - const USHORT nFilter = rFilterName.Len() && pGF->GetImportFormatCount() + const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() ? pGF->GetImportFormatNumber( rFilterName ) : GRFILTER_FORMAT_DONTKNOW; @@ -135,7 +135,7 @@ public: const ::com::sun::star::uno::Any & rValue ); void DataChanged( const Graphic& rGraphic ); - BOOL Connect() { return 0 != GetRealObject(); } + sal_Bool Connect() { return 0 != GetRealObject(); } void UpdateAsynchron(); void RemoveGraphicUpdater(); }; @@ -215,7 +215,7 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) , pGrafObj( pObj ) , pGraphicUpdater( NULL ) { - SetSynchron( FALSE ); + SetSynchron( sal_False ); } // ----------------------------------------------------------------------------- @@ -325,11 +325,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj); SdrGrafObj::SdrGrafObj() : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject; pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -348,11 +348,11 @@ SdrGrafObj::SdrGrafObj() SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -371,11 +371,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -447,7 +447,7 @@ const Graphic& SdrGrafObj::GetGraphic() const // ----------------------------------------------------------------------------- -Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const +Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { // #107947# Refactored most of the code to GraphicObject, where // everybody can use e.g. the cropping functionality @@ -455,8 +455,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const GraphicType eType = GetGraphicType(); MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() ); const Size aDestSize( GetLogicRect().GetSize() ); - const BOOL bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; - const BOOL bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && + const sal_Bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; + const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ); // #104115# Need cropping info earlier @@ -472,9 +472,9 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const if( bMirror ) { - USHORT nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); - FASTBOOL bHMirr = nMirrorCase == 2 || nMirrorCase == 4; - FASTBOOL bVMirr = nMirrorCase == 3 || nMirrorCase == 4; + sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); + int bHMirr = nMirrorCase == 2 || nMirrorCase == 4; + int bVMirr = nMirrorCase == 3 || nMirrorCase == 4; aActAttr.SetMirrorFlags( ( bHMirr ? BMP_MIRROR_HORZ : 0 ) | ( bVMirr ? BMP_MIRROR_VERT : 0 ) ); } @@ -657,35 +657,35 @@ void SdrGrafObj::ReleaseGraphicLink() void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - FASTBOOL bAnim = pGraphic->IsAnimated(); - FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; + int bAnim = pGraphic->IsAnimated(); + int bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 || aGeo.nDrehWink % 18000 == 0 || aGeo.nDrehWink % 27000 == 0; - rInfo.bResizePropAllowed = TRUE; + rInfo.bResizePropAllowed = sal_True; rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim; rInfo.bRotate90Allowed = bNoPresGrf && !bAnim; rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim; rInfo.bMirror45Allowed = bNoPresGrf && !bAnim; rInfo.bMirror90Allowed = !bEmptyPresObj; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; rInfo.bCanConvToPoly = !IsEPS(); rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } // ----------------------------------------------------------------------------- -UINT16 SdrGrafObj::GetObjIdentifier() const +sal_uInt16 SdrGrafObj::GetObjIdentifier() const { - return UINT16( OBJ_GRAF ); + return sal_uInt16( OBJ_GRAF ); } // ----------------------------------------------------------------------------- @@ -726,7 +726,7 @@ void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) ); @@ -765,7 +765,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) ); @@ -884,8 +884,8 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract { SdrRectObj::NbcResize( rRef, xFact, yFact ); - FASTBOOL bMirrX = xFact.GetNumerator() < 0; - FASTBOOL bMirrY = yFact.GetNumerator() < 0; + int bMirrX = xFact.GetNumerator() < 0; + int bMirrY = yFact.GetNumerator() < 0; if( bMirrX != bMirrY ) bMirrored = !bMirrored; @@ -908,7 +908,7 @@ void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) // ----------------------------------------------------------------------------- -void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) +void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) { SdrRectObj::NbcRotate( rRef, nWink, tn, bVShear ); } @@ -924,7 +924,7 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { - //FASTBOOL bChg=rRect.GetSize()!=aRect.GetSize(); + //int bChg=rRect.GetSize()!=aRect.GetSize(); SdrRectObj::NbcSetLogicRect(rRect); } @@ -950,7 +950,7 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { //long nDrehMerk = aGeo.nDrehWink; //long nShearMerk = aGeo.nShearWink; - //FASTBOOL bMirrMerk = bMirrored; + //int bMirrMerk = bMirrored; Size aSizMerk( aRect.GetSize() ); SdrRectObj::RestGeoData(rGeo); @@ -962,8 +962,8 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) void SdrGrafObj::SetPage( SdrPage* pNewPage ) { - FASTBOOL bRemove = pNewPage == NULL && pPage != NULL; - FASTBOOL bInsert = pNewPage != NULL && pPage == NULL; + int bRemove = pNewPage == NULL && pPage != NULL; + int bInsert = pNewPage != NULL && pPage == NULL; if( bRemove ) { @@ -985,7 +985,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) void SdrGrafObj::SetModel( SdrModel* pNewModel ) { - FASTBOOL bChg = pNewModel != pModel; + int bChg = pNewModel != pModel; if( bChg ) { @@ -1026,7 +1026,7 @@ void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/) // ----------------------------------------------------------------------------- -FASTBOOL SdrGrafObj::HasGDIMetaFile() const +int SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); } @@ -1041,7 +1041,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const // ----------------------------------------------------------------------------- -SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pRetval = NULL; @@ -1058,7 +1058,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const aFilter.SetScaleRect(GetSnapRect()); aFilter.SetLayer(GetLayer()); - UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); + sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); if(nInsAnz) { pRetval = pGrp; @@ -1104,7 +1104,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const Bitmap aBitmap( GetTransformedGraphic().GetBitmap() ); XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH); aSet.Put(XFillBitmapItem(String(), aXBmp)); - aSet.Put(XFillBmpTileItem(FALSE)); + aSet.Put(XFillBmpTileItem(sal_False)); pRetval->SetMergedItemSet(aSet); } @@ -1142,7 +1142,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() ); aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() ); aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 ); - aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 ) * 2.55 ) ); + aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() ); aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() ); aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() ); @@ -1161,7 +1161,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr() SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) ); SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) ); SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) ); - SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); + SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) ); SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) ); SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) ); @@ -1234,7 +1234,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) // ## test only if there are VOCs other than the preview renderer if(!GetViewContact().HasViewObjectContacts(true)) { - const ULONG nSwapMode = pModel->GetSwapGraphicsMode(); + const sal_uIntPtr nSwapMode = pModel->GetSwapGraphicsMode(); if( ( pGraphic->HasUserData() || pGraphicLink ) && ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) ) @@ -1266,7 +1266,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); @@ -1384,7 +1384,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream() { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); -- cgit v1.2.3 From 66356194e2a9b45df904e6452b954b9e15a121c3 Mon Sep 17 00:00:00 2001 From: Mikhail Voytenko Date: Tue, 11 Jan 2011 16:23:55 +0100 Subject: removetooltypes01: #i112600# do not affect FASTBOOL in this cws --- basic/source/sbx/sbxobj.cxx | 4 +- fpicker/source/office/iodlg.cxx | 2 +- sfx2/inc/sfx2/app.hxx | 8 +- sfx2/inc/sfx2/prnmon.hxx | 2 +- sfx2/inc/sfx2/progress.hxx | 2 +- sfx2/inc/sfx2/request.hxx | 6 +- sfx2/inc/sfx2/shell.hxx | 2 +- sfx2/inc/sfx2/viewsh.hxx | 6 +- sfx2/source/appl/app.cxx | 2 +- sfx2/source/appl/appcfg.cxx | 2 +- sfx2/source/appl/appserv.cxx | 2 +- sfx2/source/appl/workwin.cxx | 10 +-- sfx2/source/bastyp/progress.cxx | 2 +- sfx2/source/control/bindings.cxx | 8 +- sfx2/source/control/dispatch.cxx | 18 ++-- sfx2/source/control/macro.cxx | 10 +-- sfx2/source/control/request.cxx | 8 +- sfx2/source/control/shell.cxx | 2 +- sfx2/source/control/statcach.cxx | 4 +- sfx2/source/dialog/tabdlg.cxx | 2 +- sfx2/source/dialog/tplcitem.cxx | 2 +- sfx2/source/inc/virtmenu.hxx | 2 +- sfx2/source/inc/workwin.hxx | 2 +- sfx2/source/menu/mnuitem.cxx | 2 +- sfx2/source/menu/virtmenu.cxx | 8 +- sfx2/source/view/viewfrm.cxx | 4 - sfx2/source/view/viewprn.cxx | 4 +- sfx2/source/view/viewsh.cxx | 8 +- svx/inc/svdibrow.hxx | 18 ++-- svx/inc/svx/fmmodel.hxx | 6 +- svx/inc/svx/hdft.hxx | 2 +- svx/inc/svx/layctrl.hxx | 4 +- svx/inc/svx/scene3d.hxx | 8 +- svx/inc/svx/sdmetitm.hxx | 4 +- svx/inc/svx/sdtaaitm.hxx | 4 +- svx/inc/svx/srchdlg.hxx | 6 +- svx/inc/svx/svddrag.hxx | 68 +++++++-------- svx/inc/svx/svdetc.hxx | 10 +-- svx/inc/svx/svdglue.hxx | 28 +++--- svx/inc/svx/svdhlpln.hxx | 2 +- svx/inc/svx/svdlayer.hxx | 10 +-- svx/inc/svx/svdmodel.hxx | 122 +++++++++++++------------- svx/inc/svx/svdoashp.hxx | 24 +++--- svx/inc/svx/svdobj.hxx | 48 +++++------ svx/inc/svx/svdocapt.hxx | 8 +- svx/inc/svx/svdocirc.hxx | 12 +-- svx/inc/svx/svdoedge.hxx | 34 ++++---- svx/inc/svx/svdograf.hxx | 4 +- svx/inc/svx/svdogrp.hxx | 12 +-- svx/inc/svx/svdomeas.hxx | 18 ++-- svx/inc/svx/svdoole2.hxx | 10 +-- svx/inc/svx/svdopath.hxx | 10 +-- svx/inc/svx/svdorect.hxx | 6 +- svx/inc/svx/svdotable.hxx | 22 ++--- svx/inc/svx/svdotext.hxx | 72 ++++++++-------- svx/inc/svx/svdpage.hxx | 20 ++--- svx/inc/svx/svdundo.hxx | 30 +++---- svx/inc/svx/xflbmsxy.hxx | 4 +- svx/inc/svx/xflhtit.hxx | 4 +- svx/inc/svx/xlndsit.hxx | 4 +- svx/inc/svx/zoomitem.hxx | 2 +- svx/source/dialog/graphctl.cxx | 2 +- svx/source/dialog/pagectrl.cxx | 2 +- svx/source/dialog/srchdlg.cxx | 14 +-- svx/source/form/fmmodel.cxx | 6 +- svx/source/svdraw/svdattr.cxx | 8 +- svx/source/svdraw/svdetc.cxx | 8 +- svx/source/svdraw/svdfmtf.cxx | 10 +-- svx/source/svdraw/svdglue.cxx | 16 ++-- svx/source/svdraw/svdhlpln.cxx | 8 +- svx/source/svdraw/svdibrow.cxx | 54 ++++++------ svx/source/svdraw/svdlayer.cxx | 8 +- svx/source/svdraw/svdmodel.cxx | 66 +++++++------- svx/source/svdraw/svdoashp.cxx | 32 +++---- svx/source/svdraw/svdobj.cxx | 72 ++++++++-------- svx/source/svdraw/svdocapt.cxx | 28 +++--- svx/source/svdraw/svdocirc.cxx | 28 +++--- svx/source/svdraw/svdoedge.cxx | 156 ++++++++++++++++----------------- svx/source/svdraw/svdograf.cxx | 22 ++--- svx/source/svdraw/svdogrp.cxx | 22 ++--- svx/source/svdraw/svdomeas.cxx | 70 +++++++-------- svx/source/svdraw/svdoole2.cxx | 14 +-- svx/source/svdraw/svdopath.cxx | 182 +++++++++++++++++++-------------------- svx/source/svdraw/svdorect.cxx | 12 +-- svx/source/svdraw/svdotext.cxx | 60 ++++++------- svx/source/svdraw/svdotxat.cxx | 22 ++--- svx/source/svdraw/svdotxed.cxx | 14 +-- svx/source/svdraw/svdotxfl.cxx | 4 +- svx/source/svdraw/svdotxln.cxx | 8 +- svx/source/svdraw/svdotxtr.cxx | 22 ++--- svx/source/svdraw/svdoutl.cxx | 2 +- svx/source/svdraw/svdovirt.cxx | 18 ++-- svx/source/svdraw/svdpage.cxx | 14 +-- svx/source/svdraw/svdpagv.cxx | 16 ++-- svx/source/svdraw/svdtext.cxx | 2 +- svx/source/svdraw/svdtrans.cxx | 74 ++++++++-------- svx/source/svdraw/svdundo.cxx | 10 +-- svx/source/table/svdotable.cxx | 26 +++--- svx/source/tbxctrls/fillctrl.cxx | 2 +- svx/source/tbxctrls/itemwin.cxx | 2 +- svx/source/xoutdev/xattr.cxx | 8 +- svx/source/xoutdev/xattr2.cxx | 4 +- 102 files changed, 957 insertions(+), 961 deletions(-) (limited to 'svx/source/svdraw/svdograf.cxx') diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index d4aaf281a042..266e39907b66 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -804,7 +804,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix, // Properties in einem String einsammeln XubString aSource; SbxArrayRef xProps( GetProperties() ); - int bLineFeed = sal_False; + bool bLineFeed = false; for ( sal_uInt16 nProp = 0; nProp < xProps->Count(); ++nProp ) { SbxPropertyRef xProp = (SbxProperty*) xProps->Get(nProp); @@ -817,7 +817,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix, if ( bLineFeed ) aSource.AppendAscii( "\n" ); else - bLineFeed = sal_True; + bLineFeed = true; aSource += rLinePrefix; aSource += '.'; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 131e0841cfb7..3749b6e7a85a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -3273,7 +3273,7 @@ sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine ) Point aNewControlPos; Size* pNewDlgSize = NULL; sal_Bool bNewRow = bNewLine; - int bFirstNewRow = sal_False; + sal_Bool bFirstNewRow = sal_False; if ( nType == WINDOW_WINDOW ) { diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 2bfd38d51276..804a43b35d7f 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -238,7 +238,7 @@ public: sal_uInt16 SaveBasicManager() const; sal_uInt16 SaveBasicAndDialogContainer() const; void EnterBasicCall(); - int IsInBasicCall() const; + bool IsInBasicCall() const; void LeaveBasicCall(); void RegisterBasicConstants( const char *pPrefix, const SfxConstant *pConsts, @@ -248,7 +248,7 @@ public: sal_Bool GetOptions(SfxItemSet &); void SetOptions(const SfxItemSet &); virtual void Invalidate(sal_uInt16 nId = 0); - void NotifyEvent(const SfxEventHint& rEvent, int bSynchron = sal_True ); + void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); sal_Bool IsDowning() const; sal_Bool IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const; static SfxObjectShellRef DocAlreadyLoaded( const String &rName, @@ -265,7 +265,7 @@ public: SAL_DLLPRIVATE sal_Bool QueryExit_Impl(); SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &); - SAL_DLLPRIVATE int Initialize_Impl(); + SAL_DLLPRIVATE bool Initialize_Impl(); SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; } @@ -306,7 +306,7 @@ public: SAL_DLLPRIVATE void PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas ); SAL_DLLPRIVATE void EnterAsynchronCall_Impl(); - SAL_DLLPRIVATE int IsInAsynchronCall_Impl() const; + SAL_DLLPRIVATE bool IsInAsynchronCall_Impl() const; SAL_DLLPRIVATE void LeaveAsynchronCall_Impl(); SAL_DLLPRIVATE void Registrations_Impl(); SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const; diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx index a4a48cf095d9..0b00fbb47ab9 100644 --- a/sfx2/inc/sfx2/prnmon.hxx +++ b/sfx2/inc/sfx2/prnmon.hxx @@ -57,7 +57,7 @@ private: //#endif public: SfxPrintProgress( SfxViewShell* pViewSh, - int bShow = sal_True ); + FASTBOOL bShow = sal_True ); virtual ~SfxPrintProgress(); virtual void SetText( const String &rText ); diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index e5c95625e587..6f21f6ed92f8 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -82,7 +82,7 @@ public: //#if 0 // _SOLAR__PRIVATE DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* ); DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* ); - SAL_DLLPRIVATE int StatusBarManagerGone_Impl(SfxStatusBarManager*pStb); + SAL_DLLPRIVATE FASTBOOL StatusBarManagerGone_Impl(SfxStatusBarManager*pStb); SAL_DLLPRIVATE const String& GetStateText_Impl() const; //#endif }; diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index d74e565807ed..26a87fa31c3d 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -96,7 +96,7 @@ public: static const SfxPoolItem* GetItem( const SfxItemSet*, sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ); - const SfxPoolItem* GetArg( sal_uInt16 nSlotId, int bDeep = sal_False, TypeId aType = 0 ) const; + const SfxPoolItem* GetArg( sal_uInt16 nSlotId, bool bDeep = false, TypeId aType = 0 ) const; void ReleaseArgs(); void SetReturnValue(const SfxPoolItem &); const SfxPoolItem* GetReturnValue() const; @@ -105,7 +105,7 @@ public: static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL ); static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL ); sal_uInt16 GetCallMode() const; - int IsRecording() const; + bool IsRecording() const; void AllowRecording( sal_Bool ); sal_Bool AllowsRecording() const; sal_Bool IsAPI() const; @@ -119,7 +119,7 @@ public: void Ignore(); void Cancel(); sal_Bool IsCancelled() const; - void Done(const SfxItemSet &, int bKeep = sal_True ); + void Done(const SfxItemSet &, bool bKeep = true ); void ForgetAllArgs(); diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 8eb2ed59077a..ceec7c05c719 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -254,7 +254,7 @@ public: virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); #ifndef _SFXSH_HXX - SAL_DLLPRIVATE int CanExecuteSlot_Impl( const SfxSlot &rSlot ); + SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot ); SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI); #endif diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 7a155af570d6..3209a791b8e0 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -224,8 +224,8 @@ public: // Focus, KeyInput, Cursor void GotFocus() const; inline void LostFocus() const; - virtual void ShowCursor( int bOn = sal_True ); - virtual int KeyInput( const KeyEvent &rKeyEvent ); + virtual void ShowCursor( FASTBOOL bOn = sal_True ); + virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent ); sal_Bool Escape(); // Viewing Interface @@ -300,7 +300,7 @@ public: SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const; SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor ); SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor ); - SAL_DLLPRIVATE int GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); + SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) { GetIPClientList_Impl(sal_True)->Insert(pIPClient); } diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 1443b8351011..b214012ddfdb 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -651,7 +651,7 @@ void SfxApplication::LeaveAsynchronCall_Impl() //-------------------------------------------------------------------- -int SfxApplication::IsInAsynchronCall_Impl() const +FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const { return pAppData_Impl->nAsynchronCalls > 0; } diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 1d903266ffa8..7f6e6c335383 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -1003,7 +1003,7 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const //-------------------------------------------------------------------- //-------------------------------------------------------------------- -void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, int bSynchron ) +void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron ) { //DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!"); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index cbdddb79f0a9..c9e09254edda 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -157,7 +157,7 @@ long QuitAgain_Impl( void* pObj, void* pArg ) void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { DBG_MEMTEST(); - int bDone = sal_False; + bool bDone = sal_False; switch ( rReq.GetSlot() ) { case SID_SETOPTIONS: diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 1fb3dd38f50f..0692b85afcda 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -1292,7 +1292,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, //------------------------------------------------------------------------ -int SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const +bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const /* [Beschreibung] @@ -1309,10 +1309,10 @@ int SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const for ( sal_uInt16 n=0; n wird zerst"ort ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index b2b414707291..8dab74f6c7d8 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -373,7 +373,7 @@ void SfxBindings::HidePopups( bool bHide ) pImp->pWorkWin->HidePopups_Impl( bHide, sal_True ); } -void SfxBindings::HidePopupCtrls_Impl( int bHide ) +void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide ) { if ( bHide ) { @@ -1503,10 +1503,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl } // Mu\s der Slot "uberhaupt upgedatet werden ? - int bInsert = pSiblingCache && pSiblingCache->IsControllerDirty(); + bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty(); // Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !! - int bSameMethod = pSiblingCache && pFnc == pSiblingFnc; + bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc; // Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht // einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt. @@ -1736,7 +1736,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) pImp->aTimer.SetTimeout(TIMEOUT_UPDATING); // at least 10 loops and further if more jobs are available but no input - int bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule; + bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule; sal_uInt16 nLoops = 10; pImp->bInNextJob = sal_True; const sal_uInt16 nCount = pImp->pCaches->Count(); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index de8df832ef5b..295b8891fbbb 100755 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -2022,7 +2022,7 @@ void SfxDispatcher::FlushImpl() { // tats"aechlich poppen SfxShell* pPopped = 0; - int bFound = sal_False; + bool bFound = sal_False; do { DBG_ASSERT( pImp->aStack.Count(), "popping from empty stack" ); @@ -2403,12 +2403,12 @@ sal_Bool SfxDispatcher::_FindServer if ( pSlot ) { // Slot geh"ort zum Container? - int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER); - int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive(); + bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER); + bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive(); // Shell geh"ort zum Server? // AppDispatcher oder IPFrame-Dispatcher - int bIsServerShell = !pImp->pFrame || bIsInPlace; + bool bIsServerShell = !pImp->pFrame || bIsInPlace; // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen. @@ -2420,7 +2420,7 @@ sal_Bool SfxDispatcher::_FindServer // Shell geh"ort zum Container? // AppDispatcher oder kein IPFrameDispatcher - int bIsContainerShell = !pImp->pFrame || !bIsInPlace; + bool bIsContainerShell = !pImp->pFrame || !bIsInPlace; // Shell und Slot passen zusammen if ( !( ( bIsContainerSlot && bIsContainerShell ) || ( !bIsContainerSlot && bIsServerShell ) ) ) @@ -2521,12 +2521,12 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot ) if ( pSlot ) { // Slot geh"ort zum Container? - int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER); - int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive(); + bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER); + bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive(); // Shell geh"ort zum Server? // AppDispatcher oder IPFrame-Dispatcher - int bIsServerShell = !pImp->pFrame || bIsInPlace; + bool bIsServerShell = !pImp->pFrame || bIsInPlace; // Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf // einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen. @@ -2538,7 +2538,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot ) // Shell geh"ort zum Container? // AppDispatcher oder kein IPFrameDispatcher - int bIsContainerShell = !pImp->pFrame || !bIsInPlace; + bool bIsContainerShell = !pImp->pFrame || !bIsInPlace; // Shell und Slot passen zusammen if ( !( ( bIsContainerSlot && bIsContainerShell ) || diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx index 4bf4eeef8696..87879656021e 100644 --- a/sfx2/source/control/macro.cxx +++ b/sfx2/source/control/macro.cxx @@ -126,11 +126,11 @@ SfxMacroStatement::SfxMacroStatement return; /* // Objekt-Typ bestimmen - int bIsApp = rShell.ISA(SfxApplication); - int bIsDoc = rShell.ISA(SfxObjectShell); - int bIsWin = !bIsApp && !bIsDoc && + bool bIsApp = rShell.ISA(SfxApplication); + bool bIsDoc = rShell.ISA(SfxObjectShell); + bool bIsWin = !bIsApp && !bIsDoc && ( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) ); - int bIsSel = !bIsApp && !bIsDoc && !bIsWin; + bool bIsSel = !bIsApp && !bIsDoc && !bIsWin; // Objekt nicht schon im Slot-Namen enthalten? if ( bIsSel || rSlot.pName[0] == '.' ) @@ -387,7 +387,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl } // nicht druckbare Zeichen werden als chr$(...) geschrieben - int bPrevReplaced = sal_False; + bool bPrevReplaced = sal_False; for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n ) { sal_Unicode cChar = aRecordable.GetChar(n); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 05c9a8da0eb0..718e51922e7d 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -471,7 +471,7 @@ void SfxRequest::RemoveItem( sal_uInt16 nID ) const SfxPoolItem* SfxRequest::GetArg ( sal_uInt16 nSlotId, // Slot-Id oder Which-Id des Parameters - int bDeep, // sal_False: nicht in Parent-ItemSets suchen + bool bDeep, // false: nicht in Parent-ItemSets suchen TypeId aType // != 0: RTTI Pruefung mit Assertion ) const { @@ -574,11 +574,11 @@ void SfxRequest::Done erfragt wurden, ggf. 0 falls keine Parameter gesetzt wurden */ - int bKeep /* sal_True (default) + bool bKeep /* true (default) 'rSet' wird gepeichert und ist "uber GetArgs() abfragbar - FALSE + false 'rSet' wird nicht kopiert (schneller) */ ) @@ -904,7 +904,7 @@ sal_Bool SfxRequest::IsAPI() const //-------------------------------------------------------------------- -int SfxRequest::IsRecording() const +bool SfxRequest::IsRecording() const /* [Beschreibung] diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index eabf666078f6..5722d228ed07 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -853,7 +853,7 @@ ResMgr* SfxShell::GetResMgr() const //-------------------------------------------------------------------- -int SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) +bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) /* [Beschreibung] diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index cb2498c290f7..889cf97b1b6c 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -457,10 +457,10 @@ void SfxStateCache::SetState_Impl DBG_PROFSTART(SfxStateCacheSetState); // m"ussen die Controller "uberhaupt benachrichtigt werden? - int bNotify = bItemDirty; + bool bNotify = bItemDirty; if ( !bItemDirty ) { - int bBothAvailable = pLastItem && pState && + bool bBothAvailable = pLastItem && pState && !IsInvalidItem(pState) && !IsInvalidItem(pLastItem); DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" ); if ( bBothAvailable ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 3c42e726a146..e9c66e2a5f13 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -1761,7 +1761,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet ) */ { - int bSet = ( pSet != NULL ); + bool bSet = ( pSet != NULL ); pSet = pInSet; diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 72fff7e0aa54..2b815a260e3a 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -79,7 +79,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta case SID_STYLE_FAMILY4: case SID_STYLE_FAMILY5: { - int bAvailable = SFX_ITEM_AVAILABLE == eState; + bool bAvailable = SFX_ITEM_AVAILABLE == eState; if ( !bAvailable ) rTemplateDlg.SetFamilyState(GetId(), 0); else { diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index d15cc20f8280..c54a627e2a78 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -68,7 +68,7 @@ private: private: void Construct_Impl(); - int Bind_Impl( Menu *pMenu ); + bool Bind_Impl( Menu *pMenu ); inline SfxMenuCtrlArr_Impl& GetAppCtrl_Impl() { return pAppCtrl? *pAppCtrl: *(pAppCtrl = new SfxMenuCtrlArr_Impl) ; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index a653ba71a085..8c06e1233297 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -335,7 +335,7 @@ public: void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface *pIFace, const String* pName=0 ); Window* GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId ); - int KnowsObjectBar_Impl( sal_uInt16 nPos ) const; + bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; sal_Bool IsVisible_Impl(); void MakeVisible_Impl( sal_Bool ); void SetObjectBarVisibility_Impl( sal_uInt16 nVis ); diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index e4d26062d8cb..9b7506d993b9 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -258,7 +258,7 @@ void SfxMenuControl::StateChanged DBG_ASSERT( nSID == GetId(), "strange SID" ); DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" ); - int bIsObjMenu = + bool bIsObjMenu = GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST; // enabled/disabled-Flag pauschal korrigieren diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index c6e09245184d..cd5aa937e2b6 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -768,7 +768,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu ) //-------------------------------------------------------------------- -int SfxVirtualMenu::Bind_Impl( Menu *pMenu ) +bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) { // Selber suchen, da SV mit 'sal_uInt16 nSID = pSVMenu->GetCurItemId();' immer // 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit @@ -778,7 +778,7 @@ int SfxVirtualMenu::Bind_Impl( Menu *pMenu ) for ( sal_uInt16 nPos = 0; nPos < nCount; ++nPos ) { // angesprochenes Sub-Menu gefunden? - int bFound = sal_False; + bool bFound = false; sal_uInt16 nSID = pSVMenu->GetItemId(nPos); SfxMenuControl &rCtrl = pItems[nPos]; bFound = pSVMenu->GetPopupMenu(nSID) == pMenu; @@ -824,11 +824,11 @@ int SfxVirtualMenu::Bind_Impl( Menu *pMenu ) // gefunden, dann abbrechen if ( bFound ) - return sal_True; + return true; } // nicht in diesem Untermenu gefunden - return sal_False; + return false; } void SfxVirtualMenu::BindControllers() diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index abc863e36887..d88c097a0d57 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -3028,7 +3028,6 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { DBG_MEMTEST(); - int bDone = sal_False; switch ( rReq.GetSlot() ) { case SID_STOP_RECORDING : @@ -3207,9 +3206,6 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) break; } } - - if ( bDone ) - rReq.Done(); } void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 2907d31ef709..9f244a1c303d 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -528,8 +528,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) SfxPrinter *pDocPrinter = GetPrinter(); // Printer-Options auswerten - int bOriToDoc = sal_False; - int bSizeToDoc = sal_False; + bool bOriToDoc = false; + bool bSizeToDoc = false; if ( &pDocPrinter->GetOptions() ) { sal_uInt16 nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index cfa336470738..88b185482abb 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1758,7 +1758,7 @@ sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) //-------------------------------------------------------------------- -int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) +FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) /* [Beschreibung] @@ -1769,7 +1769,7 @@ int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) [R"uckgabewert] - int TRUE + FASTBOOL sal_True die Taste ist konfiguriert, der betreffende Handler wurde gerufen @@ -1785,14 +1785,14 @@ int SfxViewShell::KeyInput( const KeyEvent &rKeyEvent ) return ExecKey_Impl(rKeyEvent); } -int SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) +bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ) { return ExecKey_Impl(rKeyEvent); } //-------------------------------------------------------------------- -void SfxViewShell::ShowCursor( int /*bOn*/ ) +void SfxViewShell::ShowCursor( FASTBOOL /*bOn*/ ) /* [Beschreibung] diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 7c844e80c71c..0d20b950a49c 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -50,11 +50,11 @@ friend class ImpItemEdit; sal_uInt16 nLastWhich; sal_uInt16 nLastWhichOben; sal_uInt16 nLastWhichUnten; - int bWhichesButNames; - int bDontHideIneffectiveItems; - int bDontSortItems; - int bShowWhichIds; - int bShowRealValues; + FASTBOOL bWhichesButNames; + FASTBOOL bDontHideIneffectiveItems; + FASTBOOL bDontSortItems; + FASTBOOL bShowWhichIds; + FASTBOOL bShowRealValues; private: #if _SOLAR__PRIVATE void ImpCtor(); @@ -80,8 +80,8 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual int BegChangeEntry(sal_uIntPtr nPos); - virtual int EndChangeEntry(); + virtual FASTBOOL BegChangeEntry(sal_uIntPtr nPos); + virtual FASTBOOL EndChangeEntry(); virtual void BrkChangeEntry(); /** GetCellText returns the text at the given position @@ -114,7 +114,7 @@ public: virtual void GetFocus(); void Clear() { aBrowse.Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); } - void SetFloatingMode(int /*bOn*/) {} + void SetFloatingMode(FASTBOOL /*bOn*/) {} const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; } _SdrItemBrowserControl& GetBrowserControl() { return aBrowse; } }; @@ -124,7 +124,7 @@ class SdrView; class SdrItemBrowser: public _SdrItemBrowserWindow { Timer aIdleTimer; SdrView* pView; - int bDirty; + FASTBOOL bDirty; private: static Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl,Timer*); diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index a8e7519adb43..98655fb4e640 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -60,13 +60,13 @@ public: FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, int bUseExtColorTable); + FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable); FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - int bUseExtColorTable); + FASTBOOL bUseExtColorTable); virtual ~FmFormModel(); - virtual SdrPage* AllocPage(int bMasterPage); + virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 297d44acaa07..adc4745ace83 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -90,7 +90,7 @@ protected: SfxItemSet* pBBSet; sal_Bool bDisableQueryBox; sal_Bool bEnableBackgroundSelector; - int bInReset; + FASTBOOL bInReset; void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx index cf77a41f0ee7..6137c33a0eb2 100644 --- a/svx/inc/svx/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl { private: - int bEnabled; + FASTBOOL bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; @@ -58,7 +58,7 @@ public: class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl { - int bEnabled; + FASTBOOL bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index bd01c7f35475..a55eac577419 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -242,10 +242,10 @@ public: virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; // create moves - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); }; diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index fdcffbfe79c0..a92e9f0944b8 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -44,8 +44,8 @@ public: SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 5bdcb4097997..d60e83859eaf 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -38,8 +38,8 @@ public: SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index b4e8cb17a555..c2a7893be044 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -218,9 +218,9 @@ private: sal_Bool bSearch; sal_Bool bFormat; sal_uInt16 nOptions; - int bSet; - int bReadOnly; - int bConstruct; + FASTBOOL bSet; + FASTBOOL bReadOnly; + FASTBOOL bConstruct; sal_uIntPtr nModifyFlag; String aStylesStr; String aLayoutStr; diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 8b2ff7f6a733..00355132fab2 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -69,11 +69,11 @@ protected: Point aReservePoint4; Rectangle aReserveRect1; Rectangle aReserveRect2; - int bEndDragChangesAttributes; - int bEndDragChangesGeoAndAttributes; - int bMouseIsUp; - int aReserveBool3; - int aReserveBool4; + FASTBOOL bEndDragChangesAttributes; + FASTBOOL bEndDragChangesGeoAndAttributes; + FASTBOOL bMouseIsUp; + FASTBOOL aReserveBool3; + FASTBOOL aReserveBool4; long aReserveLong1; long aReserveLong2; long aReserveLong3; @@ -83,21 +83,21 @@ protected: void* aReservePtr3; void* aReservePtr4; - int bShown; // Xor sichrbar? + FASTBOOL bShown; // Xor sichrbar? sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden - int bMinMoved; // MinMove durchbrochen? + FASTBOOL bMinMoved; // MinMove durchbrochen? - int bHorFixed; // nur Vertikal draggen - int bVerFixed; // nur Horizontal draggen - int bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet + FASTBOOL bHorFixed; // nur Vertikal draggen + FASTBOOL bVerFixed; // nur Horizontal draggen + FASTBOOL bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben. - int bOrtho4; - int bOrtho8; + FASTBOOL bOrtho4; + FASTBOOL bOrtho8; SdrDragMethod* pDragMethod; protected: - void Clear(int bLeaveOne); + void Clear(FASTBOOL bLeaveOne); Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata @@ -129,50 +129,50 @@ public: void SetHdl(SdrHdl* pH) { pHdl=pH; } SdrDragStatUserData* GetUser() const { return pUser; } void SetUser(SdrDragStatUserData* pU) { pUser=pU; } - int IsShown() const { return bShown; } - void SetShown(int bOn) { bShown=bOn; } + FASTBOOL IsShown() const { return bShown; } + void SetShown(FASTBOOL bOn) { bShown=bOn; } - int IsMinMoved() const { return bMinMoved; } + FASTBOOL IsMinMoved() const { return bMinMoved; } void SetMinMoved() { bMinMoved=sal_True; } void ResetMinMoved() { bMinMoved=sal_False; } void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } sal_uInt16 GetMinMove() const { return nMinMov; } - int IsHorFixed() const { return bHorFixed; } - void SetHorFixed(int bOn) { bHorFixed=bOn; } - int IsVerFixed() const { return bVerFixed; } - void SetVerFixed(int bOn) { bVerFixed=bOn; } + FASTBOOL IsHorFixed() const { return bHorFixed; } + void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; } + FASTBOOL IsVerFixed() const { return bVerFixed; } + void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; } // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!" // z.B. fuer den Winkel des Kreisbogen... - int IsNoSnap() const { return bWantNoSnap; } - void SetNoSnap(int bOn=sal_True) { bWantNoSnap=bOn; } + FASTBOOL IsNoSnap() const { return bWantNoSnap; } + void SetNoSnap(FASTBOOL bOn=sal_True) { bWantNoSnap=bOn; } // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins) // sinnvoll auf ihm angewendet werden kann. // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt) - int IsOrtho4Possible() const { return bOrtho4; } - void SetOrtho4Possible(int bOn=sal_True) { bOrtho4=bOn; } + FASTBOOL IsOrtho4Possible() const { return bOrtho4; } + void SetOrtho4Possible(FASTBOOL bOn=sal_True) { bOrtho4=bOn; } // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien) - int IsOrtho8Possible() const { return bOrtho8; } - void SetOrtho8Possible(int bOn=sal_True) { bOrtho8=bOn; } + FASTBOOL IsOrtho8Possible() const { return bOrtho8; } + void SetOrtho8Possible(FASTBOOL bOn=sal_True) { bOrtho8=bOn; } // Wird vom gedraggten Objekt gesetzt - int IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } - void SetEndDragChangesAttributes(int bOn) { bEndDragChangesAttributes=bOn; } - int IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } - void SetEndDragChangesGeoAndAttributes(int bOn) { bEndDragChangesGeoAndAttributes=bOn; } + FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } + void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; } + FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } + void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; } // Wird von der View gesetzt und kann vom Obj ausgewertet werden - int IsMouseDown() const { return !bMouseIsUp; } - void SetMouseDown(int bDown) { bMouseIsUp=!bDown; } + FASTBOOL IsMouseDown() const { return !bMouseIsUp; } + void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; } Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(int bSaveReal=sal_False); + void NextPoint(FASTBOOL bSaveReal=sal_False); void PrevPoint(); - int CheckMinMoved(const Point& rPnt); + FASTBOOL CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } long GetDY() const { return GetNow().Y()-GetPrev().Y(); } Fraction GetXFact() const; diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 7ea8d181e2fa..f1ba2d3cf93b 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -125,7 +125,7 @@ public: class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle // Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. -SVX_DLLPUBLIC int GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); +SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { @@ -163,7 +163,7 @@ private: // damit keiner vergessen wird virtual void Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; -// virtual int Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; +// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -186,10 +186,10 @@ class ImpSdrHdcMerk Color* pLineColorMerk; sal_uInt16 nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, int bAutoMerk=sal_True); + ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=sal_True); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); - int IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } + FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const; }; //#endif // __PRIVATE @@ -275,7 +275,7 @@ public: const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); } void InsertLink(const Link& rLink, unsigned nPos=0xFFFF); void RemoveLink(const Link& rLink); - int HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } + FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } }; // Fuer die Factory in SvdObj.CXX diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index ed8ab7dc33b0..334b79229aa0 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -69,12 +69,12 @@ class SVX_DLLPUBLIC SdrGluePoint { sal_uInt16 nEscDir; sal_uInt16 nId; sal_uInt16 nAlign; - int bNoPercent:1; - int bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - int bUserDefined:1; // #i38892# + FASTBOOL bNoPercent:1; + FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt + FASTBOOL bUserDefined:1; // #i38892# public: SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } - SdrGluePoint(const Point& rNewPos, int bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; } + SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } @@ -84,14 +84,14 @@ public: sal_uInt16 GetId() const { return nId; } void SetId(sal_uInt16 nNewId) { nId=nNewId; } bool IsPercent() const { return !bNoPercent; } - void SetPercent(int bOn) { bNoPercent=!bOn; } + void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - int IsReallyAbsolute() const { return bReallyAbsolute; } - void SetReallyAbsolute(int bOn, const SdrObject& rObj); + FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; } + void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); // #i38892# - int IsUserDefined() const { return bUserDefined; } - void SetUserDefined(int bNew) { bUserDefined = bNew; } + FASTBOOL IsUserDefined() const { return bUserDefined; } + void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; } sal_uInt16 GetAlign() const { return nAlign; } void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } @@ -100,7 +100,7 @@ public: sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; - int IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); @@ -111,7 +111,7 @@ public: void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); }; #define SDRGLUEPOINT_NOTFOUND 0xFFFF @@ -134,14 +134,14 @@ public: SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; - sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, int bBack=sal_False, int bNext=sal_False, sal_uInt16 nId0=0) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=sal_False, FASTBOOL bNext=sal_False, sal_uInt16 nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetReallyAbsolute(int bOn, const SdrObject& rObj); + void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); }; diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index dd6698110f67..a41d69a38eff 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -68,7 +68,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - int IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; + FASTBOOL IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index db7caa7ce134..b38ada9733d7 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -69,8 +69,8 @@ public: // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll. // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName() // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined". - void SetStandardLayer(int bStd=sal_True); - int IsStandardLayer() const { return nType==1; } + void SetStandardLayer(FASTBOOL bStd=sal_True); + FASTBOOL IsStandardLayer() const { return nType==1; } }; // Beim Aendern von Layerdaten muss man derzeit @@ -124,9 +124,9 @@ public: sal_uInt16 GetLayerPos(SdrLayer* pLayer) const; - SdrLayer* GetLayer(const String& rName, int bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } - const SdrLayer* GetLayer(const String& rName, int bInherited) const; - SdrLayerID GetLayerID(const String& rName, int bInherited) const; + SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } + const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const; + SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const; SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 28307b6f85b2..01661e1ca5b0 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -171,7 +171,7 @@ public: struct SdrDocumentStreamInfo { - int mbDeleteAfterUse; + FASTBOOL mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; sal_Bool mbDummy1 : 1; @@ -196,11 +196,11 @@ protected: String aUIUnitStr; // see above Fraction aUIUnitFact; // see above int nUIUnitKomma; // see above - int bUIOnlyKomma; // see above + FASTBOOL bUIOnlyKomma; // see above SdrLayerAdmin* pLayerAdmin; SfxItemPool* pItemPool; - int bMyPool; // zum Aufraeumen von pMyPool ab 303a + FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe @@ -220,25 +220,25 @@ protected: bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei - int bExtColorTable; // Keinen eigenen ColorTable + FASTBOOL bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; - int bInfoChanged; - int bPagNumsDirty; - int bMPgNumsDirty; - int bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. - int bSavePortable; // Metafiles portabel speichern - int bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen - int bReadOnly; - int bTransparentTextFrames; - int bSaveCompressed; - int bSwapGraphics; - int bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode - int bSaveOLEPreview; // save preview metafile of OLE objects + FASTBOOL bInfoChanged; + FASTBOOL bPagNumsDirty; + FASTBOOL bMPgNumsDirty; + FASTBOOL bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. + FASTBOOL bSavePortable; // Metafiles portabel speichern + FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen + FASTBOOL bReadOnly; + FASTBOOL bTransparentTextFrames; + FASTBOOL bSaveCompressed; + FASTBOOL bSwapGraphics; + FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode + FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects sal_uInt16 nStreamCompressMode; // Komprimiert schreiben? sal_uInt16 nStreamNumberFormat; sal_uInt16 nDefaultTabulator; sal_uInt32 nMaxUndoCount; - int bSaveNative; + FASTBOOL bSaveNative; sal_Bool bStarDrawPreviewMode; @@ -279,10 +279,10 @@ public: sal_uInt16 mnHandoutPageCount; sal_uInt16 nReserveUInt6; sal_uInt16 nReserveUInt7; - int mbModelLocked; - int mbKernAsianPunctuation; - int mbAddExtLeading; - int mbInDestruction; + FASTBOOL mbModelLocked; + FASTBOOL mbKernAsianPunctuation; + FASTBOOL mbAddExtLeading; + FASTBOOL mbInDestruction; // Zeiger auf Paletten, Listen und Tabellen XColorTable* pColorTable; @@ -310,7 +310,7 @@ private: // Nicht implementiert: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); - SVX_DLLPRIVATE int operator==(const SdrModel& rCmpModel) const; + SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const; //#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); @@ -328,8 +328,8 @@ private: public: //#if 0 // _SOLAR__PRIVATE - int IsPasteResize() const { return bPasteResize; } - void SetPasteResize(int bOn) { bPasteResize=bOn; } + FASTBOOL IsPasteResize() const { return bPasteResize; } + void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; } //#endif // __PRIVATE TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch @@ -345,13 +345,13 @@ public: // Wahl des Pools. SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); virtual ~SdrModel(); void ClearModel(sal_Bool bCalledFromDestructor); // Hier kann man erfragen, ob das Model gerade eingrstreamt wird - int IsLoading() const { return sal_False /*BFS01 bLoading */; } + FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. @@ -364,7 +364,7 @@ public: void BurnInStyleSheetAttributes(); // Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten // und diese beiden VM AllocPage() und AllocModel() ueberladen... - virtual SdrPage* AllocPage(int bMasterPage); + virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual SdrModel* AllocModel() const; // Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model! @@ -449,17 +449,17 @@ public: const Fraction& GetUIUnitFact() const { return aUIUnitFact; } const String& GetUIUnitStr() const { return aUIUnitStr; } int GetUIUnitKomma() const { return nUIUnitKomma; } - int IsUIOnlyKomma() const { return bUIOnlyKomma; } + FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, String& rStr, int bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, String& rStr, int bNoDegChar=sal_False) const; - void TakePercentStr(const Fraction& rVal, String& rStr, int bNoPercentChar=sal_False) const; + void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=sal_False) const; + void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=sal_False) const; // RecalcPageNums wird idR. nur von der Page gerufen. - int IsPagNumsDirty() const { return bPagNumsDirty; }; - int IsMPgNumsDirty() const { return bMPgNumsDirty; }; - void RecalcPageNums(int bMaster); + FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; }; + FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; }; + void RecalcPageNums(FASTBOOL bMaster); // Nach dem Insert gehoert die Page dem SdrModel. virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual void DeletePage(sal_uInt16 nPgNum); @@ -493,28 +493,28 @@ public: // PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt. - int IsPageNotValid() const { return bPageNotValid; } - void SetPageNotValid(int bJa=sal_True) { bPageNotValid=bJa; } + FASTBOOL IsPageNotValid() const { return bPageNotValid; } + void SetPageNotValid(FASTBOOL bJa=sal_True) { bPageNotValid=bJa; } // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. - int IsSavePortable() const { return bSavePortable; } - void SetSavePortable(int bJa=sal_True) { bSavePortable=bJa; } + FASTBOOL IsSavePortable() const { return bSavePortable; } + void SetSavePortable(FASTBOOL bJa=sal_True) { bSavePortable=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. - int IsSaveCompressed() const { return bSaveCompressed; } - void SetSaveCompressed(int bJa=sal_True) { bSaveCompressed=bJa; } + FASTBOOL IsSaveCompressed() const { return bSaveCompressed; } + void SetSaveCompressed(FASTBOOL bJa=sal_True) { bSaveCompressed=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. - int IsSaveNative() const { return bSaveNative; } - void SetSaveNative(int bJa=sal_True) { bSaveNative=bJa; } + FASTBOOL IsSaveNative() const { return bSaveNative; } + void SetSaveNative(FASTBOOL bJa=sal_True) { bSaveNative=bJa; } // Schaltet man dieses Flag auf sal_True, so werden die Grafiken // von Grafikobjekten: @@ -525,13 +525,13 @@ public: // Damit das funktioniert, muss die virtuelle Methode // GetDocumentStream() ueberladen werden. // Default=FALSE. Flag ist nicht persistent. - int IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(int bJa=sal_True); + FASTBOOL IsSwapGraphics() const { return bSwapGraphics; } + void SetSwapGraphics(FASTBOOL bJa=sal_True); void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; } sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; } - int IsSaveOLEPreview() const { return bSaveOLEPreview; } - void SetSaveOLEPreview( int bSet) { bSaveOLEPreview = bSet; } + FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; } + void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; } // Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten) // etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit @@ -540,14 +540,14 @@ public: // in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet // (Speicher sparen). // Default=Cache eingeschaltet. Flag ist nicht persistent. - int IsBitmapCaching() const { return !bNoBitmapCaching; } - void SetBitmapCaching(int bJa=sal_True) { bNoBitmapCaching=!bJa; } + FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; } + void SetBitmapCaching(FASTBOOL bJa=sal_True) { bNoBitmapCaching=!bJa; } // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. - int IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } - void SetPickThroughTransparentTextFrames(int bOn) { bTransparentTextFrames=bOn; } + FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } + void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; } // Darf denn das Model ueberhaupt veraendert werden? // Wird nur von den Possibility-Methoden der View ausgewerdet. @@ -555,8 +555,8 @@ public: // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). - virtual int IsReadOnly() const; - virtual void SetReadOnly(int bYes); + virtual FASTBOOL IsReadOnly() const; + virtual void SetReadOnly(FASTBOOL bYes); // Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht // const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved. @@ -576,13 +576,13 @@ public: virtual void Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, sal_uInt16 nDestPos=0xFFFF, - int bMergeMasterPages=sal_False, int bAllMasterPages=sal_False, - int bUndo=sal_True, int bTreadSourceAsConst=sal_False); + FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False, + FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False); // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,FALSE,bUndo,!bMoveNoCopy); void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - int bUndo=sal_True, int bMoveNoCopy=sal_False); + FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions // beliebig tief zu klammern. Als Kommentar der @@ -617,9 +617,9 @@ public: sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } - int Undo(); - int Redo(); - int Repeat(SfxRepeatTarget&); + FASTBOOL Undo(); + FASTBOOL Redo(); + FASTBOOL Repeat(SfxRepeatTarget&); // Hier kann die Applikation einen Handler setzen, der die auflaufenden // UndoActions einsammelt. Der Handler hat folgendes Aussehen: @@ -681,7 +681,7 @@ public: // Methode sal_True, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) - int CheckConsistence() const; + FASTBOOL CheckConsistence() const; void SetStarDrawPreviewMode(sal_Bool bPreview); sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } @@ -711,7 +711,7 @@ public: void ReformatAllTextObjects(); - int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 7e052cf9eb2e..db0477648599 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -124,7 +124,7 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const int bHgt, const int bWdt ); + Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ); public: // #i37011# @@ -187,7 +187,7 @@ public: virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void SetSnapRect(const Rectangle& rRect); virtual void SetLogicRect(const Rectangle& rRect); @@ -195,7 +195,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -208,21 +208,21 @@ public: virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual int BegCreate( SdrDragStat& rStat ); - virtual int MovCreate(SdrDragStat& rStat); // #i37448# - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BegCreate( SdrDragStat& rStat ); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448# + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int IsAutoGrowHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowWidth() const; virtual void SetVerticalWriting( sal_Bool bVertical ); virtual sal_Bool BegTextEdit( SdrOutliner& rOutl ); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void operator=(const SdrObject& rObj); diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 30d8b407dabe..86d6f0717bb7 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -183,7 +183,7 @@ public: const SetOfByte* pVisiLayer; const SdrPageView* pPageView; sal_uInt16 nTol; - int bDown; + FASTBOOL bDown; public: SdrObjMacroHitRec() @@ -236,11 +236,11 @@ public: sal_uInt32 GetInventor() const { return nInventor; } sal_uInt16 GetId() const { return nIdentifier; } - virtual int HasMacro (const SdrObject* pObj) const; + virtual FASTBOOL HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual int DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); + virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; @@ -522,8 +522,8 @@ protected: void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } - String GetWinkStr(long nWink, int bNoDegChar=sal_False) const; - String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, int bNoUnitChars=sal_False) const; + String GetWinkStr(long nWink, FASTBOOL bNoDegChar=sal_False) const; + String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=sal_False) const; // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -596,7 +596,7 @@ public: // Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der // der beim Einfuegen des Symbols auf das Raster gefangen werden soll // oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes. - virtual int HasRefPoint() const; + virtual FASTBOOL HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); @@ -757,10 +757,10 @@ public: // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen. - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); // damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert @@ -778,13 +778,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void Move (const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); // Die relative Position eines Zeichenobjektes ist die Entfernung der // linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect) @@ -821,7 +821,7 @@ public: // Drehwinkel und Shear virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte, // Kreismittelpunkt, ...) @@ -864,7 +864,7 @@ public: void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False); // NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ... - void TakeNotPersistAttr(SfxItemSet& rAttr, int bMerge) const; + void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const; void ApplyNotPersistAttr(const SfxItemSet& rAttr); void NbcApplyNotPersistAttr(const SfxItemSet& rAttr); @@ -875,7 +875,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // TextEdit - virtual int HasTextEdit() const; + virtual FASTBOOL HasTextEdit() const; // Return==TRUE: TextEditMode gestartet virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); @@ -892,11 +892,11 @@ public: void BurnInStyleSheetAttributes(); // Macrofaehigkeit, z.B. ein Rechteck als PushButton. - virtual int HasMacro() const; + virtual FASTBOOL HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual int DoMacro (const SdrObjMacroHitRec& rRec); + virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; } @@ -917,7 +917,7 @@ public: // Beim Verschieben/Resizen der Kante wird dagegen die Verbindung // geloesst. // Objekt ist ein Knoten? - virtual int IsNode() const; + virtual FASTBOOL IsNode() const; // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern @@ -935,19 +935,19 @@ public: virtual SdrGluePointList* ForceGluePointList(); // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetGlueReallyAbsolute(int bOn); + void SetGlueReallyAbsolute(FASTBOOL bOn); void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs); void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2); - void NbcShearGluePoints (const Point& rRef, long nWink, double tn, int bVShear); + void NbcShearGluePoints (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); // Objekt ist eine Kante? - virtual int IsEdge() const; + virtual FASTBOOL IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - virtual void ConnectToNode(int bTail1, SdrObject* pObj); - virtual void DisconnectFromNode(int bTail1); - virtual SdrObject* GetConnectedNode(int bTail1) const; + virtual void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); + virtual void DisconnectFromNode(FASTBOOL bTail1); + virtual SdrObject* GetConnectedNode(FASTBOOL bTail1) const; /** sets the writing mode of the object's context diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index e85c2561798f..7bac32cb9c1e 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -118,10 +118,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index 183eb4c93f3f..969920906dce 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -82,7 +82,7 @@ private: SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren // Liefert sal_True, wenn das Painten ein XPolygon erfordert. - SVX_DLLPRIVATE int PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc + SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); protected: @@ -126,17 +126,17 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; virtual void NbcMove(const Size& aSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; protected: diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index dfe75d5f8b6f..77f3861898a3 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -73,7 +73,7 @@ public: SVX_DLLPUBLIC ~SdrObjConnection(); void ResetVars(); - int TakeGluePoint(SdrGluePoint& rGP, int bSetAbsolutePos) const; + FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const; inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; @@ -126,7 +126,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - int ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; @@ -208,10 +208,10 @@ protected: XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; - static int ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); + static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; - int ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte - void ImpSetTailPoint(int bTail1, const Point& rPt); + FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte + void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time void ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren @@ -223,26 +223,26 @@ public: SdrEdgeObj(); virtual ~SdrEdgeObj(); - SdrObjConnection& GetConnection(int bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } + SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - virtual int IsNode() const; + virtual FASTBOOL IsNode() const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); - virtual int IsEdge() const; + virtual FASTBOOL IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; } - void ConnectToNode(int bTail1, SdrObject* pObj); - void DisconnectFromNode(int bTail1); - SdrObject* GetConnectedNode(int bTail1) const; - const SdrObjConnection& GetConnection(int bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } - int CheckNodeConnection(int bTail1) const; + void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); + void DisconnectFromNode(FASTBOOL bTail1); + SdrObject* GetConnectedNode(FASTBOOL bTail1) const; + const SdrObjConnection& GetConnection(FASTBOOL bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } + FASTBOOL CheckNodeConnection(FASTBOOL bTail1) const; virtual void RecalcSnapRect(); virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; @@ -273,10 +273,10 @@ public: // #102344# Added missing implementation virtual void NbcSetAnchorPos(const Point& rPnt); - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 9b8f318cce16..fa5b56e403e5 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -188,14 +188,14 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - int HasGDIMetaFile() const; + FASTBOOL HasGDIMetaFile() const; const GDIMetaFile* GetGDIMetaFile() const; virtual void SetPage(SdrPage* pNewPage); diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 227d2817b450..9cf0ad056047 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -56,7 +56,7 @@ protected: long nShearWink; Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe - int bRefPoint; // Ist ein RefPoint gesetzt? + FASTBOOL bRefPoint; // Ist ein RefPoint gesetzt? public: TYPEINFO(); @@ -71,7 +71,7 @@ public: virtual void SetObjList(SdrObjList* pNewObjList); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual int HasRefPoint() const; + virtual FASTBOOL HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); virtual SdrObjList* GetSubList() const; @@ -90,16 +90,16 @@ public: // special drag methods virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void SetAnchorPos(const Point& rPnt); virtual void SetRelativePos(const Point& rPnt); virtual void SetSnapRect(const Rectangle& rRect); @@ -109,7 +109,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetAnchorPos(const Point& rPnt); virtual void NbcSetRelativePos(const Point& rPnt); virtual void NbcSetSnapRect(const Rectangle& rRect); diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index 11e1a5cacb23..9be5e7e2e73b 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -77,7 +77,7 @@ protected: Point aPt1; Point aPt2; - int bTextDirty; + FASTBOOL bTextDirty; protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; @@ -116,10 +116,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -128,7 +128,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual long GetRotateAngle() const; virtual void RecalcSnapRect(); @@ -144,7 +144,7 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; @@ -152,8 +152,8 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 9e037fdb4bf7..59327e85868d 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -85,10 +85,10 @@ protected: public: TYPEINFO(); - SdrOle2Obj(int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, int bFrame_=sal_False); + SdrOle2Obj(FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=sal_False); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef @@ -117,7 +117,7 @@ public: // spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte). void SetProgName(const String& rNam) { aProgName=rNam; } const String& GetProgName() const { return aProgName; } - int IsEmpty() const; + FASTBOOL IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const; diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 528e7170e231..0030d48d6d6c 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -115,10 +115,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; Pointer GetCreatePointer() const; @@ -131,7 +131,7 @@ public: virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos); virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2); - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, int bVShear); + virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear); virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 72382fde7d64..20fe1c3adc76 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -63,7 +63,7 @@ protected: protected: // Liefert sal_True, wenn das Painten ein Polygon erfordert. - int PaintNeedsXPoly(long nEckRad) const; + FASTBOOL PaintNeedsXPoly(long nEckRad) const; protected: XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; @@ -120,9 +120,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); - virtual int DoMacro(const SdrObjMacroHitRec& rRec); + virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 47b12451f84e..a9039c55d486 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -201,19 +201,19 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, int bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; - virtual int IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - virtual int IsFontwork() const; + virtual FASTBOOL IsFontwork() const; virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); @@ -221,8 +221,8 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void SetChanged(); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; virtual void operator=(const SdrObject& rObj); @@ -250,10 +250,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 5c66e793e67d..fe6d298af405 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -261,7 +261,7 @@ private: // #101029#: Extracted from ImpGetDrawOutliner() SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const; // #101029#: Extracted from Paint() - SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( int bContourFrame, + SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, SdrOutliner& rOutliner, Rectangle& rTextRect, Rectangle& rAnchorRect, @@ -276,7 +276,7 @@ private: protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; - SdrObject* ImpConvertAddText(SdrObject* pObj, int bBezier) const; + SdrObject* ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const; void ImpSetTextStyleSheetListeners(); void ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const; void ImpJustifyRect(Rectangle& rRect) const; @@ -291,14 +291,14 @@ protected: virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - int NbcSetEckenradius(long nRad); - int NbcSetAutoGrowHeight(bool bAuto); - int NbcSetMinTextFrameHeight(long nHgt); - int NbcSetMaxTextFrameHeight(long nHgt); - int NbcSetAutoGrowWidth(bool bAuto); - int NbcSetMinTextFrameWidth(long nWdt); - int NbcSetMaxTextFrameWidth(long nWdt); - int NbcSetFitToSize(SdrFitToSizeType eFit); + FASTBOOL NbcSetEckenradius(long nRad); + FASTBOOL NbcSetAutoGrowHeight(bool bAuto); + FASTBOOL NbcSetMinTextFrameHeight(long nHgt); + FASTBOOL NbcSetMaxTextFrameHeight(long nHgt); + FASTBOOL NbcSetAutoGrowWidth(bool bAuto); + FASTBOOL NbcSetMinTextFrameWidth(long nWdt); + FASTBOOL NbcSetMaxTextFrameWidth(long nWdt); + FASTBOOL NbcSetFitToSize(SdrFitToSizeType eFit); // Konstruktoren fuer beschriftete Zeichenobjekte SdrTextObj(); @@ -330,20 +330,20 @@ public: // Eine Attributierung kann nur am Textrahmen vollzogen werden. void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); - int IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } - int ReloadLinkedText(int bForceLoad=sal_False); - int LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); + FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } + FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=sal_False); + FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact); - int IsTextFrame() const { return bTextFrame; } - int IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + FASTBOOL IsTextFrame() const { return bTextFrame; } + FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } SdrObjKind GetTextKind() const { return eTextKind; } virtual bool HasText() const; - int HasEditText() const; + FASTBOOL HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } /** returns the currently active text. */ @@ -364,8 +364,8 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; - void SetDisableAutoWidthOnDragging(int bOn) { bDisableAutoWidthOnDragging=bOn; } - int IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } + void SetDisableAutoWidthOnDragging(FASTBOOL bOn) { bDisableAutoWidthOnDragging=bOn; } + FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); @@ -377,16 +377,16 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } long GetEckenradius() const; - virtual int IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; @@ -394,13 +394,13 @@ public: const Rectangle &GetGeoRect() const { return aRect; } // Feststellen, ob TextFontwork - virtual int IsFontwork() const; + virtual FASTBOOL IsFontwork() const; // Soll die Fontwork-Kontour versteckt werden? - int IsHideContour() const; + FASTBOOL IsHideContour() const; // Textfluss innerhalb Kontur - int IsContourTextFrame() const; + FASTBOOL IsContourTextFrame() const; // Horizontale Textausrichtung SdrTextHorzAdjust GetTextHorizontalAdjust(const SfxItemSet& rSet) const; @@ -435,7 +435,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -448,10 +448,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -460,9 +460,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); - virtual int HasTextEdit() const; + virtual FASTBOOL HasTextEdit() const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); @@ -480,8 +480,8 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index f85596251dd0..1554e5b84ebd 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -97,8 +97,8 @@ friend class SdrEditView; Rectangle aOutRect; Rectangle aSnapRect; SdrObjListKind eListKind; - int bObjOrdNumsDirty; - int bRectsDirty; + FASTBOOL bObjOrdNumsDirty; + FASTBOOL bRectsDirty; protected: virtual void RecalcRects(); @@ -131,7 +131,7 @@ public: virtual void SetModel(SdrModel* pNewModel); // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); - int IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } + FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); @@ -169,7 +169,7 @@ public: SdrObject* GetObj(sal_uIntPtr nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt - virtual int IsReadOnly() const; + virtual FASTBOOL IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... sal_uIntPtr CountAllObjects() const; @@ -480,7 +480,7 @@ public: virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); - int IsInserted() const { return mbInserted; } + FASTBOOL IsInserted() const { return mbInserted; } virtual void SetChanged(); // #i68775# React on PageNum changes (from Model in most cases) @@ -532,11 +532,11 @@ public: // GetBitmap und GetMetafile sind noch nicht implementiert. // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der // Page erzeugen. - Bitmap GetBitmap(int bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } - Bitmap GetBitmap(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True) const; + Bitmap GetBitmap(FASTBOOL bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } + Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True) const; // Metafile aus den Objekten der Page erzeugen - GDIMetaFile GetMetaFile(int bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } - GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True); + GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } + GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True); virtual String GetLayoutName() const; @@ -559,7 +559,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 29fea090bf68..5329be5973eb 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -145,9 +145,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, int bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, int bRepeat = sal_False ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -173,8 +173,8 @@ protected: SfxStyleSheet* pUndoStyleSheet; SfxStyleSheet* pRedoStyleSheet; SfxStyleSheet* pRepeatStyleSheet; - int bStyleSheet; - int bHaveToTakeRedoSet; + FASTBOOL bStyleSheet; + FASTBOOL bHaveToTakeRedoSet; // Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text: OutlinerParaObject* pTextUndo; @@ -186,7 +186,7 @@ protected: SdrUndoGroup* pUndoGroup; public: - SdrUndoAttrObj(SdrObject& rNewObj, int bStyleSheet1=sal_False, int bSaveText=sal_False); + SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False); virtual ~SdrUndoAttrObj(); void SetRepeatAttr(const SfxItemSet& rSet); virtual void Undo(); @@ -295,7 +295,7 @@ protected: class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: - SdrUndoRemoveObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -314,7 +314,7 @@ public: class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: - SdrUndoInsertObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -332,7 +332,7 @@ public: class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: - SdrUndoDelObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); @@ -356,7 +356,7 @@ public: class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: - SdrUndoNewObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -410,7 +410,7 @@ public: class SdrUndoCopyObj : public SdrUndoNewObj { public: - SdrUndoCopyObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} virtual String GetComment() const; @@ -460,7 +460,7 @@ class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; - int bNewTextAvailable; + FASTBOOL bNewTextAvailable; sal_Bool bEmptyPresObj; sal_Int32 mnText; @@ -468,7 +468,7 @@ public: SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText ); virtual ~SdrUndoObjSetText(); - int IsDifferent() const { return pOldText!=pNewText; } + FASTBOOL IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); virtual void Undo(); @@ -535,7 +535,7 @@ protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; sal_uInt16 nNum; - int bItsMine; + FASTBOOL bItsMine; protected: SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -633,7 +633,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, int bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const; }; //************************************************************ @@ -651,7 +651,7 @@ protected: // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE - int bItsMine; + FASTBOOL bItsMine; protected: SdrUndoPageList(SdrPage& rNewPg); diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 84ba0703d01a..5d8a4cf3e9a6 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -55,7 +55,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual int HasMetrics() const; + SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; }; /************************************************************************* @@ -82,7 +82,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual int HasMetrics() const; + SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; }; #endif diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index f2754ca62cfc..a666381dd4e3 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -62,8 +62,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index 783c2922df06..0cfefadb550c 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -66,8 +66,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 4904aeb40a97..348e9ebe869a 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -61,7 +61,7 @@ public: void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; } sal_uInt16 GetValueSet() const { return nValueSet; } - int IsValueAllowed( sal_uInt16 nValue ) const + FASTBOOL IsValueAllowed( sal_uInt16 nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 8e37aa1f33a8..66f4e34eb022 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -616,7 +616,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if(pView->IsDragObj()) { - int bWasNoSnap = rDragStat.IsNoSnap(); + FASTBOOL bWasNoSnap = rDragStat.IsNoSnap(); sal_Bool bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 01f88c99d3c7..e0c302da38df 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -45,7 +45,7 @@ struct PageWindow_Impl { SvxBoxItem* pBorder; Bitmap aBitmap; - int bBitmap; + FASTBOOL bBitmap; sal_Bool bResetBackground; sal_Bool bFrameDirection; sal_Int32 nFrameDirection; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ef74f059fdbd..92e2b9a68acc 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -979,7 +979,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) CalculateDelta_Impl(); - int bDraw = sal_False; + bool bDraw = sal_False; if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) { Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); @@ -1083,7 +1083,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) FlagHdl_Impl( &aJapOptionsCB ); pImpl->bSaveToModule = sal_True; - int bDisableSearch = sal_False; + bool bDisableSearch = sal_False; SfxViewShell* pViewShell = SfxViewShell::Current(); if ( pViewShell ) @@ -1142,14 +1142,14 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) } else { - int bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 ); - int bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 ); + bool bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 ); + bool bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 ); if ( pSearchItem->GetSearchString().Len() && bSetSearch ) aSearchLB.SetText( pSearchItem->GetSearchString() ); else if ( aSearchStrings.Count() ) { - int bAttributes = + bool bAttributes = ( ( pSearchList && pSearchList->Count() ) || ( pReplaceList && pReplaceList->Count() ) ); @@ -1434,7 +1434,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) { - int bInclusive = ( aLayoutBtn.GetText() == aLayoutStr ); + bool bInclusive = ( aLayoutBtn.GetText() == aLayoutStr ); if ( ( pBtn == &aSearchBtn ) || ( pBtn == &aSearchAllBtn ) || @@ -1842,7 +1842,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) } else if ( !IsVisible() ) Show(); - int bNoSearch = sal_True; + bool bNoSearch = sal_True; sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0; aSearchBtn.Enable(bEnableSearch); diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 6c1415aecf64..3c4c3debcc82 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -112,7 +112,7 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh |* \************************************************************************/ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, - int bUseExtColorTable + FASTBOOL bUseExtColorTable ) :SdrModel(pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) ,m_pImpl(NULL) @@ -133,7 +133,7 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, |* \************************************************************************/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - int bUseExtColorTable) + FASTBOOL bUseExtColorTable) :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS) ,m_pImpl( NULL ) ,m_pObjShell(0) @@ -173,7 +173,7 @@ FmFormModel::~FmFormModel() |* Erzeugt eine neue Seite |* \************************************************************************/ -SdrPage* FmFormModel::AllocPage(int bMasterPage) +SdrPage* FmFormModel::AllocPage(FASTBOOL bMasterPage) { return new FmFormPage(*this, NULL, bMasterPage); } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 1a4c17d19959..9b73f0caaab7 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -991,12 +991,12 @@ SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new SdrMetricItem(Which(),rIn); } -int __EXPORT SdrMetricItem::HasMetrics() const +FASTBOOL __EXPORT SdrMetricItem::HasMetrics() const { return sal_True; } -int __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv) +FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv) { if (GetValue()!=0) { BigInt aVal(GetValue()); @@ -1387,12 +1387,12 @@ SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } -int __EXPORT SdrTextAniAmountItem::HasMetrics() const +FASTBOOL __EXPORT SdrTextAniAmountItem::HasMetrics() const { return GetValue()>0; } -int __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) +FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) { if (GetValue()>0) { BigInt aVal(GetValue()); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 9fd87af3b163..b68909ffa99a 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -321,7 +321,7 @@ void UShortCont::Sort() class ImpClipMerk { Region aClip; - int bClip; + FASTBOOL bClip; public: ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {} void Restore(OutputDevice& rOut) @@ -385,7 +385,7 @@ public: const Color& GetLineColor() const { return aLineColor; } }; -ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, int bAutoMerk): +ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, FASTBOOL bAutoMerk): pFarbMerk(NULL), pClipMerk(NULL), pLineColorMerk(NULL), @@ -498,10 +498,10 @@ void SdrLinkList::RemoveLink(const Link& rLink) //////////////////////////////////////////////////////////////////////////////////////////////////// // #98988# Re-implement GetDraftFillColor(...) -int GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) +FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) { XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue(); - int bRetval(sal_False); + FASTBOOL bRetval(sal_False); switch(eFill) { diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index e661788b3027..6a207ca4cba4 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -268,12 +268,12 @@ sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, return aTmpList.GetObjCount(); } -void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, int bForceTextAttr) +void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr) { bNoLine = sal_False; bNoFill = sal_False; - int bLine=sal_True && !bForceTextAttr; - int bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr; - int bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); + FASTBOOL bLine=sal_True && !bForceTextAttr; + FASTBOOL bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr; + FASTBOOL bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); if ( bLine ) { @@ -431,7 +431,7 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) aTmpList.InsertObject( pObj ); if ( HAS_BASE( SdrPathObj, pObj ) ) { - int bClosed=pObj->IsClosedObj(); + FASTBOOL bClosed=pObj->IsClosedObj(); bLastObjWasPolyWithoutLine=bNoLine && bClosed; bLastObjWasLine=!bClosed; } diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 4f7605d0a4dd..f5df7171499f 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -35,7 +35,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrGluePoint::SetReallyAbsolute(int bOn, const SdrObject& rObj) +void SdrGluePoint::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj) { if ( bReallyAbsolute != bOn ) { @@ -245,7 +245,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, int bVShear, const SdrObject* pObj) +void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, FASTBOOL bVShear, const SdrObject* pObj) { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); ShearPoint(aPt,rRef,tn,bVShear); @@ -305,7 +305,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const rWin.EnableMapMode(bMapMerk); } -int SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const +FASTBOOL SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); Size aSiz=rOut.PixelToLogic(Size(3,3)); @@ -344,12 +344,12 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) sal_uInt16 nInsPos=nAnz; sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastIdnAnz; + FASTBOOL bHole=nLastId>nAnz; if (nId<=nLastId) { if (!bHole || nId==0) { nId=nLastId+1; } else { - int bBrk=sal_False; + FASTBOOL bBrk=sal_False; for (sal_uInt16 nNum=0; nNumGetId(); @@ -390,7 +390,7 @@ sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const return nRet; } -sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, int bBack, int bNext, sal_uInt16 nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack, FASTBOOL bNext, sal_uInt16 nId0) const { sal_uInt16 nAnz=GetCount(); sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; @@ -408,7 +408,7 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut return nRet; } -void SdrGluePointList::SetReallyAbsolute(int bOn, const SdrObject& rObj) +void SdrGluePointList::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj) { sal_uInt16 nAnz=GetCount(); for (sal_uInt16 nNum=0; nNum=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); - int bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height(); + FASTBOOL bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); + FASTBOOL bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height(); switch (eKind) { case SDRHELPLINE_VERTICAL : return bXHit; case SDRHELPLINE_HORIZONTAL: return bYHit; @@ -123,7 +123,7 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { - int bEqual=sal_False; + FASTBOOL bEqual=sal_False; sal_uInt16 nAnz=GetCount(); if (nAnz==rSrcList.GetCount()) { bEqual=sal_True; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index d2d4220ae36f..0668b8f69210 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -415,7 +415,7 @@ void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) void __EXPORT _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); - int bAusgewertet=sal_False; + FASTBOOL bAusgewertet=sal_False; sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { if (nKeyCode==KEY_RETURN) { @@ -483,7 +483,7 @@ void _SdrItemBrowserControl::ImpSaveWhich() void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { - int bFnd=sal_False; + FASTBOOL bFnd=sal_False; sal_uInt16 nBestMinWh=0,nBestMaxWh=0xFFFF; // not implemented yet sal_uIntPtr nBestMinPos=0,nBestMaxPos=0xFFFFFFFF; // not implemented yet sal_uIntPtr nAnz=aList.Count(); @@ -508,10 +508,10 @@ void _SdrItemBrowserControl::ImpRestoreWhich() } } -int _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) +FASTBOOL _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) { BrkChangeEntry(); - int bRet=sal_False; + FASTBOOL bRet=sal_False; ImpItemListRow* pEntry=ImpGetEntry(nPos); if (pEntry!=NULL && !pEntry->bComment) { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); @@ -547,9 +547,9 @@ int _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) return bRet; } -int _SdrItemBrowserControl::EndChangeEntry() +FASTBOOL _SdrItemBrowserControl::EndChangeEntry() { - int bRet=sal_False; + FASTBOOL bRet=sal_False; if (pEditControl!=NULL) { aEntryChangedHdl.Call(this); delete pEditControl; @@ -584,9 +584,9 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP aList.Insert(new ImpItemListRow(rEntry),CONTAINER_APPEND); RowInserted(nEntryNum); } else if (*pAktEntry!=rEntry) { - int bStateDiff=rEntry.eState!=pAktEntry->eState; - int bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue); - int bAllDiff=sal_True; + FASTBOOL bStateDiff=rEntry.eState!=pAktEntry->eState; + FASTBOOL bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue); + FASTBOOL bAllDiff=sal_True; if (bStateDiff || bValueDiff) { // Checken, ob nur State und/oder Value geaendert ImpItemListRow aTest(rEntry); @@ -604,7 +604,7 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntP } } -int ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) +FASTBOOL ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem); if (eState==SFX_ITEM_DEFAULT) { @@ -613,12 +613,12 @@ int ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rp return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; } -int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) +FASTBOOL IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; if (pSet==NULL) return sal_False; const SfxPoolItem* pItem=NULL; - int bRet=sal_False; + FASTBOOL bRet=sal_False; switch (nWhich) { case XATTR_LINEDASH : case XATTR_LINEWIDTH : @@ -687,10 +687,10 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) { return sal_False; // immer anwaehlbar } - int bTileTRUE=sal_False; - int bTileFALSE=sal_False; - int bStretchTRUE=sal_False; - int bStretchFALSE=sal_False; + FASTBOOL bTileTRUE=sal_False; + FASTBOOL bTileFALSE=sal_False; + FASTBOOL bStretchTRUE=sal_False; + FASTBOOL bStretchFALSE=sal_False; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILE,pItem)) { bTileTRUE=((const XFillBmpTileItem*)pItem)->GetValue(); bTileFALSE=!bTileTRUE; @@ -717,7 +717,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) { if (bTileFALSE) return sal_True; sal_uInt16 nX=0,nY=0; - int bX=sal_False,bY=sal_False; + FASTBOOL bX=sal_False,bY=sal_False; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) { nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue(); bX=sal_True; @@ -777,7 +777,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_SHADOWPERSP : { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) { - int bShadow=((const SdrShadowItem*)pItem)->GetValue(); + FASTBOOL bShadow=((const SdrShadowItem*)pItem)->GetValue(); if (!bShadow) return sal_True; } } break; @@ -785,7 +785,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_CAPTIONANGLE: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) { - int bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); + FASTBOOL bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); if (!bFixed) return sal_True; } } break; @@ -793,7 +793,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_CAPTIONESCABS: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) { - int bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); + FASTBOOL bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True; if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True; } @@ -801,7 +801,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_CAPTIONLINELEN: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) { - int bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); + FASTBOOL bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); if (bFit) return sal_True; } } break; @@ -810,7 +810,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_TEXT_MAXFRAMEHEIGHT: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) { - int bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); + FASTBOOL bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); if (!bAutoGrow) return sal_True; } } break; @@ -818,7 +818,7 @@ int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIn case SDRATTR_TEXT_MAXFRAMEWIDTH: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) { - int bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); + FASTBOOL bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); if (!bAutoGrow) return sal_True; } } break; @@ -1031,7 +1031,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem default: break; } // switch if (aEntry.bIsNum) aEntry.bCanNum=sal_True; - int bGetPres=sal_True; + FASTBOOL bGetPres=sal_True; if (bGetPres) { rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, pPool->GetMetric(nWhich), @@ -1197,9 +1197,9 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax; if (nLongValnMin) nLongVal=pEntry->nMin; } - int bPair=sal_False; - int bPairX=sal_True; - int bPairY=sal_False; + FASTBOOL bPair=sal_False; + FASTBOOL bPairX=sal_True; + FASTBOOL bPairY=sal_False; sal_uInt16 nSepLen=1; long nLongX = aNewText.ToInt32(); long nLongY=0; diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index c4ee0a231bd6..f4df93fc843e 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -196,7 +196,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const // SdrLayer //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrLayer::SetStandardLayer(int bStd) +void SdrLayer::SetStandardLayer(FASTBOOL bStd) { nType=(sal_uInt16)bStd; if (bStd) { @@ -291,7 +291,7 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const if (pParent!=rCmpLayerAdmin.pParent || aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() || aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False; - int bOk=sal_True; + FASTBOOL bOk=sal_True; sal_uInt16 nAnz=GetLayerCount(); sal_uInt16 i=0; while (bOk && impUndoManager ) { DBG_ERROR("svx::SdrModel::Undo(), method not supported with application undo manager!"); @@ -474,9 +474,9 @@ int SdrModel::Undo() return bRet; } -int SdrModel::Redo() +FASTBOOL SdrModel::Redo() { - int bRet=sal_False; + FASTBOOL bRet=sal_False; if( mpImpl->mpUndoManager ) { DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); @@ -498,9 +498,9 @@ int SdrModel::Redo() return bRet; } -int SdrModel::Repeat(SfxRepeatTarget& rView) +FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView) { - int bRet=sal_False; + FASTBOOL bRet=sal_False; if( mpImpl->mpUndoManager ) { DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!"); @@ -808,7 +808,7 @@ SdrModel* SdrModel::AllocModel() const return pModel; } -SdrPage* SdrModel::AllocPage(int bMasterPage) +SdrPage* SdrModel::AllocPage(FASTBOOL bMasterPage) { return new SdrPage(*this,bMasterPage); } @@ -1294,7 +1294,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr) } } -void SdrModel::TakeMetricStr(long nVal, XubString& rStr, int bNoUnitChars, sal_Int32 nNumDigits) const +void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, sal_Int32 nNumDigits) const { // #i22167# // change to double precision usage to not loose decimal places after comma @@ -1408,7 +1408,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, int bNoUnitChars, sal_I rStr += aUIUnitStr; } -void SdrModel::TakeWinkStr(long nWink, XubString& rStr, int bNoDegChar) const +void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) const { sal_Bool bNeg(nWink < 0); @@ -1436,7 +1436,7 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, int bNoDegChar) const rStr += DEGREE_CHAR; } -void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, int bNoPercentChar) const +void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, FASTBOOL bNoPercentChar) const { sal_Int32 nMul(rVal.GetNumerator()); sal_Int32 nDiv(rVal.GetDenominator()); @@ -1469,7 +1469,7 @@ void SdrModel::SetChanged(sal_Bool bFlg) mbChanged = bFlg; } -void SdrModel::RecalcPageNums(int bMaster) +void SdrModel::RecalcPageNums(FASTBOOL bMaster) { Container& rPL=*(bMaster ? &maMaPag : &maPages); sal_uInt16 nAnz=sal_uInt16(rPL.Count()); @@ -1604,9 +1604,9 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrModel::CheckConsistence() const +FASTBOOL SdrModel::CheckConsistence() const { - int bRet=sal_True; + FASTBOOL bRet=sal_True; #ifdef DBG_UTIL DBG_CHKTHIS(SdrModel,NULL); #endif @@ -1618,7 +1618,7 @@ int SdrModel::CheckConsistence() const // #48289# void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - int bUndo, int bMoveNoCopy) + FASTBOOL bUndo, FASTBOOL bMoveNoCopy) { if( bUndo && !IsUndoEnabled() ) bUndo = false; @@ -1635,7 +1635,7 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, nFirstPageNum=nMaxPage; if (nLastPageNum>nMaxPage) nLastPageNum =nMaxPage; - int bReverse=nLastPageNumnPageAnz) nDestPos=nPageAnz; @@ -1696,8 +1696,8 @@ void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, void SdrModel::Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - int bMergeMasterPages, int bAllMasterPages, - int bUndo, int bTreadSourceAsConst) + FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages, + FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst) { if (&rSourceModel==this) { // #48289# @@ -1714,11 +1714,11 @@ void SdrModel::Merge(SdrModel& rSourceModel, sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount(); sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); sal_uInt16 nDstMasterPageAnz=GetMasterPageCount(); - int bInsPages=(nFirstPageNumnMaxSrcPage) nFirstPageNum=nMaxSrcPage; if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage; - int bReverse=nLastPageNumIsSolidDragging() ) @@ -2484,7 +2484,7 @@ int SdrObjCustomShape::MovCreate(SdrDragStat& rStat) return sal_True; } -int SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) +FASTBOOL SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) { DragCreateObject( rStat ); @@ -2522,18 +2522,18 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r // in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text, // the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape -int SdrObjCustomShape::IsAutoGrowHeight() const +FASTBOOL SdrObjCustomShape::IsAutoGrowHeight() const { const SfxItemSet& rSet = GetMergedItemSet(); - int bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + FASTBOOL bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowHeight && IsVerticalWriting() ) bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowHeight; } -int SdrObjCustomShape::IsAutoGrowWidth() const +FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const { const SfxItemSet& rSet = GetMergedItemSet(); - int bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + FASTBOOL bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowWidth && !IsVerticalWriting() ) bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowWidth; @@ -2601,12 +2601,12 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical ) } } } -int SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, int bWdt) const +FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const { if ( pModel && HasText() && !rR.IsEmpty() ) { - int bWdtGrow=bWdt && IsAutoGrowWidth(); - int bHgtGrow=bHgt && IsAutoGrowHeight(); + FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth(); + FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight(); if ( bWdtGrow || bHgtGrow ) { Rectangle aR0(rR); @@ -2745,7 +2745,7 @@ int SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, in return sal_False; } -Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const int bHgt, const int bWdt ) +Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ) { Rectangle aReturnValue; @@ -2775,7 +2775,7 @@ Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const int bHgt, const int bW return aReturnValue; } -int SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt) +FASTBOOL SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) { Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt ); sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect ); @@ -2805,7 +2805,7 @@ int SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt) } return bRet; } -int SdrObjCustomShape::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt) +FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) { Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt ); sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect ); @@ -2968,7 +2968,7 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const else SdrTextObj::TakeTextAnchorRect( rAnchorRect ); } -void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, +void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 60b037782991..c82a367e9a5b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -162,7 +162,7 @@ SdrObjUserData::~SdrObjUserData() { } -int SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const +FASTBOOL SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { return sal_False; } @@ -206,7 +206,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec rOut.SetRasterOp(eRop); } -int SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) +FASTBOOL SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) { return sal_False; } @@ -678,7 +678,7 @@ AutoTimer* SdrObject::ForceAutoTimer() return pPlusData->pAutoTimer; } -int SdrObject::HasRefPoint() const +FASTBOOL SdrObject::HasRefPoint() const { return sal_False; } @@ -1115,7 +1115,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, s } } -XubString SdrObject::GetWinkStr(long nWink, int bNoDegChar) const +XubString SdrObject::GetWinkStr(long nWink, FASTBOOL bNoDegChar) const { XubString aStr; if (pModel!=NULL) { @@ -1124,7 +1124,7 @@ XubString SdrObject::GetWinkStr(long nWink, int bNoDegChar) const return aStr; } -XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, int bNoUnitChars) const +XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, FASTBOOL bNoUnitChars) const { XubString aStr; if (pModel!=NULL) { @@ -1279,14 +1279,14 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const Rectangle aRect(aTmpRect); const SdrHdl* pHdl=rDrag.GetHdl(); SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind(); - int bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); - int bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); - int bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); + FASTBOOL bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT); + FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + FASTBOOL bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); - int bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); - int bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); - int bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); - int bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); + FASTBOOL bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT); + FASTBOOL bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT); + FASTBOOL bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT); + FASTBOOL bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT); if (bLft) aTmpRect.Left() =aPos.X(); if (bRgt) aTmpRect.Right() =aPos.X(); if (bTop) aTmpRect.Top() =aPos.Y(); @@ -1298,8 +1298,8 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const long nYMul=aTmpRect.Bottom()-aTmpRect.Top(); long nXDiv=nWdt0; long nYDiv=nHgt0; - int bXNeg=(nXMul<0)!=(nXDiv<0); - int bYNeg=(nYMul<0)!=(nYDiv<0); + FASTBOOL bXNeg=(nXMul<0)!=(nXDiv<0); + FASTBOOL bYNeg=(nYMul<0)!=(nYDiv<0); nXMul=Abs(nXMul); nYMul=Abs(nYMul); nXDiv=Abs(nXDiv); @@ -1311,7 +1311,7 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const nXDiv=aXFact.GetDenominator(); nYDiv=aYFact.GetDenominator(); if (bEcke) { // Eckpunkthandles - int bUseX=(aXFactHasMacro(this) : sal_False; @@ -1891,7 +1891,7 @@ void SdrObject::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, cons } } -int SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) +FASTBOOL SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) { SdrObjUserData* pData=ImpGetMacroUserData(); if (pData!=NULL) { @@ -2211,13 +2211,13 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } -void lcl_SetItem(SfxItemSet& rAttr, int bMerge, const SfxPoolItem& rItem) +void lcl_SetItem(SfxItemSet& rAttr, FASTBOOL bMerge, const SfxPoolItem& rItem) { if (bMerge) rAttr.MergeValue(rItem,sal_True); else rAttr.Put(rItem); } -void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, int bMerge) const +void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const { const Rectangle& rSnap=GetSnapRect(); const Rectangle& rLogic=GetLogicRect(); @@ -2291,7 +2291,7 @@ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRe // Das Broadcasting beim Setzen der Attribute wird vom AttrObj gemanagt //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrObject::IsNode() const +FASTBOOL SdrObject::IsNode() const { return sal_True; } @@ -2354,7 +2354,7 @@ SdrGluePointList* SdrObject::ForceGluePointList() return pPlusData->pGluePoints; } -void SdrObject::SetGlueReallyAbsolute(int bOn) +void SdrObject::SetGlueReallyAbsolute(FASTBOOL bOn) { // erst Const-Aufruf um zu sehen, ob // ueberhaupt Klebepunkte da sind @@ -2387,7 +2387,7 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2) } } -void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, int bVShear) +void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { // erst Const-Aufruf um zu sehen, ob // ueberhaupt Klebepunkte da sind @@ -2398,20 +2398,20 @@ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, int } } -int SdrObject::IsEdge() const +FASTBOOL SdrObject::IsEdge() const { return sal_False; } -void SdrObject::ConnectToNode(int /*bTail1*/, SdrObject* /*pObj*/) +void SdrObject::ConnectToNode(FASTBOOL /*bTail1*/, SdrObject* /*pObj*/) { } -void SdrObject::DisconnectFromNode(int /*bTail1*/) +void SdrObject::DisconnectFromNode(FASTBOOL /*bTail1*/) { } -SdrObject* SdrObject::GetConnectedNode(int /*bTail1*/) const +SdrObject* SdrObject::GetConnectedNode(FASTBOOL /*bTail1*/) const { return NULL; } diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index f410f1ecb08e..53f255c361a1 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -77,9 +77,9 @@ public: long nEscAbs; long nLineLen; SdrCaptionEscDir eEscDir; - int bFitLineLen; - int bEscRel; - int bFixedAngle; + FASTBOOL bFitLineLen; + FASTBOOL bEscRel; + FASTBOOL bFixedAngle; public: ImpCaptParams() @@ -115,7 +115,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi nY+=rRect.Top(); Point aBestPt; EscDir eBestDir=LKS; - int bTryH=eEscDir==SDRCAPT_ESCBESTFIT; + FASTBOOL bTryH=eEscDir==SDRCAPT_ESCBESTFIT; if (!bTryH) { if (eType!=SDRCAPT_TYPE1) { bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL; @@ -123,7 +123,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi bTryH=eEscDir==SDRCAPT_ESCVERTICAL; } } - int bTryV=eEscDir==SDRCAPT_ESCBESTFIT; + FASTBOOL bTryV=eEscDir==SDRCAPT_ESCBESTFIT; if (!bTryV) { if (eType!=SDRCAPT_TYPE1) { bTryV=eEscDir==SDRCAPT_ESCVERTICAL; @@ -135,7 +135,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi if (bTryH) { Point aLft(rRect.Left()-nGap,nY); Point aRgt(rRect.Right()+nGap,nY); - int bLft=(aTl.X()-aLft.X()=2); } -int SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) +FASTBOOL SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -761,8 +761,8 @@ SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier); SdrObject* pRet=(pTail!=NULL) ? pTail : pRect; if (pTail!=NULL && pRect!=NULL) { - int bInsRect=sal_True; - int bInsTail=sal_True; + FASTBOOL bInsRect=sal_True; + FASTBOOL bInsTail=sal_True; SdrObjList* pOL=pTail->GetSubList(); if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; } if (pOL==NULL) pOL=pRect->GetSubList(); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 5a5ee11061e4..1d00e13571d9 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -152,7 +152,7 @@ SdrCircObj::~SdrCircObj() void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - int bCanConv=!HasText() || ImpCanConvTextToCurve(); + FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; @@ -164,13 +164,13 @@ sal_uInt16 SdrCircObj::GetObjIdentifier() const return sal_uInt16(meCircleKind); } -int SdrCircObj::PaintNeedsXPolyCirc() const +FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const { // XPoly ist notwendig fuer alle gedrehten Ellipsenobjekte, // fuer alle Kreis- und Ellipsenabschnitte // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) - int bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; + FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) if (meCircleKind!=OBJ_CIRC) bNeed=sal_True; @@ -375,7 +375,7 @@ struct ImpCircUser : public SdrDragStatUserData long nStart; long nEnd; long nWink; - int bRight; // noch nicht implementiert + FASTBOOL bRight; // noch nicht implementiert public: ImpCircUser() @@ -690,7 +690,7 @@ void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const pU->SetCreateParams(rStat); } -int SdrCircObj::BegCreate(SdrDragStat& rStat) +FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); @@ -701,7 +701,7 @@ int SdrCircObj::BegCreate(SdrDragStat& rStat) return sal_True; } -int SdrCircObj::MovCreate(SdrDragStat& rStat) +FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat) { ImpSetCreateParams(rStat); ImpCircUser* pU=(ImpCircUser*)rStat.GetUser(); @@ -724,11 +724,11 @@ int SdrCircObj::MovCreate(SdrDragStat& rStat) return sal_True; } -int SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +FASTBOOL SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpSetCreateParams(rStat); ImpCircUser* pU=(ImpCircUser*)rStat.GetUser(); - int bRet=sal_False; + FASTBOOL bRet=sal_False; if (eCmd==SDRCREATE_FORCEEND && rStat.GetPointAnz()<4) meCircleKind=OBJ_CIRC; if (meCircleKind==OBJ_CIRC) { bRet=rStat.GetPointAnz()>=2; @@ -765,7 +765,7 @@ void SdrCircObj::BrkCreate(SdrDragStat& rStat) rStat.SetUser(NULL); } -int SdrCircObj::BckCreate(SdrDragStat& rStat) +FASTBOOL SdrCircObj::BckCreate(SdrDragStat& rStat) { rStat.SetNoSnap(rStat.GetPointAnz()>=3); rStat.SetOrtho4Possible(rStat.GetPointAnz()<3); @@ -823,12 +823,12 @@ void SdrCircObj::NbcMove(const Size& aSiz) void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { long nWink0=aGeo.nDrehWink; - int bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); + FASTBOOL bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); SdrTextObj::NbcResize(rRef,xFact,yFact); bNoShearRota|=(aGeo.nDrehWink==0 && aGeo.nShearWink==0); if (meCircleKind!=OBJ_CIRC) { - int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { // bei bXMirr!=bYMirr muessten eigentlich noch die beiden // Linienende vertauscht werden. Das ist jedoch mal wieder @@ -872,7 +872,7 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract ImpSetCircInfoToAttr(); } -void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { SdrTextObj::NbcShear(rRef,nWink,tn,bVShear); SetXPolyDirty(); @@ -882,7 +882,7 @@ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2) { //long nWink0=aGeo.nDrehWink; - int bFreeMirr=meCircleKind!=OBJ_CIRC; + FASTBOOL bFreeMirr=meCircleKind!=OBJ_CIRC; Point aTmpPt1; Point aTmpPt2; if (bFreeMirr) { // bei freier Spiegelachse einige Vorbereitungen Treffen diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index f0857b8d9e9b..6eec6e855bf9 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -76,9 +76,9 @@ void SdrObjConnection::ResetVars() bAutoCorner=sal_False; } -int SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, int bSetAbsPos) const +FASTBOOL SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsPos) const { - int bRet=sal_False; + FASTBOOL bRet=sal_False; if (pObj!=NULL) { // Ein Obj muss schon angedockt sein! if (bAutoVertex) { rGP=pObj->GetVertexGluePoint(nConId); @@ -129,10 +129,10 @@ sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolyg return 0; } -int SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const +FASTBOOL SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP); - int bHorz=nAngle1==0 || nAngle1==18000; + FASTBOOL bHorz=nAngle1==0 || nAngle1==18000; if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) { nIdx=rXP.GetPointCount()-nIdx; // #36314# bHorz=nAngle2==0 || nAngle2==18000; // #52000# @@ -373,7 +373,7 @@ void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bGradientAllowed = sal_False; rInfo.bShearAllowed =sal_False; rInfo.bEdgeRadiusAllowed=sal_False; - int bCanConv=!HasText() || ImpCanConvTextToCurve(); + FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); @@ -414,7 +414,7 @@ void SdrEdgeObj::TakeUnrotatedSnapRect(Rectangle& rRect) const rRect=GetSnapRect(); } -int SdrEdgeObj::IsNode() const +FASTBOOL SdrEdgeObj::IsNode() const { return sal_True; } @@ -462,12 +462,12 @@ SdrGluePointList* SdrEdgeObj::ForceGluePointList() return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671# } -int SdrEdgeObj::IsEdge() const +FASTBOOL SdrEdgeObj::IsEdge() const { return sal_True; } -void SdrEdgeObj::ConnectToNode(int bTail1, SdrObject* pObj) +void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj) { SdrObjConnection& rCon=GetConnection(bTail1); DisconnectFromNode(bTail1); @@ -478,7 +478,7 @@ void SdrEdgeObj::ConnectToNode(int bTail1, SdrObject* pObj) } } -void SdrEdgeObj::DisconnectFromNode(int bTail1) +void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1) { SdrObjConnection& rCon=GetConnection(bTail1); if (rCon.pObj!=NULL) { @@ -487,16 +487,16 @@ void SdrEdgeObj::DisconnectFromNode(int bTail1) } } -SdrObject* SdrEdgeObj::GetConnectedNode(int bTail1) const +SdrObject* SdrEdgeObj::GetConnectedNode(FASTBOOL bTail1) const { SdrObject* pObj=GetConnection(bTail1).pObj; if (pObj!=NULL && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=NULL; return pObj; } -int SdrEdgeObj::CheckNodeConnection(int bTail1) const +FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const { - int bRet=sal_False; + FASTBOOL bRet=sal_False; const SdrObjConnection& rCon=GetConnection(bTail1); sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) { @@ -519,7 +519,7 @@ int SdrEdgeObj::CheckNodeConnection(int bTail1) const return bRet; } -void SdrEdgeObj::ImpSetTailPoint(int bTail1, const Point& rPt) +void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt) { sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (nPtAnz==0) { @@ -605,11 +605,11 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const long dyo=rPt.Y()-aR.Top(); long dxr=aR.Right()-rPt.X(); long dyu=aR.Bottom()-rPt.Y(); - int bxMitt=Abs(dxl-dxr)<2; - int byMitt=Abs(dyo-dyu)<2; + FASTBOOL bxMitt=Abs(dxl-dxr)<2; + FASTBOOL byMitt=Abs(dyo-dyu)<2; long dx=Min(dxl,dxr); long dy=Min(dyo,dyu); - int bDiag=Abs(dx-dy)<2; + FASTBOOL bDiag=Abs(dx-dy)<2; if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte if (bDiag) { // diagonal sal_uInt16 nRet=0; @@ -635,7 +635,7 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const } } -int SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const +FASTBOOL SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const { // fehlende Implementation !!! return sal_False; @@ -645,10 +645,10 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons { XPolygon aXP; aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL); - int bRts=nEscAngle==0; - int bObn=nEscAngle==9000; - int bLks=nEscAngle==18000; - int bUnt=nEscAngle==27000; + FASTBOOL bRts=nEscAngle==0; + FASTBOOL bObn=nEscAngle==9000; + FASTBOOL bLks=nEscAngle==18000; + FASTBOOL bUnt=nEscAngle==27000; Point aP1(rStPt); // erstmal den Pflichtabstand if (bLks) aP1.X()=rRect.Left(); @@ -656,7 +656,7 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons if (bObn) aP1.Y()=rRect.Top(); if (bUnt) aP1.Y()=rRect.Bottom(); - int bFinish=sal_False; + FASTBOOL bFinish=sal_False; if (!bFinish) { Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X(); @@ -724,8 +724,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& aPt2=aOutRect.BottomRight(); } } - int bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted(); - int bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted(); + FASTBOOL bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted(); + FASTBOOL bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted(); const SfxItemSet& rSet = GetObjectItemSet(); if (bCon1) { @@ -779,8 +779,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& XPolygon aBestXP; sal_uIntPtr nBestQual=0xFFFFFFFF; SdrEdgeInfoRec aBestInfo; - int bAuto1=bCon1 && rCon1.bBestVertex; - int bAuto2=bCon2 && rCon2.bBestVertex; + FASTBOOL bAuto1=bCon1 && rCon1.bBestVertex; + FASTBOOL bAuto2=bCon2 && rCon2.bBestVertex; if (bAuto1) rCon1.bAutoVertex=sal_True; if (bAuto2) rCon2.bAutoVertex=sal_True; sal_uInt16 nBestAuto1=0; @@ -833,19 +833,19 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); - int bRts1=nAngle1==0; - int bObn1=nAngle1==9000; - int bLks1=nAngle1==18000; - int bUnt1=nAngle1==27000; - int bHor1=bLks1 || bRts1; - int bVer1=bObn1 || bUnt1; - int bRts2=nAngle2==0; - int bObn2=nAngle2==9000; - int bLks2=nAngle2==18000; - int bUnt2=nAngle2==27000; - int bHor2=bLks2 || bRts2; - int bVer2=bObn2 || bUnt2; - int bInfo=pInfo!=NULL; + FASTBOOL bRts1=nAngle1==0; + FASTBOOL bObn1=nAngle1==9000; + FASTBOOL bLks1=nAngle1==18000; + FASTBOOL bUnt1=nAngle1==27000; + FASTBOOL bHor1=bLks1 || bRts1; + FASTBOOL bVer1=bObn1 || bUnt1; + FASTBOOL bRts2=nAngle2==0; + FASTBOOL bObn2=nAngle2==9000; + FASTBOOL bLks2=nAngle2==18000; + FASTBOOL bUnt2=nAngle2==27000; + FASTBOOL bHor2=bLks2 || bRts2; + FASTBOOL bVer2=bObn2 || bUnt2; + FASTBOOL bInfo=pInfo!=NULL; if (bInfo) { pInfo->cOrthoForm=0; pInfo->nAngle1=nAngle1; @@ -861,8 +861,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec Rectangle aBewareRect1(rBewareRect1); Rectangle aBewareRect2(rBewareRect2); Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2); - int bMeetingXMid=sal_True; - int bMeetingYMid=sal_True; + FASTBOOL bMeetingXMid=sal_True; + FASTBOOL bMeetingYMid=sal_True; if (eKind==SDREDGE_ONELINE) { XPolygon aXP(2); aXP[0]=rPt1; @@ -908,7 +908,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec return aXP; } sal_uInt16 nIntersections=0; - int bForceMeeting=sal_False; // Muss die Linie durch den MeetingPoint laufen? + FASTBOOL bForceMeeting=sal_False; // Muss die Linie durch den MeetingPoint laufen? { Point aC1(aBewareRect1.Center()); Point aC2(aBewareRect2.Center()); @@ -948,7 +948,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); //int bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()aBoundRect2.Top() && aBoundRect1.Top()aBewareRect2.Left() && aBewareRect1.Left()aBewareRect2.Left() && aBewareRect1.Left()aBewareRect2.Top() && aBewareRect1.Top()=aBewareRect2.Right(); - int bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right(); - int bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom(); - int bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom(); + FASTBOOL bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right(); + FASTBOOL bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right(); + FASTBOOL bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom(); + FASTBOOL bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom(); if (bLks1 && (bY1Ok || aBewareRect1.Left()aBewR2.Left(); + FASTBOOL bCase29Direct=sal_False; + FASTBOOL bCase29=aBewR1.Right()>aBewR2.Left(); if (aBndR1.Right()<=aBndR2.Left()) { // Fall 2.9 und keine Boundrectueberschneidung if ((aPt1.Y()>aBewareRect2.Top() && aPt1.Y()aBewareRect1.Top() && aPt2.Y()aBewR2.Top(); + FASTBOOL bCase29Direct=sal_False; + FASTBOOL bCase29=aBewR1.Bottom()>aBewR2.Top(); if (aBndR1.Bottom()<=aBndR2.Top()) { // Fall 2.9 und keine Boundrectueberschneidung if ((aPt1.X()>aBewareRect2.Left() && aPt1.X()aBewareRect1.Left() && aPt2.X()aBewareRect1.Left() && aPt1b.X()aBewareRect1.Left() && aPt1b.X()aBewareRect1.Top() && aPt1b.Y()aBewareRect2.Left() && aPt1b.X()aBewareRect2.Left() && aPt1b.X()aBewareRect2.Top() && aPt1b.Y()GetId(); - int bDataChg=nId==SFX_HINT_DATACHANGED; - int bDying=nId==SFX_HINT_DYING; - int bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; - int bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC; + FASTBOOL bDataChg=nId==SFX_HINT_DATACHANGED; + FASTBOOL bDying=nId==SFX_HINT_DYING; + FASTBOOL bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; + FASTBOOL bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC; if (bDying && (bObj1 || bObj2)) { // #35605# Dying vorher abfangen, damit AttrObj nicht // wg. vermeintlicher Vorlagenaenderung rumbroadcastet @@ -2004,7 +2004,7 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth return aResult; } -int SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) +FASTBOOL SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) { rDragStat.SetNoSnap(sal_True); pEdgeTrack->SetPointCount(2); @@ -2018,7 +2018,7 @@ int SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) return sal_True; } -int SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) +FASTBOOL SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) { sal_uInt16 nMax=pEdgeTrack->GetPointCount(); (*pEdgeTrack)[nMax-1]=rDragStat.GetNow(); @@ -2034,9 +2034,9 @@ int SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) return sal_True; } -int SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) +FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) { - int bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); + FASTBOOL bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); if (bOk) { ConnectToNode(sal_True,aCon1.pObj); ConnectToNode(sal_False,aCon2.pObj); @@ -2049,7 +2049,7 @@ int SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) return bOk; } -int SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) +FASTBOOL SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) { if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); @@ -2076,7 +2076,7 @@ Pointer SdrEdgeObj::GetCreatePointer() const return Pointer(POINTER_DRAW_CONNECT); } -int SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) +FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut) { rCon.ResetVars(); if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0); @@ -2095,10 +2095,10 @@ int SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrOb aMouseRect.Bottom()+=aHalfConSiz.Height(); sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; sal_uIntPtr no=pOL->GetObjCount(); - int bFnd=sal_False; + FASTBOOL bFnd=sal_False; SdrObjConnection aTestCon; SdrObjConnection aBestCon; - int bTestBoundHit=sal_False; + FASTBOOL bTestBoundHit=sal_False; //int bBestBoundHit=sal_False; while (no>0 && !bFnd) { @@ -2113,22 +2113,22 @@ int SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrOb if (aObjBound.IsOver(aMouseRect)) { aTestCon.ResetVars(); bTestBoundHit=sal_False; - int bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge + FASTBOOL bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge // Die Userdefined Konnektoren haben absolute Prioritaet. // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert. // Zum Schluss kommt noch ein HitTest aufs Obj. const SdrGluePointList* pGPL=pObj->GetGluePointList(); sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); sal_uInt16 nGesAnz=nConAnz+9; - int bUserFnd=sal_False; + FASTBOOL bUserFnd=sal_False; sal_uIntPtr nBestDist=0xFFFFFFFF; for (sal_uInt16 i=0; i=nConAnz+0 && i=nConAnz+4 && i=nConAnz+0 && i=nConAnz+4 && iIsAnimated(); - int bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; + FASTBOOL bAnim = pGraphic->IsAnimated(); + FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj; rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 || aGeo.nDrehWink % 18000 == 0 || @@ -884,8 +884,8 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract { SdrRectObj::NbcResize( rRef, xFact, yFact ); - int bMirrX = xFact.GetNumerator() < 0; - int bMirrY = yFact.GetNumerator() < 0; + FASTBOOL bMirrX = xFact.GetNumerator() < 0; + FASTBOOL bMirrY = yFact.GetNumerator() < 0; if( bMirrX != bMirrY ) bMirrored = !bMirrored; @@ -908,7 +908,7 @@ void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2) // ----------------------------------------------------------------------------- -void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { SdrRectObj::NbcRotate( rRef, nWink, tn, bVShear ); } @@ -962,8 +962,8 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) void SdrGrafObj::SetPage( SdrPage* pNewPage ) { - int bRemove = pNewPage == NULL && pPage != NULL; - int bInsert = pNewPage != NULL && pPage == NULL; + FASTBOOL bRemove = pNewPage == NULL && pPage != NULL; + FASTBOOL bInsert = pNewPage != NULL && pPage == NULL; if( bRemove ) { @@ -985,7 +985,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage ) void SdrGrafObj::SetModel( SdrModel* pNewModel ) { - int bChg = pNewModel != pModel; + FASTBOOL bChg = pNewModel != pModel; if( bChg ) { @@ -1026,7 +1026,7 @@ void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/) // ----------------------------------------------------------------------------- -int SdrGrafObj::HasGDIMetaFile() const +FASTBOOL SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); } diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 06372cd153a5..ede6b35178f9 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -177,7 +177,7 @@ sal_uInt16 SdrObjGroup::GetObjIdentifier() const SdrLayerID SdrObjGroup::GetLayer() const { - int b1st=sal_True; + FASTBOOL b1st=sal_True; SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer()); SdrObjList* pOL=pSub; sal_uIntPtr nObjAnz=pOL->GetObjCount(); @@ -245,7 +245,7 @@ void SdrObjGroup::SetModel(SdrModel* pNewModel) } -int SdrObjGroup::HasRefPoint() const +FASTBOOL SdrObjGroup::HasRefPoint() const { return bRefPoint; } @@ -385,7 +385,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const } -int SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) +FASTBOOL SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -397,7 +397,7 @@ long SdrObjGroup::GetRotateAngle() const } -long SdrObjGroup::GetShearAngle(int /*bVertical*/) const +long SdrObjGroup::GetShearAngle(FASTBOOL /*bVertical*/) const { return nShearWink; } @@ -448,8 +448,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz) void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -509,7 +509,7 @@ void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { SetGlueReallyAbsolute(sal_True); nShearWink+=nWink; @@ -604,8 +604,8 @@ void SdrObjGroup::Move(const Size& rSiz) void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) { - int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -700,7 +700,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) } -void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { if (nWink!=0) { SetGlueReallyAbsolute(sal_True); @@ -731,7 +731,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, int bVShear) void SdrObjGroup::SetAnchorPos(const Point& rPnt) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); - int bChg=aAnchor!=rPnt; + FASTBOOL bChg=aAnchor!=rPnt; aAnchor=rPnt; Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); MovePoint(aRefPoint,aSiz); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index f4de0ea2726d..63d23eb2c72b 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -275,17 +275,17 @@ struct ImpMeasureRec : public SdrDragStatUserData long nHelplineDist; long nHelpline1Len; long nHelpline2Len; - int bBelowRefEdge; - int bTextRota90; - int bTextUpsideDown; + FASTBOOL bBelowRefEdge; + FASTBOOL bTextRota90; + FASTBOOL bTextUpsideDown; long nMeasureOverhang; FieldUnit eMeasureUnit; Fraction aMeasureScale; - int bShowUnit; + FASTBOOL bShowUnit; String aFormatString; - int bTextAutoAngle; + FASTBOOL bTextAutoAngle; long nTextAutoAngleView; - int bTextIsFixedAngle; + FASTBOOL bTextIsFixedAngle; long nTextFixedAngle; }; @@ -321,11 +321,11 @@ struct ImpMeasurePoly long nArrow1Wdt; // Breite des 1. Pfeils long nArrow2Wdt; // Breite des 2. Pfeils long nShortLineLen; // Linienlaenge, wenn PfeileAussen - int bArrow1Center; // Pfeil 1 zentriert? - int bArrow2Center; // Pfeil 2 zentriert? - int bAutoUpsideDown; // UpsideDown durch Automatik - int bPfeileAussen; - int bBreakedLine; + FASTBOOL bArrow1Center; // Pfeil 1 zentriert? + FASTBOOL bArrow2Center; // Pfeil 2 zentriert? + FASTBOOL bAutoUpsideDown; // UpsideDown durch Automatik + FASTBOOL bPfeileAussen; + FASTBOOL bBreakedLine; }; void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const @@ -389,7 +389,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.nArrow2Wdt=0; long nArrowNeed=0; long nShortLen=0; - int bPfeileAussen=sal_False; + FASTBOOL bPfeileAussen=sal_False; const SfxItemSet& rSet = GetObjectItemSet(); sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke @@ -419,7 +419,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.eUsedTextHPos=rRec.eWantTextHPos; rPol.eUsedTextVPos=rRec.eWantTextVPos; if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE; - int bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; + FASTBOOL bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE; if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) { OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); @@ -430,7 +430,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& } rPol.bBreakedLine=bBrkLine; if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben - int bOutside=sal_False; + FASTBOOL bOutside=sal_False; long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height(); if (nNeedSiz>rPol.nLineLen) bOutside=sal_True; // Text passt nicht in die Mitte if (bBrkLine) { @@ -581,8 +581,8 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) return aRetval; } -int SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - int bEdit, +FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const { const SvxFieldData* pField=rField.GetField(); @@ -667,9 +667,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const } Point aTextPos; - int bRota90=aRec.bTextRota90; - int bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown; - int bBelowRefEdge=aRec.bBelowRefEdge; + FASTBOOL bRota90=aRec.bTextRota90; + FASTBOOL bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown; + FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge; SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; if (!bRota90) { @@ -910,9 +910,9 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c const SdrHdl* pHdl=rDrag.GetHdl(); sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); - int bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); - int bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho(); - int bBelow=rRec.bBelowRefEdge; + FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho(); + FASTBOOL bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho(); + FASTBOOL bBelow=rRec.bBelowRefEdge; Point aPt(rDrag.GetNow()); switch (nHdlNum) { @@ -929,22 +929,22 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c if (bOrtho) rRec.nHelpline1Len=rRec.nHelpline2Len; } break; case 2: case 3: { - int bAnf=nHdlNum==2; + FASTBOOL bAnf=nHdlNum==2; Point& rMov=bAnf ? rRec.aPt1 : rRec.aPt2; Point aMov(rMov); Point aFix(bAnf ? rRec.aPt2 : rRec.aPt1); if (bOrtho) { long ndx0=aMov.X()-aFix.X(); long ndy0=aMov.Y()-aFix.Y(); - int bHLin=ndy0==0; - int bVLin=ndx0==0; + FASTBOOL bHLin=ndy0==0; + FASTBOOL bVLin=ndx0==0; if (!bHLin || !bVLin) { // sonst ist aPt1==aPt2 long ndx=aPt.X()-aFix.X(); long ndy=aPt.Y()-aFix.Y(); double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aPt=aFix; @@ -971,7 +971,7 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrMeasureObj::BegCreate(SdrDragStat& rStat) +FASTBOOL SdrMeasureObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho8Possible(); aPt1=rStat.GetStart(); @@ -980,7 +980,7 @@ int SdrMeasureObj::BegCreate(SdrDragStat& rStat) return sal_True; } -int SdrMeasureObj::MovCreate(SdrDragStat& rStat) +FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat) { SdrView* pView=rStat.GetView(); aPt1=rStat.GetStart(); @@ -995,14 +995,14 @@ int SdrMeasureObj::MovCreate(SdrDragStat& rStat) return sal_True; } -int SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +FASTBOOL SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { SetTextDirty(); SetRectsDirty(); return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); } -int SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/) +FASTBOOL SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/) { return sal_False; } @@ -1073,7 +1073,7 @@ void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetRectsDirty(); } -void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { SdrTextObj::NbcShear(rRef,nWink,tn,bVShear); ShearPoint(aPt1,rRef,tn,bVShear); @@ -1298,7 +1298,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SetTextDirty(); // Text neu berechnen! } -void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, +void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { if (bTextDirty) UndirtyText(); @@ -1329,9 +1329,9 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const SdrTextVertAdjust eTV=GetTextVerticalAdjust(); SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; - int bTextRota90=aRec.bTextRota90; + FASTBOOL bTextRota90=aRec.bTextRota90; //int bTextUpsideDown=aRec.bTextUpsideDown; - int bBelowRefEdge=aRec.bBelowRefEdge; + FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge; // bTextUpsideDown muss hier noch ausgewertet werden!!!! if (!bTextRota90) { diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 814f41e1921d..7becaa96e254 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -752,7 +752,7 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() TYPEINIT1(SdrOle2Obj,SdrRectObj); DBG_NAME(SdrOle2Obj) -SdrOle2Obj::SdrOle2Obj(int bFrame_) : m_bTypeAsked(false) +SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false) ,m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); @@ -762,7 +762,7 @@ SdrOle2Obj::SdrOle2Obj(int bFrame_) : m_bTypeAsked(false) } // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_) : xObjRef( rNewObjRef ) , m_bTypeAsked(false) , m_bChart(false) @@ -783,7 +783,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_) // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, int bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_) : xObjRef( rNewObjRef ) , m_bTypeAsked(false) , m_bChart(false) @@ -805,7 +805,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, int bFrame_) +SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_) : SdrRectObj(rNewRect) , xObjRef( rNewObjRef ) , m_bTypeAsked(false) @@ -911,7 +911,7 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf) // ----------------------------------------------------------------------------- -int SdrOle2Obj::IsEmpty() const +FASTBOOL SdrOle2Obj::IsEmpty() const { return !(xObjRef.is()); } @@ -1419,8 +1419,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) void SdrOle2Obj::SetPage(SdrPage* pNewPage) { - int bRemove=pNewPage==NULL && pPage!=NULL; - int bInsert=pNewPage!=NULL && pPage==NULL; + FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL; + FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL; if (bRemove && mpImpl->mbConnected ) Disconnect(); diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index ab190826b4ba..b1634ff4717f 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -80,7 +80,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } using namespace sdr; -inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed) +inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed) { if (nPnt>0) { nPnt--; @@ -91,7 +91,7 @@ inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed) return nPnt; } -inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed) +inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, FASTBOOL bClosed) { nPnt++; if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0; @@ -101,31 +101,31 @@ inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed) struct ImpSdrPathDragData : public SdrDragStatUserData { XPolygon aXP; // Ausschnitt aud dem Originalpolygon - int bValid; // sal_False = zu wenig Punkte - int bClosed; // geschlossenes Objekt? + FASTBOOL bValid; // sal_False = zu wenig Punkte + FASTBOOL bClosed; // geschlossenes Objekt? sal_uInt16 nPoly; // Nummer des Polygons im PolyPolygon sal_uInt16 nPnt; // Punktnummer innerhalb des obigen Polygons sal_uInt16 nPntAnz; // Punktanzahl des Polygons sal_uInt16 nPntMax; // Maximaler Index - int bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - int bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline + FASTBOOL bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + FASTBOOL bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt; // Index des vorherigen Punkts sal_uInt16 nNextPnt; // Index des naechsten Punkts - int bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline - int bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline + FASTBOOL bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline + FASTBOOL bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt; // Index des uebernaechsten Punkts - int bControl; // Punkt ist ein Kontrollpunkt - int bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - int bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - int bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - int bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + FASTBOOL bControl; // Punkt ist ein Kontrollpunkt + FASTBOOL bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt + FASTBOOL bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + FASTBOOL bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + FASTBOOL bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt sal_uInt16 nPrevPrevPnt0; sal_uInt16 nPrevPnt0; sal_uInt16 nPnt0; sal_uInt16 nNextPnt0; sal_uInt16 nNextNextPnt0; - int bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) + FASTBOOL bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) // ## sal_Bool mbMultiPointDrag; @@ -249,15 +249,15 @@ struct ImpPathCreateUser : public SdrDragStatUserData long nCircRadius; long nCircStWink; long nCircRelWink; - int bBezier; - int bBezHasCtrl0; - int bCurve; - int bCircle; - int bAngleSnap; - int bLine; - int bLine90; - int bRect; - int bMixedCreate; + FASTBOOL bBezier; + FASTBOOL bBezHasCtrl0; + FASTBOOL bCurve; + FASTBOOL bCircle; + FASTBOOL bAngleSnap; + FASTBOOL bLine; + FASTBOOL bLine90; + FASTBOOL bRect; + FASTBOOL bMixedCreate; sal_uInt16 nBezierStartPoint; SdrObjKind eStartKind; SdrObjKind eAktKind; @@ -268,18 +268,18 @@ public: bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; } - int IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } + FASTBOOL IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } XPolygon GetFormPoly() const; - int CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, int bMouseDown); + FASTBOOL CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown); XPolygon GetBezierPoly() const; //int CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return sal_False; } XPolygon GetCurvePoly() const { return XPolygon(); } - int CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + FASTBOOL CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; - int CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + FASTBOOL CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView) const; XPolygon GetLinePoly() const; - int CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); + FASTBOOL CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetRectPoly() const; }; @@ -293,9 +293,9 @@ XPolygon ImpPathCreateUser::GetFormPoly() const return XPolygon(); } -int ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, int bMouseDown) +FASTBOOL ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown) { - int bRet=sal_True; + FASTBOOL bRet=sal_True; aBezStart=rP1; aBezCtrl1=rP1+rDir; aBezCtrl2=rP2; @@ -318,7 +318,7 @@ XPolygon ImpPathCreateUser::GetBezierPoly() const return aXP; } -int ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { long nTangAngle=GetAngle(rDir); aCircStart=rP1; @@ -329,7 +329,7 @@ int ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poin long dAngle=GetAngle(Point(dx,dy))-nTangAngle; dAngle=NormAngle360(dAngle); long nTmpAngle=NormAngle360(9000-dAngle); - int bRet=nTmpAngle!=9000 && nTmpAngle!=27000; + FASTBOOL bRet=nTmpAngle!=9000 && nTmpAngle!=27000; long nRad=0; if (bRet) { double cs=cos(nTmpAngle*nPi180); @@ -351,7 +351,7 @@ int ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poin if (bAngleSnap) { long nSA=pView->GetSnapAngle(); if (nSA!=0) { // Winkelfang - int bNeg=nCircRelWink<0; + FASTBOOL bNeg=nCircRelWink<0; if (bNeg) nCircRelWink=-nCircRelWink; nCircRelWink+=nSA/2; nCircRelWink/=nSA; @@ -395,8 +395,8 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr { long x=aCsr.X(),x1=x,x2=x; long y=aCsr.Y(),y1=y,y2=y; - int bHLin=nDirY==0; - int bVLin=nDirX==0; + FASTBOOL bHLin=nDirY==0; + FASTBOOL bVLin=nDirX==0; if (bHLin) y=0; else if (bVLin) x=0; else { @@ -413,7 +413,7 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr return Point(x,y); } -int ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aLineStart=rP1; aLineEnd=rP2; @@ -443,7 +443,7 @@ XPolygon ImpPathCreateUser::GetLinePoly() const return aXP; } -int ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) +FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { aRectP1=rP1; aRectP2=rP1; @@ -454,8 +454,8 @@ int ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& long nDirY=rDir.Y(); long x=aTmpPt.X(); long y=aTmpPt.Y(); - int bHLin=nDirY==0; - int bVLin=nDirX==0; + FASTBOOL bHLin=nDirY==0; + FASTBOOL bVLin=nDirX==0; if (bHLin) y=0; else if (bVLin) x=0; else { @@ -477,7 +477,7 @@ int ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=Abs(dy1); long dx2=aRectP3.X()-aRectP2.X(); long dx2a=Abs(dx2); long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=Abs(dy2); - int b1MoreThan2=dx1a+dy1a>dx2a+dy2a; + FASTBOOL b1MoreThan2=dx1a+dy1a>dx2a+dy2a; if (b1MoreThan2 != pView->IsBigOrtho()) { long xtemp=dy2a-dx1a; if (dx1<0) xtemp=-xtemp; long ytemp=dx2a-dy1a; if (dy1<0) ytemp=-ytemp; @@ -528,10 +528,10 @@ public: basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; // create stuff - int BegCreate(SdrDragStat& rStat); - int MovCreate(SdrDragStat& rStat); - int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - int BckCreate(SdrDragStat& rStat); + FASTBOOL BegCreate(SdrDragStat& rStat); + FASTBOOL MovCreate(SdrDragStat& rStat); + FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + FASTBOOL BckCreate(SdrDragStat& rStat); void BrkCreate(SdrDragStat& rStat); Pointer GetCreatePointer() const; @@ -669,30 +669,30 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const mpSdrPathDragData->ResetPoly(mrSdrPathObject); // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff - int bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? + FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons - int bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - int bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline + FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts - int bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline - int bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline + FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline + FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts - int bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt + FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - int bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - int bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - int bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt // Ortho bei Linien/Polygonen = Winkel beibehalten if (!bControl && rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho()) { - int bBigOrtho=rDrag.GetView()->IsBigOrtho(); + FASTBOOL bBigOrtho=rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // die aktuelle Position Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der gedraggte Punkt sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte Point aNeuPos1,aNeuPos2; // die neuen Alternativen fuer aPos - int bPnt1=sal_False,bPnt2=sal_False; // die neuen Alternativen gueltig? + FASTBOOL bPnt1=sal_False,bPnt2=sal_False; // die neuen Alternativen gueltig? if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien if (!bBegPnt) nPnt1=nPrevPnt; if (!bEndPnt) nPnt2=nNextPnt; @@ -705,16 +705,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const Point aPnt1=mpSdrPathDragData->aXP[nPnt1]; long ndx0=aPnt.X()-aPnt1.X(); long ndy0=aPnt.Y()-aPnt1.Y(); - int bHLin=ndy0==0; - int bVLin=ndx0==0; + FASTBOOL bHLin=ndy0==0; + FASTBOOL bVLin=ndx0==0; if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt1.X(); long ndy=aPos.Y()-aPnt1.Y(); bPnt1=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aNeuPos1=aPnt1; @@ -726,16 +726,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const Point aPnt2=mpSdrPathDragData->aXP[nPnt2]; long ndx0=aPnt.X()-aPnt2.X(); long ndy0=aPnt.Y()-aPnt2.Y(); - int bHLin=ndy0==0; - int bVLin=ndx0==0; + FASTBOOL bHLin=ndy0==0; + FASTBOOL bVLin=ndx0==0; if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt2.X(); long ndy=aPos.Y()-aPnt2.Y(); bPnt2=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; - int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); - int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); + FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); + FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho); if (bHor) ndy=long(ndy0*nXFact); if (bVer) ndx=long(ndx0*nYFact); aNeuPos2=aPnt2; @@ -912,8 +912,8 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag) { // #40549# Point aLinePt1_(aPathPolygon[0][0]); Point aLinePt2_(aPathPolygon[0][1]); - int bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X()); - int bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y()); + FASTBOOL bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X()); + FASTBOOL bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y()); if (bXMirr || bYMirr) { Point aRef1(mrSdrPathObject.GetSnapRect().Center()); if (bXMirr) { @@ -1188,22 +1188,22 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra return aRetval.getB2DPolyPolygon(); } // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff - int bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? + FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons - int bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline - int bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline + FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline + FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts - int bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline - int bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline + FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline + FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts - int bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt + FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - int bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - int bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - int bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt XPolygon aXPoly(mpSdrPathDragData->aXP); XPolygon aLine1(2); XPolygon aLine2(2); @@ -1281,14 +1281,14 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra return aRetval.getB2DPolyPolygon(); } -int ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) +FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) { bool bFreeHand(IsFreeHand(meObjectKind)); rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(); aPathPolygon.Clear(); mbCreating=sal_True; - int bMakeStartPoint=sal_True; + FASTBOOL bMakeStartPoint=sal_True; SdrView* pView=rStat.GetView(); if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() && (meObjectKind==OBJ_POLY || meObjectKind==OBJ_PLIN || meObjectKind==OBJ_PATHLINE || meObjectKind==OBJ_PATHFILL)) { @@ -1306,7 +1306,7 @@ int ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) return sal_True; } -int ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) +FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); SdrView* pView=rStat.GetView(); @@ -1343,7 +1343,7 @@ int ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) if (nActPoint==0) { rXPoly[0]=rStat.GetPos0(); } else nActPoint--; - int bFreeHand=IsFreeHand(pU->eAktKind); + FASTBOOL bFreeHand=IsFreeHand(pU->eAktKind); rStat.SetNoSnap(bFreeHand /*|| (pU->bMixed && pU->eAktKind==OBJ_LINE)*/); rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE)); Point aActMerk(rXPoly[nActPoint]); @@ -1413,12 +1413,12 @@ int ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) return sal_True; } -int ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); - int bRet=sal_False; + FASTBOOL bRet=sal_False; SdrView* pView=rStat.GetView(); - int bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); + FASTBOOL bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; Point aAktMerk(rXPoly[nActPoint]); @@ -1529,7 +1529,7 @@ int ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) return bRet; } -int ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) +FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); if (aPathPolygon.Count()>0) { @@ -1867,8 +1867,8 @@ void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bNoContortion=sal_False; - int bCanConv = !HasText() || ImpCanConvTextToCurve(); - int bIsPath = IsBezier() || IsSpline(); + FASTBOOL bCanConv = !HasText() || ImpCanConvTextToCurve(); + FASTBOOL bIsPath = IsBezier() || IsSpline(); rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath = bCanConv && !bIsPath; @@ -2061,7 +2061,7 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const // keep old stuff to be able to keep old SdrHdl stuff, too const XPolyPolygon aOldPathPolygon(GetPathPoly()); sal_uInt16 nPolyCnt=aOldPathPolygon.Count(); - int bClosed=IsClosed(); + FASTBOOL bClosed=IsClosed(); sal_uInt16 nIdx=0; for (sal_uInt16 i=0; iisLocked() ) ) // SJ: #i44922# { @@ -667,7 +667,7 @@ int SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) return sal_False; } -int SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) +FASTBOOL SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) { if(bTextFrame) { @@ -677,7 +677,7 @@ int SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) return sal_False; } -int SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) +FASTBOOL SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) { if(bTextFrame) { @@ -687,7 +687,7 @@ int SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) return sal_False; } -int SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) +FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) { if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922# { @@ -706,7 +706,7 @@ int SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) return sal_False; } -int SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) +FASTBOOL SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) { if(bTextFrame) { @@ -716,7 +716,7 @@ int SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) return sal_False; } -int SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) +FASTBOOL SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) { if(bTextFrame) { @@ -795,7 +795,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const long nUpperDist=GetTextUpperDistance(); long nLowerDist=GetTextLowerDistance(); Rectangle aAnkRect(aRect); // Rect innerhalb dem geankert wird - int bFrame=IsTextFrame(); + FASTBOOL bFrame=IsTextFrame(); if (!bFrame) { TakeUnrotatedSnapRect(aAnkRect); } @@ -824,7 +824,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const rAnchorRect=aAnkRect; } -void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, +void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird @@ -835,10 +835,10 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int SdrTextAniDirection eAniDirection=GetTextAniDirection(); SdrFitToSizeType eFit=GetFitToSize(); - int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - int bContourFrame=IsContourTextFrame(); + FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bContourFrame=IsContourTextFrame(); - int bFrame=IsTextFrame(); + FASTBOOL bFrame=IsTextFrame(); sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; if (!bContourFrame) @@ -1039,7 +1039,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r #endif } unsigned nLoopCount=0; - int bNoMoreLoop=sal_False; + FASTBOOL bNoMoreLoop=sal_False; long nXDiff0=0x7FFFFFFF; long nWantWdt=rAnchorRect.Right()-rAnchorRect.Left(); long nIsWdt=rTextRect.Right()-rTextRect.Left(); @@ -1055,8 +1055,8 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen - int bChkX=sal_True; - int bChkY=sal_True; + FASTBOOL bChkX=sal_True; + FASTBOOL bChkY=sal_True; if (bNoStretching) { // #35762# evtl. nur proportional moeglich if (nX>nY) { nX=nY; bChkX=sal_False; } else { nY=nX; bChkY=sal_False; } @@ -1275,7 +1275,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const TakeTextRect(rOutliner,aR,sal_False,&aAnchor2); rOutliner.Clear(); SdrFitToSizeType eFit=GetFitToSize(); - int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); if (bFitToSize) aR=aAnchor2; Polygon aPol(aR); if (aGeo.nDrehWink!=0) RotatePoly(aPol,aR.TopLeft(),aGeo.nSin,aGeo.nCos); @@ -1382,7 +1382,7 @@ boost::shared_ptr< SdrOutliner > SdrTextObj::CreateDrawOutliner() } // #101029#: Extracted from Paint() -void SdrTextObj::ImpSetupDrawOutlinerForPaint( int bContourFrame, +void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, SdrOutliner& rOutliner, Rectangle& rTextRect, Rectangle& rAnchorRect, @@ -1428,7 +1428,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint Rectangle aAnchorRect; Fraction aFitXKorreg(1,1); - int bContourFrame=IsContourTextFrame(); + FASTBOOL bContourFrame=IsContourTextFrame(); ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); @@ -1866,19 +1866,19 @@ long SdrTextObj::GetMaxTextFrameWidth() const return ((SdrTextMaxFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue(); } -int SdrTextObj::IsFontwork() const +FASTBOOL SdrTextObj::IsFontwork() const { return (bTextFrame) ? sal_False // Default ist FALSE : ((XFormTextStyleItem&)(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE))).GetValue()!=XFT_NONE; } -int SdrTextObj::IsHideContour() const +FASTBOOL SdrTextObj::IsHideContour() const { return (bTextFrame) ? sal_False // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames : ((XFormTextHideFormItem&)(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM))).GetValue(); } -int SdrTextObj::IsContourTextFrame() const +FASTBOOL SdrTextObj::IsContourTextFrame() const { return (bTextFrame) ? sal_False // ContourFrame nicht bei normalen TextFrames : ((SdrTextContourFrameItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME))).GetValue(); diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 18117fbdc8ac..6a903b75ae92 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -75,19 +75,19 @@ // //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, int bWdt) const +FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const { if (bTextFrame && pModel!=NULL && !rR.IsEmpty()) { SdrFitToSizeType eFit=GetFitToSize(); - int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - int bWdtGrow=bWdt && IsAutoGrowWidth(); - int bHgtGrow=bHgt && IsAutoGrowHeight(); + FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth(); + FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight(); SdrTextAniKind eAniKind=GetTextAniKind(); SdrTextAniDirection eAniDir=GetTextAniDirection(); - int bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE; - int bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT); - int bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN); + FASTBOOL bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE; + FASTBOOL bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT); + FASTBOOL bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN); if (!bFitToSize && (bWdtGrow || bHgtGrow)) { Rectangle aR0(rR); @@ -210,9 +210,9 @@ int SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, int bWdt) return sal_False; } -int SdrTextObj::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt) +FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) { - int bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt); + FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt); if (bRet) { SetRectsDirty(); if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack @@ -225,10 +225,10 @@ int SdrTextObj::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt) return bRet; } -int SdrTextObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt) +FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) { Rectangle aNeuRect(aRect); - int bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); + FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); // #110094#-14 SendRepaintBroadcast(); diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index dd01c7cb6d02..af53a36f133c 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -52,7 +52,7 @@ // //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrTextObj::HasTextEdit() const +FASTBOOL SdrTextObj::HasTextEdit() const { // lt. Anweisung von MB duerfen gelinkte Textobjekte nun doch // geaendert werden (kein automatisches Reload) @@ -74,8 +74,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetRefDevice( pModel->GetRefDevice() ); SdrFitToSizeType eFit=GetFitToSize(); - int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - int bContourFrame=IsContourTextFrame(); + FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bContourFrame=IsContourTextFrame(); ImpSetTextEditParams(); if (!bContourFrame) { @@ -147,7 +147,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const { SdrFitToSizeType eFit=GetFitToSize(); - int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); Size aPaperMin,aPaperMax; Rectangle aViewInit; TakeTextAnchorRect(aViewInit); @@ -325,15 +325,15 @@ sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const void SdrTextObj::ImpSetTextEditParams() const { if (pEdtOutl!=NULL) { - int bUpdMerk=pEdtOutl->GetUpdateMode(); + FASTBOOL bUpdMerk=pEdtOutl->GetUpdateMode(); if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL); //SdrFitToSizeType eFit=GetFitToSize(); - //int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); - int bContourFrame=IsContourTextFrame(); + //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); + FASTBOOL bContourFrame=IsContourTextFrame(); //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 575ff909e4dd..444796adb30c 100644 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -50,8 +50,8 @@ void SdrRegisterFieldClasses() ///////////////////////////////////////////////////////////////////////////////////////////////// */ -int SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, - int /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const +FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, + FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { return sal_False; } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index e350f451aca7..d36b73ae0a1b 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed() void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */) { - int bForceReload=sal_False; + FASTBOOL bForceReload=sal_False; SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0; sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; if( pLinkManager ) @@ -208,10 +208,10 @@ void SdrTextObj::ReleaseTextLink() } } -int SdrTextObj::ReloadLinkedText( int bForceLoad) +FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad) { ImpSdrObjTextLinkUserData* pData = GetLinkUserData(); - int bRet = sal_True; + FASTBOOL bRet = sal_True; if( pData ) { @@ -260,7 +260,7 @@ int SdrTextObj::ReloadLinkedText( int bForceLoad) return bRet; } -int SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) +FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) { INetURLObject aFileURL( rFileName ); sal_Bool bRet = sal_False; diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 2ffce73671ad..3e7f5434b14e 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -125,7 +125,7 @@ long SdrTextObj::GetRotateAngle() const return aGeo.nDrehWink; } -long SdrTextObj::GetShearAngle(int /*bVertical*/) const +long SdrTextObj::GetShearAngle(FASTBOOL /*bVertical*/) const { return aGeo.nShearWink; } @@ -140,14 +140,14 @@ void SdrTextObj::NbcMove(const Size& rSiz) void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - int bNoShearMerk=aGeo.nShearWink==0; - int bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0; + FASTBOOL bNoShearMerk=aGeo.nShearWink==0; + FASTBOOL bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0; long nHDist=GetTextLeftDistance()+GetTextRightDistance(); long nVDist=GetTextUpperDistance()+GetTextLowerDistance(); long nTWdt0=aRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0; long nTHgt0=aRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0; - int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); - int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); + FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0); + FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0); if (bXMirr || bYMirr) { Point aRef1(GetSnapRect().Center()); if (bXMirr) { @@ -205,7 +205,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract } if (bRota90Merk) { - int bRota90=aGeo.nDrehWink % 9000 ==0; + FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0; if (!bRota90) { // Scheinbar Rundungsfehler: Korregieren long a=NormAngle360(aGeo.nDrehWink); if (a<4500) a=0; @@ -261,7 +261,7 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetGlueReallyAbsolute(sal_False); } -void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { SetGlueReallyAbsolute(sal_True); @@ -286,8 +286,8 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) { SetGlueReallyAbsolute(sal_True); - int bNoShearMerk=aGeo.nShearWink==0; - int bRota90Merk=sal_False; + FASTBOOL bNoShearMerk=aGeo.nShearWink==0; + FASTBOOL bRota90Merk=sal_False; if (bNoShearMerk && (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() || Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) { @@ -309,7 +309,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) Poly2Rect(aPol,aRect,aGeo); if (bRota90Merk) { - int bRota90=aGeo.nDrehWink % 9000 ==0; + FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0; if (bRota90Merk && !bRota90) { // Scheinbar Rundungsfehler: Korregieren long a=NormAngle360(aGeo.nDrehWink); if (a<4500) a=0; @@ -515,7 +515,7 @@ SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPol return pPathObj; } -SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, int bBezier) const +SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const { if(!ImpCanConvTextToCurve()) { diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 2da5e803f3f6..22c28b7808d4 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -111,7 +111,7 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj ) XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor) { - int bOk = sal_False; + FASTBOOL bOk = sal_False; XubString aRet; if(mpTextObj.is()) diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index e1a04f83d725..c6703f2305df 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -347,22 +347,22 @@ String SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrVirtObj::BegCreate(SdrDragStat& rStat) +FASTBOOL SdrVirtObj::BegCreate(SdrDragStat& rStat) { return rRefObj.BegCreate(rStat); } -int SdrVirtObj::MovCreate(SdrDragStat& rStat) +FASTBOOL SdrVirtObj::MovCreate(SdrDragStat& rStat) { return rRefObj.MovCreate(rStat); } -int SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +FASTBOOL SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { return rRefObj.EndCreate(rStat,eCmd); } -int SdrVirtObj::BckCreate(SdrDragStat& rStat) +FASTBOOL SdrVirtObj::BckCreate(SdrDragStat& rStat) { return rRefObj.BckCreate(rStat); } @@ -404,7 +404,7 @@ void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2) SetRectsDirty(); } -void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { rRefObj.NbcShear(rRef-aAnchor,nWink,tn,bVShear); SetRectsDirty(); @@ -452,7 +452,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2) SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); } -void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, int bVShear) +void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear) { if (nWink!=0) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); @@ -531,7 +531,7 @@ long SdrVirtObj::GetRotateAngle() const return rRefObj.GetRotateAngle(); } -long SdrVirtObj::GetShearAngle(int bVertical) const +long SdrVirtObj::GetShearAngle(FASTBOOL bVertical) const { return rRefObj.GetShearAngle(bVertical); } @@ -620,7 +620,7 @@ void SdrVirtObj::ReformatText() //////////////////////////////////////////////////////////////////////////////////////////////////// -int SdrVirtObj::HasMacro() const +FASTBOOL SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); } @@ -640,7 +640,7 @@ void SdrVirtObj::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, con rRefObj.PaintMacro(rOut,rDirtyRect,rRec); // Todo: Positionsversatz } -int SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) +FASTBOOL SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) { return rRefObj.DoMacro(rRec); // Todo: Positionsversatz } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index d2a12ece7702..7fdc35ae7545 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -184,7 +184,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) // Aehnliche Implementation an folgenden Stellen: // void SdrObjList::CopyObjects(const SdrObjList& rSrcList) // SdrModel* SdrExchangeView::GetMarkedObjModel() const - // int SdrExchangeView::Paste(const SdrModel& rMod,...) + // FASTBOOL SdrExchangeView::Paste(const SdrModel& rMod,...) // void SdrEditView::CopyMarked() if (nCloneErrCnt==0) { for (no=0; noIsReadOnly(); return bRet; } @@ -1859,9 +1859,9 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const return pObj->GetStyleSheet(); } -int SdrPage::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const +FASTBOOL SdrPage::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const { - int bRet = sal_False; + FASTBOOL bRet = sal_False; for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) ) @@ -1936,12 +1936,12 @@ void SdrPage::ActionChanged() const } // NYI: Dummy implementations for declarations in svdpage.hxx -Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, int /*bTrimBorders*/) const +Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/) const { DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented."); return Bitmap(); } -GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, int /*bTrimBorders*/) +GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/) { DBG_ASSERT(0, "SdrPage::GetMetaFile(): not yet implemented."); return GDIMetaFile(); diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index f41000da49bd..65a72cc915be 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -330,7 +330,7 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) if (GetView().pTextEditOutliner==NULL) return; //const SdrObject* pTextObjTmp=GetView().GetTextEditObject(); //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp); - //int bTextFrame=pText!=NULL && pText->IsTextFrame(); + //FASTBOOL bTextFrame=pText!=NULL && pText->IsTextFrame(); sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount(); for (sal_uIntPtr i=0; iGetView(i); @@ -550,8 +550,8 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C Size aMinDotDist(rOut.PixelToLogic(Size(nMinDotPix,nMinDotPix))); //Size a3PixSiz(rOut.PixelToLogic(Size(2,2))); Size aMinLinDist(rOut.PixelToLogic(Size(nMinLinPix,nMinLinPix))); - int bHoriSolid=nx2GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); - int bScaleUnitChanged=aNewUnit!=aOldUnit; + FASTBOOL bScaleUnitChanged=aNewUnit!=aOldUnit; // und nun dem OutlinerParaObject einen neuen Pool verpassen // !!! Hier muss noch DefTab und RefDevice der beiden Models // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!! diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 6841f074154b..2dffd558cf49 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -51,7 +51,7 @@ void MoveXPoly(XPolyPolygon& rPoly, const Size& S) //////////////////////////////////////////////////////////////////////////////////////////////////// -void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, int bNoJustify) +void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, FASTBOOL bNoJustify) { Fraction xFact(rxFact); Fraction yFact(ryFact); @@ -159,7 +159,7 @@ void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs) //////////////////////////////////////////////////////////////////////////////////////////////////// -void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, int bNoJustify) +void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, FASTBOOL bNoJustify) { // !!! fehlende Implementation !!! if (!bNoJustify) rRect.Justify(); @@ -234,7 +234,7 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) //////////////////////////////////////////////////////////////////////////////////////////////////// -void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, int bVShear) +void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear) { sal_uInt16 nAnz=rPoly.GetSize(); for (sal_uInt16 i=0; imaEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1468,7 +1468,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, in // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const +void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const { if( !mpImpl ) return; @@ -2050,7 +2050,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetRefDevice( pModel->GetRefDevice() ); // -- - int bUpdMerk=rOutl.GetUpdateMode(); + FASTBOOL bUpdMerk=rOutl.GetUpdateMode(); if (bUpdMerk) rOutl.SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; @@ -2212,10 +2212,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac // -------------------------------------------------------------------- -int SdrTableObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt) +FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) { Rectangle aNeuRect(maLogicRect); - int bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); + FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { Rectangle aBoundRect0; @@ -2232,7 +2232,7 @@ int SdrTableObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt) // -------------------------------------------------------------------- -int SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHeight, int bWidth) const +FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const { if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) return sal_False; @@ -2328,7 +2328,7 @@ bool SdrTableObj::IsRealyEdited() const // -------------------------------------------------------------------- -int SdrTableObj::IsFontwork() const +FASTBOOL SdrTableObj::IsFontwork() const { return sal_False; } @@ -2599,7 +2599,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag // Create // -------------------------------------------------------------------- -int SdrTableObj::BegCreate(SdrDragStat& rStat) +FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); @@ -2611,7 +2611,7 @@ int SdrTableObj::BegCreate(SdrDragStat& rStat) // -------------------------------------------------------------------- -int SdrTableObj::MovCreate(SdrDragStat& rStat) +FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -2625,7 +2625,7 @@ int SdrTableObj::MovCreate(SdrDragStat& rStat) // -------------------------------------------------------------------- -int SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +FASTBOOL SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(aRect); ImpJustifyRect(aRect); @@ -2638,7 +2638,7 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/) // -------------------------------------------------------------------- -int SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) +FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) { return sal_True; } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 1fffd4fbec60..eb10f11060d4 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -109,7 +109,7 @@ void SvxFillToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - int bEnableControls = sal_False; + bool bEnableControls = sal_False; if ( bIgnoreStatusUpdate ) return; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index e2891eab1e8d..76fd7d423324 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -612,7 +612,7 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt ) pSh->KeyInput( *pKEvt ); else { - int bHandled = sal_False; + bool bHandled = sal_False; switch ( rKey.GetCode() ) { diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 5df3689e023e..fedc43d228f5 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1089,14 +1089,14 @@ SfxItemPresentation XLineDashItem::GetPresentation //------------------------------------------------------------------------ -int XLineDashItem::HasMetrics() const +FASTBOOL XLineDashItem::HasMetrics() const { return sal_True; } //------------------------------------------------------------------------ -int XLineDashItem::ScaleMetrics(long nMul, long nDiv) +FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv) { aDash.SetDotLen( ScaleMetricValue( aDash.GetDotLen(), nMul, nDiv ) ); aDash.SetDashLen( ScaleMetricValue( aDash.GetDashLen(), nMul, nDiv ) ); @@ -4465,14 +4465,14 @@ SfxItemPresentation XFillHatchItem::GetPresentation //------------------------------------------------------------------------ -int XFillHatchItem::HasMetrics() const +FASTBOOL XFillHatchItem::HasMetrics() const { return sal_True; } //------------------------------------------------------------------------ -int XFillHatchItem::ScaleMetrics(long nMul, long nDiv) +FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv) { aHatch.SetDistance( ScaleMetricValue( aHatch.GetDistance(), nMul, nDiv ) ); return sal_True; diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index f48a51f22e73..cd82db743f4d 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -890,7 +890,7 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation |* \*************************************************************************/ -int XFillBmpSizeXItem::HasMetrics() const +FASTBOOL XFillBmpSizeXItem::HasMetrics() const { return GetValue() > 0L; } @@ -1006,7 +1006,7 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation |* \*************************************************************************/ -int XFillBmpSizeYItem::HasMetrics() const +FASTBOOL XFillBmpSizeYItem::HasMetrics() const { return GetValue() > 0L; } -- cgit v1.2.3