removetooltypes01: #i112600# do not affect FASTBOOL in this cws

32 files changed, 541 insertions, 541 deletions

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(): nLastId<nAnz");
-    int bHole=nLastId>nAnz;
+    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; nNum<nAnz && !bBrk; nNum++) {
                 const SdrGluePoint* pGP2=GetObject(nNum);
                 sal_uInt16 nTmpId=pGP2->GetId();
@@ -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<nAnz; nNum++) {
@@ -439,7 +439,7 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink
     }
 }
 
-void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj)
+void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj)
 {
     sal_uInt16 nAnz=GetCount();
     for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index c59250ea67ef..588c7a3d57f2 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -47,11 +47,11 @@ Pointer SdrHelpLine::GetPointer() const
     } // switch
 }
 
-int SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
+FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
 {
     Size a1Pix(rOut.PixelToLogic(Size(1,1)));
-    int bXHit=rPnt.X()>=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 (nLongVal<pEntry->nMin) 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 && i<nAnz) {
@@ -383,7 +383,7 @@ sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
     return sal_uInt16(nRet);
 }
 
-const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, int /*bInherited*/) const
+const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInherited*/) const
 {
     sal_uInt16 i(0);
     const SdrLayer* pLay = NULL;
@@ -404,7 +404,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, int /*bInherited
     return pLay;
 }
 
-SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, int bInherited) const
+SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited) const
 {
     SdrLayerID nRet=SDRLAYER_NOTFOUND;
     const SdrLayer* pLay=GetLayer(rName,bInherited);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bf6db87761f7..c29cc1313a26 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -234,7 +234,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,sal_False, (int)bLoadRefCounts);
+    ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
@@ -247,10 +247,10 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,sal_False, (int)bLoadRefCounts);
+    ImpCtor(pPool,pPers,sal_False, (FASTBOOL)bLoadRefCounts);
 }
 
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts):
     maMaPag(1024,32,32),
     maPages(1024,32,32)
 {
@@ -259,10 +259,10 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,bUseExtColorTable, (int)bLoadRefCounts);
+    ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
 }
 
-SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts):
     maMaPag(1024,32,32),
     maPages(1024,32,32),
     aTablePath(rPath)
@@ -272,7 +272,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
 #endif
 
     DBG_CTOR(SdrModel,NULL);
-    ImpCtor(pPool,pPers,bUseExtColorTable, (int)bLoadRefCounts);
+    ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
 }
 
 SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
@@ -398,23 +398,23 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
     DBG_ERROR("SdrModel::operator=() ist noch nicht implementiert");
 }
 
-int SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
+FASTBOOL SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
 {
     DBG_ERROR("SdrModel::operator==() ist noch nicht implementiert");
     return sal_False;
 }
 
-void SdrModel::SetSwapGraphics( int bSwap )
+void SdrModel::SetSwapGraphics( FASTBOOL bSwap )
 {
     bSwapGraphics = bSwap;
 }
 
-int SdrModel::IsReadOnly() const
+FASTBOOL SdrModel::IsReadOnly() const
 {
     return bReadOnly;
 }
 
-void SdrModel::SetReadOnly(int bYes)
+void SdrModel::SetReadOnly(FASTBOOL bYes)
 {
     bReadOnly=bYes;
 }
@@ -450,9 +450,9 @@ void SdrModel::ClearUndoBuffer()
     }
 }
 
-int SdrModel::Undo()
+FASTBOOL SdrModel::Undo()
 {
-    int bRet=sal_False;
+    FASTBOOL bRet=sal_False;
     if( mpImpl->mpUndoManager )
     {
         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=nLastPageNum<nFirstPageNum;
+    FASTBOOL bReverse=nLastPageNum<nFirstPageNum;
     if (nDestPos>nPageAnz)
         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=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
+    FASTBOOL bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
     sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
     if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage;
     if (nLastPageNum>nMaxSrcPage)  nLastPageNum =nMaxSrcPage;
-    int bReverse=nLastPageNum<nFirstPageNum;
+    FASTBOOL bReverse=nLastPageNum<nFirstPageNum;
 
     sal_uInt16*   pMasterMap=NULL;
     int* pMasterNeed=NULL;
@@ -1729,9 +1729,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
         pMasterNeed=new int[nSrcMasterPageAnz];
         memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16));
         if (bAllMasterPages) {
-            memset(pMasterNeed,sal_True,nSrcMasterPageAnz*sizeof(int));
+            memset(pMasterNeed,sal_True,nSrcMasterPageAnz*sizeof(FASTBOOL));
         } else {
-            memset(pMasterNeed,sal_False,nSrcMasterPageAnz*sizeof(int));
+            memset(pMasterNeed,sal_False,nSrcMasterPageAnz*sizeof(FASTBOOL));
             sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
             sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
             for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
@@ -2024,9 +2024,9 @@ void SdrModel::ReformatAllTextObjects()
     ImpReformatAllTextObjects();
 }
 
-int SdrModel::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
+FASTBOOL SdrModel::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
 {
-    int bRet = sal_False;
+    FASTBOOL    bRet = sal_False;
     sal_uInt16      n, nCount;
 
     for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ )
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 14ac649b53d7..30791ce216d4 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1972,12 +1972,12 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
     InvalidateRenderGeometry();
 }
 
-void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, int bVShear )
+void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear )
 {
     SdrTextObj::Shear( rRef, nWink, tn, bVShear );
     InvalidateRenderGeometry();
 }
-void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, int bVShear )
+void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear )
 {
     long nDrehWink = aGeo.nDrehWink;
     if ( nDrehWink )
@@ -2467,12 +2467,12 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
     bSnapRectDirty=sal_True;
 }
 
-int SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
+FASTBOOL SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
 {
     return SdrTextObj::BegCreate( rDrag );
 }
 
-int SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
+FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
 {
     SdrView* pView = rStat.GetView();       // #i37448#
     if( pView && pView->IsSolidDragging() )
@@ -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=(aXFact<aYFact) != bBigOrtho;
+            FASTBOOL bUseX=(aXFact<aYFact) != bBigOrtho;
             if (bUseX) {
                 long nNeed=long(BigInt(nHgt0)*BigInt(nXMul)/BigInt(nXDiv));
                 if (bYNeg) nNeed=-nNeed;
@@ -1401,7 +1401,7 @@ basegfx::B2DPolyPolygon SdrObject::getSpecialDragPoly(const SdrDragStat& /*rDrag
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Create
-int SdrObject::BegCreate(SdrDragStat& rStat)
+FASTBOOL SdrObject::BegCreate(SdrDragStat& rStat)
 {
     rStat.SetOrtho4Possible();
     Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
@@ -1411,7 +1411,7 @@ int SdrObject::BegCreate(SdrDragStat& rStat)
     return sal_True;
 }
 
-int SdrObject::MovCreate(SdrDragStat& rStat)
+FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat)
 {
     rStat.TakeCreateRect(aOutRect);
     rStat.SetActionRect(aOutRect);
@@ -1428,7 +1428,7 @@ int SdrObject::MovCreate(SdrDragStat& rStat)
     return sal_True;
 }
 
-int SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+FASTBOOL SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     rStat.TakeCreateRect(aOutRect);
     aOutRect.Justify();
@@ -1444,7 +1444,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/)
 {
 }
 
-int SdrObject::BckCreate(SdrDragStat& /*rStat*/)
+FASTBOOL SdrObject::BckCreate(SdrDragStat& /*rStat*/)
 {
     return sal_False;
 }
@@ -1475,8 +1475,8 @@ void SdrObject::NbcMove(const Size& rSiz)
 
 void SdrObject::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) {
@@ -1553,7 +1553,7 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
     SetGlueReallyAbsolute(sal_False);
 }
 
-void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
+void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
     SetGlueReallyAbsolute(sal_True);
     NbcShearGluePoints(rRef,nWink,tn,bVShear);
@@ -1606,7 +1606,7 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 }
 
-void SdrObject::Shear(const Point& rRef, long nWink, double tn, int bVShear)
+void SdrObject::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
     if (nWink!=0) {
         Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
@@ -1720,7 +1720,7 @@ long SdrObject::GetRotateAngle() const
     return 0;
 }
 
-long SdrObject::GetShearAngle(int /*bVertical*/) const
+long SdrObject::GetShearAngle(FASTBOOL /*bVertical*/) const
 {
     return 0;
 }
@@ -1764,7 +1764,7 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/)
 {
 }
 
-int SdrObject::HasTextEdit() const
+FASTBOOL SdrObject::HasTextEdit() const
 {
     return sal_False;
 }
@@ -1832,7 +1832,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const
     return pData;
 }
 
-int SdrObject::HasMacro() const
+FASTBOOL SdrObject::HasMacro() const
 {
     SdrObjUserData* pData=ImpGetMacroUserData();
     return pData!=NULL ? pData->HasMacro(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()<aRgt.X()-aTl.X());
+        FASTBOOL bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
         if (bLft) {
             eBestDir=LKS;
             aBestPt=aLft;
@@ -147,7 +147,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
     if (bTryV) {
         Point aTop(nX,rRect.Top()-nGap);
         Point aBtm(nX,rRect.Bottom()+nGap);
-        int bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
+        FASTBOOL bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
         Point aBest2;
         EscDir eBest2;
         if (bTop) {
@@ -157,7 +157,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
             eBest2=UNT;
             aBest2=aBtm;
         }
-        int bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
+        FASTBOOL bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
         if (!bTakeIt) {
             BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX;
             BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY;
@@ -557,7 +557,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
     }
 }
 
-int SdrCaptionObj::BegCreate(SdrDragStat& rStat)
+FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
 {
     if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect
 
@@ -570,7 +570,7 @@ int SdrCaptionObj::BegCreate(SdrDragStat& rStat)
     return sal_True;
 }
 
-int SdrCaptionObj::MovCreate(SdrDragStat& rStat)
+FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
 {
     ImpCaptParams aPara;
     ImpGetCaptParams(aPara);
@@ -582,7 +582,7 @@ int SdrCaptionObj::MovCreate(SdrDragStat& rStat)
     return sal_True;
 }
 
-int SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     ImpCaptParams aPara;
     ImpGetCaptParams(aPara);
@@ -592,7 +592,7 @@ int SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=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.Right() &&
                                aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom();
-        int bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
+        FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
                                 aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
         unsigned nMainCase=3;
         if (nAngle1==nAngle2) nMainCase=1;
@@ -957,10 +957,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             if (bVer1) aMeeting.X()=(aPt1.X()+aPt2.X()+1)/2; // ist hier besser, als der
             if (bHor1) aMeeting.Y()=(aPt1.Y()+aPt2.Y()+1)/2; // Mittelpunkt des Freiraums
             // bX1Ok bedeutet, dass die Vertikale, die aus Obj1 austritt, keinen Konflikt mit Obj2 bildet, ...
-            int bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=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()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) {
                 aMeeting.X()=nXMin;
                 bMeetingXMid=sal_False;
@@ -1019,8 +1019,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
                         // des jeweils anderen Objekts verletzen wuerden.
-                        int bCase29Direct=sal_False;
-                        int bCase29=aBewR1.Right()>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()<aBewareRect2.Bottom()) ||
                                 (aPt2.Y()>aBewareRect1.Top() && aPt2.Y()<aBewareRect1.Bottom())) {
@@ -1028,7 +1028,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             }
                         }
                         if (!bCase29Direct) {
-                            int bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
+                            FASTBOOL bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
                             if (bObenLang) {
                                 aMeeting.Y()=nYMin;
                             } else {
@@ -1079,8 +1079,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                         // Ueberschneidung der BewareRects ohne Ueberschneidung der
                         // Boundrects wenn die Linienaustritte sonst das BewareRect
                         // des jeweils anderen Objekts verletzen wuerden.
-                        int bCase29Direct=sal_False;
-                        int bCase29=aBewR1.Bottom()>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()<aBewareRect2.Right()) ||
                                 (aPt2.X()>aBewareRect1.Left() && aPt2.X()<aBewareRect1.Right())) {
@@ -1088,7 +1088,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
                             }
                         }
                         if (!bCase29Direct) {
-                            int bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
+                            FASTBOOL bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
                             if (bLinksLang) {
                                 aMeeting.X()=nXMin;
                             } else {
@@ -1215,9 +1215,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
     }
     Point aEP1(aXP1[nXP1Anz-1]);
     Point aEP2(aXP2[nXP2Anz-1]);
-    int bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
-    int bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
-    int bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
+    FASTBOOL bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
+    FASTBOOL bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
+    FASTBOOL bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
     if (aEP1==aEP2 && (bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X())) {
         // Sonderbehandlung fuer 'I'-Verbinder
         nXP1Anz--; aXP1.Remove(nXP1Anz,1);
@@ -1303,7 +1303,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
     if (pnQuality!=NULL) {
         sal_uIntPtr nQual=0;
         sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen
-        int bOverflow=sal_False;
+        FASTBOOL bOverflow=sal_False;
         Point aPt0(aXP1[0]);
         for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
             Point aPt1b(aXP1[nPntNum]);
@@ -1353,9 +1353,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
 
         for (sal_uInt16 i=0; i<nPntAnz; i++) {
             Point aPt1b(aXP1[i]);
-            int b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
+            FASTBOOL b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
                         aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom();
-            int b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
+            FASTBOOL b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
                         aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom();
             sal_uInt16 nInt0=nIntersections;
             if (i==0 || i==nPntAnz-1) {
@@ -1553,10 +1553,10 @@ void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
     sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->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<nGesAnz; i++)
                 {
-                    int bUser=i<nConAnz;
-                    int bVertex=i>=nConAnz+0 && i<nConAnz+4;
-                    int bCorner=i>=nConAnz+4 && i<nConAnz+8;
-                    int bCenter=i==nConAnz+8;
-                    int bOk=sal_False;
+                    FASTBOOL bUser=i<nConAnz;
+                    FASTBOOL bVertex=i>=nConAnz+0 && i<nConAnz+4;
+                    FASTBOOL bCorner=i>=nConAnz+4 && i<nConAnz+8;
+                    FASTBOOL bCenter=i==nConAnz+8;
+                    FASTBOOL bOk=sal_False;
                     Point aConPos;
                     sal_uInt16 nConNum=i;
                     if (bUser) {
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index a271eaca5792..adfc7d0ba991 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -473,8 +473,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
         if( bMirror )
         {
             sal_uInt16      nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
-            int bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
-            int bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
+            FASTBOOL    bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
+            FASTBOOL    bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
 
             aActAttr.SetMirrorFlags( ( bHMirr ? BMP_MIRROR_HORZ : 0 ) | ( bVMirr ? BMP_MIRROR_VERT : 0 ) );
         }
@@ -657,8 +657,8 @@ void SdrGrafObj::ReleaseGraphicLink()
 
 void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    int bAnim = pGraphic->IsAnimated();
-    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; i<nPolyCnt; i++) {
@@ -2241,20 +2241,20 @@ basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-int SdrPathObj::BegCreate(SdrDragStat& rStat)
+FASTBOOL SdrPathObj::BegCreate(SdrDragStat& rStat)
 {
     impDeleteDAC();
     return impGetDAC().BegCreate(rStat);
 }
 
-int SdrPathObj::MovCreate(SdrDragStat& rStat)
+FASTBOOL SdrPathObj::MovCreate(SdrDragStat& rStat)
 {
     return impGetDAC().MovCreate(rStat);
 }
 
-int SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+FASTBOOL SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
-    int bRetval(impGetDAC().EndCreate(rStat, eCmd));
+    FASTBOOL bRetval(impGetDAC().EndCreate(rStat, eCmd));
 
     if(bRetval && mpDAC)
     {
@@ -2299,7 +2299,7 @@ int SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     return bRetval;
 }
 
-int SdrPathObj::BckCreate(SdrDragStat& rStat)
+FASTBOOL SdrPathObj::BckCreate(SdrDragStat& rStat)
 {
     return impGetDAC().BckCreate(rStat);
 }
@@ -2382,7 +2382,7 @@ void SdrPathObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SdrTextObj::NbcRotate(rRef,nWink,sn,cs);
 }
 
-void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, int bVShear)
+void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear)
 {
     basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt.X(), -rRefPnt.Y()));
 
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e2f96b5178b5..c6202b825561 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -136,9 +136,9 @@ void SdrRectObj::SetXPolyDirty()
     }
 }
 
-int SdrRectObj::PaintNeedsXPoly(long nEckRad) const
+FASTBOOL SdrRectObj::PaintNeedsXPoly(long nEckRad) const
 {
-    int bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
+    FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
     return bNeed;
 }
 
@@ -183,7 +183,7 @@ const XPolygon& SdrRectObj::GetXPoly() const
 
 void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    int bNoTextFrame=!IsTextFrame();
+    FASTBOOL bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
     rInfo.bResizePropAllowed=sal_True;
     rInfo.bRotateFreeAllowed=sal_True;
@@ -202,7 +202,7 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bShearAllowed     =bNoTextFrame;
     rInfo.bEdgeRadiusAllowed=sal_True;
 
-    int bCanConv=!HasText() || ImpCanConvTextToCurve();
+    FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
     if (bCanConv && !bNoTextFrame && !HasText()) {
         bCanConv=HasFill() || HasLine();
     }
@@ -509,7 +509,7 @@ void SdrRectObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetXPolyDirty();
 }
 
-void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
+void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
 {
     SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
     SetXPolyDirty();
@@ -521,7 +521,7 @@ void SdrRectObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     SetXPolyDirty();
 }
 
-int SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec)
+FASTBOOL SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec)
 {
     return SdrTextObj::DoMacro(rRec);
 }
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index bafbefb8ae33..b8cc6f51413a 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -385,7 +385,7 @@ const Size& SdrTextObj::GetTextSize() const
     return aTextSize;
 }
 
-int SdrTextObj::IsAutoGrowHeight() const
+FASTBOOL SdrTextObj::IsAutoGrowHeight() const
 {
     if(!bTextFrame)
         return sal_False; // AutoGrow nur bei TextFrames
@@ -410,7 +410,7 @@ int SdrTextObj::IsAutoGrowHeight() const
     return bRet;
 }
 
-int SdrTextObj::IsAutoGrowWidth() const
+FASTBOOL SdrTextObj::IsAutoGrowWidth() const
 {
     if(!bTextFrame)
         return sal_False; // AutoGrow nur bei TextFrames
@@ -523,7 +523,7 @@ void SdrTextObj::ImpCheckShear()
 
 void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    int bNoTextFrame=!IsTextFrame();
+    FASTBOOL bNoTextFrame=!IsTextFrame();
     rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
     rInfo.bResizePropAllowed=sal_True;
     rInfo.bRotateFreeAllowed=sal_True;
@@ -540,7 +540,7 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
     rInfo.bShearAllowed     =bNoTextFrame;
     rInfo.bEdgeRadiusAllowed=sal_True;
-    int bCanConv=ImpCanConvTextToCurve();
+    FASTBOOL bCanConv=ImpCanConvTextToCurve();
     rInfo.bCanConvToPath    =bCanConv;
     rInfo.bCanConvToPoly    =bCanConv;
     rInfo.bCanConvToPathLineToArea=bCanConv;
@@ -577,16 +577,16 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
     return bRet;
 }
 
-int SdrTextObj::HasEditText() const
+FASTBOOL SdrTextObj::HasEditText() const
 {
     return HasTextImpl( pEdtOutl );
 }
 
 void SdrTextObj::SetPage(SdrPage* pNewPage)
 {
-    int bRemove=pNewPage==NULL && pPage!=NULL;
-    int bInsert=pNewPage!=NULL && pPage==NULL;
-    int bLinked=IsLinkedText();
+    FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
+    FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
+    FASTBOOL bLinked=IsLinkedText();
 
     if (bLinked && bRemove) {
         ImpLinkAbmeldung();
@@ -632,13 +632,13 @@ void SdrTextObj::SetModel(SdrModel* pNewModel)
     }
 }
 
-int SdrTextObj::NbcSetEckenradius(long nRad)
+FASTBOOL SdrTextObj::NbcSetEckenradius(long nRad)
 {
     SetObjectItem(SdrEckenradiusItem(nRad));
     return sal_True;
 }
 
-int SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
+FASTBOOL SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
 {
     if(bTextFrame)
     {
@@ -648,7 +648,7 @@ int SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
     return sal_False;
 }
 
-int SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
+FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
 {
     if( bTextFrame && ( !pModel || !pModel->isLocked() ) )          // 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; no<nAnz; no++) {
@@ -772,9 +772,9 @@ SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const
 
 
 
-int SdrObjList::IsReadOnly() const
+FASTBOOL SdrObjList::IsReadOnly() const
 {
-    int bRet=sal_False;
+    FASTBOOL bRet=sal_False;
     if (pPage!=NULL && pPage!=this) bRet=pPage->IsReadOnly();
     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; i<nViewAnz; i++) {
         OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(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=nx2<aMinDotDist.Width();
-        int bVertSolid=ny2<aMinDotDist.Height();
+        FASTBOOL bHoriSolid=nx2<aMinDotDist.Width();
+        FASTBOOL bVertSolid=ny2<aMinDotDist.Height();
         // Linienabstand vergroessern (mind. 4 Pixel)
         // Vergroesserung: *2 *5 *10 *20 *50 *100 ...
         int nTgl=0;
@@ -586,10 +586,10 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
         //if (nx2<a2PixSiz.Width()) nx2=nx1;
         //if (ny2<a2PixSiz.Height()) ny2=ny1;
 
-        int bHoriFine=nx2<nx1;
-        int bVertFine=ny2<ny1;
-        int bHoriLines=bHoriSolid || bHoriFine || !bVertFine;
-        int bVertLines=bVertSolid || bVertFine;
+        FASTBOOL bHoriFine=nx2<nx1;
+        FASTBOOL bVertFine=ny2<ny1;
+        FASTBOOL bHoriLines=bHoriSolid || bHoriFine || !bVertFine;
+        FASTBOOL bVertLines=bVertSolid || bVertFine;
 
         Color aColorMerk( rOut.GetLineColor() );
         rOut.SetLineColor( aColor );
@@ -856,7 +856,7 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL)
 void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
 {
     if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) {
-        int bNeedRedraw=sal_True;
+        FASTBOOL bNeedRedraw=sal_True;
         if (aHelpLines[nNum].GetKind()==rNewHelpLine.GetKind()) {
             switch (rNewHelpLine.GetKind()) {
                 case SDRHELPLINE_VERTICAL  : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=sal_False; break;
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index aefe1706b871..cc65d71f8e05 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -144,7 +144,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
 
         MapUnit aOldUnit(pOldModel->GetScaleUnit());
         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; i<nAnz; i++) {
@@ -242,7 +242,7 @@ void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, int bVShear)
     }
 }
 
-void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, int bVShear)
+void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
     sal_uInt16 nAnz=rPoly.GetPointCount();
     for (sal_uInt16 i=0; i<nAnz; i++) {
@@ -250,7 +250,7 @@ void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, int bVShear)
     }
 }
 
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
+void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
     sal_uInt16 nAnz=rPoly.Count();
     for (sal_uInt16 i=0; i<nAnz; i++) {
@@ -258,7 +258,7 @@ void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
     }
 }
 
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
+void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
 {
     sal_uInt16 nAnz=rPoly.Count();
     for (sal_uInt16 i=0; i<nAnz; i++) {
@@ -279,10 +279,10 @@ void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
-                         const Point& rRad, double& rSin, double& rCos, int bVert)
+                         const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert)
 {
-    int bC1=pC1!=NULL;
-    int bC2=pC2!=NULL;
+    FASTBOOL bC1=pC1!=NULL;
+    FASTBOOL bC2=pC2!=NULL;
     long x0=rPnt.X();
     long y0=rPnt.Y();
     long cx=rCenter.X();
@@ -333,10 +333,10 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
 }
 
 double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
-                        const Point& rRad, double& rSin, double& rCos, int bVert)
+                        const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert)
 {
-    int bC1=pC1!=NULL;
-    int bC2=pC2!=NULL;
+    FASTBOOL bC1=pC1!=NULL;
+    FASTBOOL bC2=pC2!=NULL;
     long x0=rPnt.X();
     long y0=rPnt.Y();
     long dx1=0,dy1=0;
@@ -388,11 +388,11 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente
 }
 
 double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
-                          const Point& rRad, double& rSin, double& rCos, int bVert,
+                          const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert,
                           const Rectangle rRefRect)
 {
-    //int bC1=pC1!=NULL;
-    //int bC2=pC2!=NULL;
+    //FASTBOOL bC1=pC1!=NULL;
+    //FASTBOOL bC2=pC2!=NULL;
     //long x0=rPnt.X();
     long y0=rPnt.Y();
     CrookSlantXPoint(rPnt,pC1,pC2,rCenter,rRad,rSin,rCos,bVert);
@@ -403,7 +403,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
         long nBtm=rRefRect.Bottom();
         long nHgt=nBtm-nTop;
         long dy=rPnt.Y()-y0;
-        //int bOben=rRad.Y()<0;
+        //FASTBOOL bOben=rRad.Y()<0;
         double a=((double)(y0-nTop))/nHgt;
         a*=dy;
         rPnt.Y()=y0+Round(a);
@@ -412,7 +412,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
+void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     double nSin,nCos;
     sal_uInt16 nPointAnz=rPoly.GetPointCount();
@@ -435,7 +435,7 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, i
     }
 }
 
-void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
+void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     double nSin,nCos;
     sal_uInt16 nPointAnz=rPoly.GetPointCount();
@@ -458,7 +458,7 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, in
     }
 }
 
-void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert, const Rectangle rRefRect)
+void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
 {
     double nSin,nCos;
     sal_uInt16 nPointAnz=rPoly.GetPointCount();
@@ -483,7 +483,7 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad,
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
+void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     sal_uInt16 nPolyAnz=rPoly.Count();
     for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
@@ -491,7 +491,7 @@ void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRa
     }
 }
 
-void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
+void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
 {
     sal_uInt16 nPolyAnz=rPoly.Count();
     for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
@@ -499,7 +499,7 @@ void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad
     }
 }
 
-void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert, const Rectangle rRefRect)
+void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
 {
     sal_uInt16 nPolyAnz=rPoly.Count();
     for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
@@ -644,7 +644,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
     nShW-=27000; // ShearWink wird zur Senkrechten gemessen
     nShW=-nShW;  // Negieren, denn '+' ist Rechtskursivierung
 
-    int bMirr=aPt3.Y()<0;
+    FASTBOOL bMirr=aPt3.Y()<0;
     if (bMirr) { // "Punktetausch" bei Spiegelung
         nHgt=-nHgt;
         nShW+=18000;
@@ -666,7 +666,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void OrthoDistance8(const Point& rPt0, Point& rPt, int bBigOrtho)
+void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho)
 {
     long dx=rPt.X()-rPt0.X();
     long dy=rPt.Y()-rPt0.Y();
@@ -682,7 +682,7 @@ void OrthoDistance8(const Point& rPt0, Point& rPt, int bBigOrtho)
     }
 }
 
-void OrthoDistance4(const Point& rPt0, Point& rPt, int bBigOrtho)
+void OrthoDistance4(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho)
 {
     long dx=rPt.X()-rPt0.X();
     long dy=rPt.Y()-rPt0.Y();
@@ -718,7 +718,7 @@ void Kuerzen(Fraction& rF, unsigned nDigits)
 {
     sal_Int32 nMul=rF.GetNumerator();
     sal_Int32 nDiv=rF.GetDenominator();
-    int bNeg=sal_False;
+    FASTBOOL bNeg=sal_False;
     if (nMul<0) { nMul=-nMul; bNeg=!bNeg; }
     if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; }
     if (nMul==0 || nDiv==0) return;
@@ -809,8 +809,8 @@ FrPair GetMapFactor(MapUnit eS, MapUnit eD)
     if (eS==eD) return FrPair(1,1,1,1);
     FrPair aS(GetInchOrMM(eS));
     FrPair aD(GetInchOrMM(eD));
-    int bSInch=IsInch(eS);
-    int bDInch=IsInch(eD);
+    FASTBOOL bSInch=IsInch(eS);
+    FASTBOOL bDInch=IsInch(eD);
     FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
     if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
     if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -821,8 +821,8 @@ FrPair GetMapFactor(MapUnit eS, FieldUnit eD)
 {
     FrPair aS(GetInchOrMM(eS));
     FrPair aD(GetInchOrMM(eD));
-    int bSInch=IsInch(eS);
-    int bDInch=IsInch(eD);
+    FASTBOOL bSInch=IsInch(eS);
+    FASTBOOL bDInch=IsInch(eD);
     FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
     if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
     if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -833,8 +833,8 @@ FrPair GetMapFactor(FieldUnit eS, MapUnit eD)
 {
     FrPair aS(GetInchOrMM(eS));
     FrPair aD(GetInchOrMM(eD));
-    int bSInch=IsInch(eS);
-    int bDInch=IsInch(eD);
+    FASTBOOL bSInch=IsInch(eS);
+    FASTBOOL bDInch=IsInch(eD);
     FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
     if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
     if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -846,8 +846,8 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
     if (eS==eD) return FrPair(1,1,1,1);
     FrPair aS(GetInchOrMM(eS));
     FrPair aD(GetInchOrMM(eD));
-    int bSInch=IsInch(eS);
-    int bDInch=IsInch(eD);
+    FASTBOOL bSInch=IsInch(eS);
+    FASTBOOL bDInch=IsInch(eD);
     FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
     if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
     if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -867,7 +867,7 @@ void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int&
 {
     rnMul=1; rnDiv=1;
     short nKomma=0;
-    int bMetr=sal_False,bInch=sal_False;
+    FASTBOOL bMetr=sal_False,bInch=sal_False;
     switch (eMU) {
         // Metrisch
         case MAP_100TH_MM   : bMetr=sal_True; nKomma=5; break;
@@ -897,7 +897,7 @@ void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int
 {
     rnMul=1; rnDiv=1;
     short nKomma=0;
-    int bMetr=sal_False,bInch=sal_False;
+    FASTBOOL bMetr=sal_False,bInch=sal_False;
     switch (eFU) {
         case FUNIT_NONE     : break;
         // Metrisch
@@ -925,7 +925,7 @@ void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int
 void SdrFormatter::Undirty()
 {
     if (aScale.GetNumerator()==0 || aScale.GetDenominator()==0) aScale=Fraction(1,1);
-    int bSrcMetr,bSrcInch,bDstMetr,bDstInch;
+    FASTBOOL bSrcMetr,bSrcInch,bDstMetr,bDstInch;
     long nMul1,nDiv1,nMul2,nDiv2;
     short nKomma1,nKomma2;
     // Zunaechst normalisieren auf m bzw. "
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 6f4d5b192eac..e1d5d7f9b054 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -245,7 +245,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
 {
 }
 
-void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, int bRepeat )
+void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat )
 {
     rStr = ImpGetResStr(nStrCacheID);
     sal_Char aSearchText[] = "%1";
@@ -271,7 +271,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sa
     }
 }
 
-void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, int bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, FASTBOOL bRepeat) const
 {
     if ( pObj )
         GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
@@ -294,7 +294,7 @@ void SdrUndoObj::ImpShowPageOfThisObject()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, int bStyleSheet1, int bSaveText)
+SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBOOL bSaveText)
 :   SdrUndoObj(rNewObj),
     pUndoSet(NULL),
     pRedoSet(NULL),
@@ -1209,7 +1209,7 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
 
 bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
 {
-    int bOk=sal_False;
+    bool bOk=sal_False;
     if (bNewTextAvailable && rView.AreObjectsMarked()) {
         bOk=sal_True;
     }
@@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
     }
 }
 
-void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, int /*bRepeat*/) const
+void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, FASTBOOL /*bRepeat*/) const
 {
     rStr=ImpGetResStr(nStrCacheID);
 }