[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc filter/inc filter/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Nov 1 14:55:14 PDT 2010
binfilter/bf_basic/source/sbx/sbxobj.cxx | 2
binfilter/bf_sc/source/core/data/sc_drwlayer.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 2
binfilter/bf_sch/source/core/sch_chartdoc.cxx | 4
binfilter/bf_sch/source/core/sch_chtm3d2.cxx | 10 -
binfilter/bf_sch/source/core/sch_chtmode3.cxx | 2
binfilter/bf_sd/source/core/sd_drawdoc.cxx | 6
binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx | 2
binfilter/bf_sfx2/source/control/sfx2_request.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx | 2
binfilter/bf_svtools/source/filerec/svt_filerec.cxx | 20 +-
binfilter/bf_svtools/source/inc/poolio.hxx | 4
binfilter/bf_svtools/source/items1/svt_itempool.cxx | 6
binfilter/bf_svtools/source/items1/svt_itemset.cxx | 4
binfilter/bf_svtools/source/items1/svt_poolio.cxx | 33 +--
binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx | 2
binfilter/bf_svx/source/engine3d/svx_light3d.cxx | 6
binfilter/bf_svx/source/engine3d/svx_obj3d.cxx | 6
binfilter/bf_svx/source/engine3d/svx_plight3d.cxx | 2
binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx | 12 -
binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx | 2
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx | 2
binfilter/bf_svx/source/form/svx_fmmodel.cxx | 2
binfilter/bf_svx/source/form/svx_fmpage.cxx | 2
binfilter/bf_svx/source/items/svx_paraitem.cxx | 2
binfilter/bf_svx/source/svdraw/svdtxhdl.hxx | 4
binfilter/bf_svx/source/svdraw/svx_svdattr.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svddrag.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdetc.cxx | 12 -
binfilter/bf_svx/source/svdraw/svx_svdglue.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdmark.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 34 +--
binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx | 10 -
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx | 52 ++---
binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx | 18 -
binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx | 26 +-
binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx | 128 ++++++-------
binfilter/bf_svx/source/svdraw/svx_svdograf.cxx | 48 ++--
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx | 36 +--
binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx | 48 ++--
binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx | 14 -
binfilter/bf_svx/source/svdraw/svx_svdopath.cxx | 28 +-
binfilter/bf_svx/source/svdraw/svx_svdorect.cxx | 30 +--
binfilter/bf_svx/source/svdraw/svx_svdotext.cxx | 48 ++--
binfilter/bf_svx/source/svdraw/svx_svdotxat.cxx | 20 +-
binfilter/bf_svx/source/svdraw/svx_svdotxed.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdotxfl.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdotxtr.cxx | 20 +-
binfilter/bf_svx/source/svdraw/svx_svdoutl.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdovirt.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdpage.cxx | 42 ++--
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdsuro.cxx | 8
binfilter/bf_svx/source/svdraw/svx_svdtouch.cxx | 38 +--
binfilter/bf_svx/source/svdraw/svx_svdtrans.cxx | 12 -
binfilter/bf_svx/source/svdraw/svx_svdtxhdl.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdundo.cxx | 2
binfilter/bf_svx/source/svdraw/svx_svdviter.cxx | 6
binfilter/bf_svx/source/svdraw/svx_svdvmark.cxx | 2
binfilter/bf_svx/source/xoutdev/svx__xpoly.cxx | 4
binfilter/bf_svx/source/xoutdev/svx_xline.cxx | 2
binfilter/bf_svx/source/xoutdev/svx_xpool.cxx | 4
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 6
binfilter/bf_sw/source/core/bastyp/sw_swregion.cxx | 4
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 22 +-
binfilter/bf_sw/source/core/crsr/sw_findattr.cxx | 6
binfilter/bf_sw/source/core/crsr/sw_pam.cxx | 50 ++---
binfilter/bf_sw/source/core/crsr/sw_paminit.cxx | 14 -
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 103 ++++------
binfilter/bf_sw/source/core/crsr/sw_trvlreg.cxx | 16 -
binfilter/bf_sw/source/core/crsr/sw_trvltbl.cxx | 73 ++-----
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 6
binfilter/bf_sw/source/core/doc/sw_doc.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docftn.cxx | 18 -
binfilter/bf_sw/source/core/doc/sw_ftnidx.cxx | 4
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 2
binfilter/bf_sw/source/core/doc/sw_swtable.cxx | 2
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 6
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 2
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 14 -
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 14 -
binfilter/bf_sw/source/core/draw/sw_dflyobj.cxx | 2
binfilter/bf_sw/source/core/draw/sw_drawdoc.cxx | 2
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 4
binfilter/bf_sw/source/core/frmedt/sw_feshview.cxx | 2
binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx | 4
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 2
binfilter/bf_sw/source/core/inc/frmtool.hxx | 22 +-
binfilter/bf_sw/source/core/inc/pamtyp.hxx | 38 +--
binfilter/bf_sw/source/core/inc/tblrwcl.hxx | 4
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 10 -
binfilter/bf_sw/source/core/layout/sw_colfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 20 +-
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 4
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 30 +--
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 6
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 40 ++--
binfilter/bf_sw/source/core/layout/sw_hffrm.cxx | 8
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 22 +-
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 2
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 2
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 4
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 6
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 12 -
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 2
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 2
binfilter/bf_sw/source/core/text/sw_frmpaint.cxx | 2
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 8
binfilter/bf_sw/source/filter/basflt/sw_w4wflt.cxx | 2
binfilter/bf_sw/source/filter/inc/w4wflt.hxx | 2
binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 10 -
binfilter/bf_sw/source/ui/inc/wrtsh.hxx | 2
binfilter/inc/bf_sc/drwlayer.hxx | 4
binfilter/inc/bf_sch/chmod3d.hxx | 10 -
binfilter/inc/bf_sch/chtmodel.hxx | 6
binfilter/inc/bf_sch/chtscene.hxx | 2
binfilter/inc/bf_sch/schview.hxx | 4
binfilter/inc/bf_sd/drawdoc.hxx | 6
binfilter/inc/bf_sd/sderror.hxx | 4
binfilter/inc/bf_sfx2/app.hxx | 6
binfilter/inc/bf_sfx2/docfilt.hxx | 14 -
binfilter/inc/bf_sfx2/docinf.hxx | 4
binfilter/inc/bf_sfx2/objsh.hxx | 2
binfilter/inc/bf_sfx2/progress.hxx | 2
binfilter/inc/bf_sfx2/request.hxx | 2
binfilter/inc/bf_svtools/filerec.hxx | 38 +--
binfilter/inc/bf_svtools/itempool.hxx | 28 +-
binfilter/inc/bf_svtools/itemset.hxx | 4
binfilter/inc/bf_svx/camera3d.hxx | 6
binfilter/inc/bf_svx/def3d.hxx | 2
binfilter/inc/bf_svx/dlight3d.hxx | 2
binfilter/inc/bf_svx/editstat.hxx | 4
binfilter/inc/bf_svx/fmmodel.hxx | 2
binfilter/inc/bf_svx/fmpage.hxx | 2
binfilter/inc/bf_svx/light3d.hxx | 20 +-
binfilter/inc/bf_svx/obj3d.hxx | 10 -
binfilter/inc/bf_svx/plight3d.hxx | 2
binfilter/inc/bf_svx/pntobj3d.hxx | 2
binfilter/inc/bf_svx/polyob3d.hxx | 12 -
binfilter/inc/bf_svx/polysc3d.hxx | 2
binfilter/inc/bf_svx/scene3d.hxx | 10 -
binfilter/inc/bf_svx/svddrag.hxx | 64 +++---
binfilter/inc/bf_svx/svdetc.hxx | 8
binfilter/inc/bf_svx/svdglue.hxx | 36 +--
binfilter/inc/bf_svx/svdhlpln.hxx | 4
binfilter/inc/bf_svx/svdlayer.hxx | 10 -
binfilter/inc/bf_svx/svdmark.hxx | 42 ++--
binfilter/inc/bf_svx/svdmodel.hxx | 128 ++++++-------
binfilter/inc/bf_svx/svdoattr.hxx | 10 -
binfilter/inc/bf_svx/svdobj.hxx | 108 +++++------
binfilter/inc/bf_svx/svdocapt.hxx | 2
binfilter/inc/bf_svx/svdocirc.hxx | 12 -
binfilter/inc/bf_svx/svdoedge.hxx | 28 +-
binfilter/inc/bf_svx/svdograf.hxx | 18 -
binfilter/inc/bf_svx/svdogrp.hxx | 24 +-
binfilter/inc/bf_svx/svdomeas.hxx | 12 -
binfilter/inc/bf_svx/svdoole2.hxx | 8
binfilter/inc/bf_svx/svdopath.hxx | 34 +--
binfilter/inc/bf_svx/svdorect.hxx | 16 -
binfilter/inc/bf_svx/svdosmbr.hxx | 66 +++---
binfilter/inc/bf_svx/svdosmev.hxx | 196 ++++++++++----------
binfilter/inc/bf_svx/svdosmrt.hxx | 18 -
binfilter/inc/bf_svx/svdotext.hxx | 72 +++----
binfilter/inc/bf_svx/svdovirt.hxx | 6
binfilter/inc/bf_svx/svdpage.hxx | 46 ++--
binfilter/inc/bf_svx/svdpagv.hxx | 22 +-
binfilter/inc/bf_svx/svdpool.hxx | 4
binfilter/inc/bf_svx/svdsob.hxx | 14 -
binfilter/inc/bf_svx/svdtouch.hxx | 6
binfilter/inc/bf_svx/svdtrans.hxx | 32 +--
binfilter/inc/bf_svx/svdtypes.hxx | 2
binfilter/inc/bf_svx/svdundo.hxx | 12 -
binfilter/inc/bf_svx/svdviter.hxx | 6
binfilter/inc/bf_svx/svdvmark.hxx | 64 +++---
binfilter/inc/bf_svx/sxmbritm.hxx | 2
binfilter/inc/bf_svx/sxmspitm.hxx | 4
binfilter/inc/bf_svx/sxmsuitm.hxx | 2
binfilter/inc/bf_svx/sxmtaitm.hxx | 2
binfilter/inc/bf_svx/sxmtfitm.hxx | 2
binfilter/inc/bf_svx/sxmtritm.hxx | 4
binfilter/inc/bf_svx/sxopitm.hxx | 2
binfilter/inc/bf_svx/xpolyimp.hxx | 4
binfilter/inc/bf_svx/xpool.hxx | 4
binfilter/inc/bf_svx/zoomitem.hxx | 2
binfilter/inc/bf_sw/calc.hxx | 4
binfilter/inc/bf_sw/crsrsh.hxx | 46 ++--
binfilter/inc/bf_sw/cshtyp.hxx | 8
binfilter/inc/bf_sw/dcontact.hxx | 12 -
binfilter/inc/bf_sw/drawdoc.hxx | 2
binfilter/inc/bf_sw/fldbas.hxx | 2
binfilter/inc/bf_sw/iodetect.hxx | 6
binfilter/inc/bf_sw/ndarr.hxx | 2
binfilter/inc/bf_sw/ndindex.hxx | 2
binfilter/inc/bf_sw/pam.hxx | 22 +-
binfilter/inc/bf_sw/shellio.hxx | 4
binfilter/inc/bf_sw/swbaslnk.hxx | 6
binfilter/inc/bf_sw/swcrsr.hxx | 64 +++---
binfilter/inc/bf_sw/swerror.h | 4
binfilter/inc/bf_sw/swregion.hxx | 2
binfilter/inc/bf_sw/swtable.hxx | 2
binfilter/inc/bf_sw/unocrsr.hxx | 4
binfilter/inc/bf_sw/viscrs.hxx | 6
filter/inc/filter/msfilter/msdffimp.hxx | 18 -
filter/inc/filter/msfilter/svdfppt.hxx | 4
filter/source/msfilter/msdffimp.cxx | 28 +-
filter/source/msfilter/svdfppt.cxx | 4
216 files changed, 1566 insertions(+), 1615 deletions(-)
New commits:
commit c1f35b808b5958742b8c51f0ed8c9f05fc372505
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Nov 1 15:29:33 2010 -0500
convert FASTBOOL to bool in the filters repo (the last bastion)
diff --git a/binfilter/bf_basic/source/sbx/sbxobj.cxx b/binfilter/bf_basic/source/sbx/sbxobj.cxx
index 45e6e34..316bdfd 100644
--- a/binfilter/bf_basic/source/sbx/sbxobj.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxobj.cxx
@@ -684,7 +684,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
// Properties in einem String einsammeln
XubString aSource;
SbxArrayRef xProps( GetProperties() );
- FASTBOOL bLineFeed = FALSE;
+ bool bLineFeed = FALSE;
for ( USHORT nProp = 0; nProp < xProps->Count(); ++nProp )
{
SbxPropertyRef xProp = (SbxProperty*) xProps->Get(nProp);
diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
index 0f09ef7..2ce344a 100644
--- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
@@ -231,7 +231,7 @@ BOOL bDrawIsInUndo = FALSE; //! Member
/*N*/ }
-/*N*/ SdrPage* __EXPORT ScDrawLayer::AllocPage(FASTBOOL bMasterPage)
+/*N*/ SdrPage* __EXPORT ScDrawLayer::AllocPage(bool bMasterPage)
/*N*/ {
/*N*/ // don't create basic until it is needed
/*N*/ StarBASIC* pBasic = NULL;
@@ -849,7 +849,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RecalcPos( pObj, pData );
// static:
-/*N*/ void __EXPORT ScDrawLayer::SetChanged( FASTBOOL bFlg /* =TRUE */ )
+/*N*/ void __EXPORT ScDrawLayer::SetChanged( bool bFlg /* =TRUE */ )
/*N*/ {
/*N*/ if ( bFlg && pDoc )
/*N*/ pDoc->SetChartListenerCollectionNeedsUpdate( TRUE );
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index a3090d5..078b65f 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -331,7 +331,7 @@ static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)";
else
{
USHORT nPos=0;
- FASTBOOL bActive = aWinData.GetToken( 3, cToken, nPos ).ToInt32();
+ bool bActive = aWinData.GetToken( 3, cToken, nPos ).ToInt32();
aUserData = aWinData.Copy( nPos );
}
// aUserData is used in ScModelObj::getViewData
diff --git a/binfilter/bf_sch/source/core/sch_chartdoc.cxx b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
index d4ccfdc..1e4bde8 100644
--- a/binfilter/bf_sch/source/core/sch_chartdoc.cxx
+++ b/binfilter/bf_sch/source/core/sch_chartdoc.cxx
@@ -111,7 +111,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ SdrPage* ChartModel::AllocPage(FASTBOOL bMasterPage)
+/*N*/ SdrPage* ChartModel::AllocPage(bool bMasterPage)
/*N*/ {
/*N*/ return new SdrPage(*this, bMasterPage);
/*N*/ }
@@ -279,7 +279,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void ChartModel::SetChanged(FASTBOOL bFlag)
+/*N*/ void ChartModel::SetChanged(bool bFlag)
/*N*/ {
/*N*/ if (pDocShell)
/*N*/ {
diff --git a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
index 45b83e0..7a49afc 100644
--- a/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtm3d2.cxx
@@ -567,35 +567,35 @@ namespace binfilter {
//////////////////////////////////////////////////////////////////////////////
-//-/void SchRectObj::NbcSetAttributes(const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+//-/void SchRectObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
//-/{
//-/ SdrRectObj::NbcSetAttributes(rAttr,bReplaceAll);
//-/ ChartModel* pModel=(ChartModel*)GetModel();
//-/ if(pModel)
//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
//-/};
-//-/void SchE3dExtrudeObj::NbcSetAttributes(const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+//-/void SchE3dExtrudeObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
//-/{
//-/ E3dExtrudeObj::NbcSetAttributes(rAttr,bReplaceAll);
//-/ ChartModel* pModel=(ChartModel*)GetModel();
//-/ if(pModel)
//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
//-/};
-//-/void SchE3dPolygonObj::NbcSetAttributes(const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+//-/void SchE3dPolygonObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
//-/{
//-/ E3dPolygonObj::NbcSetAttributes(rAttr,bReplaceAll);
//-/ ChartModel* pModel=(ChartModel*)GetModel();
//-/ if(pModel)
//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
//-/};
-//-/void SchE3dLatheObj::NbcSetAttributes(const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+//-/void SchE3dLatheObj::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
//-/{
//-/ E3dLatheObj::NbcSetAttributes(rAttr,bReplaceAll);
//-/ ChartModel* pModel=(ChartModel*)GetModel();
//-/ if(pModel)
//-/ pModel->StoreObjectsAttributes(this,rAttr,bReplaceAll);
//-/};
-//-/void SchE3dObject::NbcSetAttributes(const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+//-/void SchE3dObject::NbcSetAttributes(const SfxItemSet& rAttr, bool bReplaceAll)
//-/{
//-/ E3dObject::NbcSetAttributes(rAttr,bReplaceAll);
//-/ ChartModel* pModel=(ChartModel*)GetModel();
diff --git a/binfilter/bf_sch/source/core/sch_chtmode3.cxx b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
index 0c6583d..f612d26 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode3.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode3.cxx
@@ -1021,7 +1021,7 @@ namespace binfilter {
/*N*/ //Achtung! diese Funktion sollte nur für 3-D-Objekte ausgeführt werden,
/*N*/ //bei z.B. Legendensymbolen führt der Aufruf zu einer Endlos-Schleife !!!!!!!!!!!!!
/*N*/ //Im BuildChart wird ueber bAttrAutoStorage=FALSE doppelte Ausfuehrung unterbunden
-/*N*/ void ChartModel::StoreObjectsAttributes(SdrObject* pObj,const SfxItemSet& rAttr, FASTBOOL bReplaceAll)
+/*N*/ void ChartModel::StoreObjectsAttributes(SdrObject* pObj,const SfxItemSet& rAttr, bool bReplaceAll)
/*N*/ {//#52277#
/*N*/ if(!bAttrAutoStorage)
/*N*/ return;
diff --git a/binfilter/bf_sd/source/core/sd_drawdoc.cxx b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
index 5ad456b..419b232 100644
--- a/binfilter/bf_sd/source/core/sd_drawdoc.cxx
+++ b/binfilter/bf_sd/source/core/sd_drawdoc.cxx
@@ -336,7 +336,7 @@ SdDrawDocument::~SdDrawDocument()
|*
\************************************************************************/
-SdrPage* SdDrawDocument::AllocPage(FASTBOOL bMasterPage)
+SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
{
return new SdPage(*this, NULL, bMasterPage);
}
@@ -789,7 +789,7 @@ void SdDrawDocument::SetPresMouseAsPen(BOOL bNewPresMouseAsPen)
|*
\************************************************************************/
-void SdDrawDocument::SetChanged(FASTBOOL bFlag)
+void SdDrawDocument::SetChanged(bool bFlag)
{
if (pDocSh)
{
@@ -815,7 +815,7 @@ void SdDrawDocument::SetChanged(FASTBOOL bFlag)
|*
\************************************************************************/
-void SdDrawDocument::NbcSetChanged(FASTBOOL bFlag)
+void SdDrawDocument::NbcSetChanged(bool bFlag)
{
// #100237# forward to baseclass
FmFormModel::SetChanged(bFlag);
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
index ec92f57..bb4ae9d 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appcfg.cxx
@@ -112,7 +112,7 @@ using namespace ::com::sun::star::beans;
//--------------------------------------------------------------------
-/*N*/ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron )
+/*N*/ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
/*N*/ {
/*N*/ DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
/*N*/
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index 6cdf2ff..c13034a 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -137,7 +137,7 @@ public:
//====================================================================
-/*N*/ FASTBOOL SfxApplication::Initialize_Impl()
+/*N*/ bool SfxApplication::Initialize_Impl()
/*N*/ {
/*N*/
/*N*/ Reference < XDesktop > xDesktop ( ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
diff --git a/binfilter/bf_sfx2/source/control/sfx2_request.cxx b/binfilter/bf_sfx2/source/control/sfx2_request.cxx
index 9e931ca..5092948 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_request.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_request.cxx
@@ -41,7 +41,7 @@ namespace binfilter {
/*N*/ (
/*N*/ const SfxItemSet* pArgs,
/*N*/ USHORT nSlotId, // Slot-Id oder Which-Id des Parameters
-/*N*/ FASTBOOL bDeep, // FALSE: nicht in Parent-ItemSets suchen
+/*N*/ bool bDeep, // FALSE: nicht in Parent-ItemSets suchen
/*N*/ TypeId aType // != 0: RTTI Pruefung mit Assertion
/*N*/ )
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
index a8b5d37..fbcc61a 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx
@@ -96,7 +96,7 @@ using namespace ::com::sun::star::uno;
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
/*?*/ }
-/*N*/ FASTBOOL SfxObjectShell::SaveWindows_Impl( SvStorage &rStor ) const
+/*N*/ bool SfxObjectShell::SaveWindows_Impl( SvStorage &rStor ) const
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
index 4c27a7d..13d4c22 100644
--- a/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
+++ b/binfilter/bf_svtools/source/filerec/svt_filerec.cxx
@@ -78,7 +78,7 @@ SV_IMPL_VARARR( SfxUINT32s, UINT32 );
UINT32 SfxMiniRecordWriter::Close
(
- FASTBOOL bSeekToEndOfRec /* TRUE (default)
+ bool bSeekToEndOfRec /* TRUE (default)
Der Stream wird an das Ende des Records
positioniert.
@@ -149,7 +149,7 @@ UINT32 SfxMiniRecordWriter::Close
//=========================================================================
-FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
+bool SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
/* [Beschreibung]
@@ -161,7 +161,7 @@ FASTBOOL SfxMiniRecordReader::SetHeader_Impl( UINT32 nHeader )
*/
{
- FASTBOOL bRet = TRUE;
+ bool bRet = TRUE;
// Record-Ende und Pre-Tag aus dem Header ermitteln
_nEofRec = _pStream->Tell() + SFX_REC_OFS(nHeader);
@@ -311,7 +311,7 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
//=========================================================================
-inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes )
+inline bool SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes )
/* [Beschreibung]
@@ -322,7 +322,7 @@ inline FASTBOOL SfxSingleRecordReader::ReadHeader_Impl( USHORT nTypes )
*/
{
- FASTBOOL bRet;
+ bool bRet;
// Basisklassen-Header einlesen
UINT32 nHeader=0;
@@ -362,7 +362,7 @@ SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, USHORT nTag )
//-------------------------------------------------------------------------
-FASTBOOL SfxSingleRecordReader::FindHeader_Impl
+bool SfxSingleRecordReader::FindHeader_Impl
(
UINT16 nTypes, // arithm. Veroderung erlaubter Record-Typen
UINT16 nTag // zu findende Record-Art-Kennung
@@ -449,7 +449,7 @@ SfxMultiFixRecordWriter::SfxMultiFixRecordWriter
//=========================================================================
-UINT32 SfxMultiFixRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
+UINT32 SfxMultiFixRecordWriter::Close( bool bSeekToEndOfRec )
// siehe <SfxMiniRecordWriter>
@@ -574,7 +574,7 @@ void SfxMultiVarRecordWriter::NewContent()
//-------------------------------------------------------------------------
-UINT32 SfxMultiVarRecordWriter::Close( FASTBOOL bSeekToEndOfRec )
+UINT32 SfxMultiVarRecordWriter::Close( bool bSeekToEndOfRec )
// siehe <SfxMiniRecordWriter>
@@ -647,7 +647,7 @@ void SfxMultiMixRecordWriter::NewContent
//=========================================================================
-FASTBOOL SfxMultiRecordReader::ReadHeader_Impl()
+bool SfxMultiRecordReader::ReadHeader_Impl()
/* [Beschreibung]
@@ -718,7 +718,7 @@ SfxMultiRecordReader::~SfxMultiRecordReader()
//-------------------------------------------------------------------------
-FASTBOOL SfxMultiRecordReader::GetContent()
+bool SfxMultiRecordReader::GetContent()
/* [Beschreibung]
diff --git a/binfilter/bf_svtools/source/inc/poolio.hxx b/binfilter/bf_svtools/source/inc/poolio.hxx
index 052865b..483526c 100644
--- a/binfilter/bf_svtools/source/inc/poolio.hxx
+++ b/binfilter/bf_svtools/source/inc/poolio.hxx
@@ -83,8 +83,8 @@ struct SfxItemPool_Impl
USHORT nStoringStart, nStoringEnd; // zu speichernder Range
BYTE nMajorVer, nMinorVer; // Pool selbst
SfxMapUnit eDefMetric;
- FASTBOOL bInSetItem;
- FASTBOOL bStreaming; // in Load() bzw. Store()
+ bool bInSetItem;
+ bool bStreaming; // in Load() bzw. Store()
SfxItemPool_Impl( USHORT nStart, USHORT nEnd )
: ppPoolItems (new SfxPoolItemArray_Impl*[ nEnd - nStart + 1])
diff --git a/binfilter/bf_svtools/source/items1/svt_itempool.cxx b/binfilter/bf_svtools/source/items1/svt_itempool.cxx
index 13555f6..a1f4d40 100644
--- a/binfilter/bf_svtools/source/items1/svt_itempool.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itempool.cxx
@@ -69,7 +69,7 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( USHORT nWhich ) const
// -----------------------------------------------------------------------
-inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const
+inline bool SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const
{
USHORT nItemFlag = pItemInfos[nPos]._nFlags;
return nFlag == (nItemFlag & nFlag);
@@ -77,7 +77,7 @@ inline FASTBOOL SfxItemPool::IsItemFlag_Impl( USHORT nPos, USHORT nFlag ) const
// -----------------------------------------------------------------------
-FASTBOOL SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const
+bool SfxItemPool::IsItemFlag( USHORT nWhich, USHORT nFlag ) const
{
for ( const SfxItemPool *pPool = this; pPool; pPool = pPool->pSecondary )
{
@@ -105,7 +105,7 @@ SfxItemPool::SfxItemPool
#ifndef TF_POOLABLE
USHORT* pSlotIdArray, /* Zuordnung von Slot-Ids zu Which-Ids */
#endif
- FASTBOOL bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */
+ bool bLoadRefCounts /* Ref-Counts mitladen oder auf 1 setzen */
)
/* [Beschreibung]
diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
index 7b6700c..d0b9ad5 100644
--- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx
@@ -1438,7 +1438,7 @@ USHORT SfxItemSet::GetWhichByPos( USHORT nPos ) const
SvStream &SfxItemSet::Store
(
SvStream& rStream, // Zielstream f"ur normale Items
- FASTBOOL bDirect // TRUE: Items direkt speicher, FALSE: Surrogate
+ bool bDirect // TRUE: Items direkt speicher, FALSE: Surrogate
) const
/* [Beschreibung]
@@ -1505,7 +1505,7 @@ SvStream &SfxItemSet::Load
(
SvStream& rStream, // Stream, aus dem geladen werden soll
- FASTBOOL bDirect, /* TRUE
+ bool bDirect, /* TRUE
Items werden direkt aus dem Stream
gelesen, nicht "uber Surrogate
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 5f8be56..3a7b189 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -203,8 +203,9 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
SfxMultiMixRecordWriter aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS, 0 );
// erst Atomaren-Items und dann die Sets schreiben (wichtig beim Laden)
- for ( pImp->bInSetItem = FALSE; pImp->bInSetItem <= TRUE && !rStream.GetError(); ++pImp->bInSetItem )
+ for ( int ft = 0; ft < 2 && !rStream.GetError(); ft++)
{
+ pImp->bInSetItem = ft != 0;
SfxPoolItemArray_Impl **pArr = pImp->ppPoolItems;
SfxPoolItem **ppDefItem = ppStaticDefaults;
const USHORT nSize = GetSize_Impl();
@@ -626,7 +627,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
}
// Items laden
- FASTBOOL bSecondaryLoaded = FALSE;
+ bool bSecondaryLoaded = FALSE;
long nSecondaryEnd = 0;
{
SfxMultiRecordReader aWhichIdsRec( &rStream, SFX_ITEMPOOL_REC_WHICHIDS);
@@ -818,7 +819,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
// Items laden
rStream.Seek( nStartPos );
CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_ITEMS );
- FASTBOOL bSecondaryLoaded = FALSE;
+ bool bSecondaryLoaded = FALSE;
long nSecondaryEnd = 0;
USHORT nWhich, nSlot;
while ( rStream >> nWhich, nWhich )
@@ -1091,7 +1092,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
// auf jeden Fall aufgel"ost werden.
if ( !pRefPool )
pRefPool = this;
- FASTBOOL bResolvable = pRefPool->GetName().Len() > 0;
+ bool bResolvable = pRefPool->GetName().Len() > 0;
if ( !bResolvable )
{
// Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId
@@ -1154,7 +1155,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
//-------------------------------------------------------------------------
-FASTBOOL SfxItemPool::StoreSurrogate
+bool SfxItemPool::StoreSurrogate
(
SvStream& rStream,
const SfxPoolItem* pItem
@@ -1167,7 +1168,7 @@ FASTBOOL SfxItemPool::StoreSurrogate
[R"uckgabewert]
- FASTBOOL TRUE
+ bool TRUE
es wurde ein echtes Surrogat gespeichert, auch
SFX_ITEMS_NULL bei 'pItem==0',
SFX_ITEMS_STATICDEFAULT und SFX_ITEMS_POOLDEFAULT
@@ -1182,7 +1183,7 @@ FASTBOOL SfxItemPool::StoreSurrogate
{
if ( pItem )
{
- FASTBOOL bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE);
+ bool bRealSurrogate = IsItemFlag(*pItem, SFX_ITEM_POOLABLE);
rStream << ( bRealSurrogate
? GetSurrogate( pItem )
: (UINT16) SFX_ITEMS_DIRECT );
@@ -1228,7 +1229,7 @@ USHORT SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
// -----------------------------------------------------------------------
-FASTBOOL SfxItemPool::IsInStoringRange( USHORT nWhich ) const
+bool SfxItemPool::IsInStoringRange( USHORT nWhich ) const
{
return nWhich >= pImp->nStoringStart &&
nWhich <= pImp->nStoringEnd;
@@ -1443,14 +1444,14 @@ USHORT SfxItemPool::GetNewWhich
// -----------------------------------------------------------------------
-FASTBOOL SfxItemPool::IsInVersionsRange( USHORT nWhich ) const
+bool SfxItemPool::IsInVersionsRange( USHORT nWhich ) const
{
return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd;
}
// -----------------------------------------------------------------------
-FASTBOOL SfxItemPool::IsCurrentVersionLoading() const
+bool SfxItemPool::IsCurrentVersionLoading() const
/* [Beschreibung]
@@ -1507,7 +1508,7 @@ USHORT SfxItemPool::GetLoadingVersion() const
//-------------------------------------------------------------------------
-FASTBOOL SfxItemPool::IsVer2_Impl() const
+bool SfxItemPool::IsVer2_Impl() const
{
return pMaster->pImp->nMajorVer >= 2;
}
@@ -1515,8 +1516,8 @@ FASTBOOL SfxItemPool::IsVer2_Impl() const
//-------------------------------------------------------------------------
-FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
- FASTBOOL bDirect ) const
+bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
+ bool bDirect ) const
/* [Beschreibung]
@@ -1541,7 +1542,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
[Querverweise]
- <SfxItemPool::LoadItem(SvStream&,FASTBOOL)const>
+ <SfxItemPool::LoadItem(SvStream&,bool)const>
*/
{
@@ -1581,7 +1582,7 @@ FASTBOOL SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
//-------------------------------------------------------------------------
-const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect,
+const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect,
const SfxItemPool *pRefPool )
// pRefPool==-1 => nicht putten!
@@ -1614,7 +1615,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, FASTBOOL bDirect,
}
// wird eine andere Version geladen?
- FASTBOOL bCurVersion = pRefPool->IsCurrentVersionLoading();
+ bool bCurVersion = pRefPool->IsCurrentVersionLoading();
if ( !bCurVersion )
// Which-Id auf neue Version mappen
nWhich = pRefPool->GetNewWhich( nWhich );
diff --git a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
index d243f57..07e861d 100644
--- a/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_dlight3d.cxx
@@ -97,7 +97,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*?*/ FASTBOOL E3dDistantLight::CalcLighting(Color& rNewColor,
+/*?*/ bool E3dDistantLight::CalcLighting(Color& rNewColor,
/*?*/ const Vector3D& rPnt,
/*?*/ const Vector3D& rPntNormal,
/*?*/ const Color& rPntColor)
diff --git a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
index e8d4f2d..4bf175f 100644
--- a/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_light3d.cxx
@@ -105,7 +105,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ FASTBOOL E3dLight::ImpCalcLighting(Color& rNewColor, const Color& rPntColor,
+/*N*/ bool E3dLight::ImpCalcLighting(Color& rNewColor, const Color& rPntColor,
/*N*/ double fR, double fG, double fB) const
/*N*/ {
/*N*/ ULONG nR(rNewColor.GetRed()),
@@ -139,7 +139,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ FASTBOOL E3dLight::CalcLighting(Color& rNewColor,
+/*N*/ bool E3dLight::CalcLighting(Color& rNewColor,
/*N*/ const Vector3D& rPnt,
/*N*/ const Vector3D& rPntNormal,
/*N*/ const Color& rPntColor)
@@ -296,7 +296,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dLight::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void E3dLight::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
index 950028c..bf9643f 100644
--- a/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_obj3d.cxx
@@ -208,7 +208,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dObject::SetRectsDirty(FASTBOOL bNotMyself)
+/*N*/ void E3dObject::SetRectsDirty(bool bNotMyself)
/*N*/ {
/*N*/ // call parent
/*N*/ SdrAttrObj::SetRectsDirty(bNotMyself);
@@ -262,7 +262,7 @@ namespace binfilter {
/*N*/ SdrLayerID E3dObject::GetLayer() const
/*N*/ {
-/*N*/ FASTBOOL bFirst = TRUE;
+/*N*/ bool bFirst = TRUE;
/*N*/ E3dObjList* pOL = pSub;
/*N*/ ULONG nObjCnt = pOL->GetObjCount();
/*N*/ SdrLayerID nLayer = SdrLayerID(nLayerID);
@@ -1024,7 +1024,7 @@ namespace binfilter {
\************************************************************************/
/*N*/ void E3dObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet,
-/*N*/ FASTBOOL bDontRemoveHardAttr)
+/*N*/ bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ // call parent
/*N*/ SdrAttrObj::NbcSetStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
diff --git a/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx b/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
index 755c156..d0d0a8c 100644
--- a/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_plight3d.cxx
@@ -72,7 +72,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ FASTBOOL E3dPointLight::CalcLighting(Color& rNewColor,
+/*N*/ bool E3dPointLight::CalcLighting(Color& rNewColor,
/*N*/ const Vector3D& rPnt,
/*N*/ const Vector3D& rPntNormal,
/*N*/ const Color& rPntColor)
diff --git a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
index 32581bc..a53d4e7 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polyob3d.cxx
@@ -63,8 +63,8 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ E3dPolyObj::E3dPolyObj(const PolyPolygon3D& rPolyPoly3D, FASTBOOL bDblSided,
-/*N*/ FASTBOOL bLight) :
+/*N*/ E3dPolyObj::E3dPolyObj(const PolyPolygon3D& rPolyPoly3D, bool bDblSided,
+/*N*/ bool bLight) :
/*N*/ bDoubleSided(bDblSided),
/*N*/ bBackSideVisible(FALSE),
/*N*/ bLighted(bLight),
@@ -82,8 +82,8 @@ namespace binfilter {
\************************************************************************/
/*?*/ E3dPolyObj::E3dPolyObj(const PolyPolygon3D& rPolyPoly3D,
-/*?*/ const PolyPolygon3D& rPolyNormals3D, FASTBOOL bDblSided,
-/*?*/ FASTBOOL bLight) :
+/*?*/ const PolyPolygon3D& rPolyNormals3D, bool bDblSided,
+/*?*/ bool bLight) :
/*?*/ bDoubleSided(bDblSided),
/*?*/ bBackSideVisible(FALSE),
/*?*/ bLighted(bLight),
@@ -104,8 +104,8 @@ namespace binfilter {
/*N*/ E3dPolyObj::E3dPolyObj(const PolyPolygon3D& rPolyPoly3D,
/*N*/ const PolyPolygon3D& rPolyNormals3D,
/*N*/ const PolyPolygon3D& rPolyTexture3D,
-/*N*/ FASTBOOL bDblSided,
-/*N*/ FASTBOOL bLight) :
+/*N*/ bool bDblSided,
+/*N*/ bool bLight) :
/*N*/ bDoubleSided(bDblSided),
/*N*/ bBackSideVisible(FALSE),
/*N*/ bLighted(bLight),
diff --git a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
index c36e2d1..3b79f06 100644
--- a/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_polysc3d.cxx
@@ -95,7 +95,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ FASTBOOL E3dPolyScene::Paint(ExtOutputDevice& rOut,
+/*N*/ bool E3dPolyScene::Paint(ExtOutputDevice& rOut,
/*N*/ const SdrPaintInfoRec& rInfoRec) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index 6bb2090..7f83367 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
@@ -808,7 +808,7 @@ namespace binfilter {
|*
\************************************************************************/
-/*N*/ void E3dScene::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void E3dScene::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ E3dObjList* pOL = pSub;
/*N*/ ULONG nObjCnt = pOL->GetObjCount();
diff --git a/binfilter/bf_svx/source/form/svx_fmmodel.cxx b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
index 18eb7c0..378dad7 100644
--- a/binfilter/bf_svx/source/form/svx_fmmodel.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmmodel.cxx
@@ -99,7 +99,7 @@ struct FmFormModelImplData
|*
\************************************************************************/
/*N*/ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SvPersist* pPers,
-/*N*/ FASTBOOL bUseExtColorTable)
+/*N*/ bool bUseExtColorTable)
/*N*/ :SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
/*N*/ ,pObjShell(0)
/*N*/ ,bStreamingOldVersion(sal_False)
diff --git a/binfilter/bf_svx/source/form/svx_fmpage.cxx b/binfilter/bf_svx/source/form/svx_fmpage.cxx
index c5a227e..16b9b8d 100644
--- a/binfilter/bf_svx/source/form/svx_fmpage.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpage.cxx
@@ -72,7 +72,7 @@ namespace binfilter {
/*N*/ TYPEINIT1(FmFormPage, SdrPage);
//------------------------------------------------------------------
-/*N*/ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, FASTBOOL bMasterPage)
+/*N*/ FmFormPage::FmFormPage(FmFormModel& rModel, StarBASIC* _pBasic, bool bMasterPage)
/*N*/ :SdrPage(rModel, bMasterPage)
/*N*/ ,pBasic(_pBasic)
/*N*/ #ifndef SVX_LIGHT
diff --git a/binfilter/bf_svx/source/items/svx_paraitem.cxx b/binfilter/bf_svx/source/items/svx_paraitem.cxx
index 0baea01..3b4e9b0 100644
--- a/binfilter/bf_svx/source/items/svx_paraitem.cxx
+++ b/binfilter/bf_svx/source/items/svx_paraitem.cxx
@@ -972,7 +972,7 @@ typedef sequence ::com::sun::star::style::TabStop> TabSTopSequence;
/*N*/ //Alles nur SWG!
/*N*/
/*N*/ const SfxItemPool *pPool = SfxItemPool::GetStoringPool();
-/*N*/ const FASTBOOL bStoreDefTabs = pPool
+/*N*/ const bool bStoreDefTabs = pPool
/*N*/ && pPool->GetName().EqualsAscii("SWG")
/*N*/ && binfilter::IsDefaultItem( this );
/*N*/
diff --git a/binfilter/bf_svx/source/svdraw/svdtxhdl.hxx b/binfilter/bf_svx/source/svdraw/svdtxhdl.hxx
index 3b86745..4a1ca22 100644
--- a/binfilter/bf_svx/source/svdraw/svdtxhdl.hxx
+++ b/binfilter/bf_svx/source/svdraw/svdtxhdl.hxx
@@ -60,7 +60,7 @@ class ImpTextPortionHandler
// Variablen fuer ConvertToPathObj
SdrObjGroup* pGroup;
SdrModel* pModel;
- FASTBOOL bToPoly;
+ bool bToPoly;
// Variablen fuer DrawFitText
Point aPos;
@@ -86,7 +86,7 @@ private:
public:
ImpTextPortionHandler(SdrOutliner& rOutln, const SdrTextObj& rTxtObj);
- void DrawTextToPath(ExtOutputDevice& rXOut, FASTBOOL bDrawEffect=TRUE);
+ void DrawTextToPath(ExtOutputDevice& rXOut, bool bDrawEffect=TRUE);
// wird von DrawTextToPath() gesetzt:
const Rectangle& GetFormTextBoundRect() { return aFormTextBoundRect; }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
index 091ce7a..8c2f8d2 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdattr.cxx
@@ -90,13 +90,13 @@ using namespace ::com::sun::star;
|*
\************************************************************************/
-SdrItemPool::SdrItemPool(USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
+SdrItemPool::SdrItemPool(USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
XOutdevItemPool(nAttrStart,nAttrEnd,bLoadRefCounts)
{
Ctor(NULL,nAttrStart,nAttrEnd);
}
-SdrItemPool::SdrItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, FASTBOOL bLoadRefCounts):
+SdrItemPool::SdrItemPool(SfxItemPool* pMaster, USHORT nAttrStart, USHORT nAttrEnd, bool bLoadRefCounts):
XOutdevItemPool(pMaster,nAttrStart,nAttrEnd,bLoadRefCounts)
{
Ctor(pMaster,nAttrStart,nAttrEnd);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx b/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
index 792fc67..638050a 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svddrag.cxx
@@ -29,7 +29,7 @@
#include "svddrag.hxx"
namespace binfilter {
-/*N*/ void SdrDragStat::Clear(FASTBOOL bLeaveOne)
+/*N*/ void SdrDragStat::Clear(bool bLeaveOne)
/*N*/ {
/*N*/ void* pP=aPnts.First();
/*N*/ while (pP!=NULL) {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
index affb6e9..0ee8681 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdetc.cxx
@@ -243,7 +243,7 @@ namespace binfilter {
/*?*/ class ImpClipMerk {
/*?*/ Region aClip;
-/*?*/ FASTBOOL bClip;
+/*?*/ bool bClip;
/*?*/ public:
/*?*/ ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {}
/*?*/ void Restore(OutputDevice& rOut)
@@ -307,7 +307,7 @@ namespace binfilter {
/*?*/ const Color& GetLineColor() const { return aLineColor; }
/*?*/ };
-/*N*/ ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, FASTBOOL bAutoMerk):
+/*N*/ ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, bool bAutoMerk):
/*N*/ pFarbMerk(NULL),
/*N*/ pClipMerk(NULL),
/*N*/ pLineColorMerk(NULL),
@@ -420,10 +420,10 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
// #98988# Re-implement GetDraftFillColor(...)
-/*N*/ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
+/*N*/ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
/*N*/ {
/*N*/ XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
-/*N*/ FASTBOOL bRetval(FALSE);
+/*N*/ bool bRetval(FALSE);
/*N*/
/*N*/ switch(eFill)
/*N*/ {
@@ -561,8 +561,8 @@ namespace binfilter {
aSet.Put(SvxFontItem(rDefaults.eFontFamily, rDefaults.aFontName, String(), PITCH_DONTKNOW, gsl_getSystemTextEncoding() ) );
aSet.Put(SvxColorItem(rDefaults.aFontColor));
ULONG nHgt=rDefaults.nFontHeight;
- FASTBOOL bDifUn=(eUn!=rDefaults.eMapUnit); // different MapUnits
- FASTBOOL bDifFr=(aFr!=rDefaults.aMapFraction); // different MapFractions
+ bool bDifUn=(eUn!=rDefaults.eMapUnit); // different MapUnits
+ bool bDifFr=(aFr!=rDefaults.aMapFraction); // different MapFractions
if (bDifUn || bDifFr) { // Wenn pMod!=NULL und pMod->Map!=rDef.Map
long nTmpLong=long(nHgt); // caasting im Ctor bringt unter MSVC sehr merkwuerdige Fehlermeldungen
BigInt aHgt1(nTmpLong); // umrechnen von DefMap in ModMap
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx b/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
index c8f74c5..0e292b3 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdglue.cxx
@@ -141,12 +141,12 @@ namespace binfilter {
/*N*/ USHORT nInsPos=nAnz;
/*N*/ USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
/*N*/ DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz");
-/*N*/ FASTBOOL bHole=nLastId>nAnz;
+/*N*/ bool bHole=nLastId>nAnz;
/*N*/ if (nId<=nLastId) {
/*N*/ if (!bHole || nId==0) {
/*N*/ nId=nLastId+1;
/*N*/ } else {
-/*N*/ FASTBOOL bBrk=FALSE;
+/*N*/ bool bBrk=FALSE;
/*N*/ for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) {
/*N*/ const SdrGluePoint* pGP=GetObject(nNum);
/*N*/ USHORT nTmpId=pGP->GetId();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
index 86e077e..5e3e729 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdlayer.cxx
@@ -37,7 +37,7 @@ namespace binfilter {
// SetOfByte
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ FASTBOOL SetOfByte::IsEmpty() const
+/*N*/ bool SetOfByte::IsEmpty() const
/*N*/ {
/*N*/ for (USHORT i=0; i<32; i++) {
/*N*/ if (aData[i]!=0) return FALSE;
@@ -282,7 +282,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SdrLayerAdmin::Broadcast(FASTBOOL bLayerSet) const
+/*N*/ void SdrLayerAdmin::Broadcast(bool bLayerSet) const
/*N*/ {
/*N*/ if (pModel!=NULL) {
/*N*/ SdrHint aHint(bLayerSet ? HINT_LAYERSETORDERCHG : HINT_LAYERORDERCHG);
@@ -305,7 +305,7 @@ namespace binfilter {
-/*N*/ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL bInherited) const
+/*N*/ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool bInherited) const
/*N*/ {
/*N*/ UINT16 i(0);
/*N*/ const SdrLayer* pLay = NULL;
@@ -326,7 +326,7 @@ namespace binfilter {
/*N*/ return pLay;
/*N*/ }
-/*N*/ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited) const
+/*N*/ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) const
/*N*/ {
/*N*/ SdrLayerID nRet=SDRLAYER_NOTFOUND;
/*N*/ const SdrLayer* pLay=GetLayer(rName,bInherited);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
index be4fbbf..d7a9fbe 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmark.cxx
@@ -140,16 +140,16 @@ namespace binfilter {
*/
/*N*/ }
-/*N*/ void SdrMarkList::InsertEntry(const SdrMark& rMark, FASTBOOL bChkSort)
+/*N*/ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
-/*N*/ FASTBOOL SdrMarkList::DeletePageView(const SdrPageView& rPV)
+/*N*/ bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
/*N*/ {
-/*N*/ FASTBOOL bChgd=FALSE;
+/*N*/ bool bChgd=FALSE;
/*N*/ for (ULONG i=GetMarkCount(); i>0;) {
/*?*/ i--;
/*?*/ SdrMark* pMark=GetMark(i);
@@ -168,9 +168,9 @@ namespace binfilter {
-/*N*/ FASTBOOL SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
+/*N*/ bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
/*N*/ {
-/*N*/ FASTBOOL bFnd=FALSE;
+/*N*/ bool bFnd=FALSE;
/*N*/ Rectangle aR;
/*N*/
/*N*/ for (ULONG i=0; i<GetMarkCount(); i++) {
@@ -188,9 +188,9 @@ namespace binfilter {
/*N*/ return bFnd;
/*N*/ }
-/*N*/ FASTBOOL SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
+/*N*/ bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
/*N*/ {
-/*N*/ FASTBOOL bFnd=FALSE;
+/*N*/ bool bFnd=FALSE;
/*N*/
/*N*/ for (ULONG i=0; i<GetMarkCount(); i++) {
/*?*/ SdrMark* pMark=GetMark(i);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
index 09353c0..4a05aac 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
@@ -103,7 +103,7 @@ using namespace ::com::sun::star;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ SdrModelInfo::SdrModelInfo(FASTBOOL bInit):
+/*N*/ SdrModelInfo::SdrModelInfo(bool bInit):
/*N*/ aCreationDate(Date(0),Time(0)),
/*N*/ aLastWriteDate(Date(0),Time(0)),
/*N*/ aLastReadDate(Date(0),Time(0)),
@@ -236,7 +236,7 @@ using namespace ::com::sun::star;
/*N*/ TYPEINIT1(SdrModel,SfxBroadcaster);
/*N*/ void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers,
-/*N*/ FASTBOOL bUseExtColorTable, FASTBOOL bLoadRefCounts)
+/*N*/ bool bUseExtColorTable, bool bLoadRefCounts)
/*N*/ {
/*N*/ mbInDestruction=false;
/*N*/ aObjUnit=SdrEngineDefaults::GetMapFraction();
@@ -360,7 +360,7 @@ using namespace ::com::sun::star;
/*N*/ #endif
/*N*/
/*N*/ DBG_CTOR(SdrModel,NULL);
-/*N*/ ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+/*N*/ ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts);
/*N*/ }
/*N*/ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts):
@@ -374,10 +374,10 @@ using namespace ::com::sun::star;
/*N*/ #endif
/*N*/
/*N*/ DBG_CTOR(SdrModel,NULL);
-/*N*/ ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+/*N*/ ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts);
/*N*/ }
-/*N*/ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts):
+/*N*/ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, bool bUseExtColorTable, INT32 bLoadRefCounts):
/*N*/ aInfo(TRUE),
/*N*/ aPages(1024,32,32),
/*N*/ aMaPag(1024,32,32),
@@ -388,7 +388,7 @@ using namespace ::com::sun::star;
/*N*/ #endif
/*N*/
/*N*/ DBG_CTOR(SdrModel,NULL);
-/*N*/ ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
+/*N*/ ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
/*N*/ }
/*N*/ SdrModel::SdrModel(const SdrModel& rSrcModel):
@@ -482,17 +482,17 @@ using namespace ::com::sun::star;
// noch nicht implementiert:
-/*N*/ void SdrModel::SetSwapGraphics( FASTBOOL bSwap )
+/*N*/ void SdrModel::SetSwapGraphics( bool bSwap )
/*N*/ {
/*N*/ bSwapGraphics = bSwap;
/*N*/ }
-/*?*/ FASTBOOL SdrModel::IsReadOnly() const
+/*?*/ bool SdrModel::IsReadOnly() const
/*?*/ {
/*?*/ return bReadOnly;
/*?*/ }
-/*?*/ void SdrModel::SetReadOnly(FASTBOOL bYes)
+/*?*/ void SdrModel::SetReadOnly(bool bYes)
/*?*/ {
/*?*/ bReadOnly=bYes;
/*?*/ }
@@ -625,7 +625,7 @@ using namespace ::com::sun::star;
/*N*/ return pModel;
/*N*/ }
-/*N*/ SdrPage* SdrModel::AllocPage(FASTBOOL bMasterPage)
+/*N*/ SdrPage* SdrModel::AllocPage(bool bMasterPage)
/*N*/ {
/*N*/ return new SdrPage(*this,bMasterPage);
/*N*/ }
@@ -804,10 +804,10 @@ using namespace ::com::sun::star;
/*N*/ void SdrModel::ImpSetUIUnit()
/*N*/ {
/*N*/ if (aUIScale.GetNumerator()==0 || aUIScale.GetDenominator()==0) aUIScale=Fraction(1,1);
-/*N*/ FASTBOOL bMapInch=IsInch(eObjUnit);
-/*N*/ FASTBOOL bMapMetr=IsMetric(eObjUnit);
-/*N*/ FASTBOOL bUIInch=IsInch(eUIUnit);
-/*N*/ FASTBOOL bUIMetr=IsMetric(eUIUnit);
+/*N*/ bool bMapInch=IsInch(eObjUnit);
+/*N*/ bool bMapMetr=IsMetric(eObjUnit);
+/*N*/ bool bUIInch=IsInch(eUIUnit);
+/*N*/ bool bUIMetr=IsMetric(eUIUnit);
/*N*/ nUIUnitKomma=0;
/*N*/ long nMul=1;
/*N*/ long nDiv=1;
@@ -1038,7 +1038,7 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-/*?*/ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, sal_Int32 nNumDigits) const
+/*?*/ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_Int32 nNumDigits) const
/*?*/ {
/*?*/ if(!bUIOnlyKomma)
/*?*/ nVal = (nVal * aUIUnitFact.GetNumerator()) / aUIUnitFact.GetDenominator();
@@ -1150,12 +1150,12 @@ using namespace ::com::sun::star;
-/*N*/ void SdrModel::SetChanged(FASTBOOL bFlg)
+/*N*/ void SdrModel::SetChanged(bool bFlg)
/*N*/ {
/*N*/ bChanged=bFlg;
/*N*/ }
-/*N*/ void SdrModel::RecalcPageNums(FASTBOOL bMaster)
+/*N*/ void SdrModel::RecalcPageNums(bool bMaster)
/*N*/ {
/*N*/ Container& rPL=*(bMaster ? &aMaPag : &aPages);
/*N*/ USHORT nAnz=USHORT(rPL.Count());
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
index 9fa4811..3ebd5d7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
@@ -667,7 +667,7 @@ namespace binfilter {
/*N*/ mpStyleSheet = NULL;
/*N*/ }
-/*N*/ void SdrAttrObj::AddStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrAttrObj::AddStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ // old StyleSheet is deleted
/*N*/ DBG_ASSERT(!mpStyleSheet, "Old style sheet not deleted before setting new one (?)");
@@ -703,7 +703,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SdrAttrObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrAttrObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ RemoveStyleSheet();
/*N*/ AddStyleSheet(pNewStyleSheet, bDontRemoveHardAttr);
@@ -711,7 +711,7 @@ namespace binfilter {
/*N*/ SetRectsDirty(TRUE);
/*N*/ }
-/*N*/ void SdrAttrObj::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrAttrObj::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ Rectangle aBoundRect0;
/*N*/
@@ -826,7 +826,7 @@ namespace binfilter {
//////////////////////////////////////////////////////////////////////////////
-/*N*/ FASTBOOL SdrAttrObj::ImpGetShadowDist(sal_Int32& nXDist, sal_Int32& nYDist) const
+/*N*/ bool SdrAttrObj::ImpGetShadowDist(sal_Int32& nXDist, sal_Int32& nYDist) const
/*N*/ {
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/
@@ -863,7 +863,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ FASTBOOL SdrAttrObj::ImpSetShadowAttributes( const SfxItemSet& rSet, SfxItemSet& rShadowSet ) const
+/*N*/ bool SdrAttrObj::ImpSetShadowAttributes( const SfxItemSet& rSet, SfxItemSet& rShadowSet ) const
/*N*/ {
/*N*/ BOOL bShadOn=((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
/*N*/
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index c9e8ca6..e4e7964 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -137,7 +137,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ }
-/*N*/ FASTBOOL SdrObjUserData::HasMacro(const SdrObject* pObj) const
+/*N*/ bool SdrObjUserData::HasMacro(const SdrObject* pObj) const
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
@@ -1155,7 +1155,7 @@ static double SMALLEST_DASH_WIDTH(26.95);
/*N*/ return new SdrObjPlusData;
/*N*/ }
-/*N*/ void SdrObject::SetRectsDirty(FASTBOOL bNotMyself)
+/*N*/ void SdrObject::SetRectsDirty(bool bNotMyself)
/*N*/ {
/*N*/ if (!bNotMyself) {
/*N*/ bBoundRectDirty=TRUE;
@@ -1410,7 +1410,7 @@ static double SMALLEST_DASH_WIDTH(26.95);
/*N*/ if (bInserted && pModel!=NULL) pModel->SetChanged();
/*N*/ }
-/*N*/ FASTBOOL SdrObject::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& /*rInfoRec*/) const
+/*N*/ bool SdrObject::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& /*rInfoRec*/) const
/*N*/ {
/*N*/ Color aRedColor( COL_RED );
/*N*/ Color aYellowColor( COL_YELLOW );
@@ -1940,7 +1940,7 @@ class ImpSkeleton;
-/*N*/ void SdrObject::TakeXorPoly(XPolyPolygon& rPoly, FASTBOOL /*bDetail*/) const
+/*N*/ void SdrObject::TakeXorPoly(XPolyPolygon& rPoly, bool /*bDetail*/) const
/*N*/ {
/*N*/ rPoly=XPolyPolygon(XPolygon(GetBoundRect()));
/*N*/ }
@@ -2112,8 +2112,8 @@ class ImpSkeleton;
/*N*/ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
/*N*/ {
-/*N*/ FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/ FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+/*N*/ bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+/*N*/ bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
/*N*/ if (bXMirr || bYMirr) {
/*N*/ Point aRef1(GetSnapRect().Center());
/*N*/ if (bXMirr) {
@@ -2190,7 +2190,7 @@ class ImpSkeleton;
/*N*/ SetGlueReallyAbsolute(FALSE);
/*N*/ }
-/*N*/ void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+/*N*/ void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
/*N*/ {
/*N*/ SetGlueReallyAbsolute(TRUE);
/*N*/ NbcShearGluePoints(rRef,nWink,tn,bVShear);
@@ -2234,7 +2234,7 @@ class ImpSkeleton;
/*N*/ }
-/*N*/ void SdrObject::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+/*N*/ void SdrObject::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
/*N*/ {
/*N*/ if (nWink!=0) {
/*N*/ Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
@@ -2343,14 +2343,14 @@ class ImpSkeleton;
/*N*/ return 0;
/*N*/ }
-/*N*/ long SdrObject::GetShearAngle(FASTBOOL bVertical) const
+/*N*/ long SdrObject::GetShearAngle(bool bVertical) const
/*N*/ {
/*N*/ return 0;
/*N*/ }
-/*N*/ FASTBOOL SdrObject::IsPolyObj() const
+/*N*/ bool SdrObject::IsPolyObj() const
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
@@ -2391,7 +2391,7 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ FASTBOOL SdrObject::HasTextEdit() const
+/*N*/ bool SdrObject::HasTextEdit() const
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
@@ -2401,7 +2401,7 @@ class ImpSkeleton;
/*N*/ return CheckHit(rPnt,nTol,pVisiLayer);
/*N*/ }
-/*N*/ FASTBOOL SdrObject::BegTextEdit(SdrOutliner& rOutl)
+/*N*/ bool SdrObject::BegTextEdit(SdrOutliner& rOutl)
/*N*/ {
/*N*/ return FALSE;
/*N*/ }
@@ -2465,7 +2465,7 @@ class ImpSkeleton;
/*N*/ return pData;
/*N*/ }
-/*N*/ FASTBOOL SdrObject::HasMacro() const
+/*N*/ bool SdrObject::HasMacro() const
/*N*/ {
/*N*/ SdrObjUserData* pData=ImpGetMacroUserData();
/*N*/ return pData!=NULL ? pData->HasMacro(this) : FALSE;
@@ -2687,7 +2687,7 @@ class ImpSkeleton;
-/*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const
+/*N*/ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
@@ -2697,18 +2697,18 @@ class ImpSkeleton;
/*N*/ return NULL;
/*N*/ }
-/*N*/ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ }
-/*N*/ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ }
// Das Broadcasting beim Setzen der Attribute wird vom AttrObj gemanagt
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ FASTBOOL SdrObject::IsNode() const
+/*N*/ bool SdrObject::IsNode() const
/*N*/ {
/*N*/ return TRUE;
/*N*/ }
@@ -2746,7 +2746,7 @@ class ImpSkeleton;
/*N*/ return pPlusData->pGluePoints;
/*N*/ }
-/*N*/ void SdrObject::SetGlueReallyAbsolute(FASTBOOL bOn)
+/*N*/ void SdrObject::SetGlueReallyAbsolute(bool bOn)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
@@ -2773,7 +2773,7 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+/*N*/ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, bool bVShear)
/*N*/ {
/*N*/ // erst Const-Aufruf um zu sehen, ob
/*N*/ // ueberhaupt Klebepunkte da sind
@@ -2785,11 +2785,11 @@ class ImpSkeleton;
-/*N*/ void SdrObject::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj)
+/*N*/ void SdrObject::ConnectToNode(bool bTail1, SdrObject* pObj)
/*N*/ {
/*N*/ }
-/*N*/ void SdrObject::DisconnectFromNode(FASTBOOL bTail1)
+/*N*/ void SdrObject::DisconnectFromNode(bool bTail1)
/*N*/ {
/*N*/ }
@@ -2895,7 +2895,7 @@ class ImpSkeleton;
/*N*/ delete pPlusData->pUserDataList;
/*N*/ pPlusData->pUserDataList=NULL;
/*N*/ }
-/*N*/ FASTBOOL bReadUserDataList=FALSE;
+/*N*/ bool bReadUserDataList=FALSE;
/*N*/ SdrDownCompat* pUserDataListCompat=NULL;
/*N*/ if (rHead.GetVersion()>=11) { // ab V11 ist die UserDataList in DownCompat gefasst (mit Flag davor)
/*N*/ rIn>>bTemp;
@@ -3031,7 +3031,7 @@ class ImpSkeleton;
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrObject::SetInserted(FASTBOOL bIns)
+/*N*/ void SdrObject::SetInserted(bool bIns)
/*N*/ {
/*N*/ if (bIns!=bInserted) {
/*N*/ bInserted=bIns;
@@ -3047,7 +3047,7 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::SetMoveProtect(FASTBOOL bProt)
+/*N*/ void SdrObject::SetMoveProtect(bool bProt)
/*N*/ {
/*N*/ bMovProt=bProt;
/*N*/ SetChanged();
@@ -3058,7 +3058,7 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::SetResizeProtect(FASTBOOL bProt)
+/*N*/ void SdrObject::SetResizeProtect(bool bProt)
/*N*/ {
/*N*/ bSizProt=bProt;
/*N*/ SetChanged();
@@ -3069,7 +3069,7 @@ class ImpSkeleton;
/*N*/ }
/*N*/ }
-/*N*/ void SdrObject::SetPrintable(FASTBOOL bPrn)
+/*N*/ void SdrObject::SetPrintable(bool bPrn)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
index e95f620..616cc1b 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocapt.cxx
@@ -57,9 +57,9 @@ namespace binfilter {
/*N*/ long nEscAbs;
/*N*/ long nLineLen;
/*N*/ SdrCaptionEscDir eEscDir;
-/*N*/ FASTBOOL bFitLineLen;
-/*N*/ FASTBOOL bEscRel;
-/*N*/ FASTBOOL bFixedAngle;
+/*N*/ bool bFitLineLen;
+/*N*/ bool bEscRel;
+/*N*/ bool bFixedAngle;
/*N*/
/*N*/ public:
/*N*/ ImpCaptParams()
@@ -95,7 +95,7 @@ namespace binfilter {
/*N*/ nY+=rRect.Top();
/*N*/ Point aBestPt;
/*N*/ EscDir eBestDir=LKS;
-/*N*/ FASTBOOL bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
+/*N*/ bool bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
/*N*/ if (!bTryH) {
/*N*/ if (eType!=SDRCAPT_TYPE1) {
/*N*/ bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL;
@@ -103,7 +103,7 @@ namespace binfilter {
/*N*/ bTryH=eEscDir==SDRCAPT_ESCVERTICAL;
/*N*/ }
/*N*/ }
-/*N*/ FASTBOOL bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
+/*N*/ bool bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
/*N*/ if (!bTryV) {
/*N*/ if (eType!=SDRCAPT_TYPE1) {
/*N*/ bTryV=eEscDir==SDRCAPT_ESCVERTICAL;
@@ -115,7 +115,7 @@ namespace binfilter {
/*N*/ if (bTryH) {
/*N*/ Point aLft(rRect.Left()-nGap,nY);
/*N*/ Point aRgt(rRect.Right()+nGap,nY);
-/*N*/ FASTBOOL bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
+/*N*/ bool bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
/*N*/ if (bLft) {
/*N*/ eBestDir=LKS;
/*N*/ aBestPt=aLft;
@@ -127,7 +127,7 @@ namespace binfilter {
/*N*/ if (bTryV) {
/*?*/ Point aTop(nX,rRect.Top()-nGap);
/*?*/ Point aBtm(nX,rRect.Bottom()+nGap);
-/*?*/ FASTBOOL bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
+/*?*/ bool bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
/*?*/ Point aBest2;
/*?*/ EscDir eBest2;
/*?*/ if (bTop) {
@@ -137,7 +137,7 @@ namespace binfilter {
/*?*/ eBest2=UNT;
/*?*/ aBest2=aBtm;
/*?*/ }
-/*?*/ FASTBOOL bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
+/*?*/ bool bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
/*?*/ if (!bTakeIt) {
/*?*/ BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX;
/*?*/ BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY;
@@ -445,7 +445,7 @@ namespace binfilter {
////////////////////////////////////////////////////////////////////////////////////////////////////
-/*N*/ void SdrCaptionObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrCaptionObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ SdrRectObj::NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
/*N*/ ImpRecalcTail();
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
index d8382ec..fec4d03 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdocirc.cxx
@@ -131,13 +131,13 @@ namespace binfilter {
/*N*/ return UINT16(eKind);
/*N*/ }
-/*N*/ FASTBOOL SdrCircObj::PaintNeedsXPoly() const
+/*N*/ bool SdrCircObj::PaintNeedsXPoly() const
/*N*/ {
/*N*/ // XPoly ist notwendig fuer alle gedrehten Ellipsenobjekte,
/*N*/ // fuer alle Kreis- und Ellipsenabschnitte
/*N*/ // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte
/*N*/ // und Kreis-/Ellipsenboegen (wg. Genauigkeit)
-/*N*/ FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || eKind==OBJ_CCUT;
+/*N*/ bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || eKind==OBJ_CCUT;
/*N*/ #ifndef WIN
/*N*/ // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!)
/*N*/ if (eKind!=OBJ_CIRC) bNeed=TRUE;
@@ -183,7 +183,7 @@ namespace binfilter {
/*N*/ return bNeed;
/*N*/ }
-/*N*/ XPolygon SdrCircObj::ImpCalcXPoly(const Rectangle& rRect1, long nStart, long nEnd, FASTBOOL bContour) const
+/*N*/ XPolygon SdrCircObj::ImpCalcXPoly(const Rectangle& rRect1, long nStart, long nEnd, bool bContour) const
/*N*/ {
/*N*/ bContour=TRUE; // am 14.1.97 wg. Umstellung TakeContour ueber Mtf und Paint. Joe.
/*N*/ long rx=rRect1.GetWidth()/2; // Da GetWidth()/GetHeight() jeweils 1
@@ -211,7 +211,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ ((SdrCircObj*)this)->bXPolyIsLine=eKind==OBJ_CARC;
-/*N*/ FASTBOOL bClose=eKind==OBJ_CIRC /*|| eKind==OBJ_SECT*/;
+/*N*/ bool bClose=eKind==OBJ_CIRC /*|| eKind==OBJ_SECT*/;
/*N*/ XPolygon aXPoly(rRect1.Center(),rx,ry,USHORT(a),USHORT(e),bClose);
/*N*/ if (eKind!=OBJ_CIRC && nStart==nEnd) {
/*?*/ if (eKind==OBJ_SECT) {
@@ -270,7 +270,7 @@ namespace binfilter {
/*N*/ ImpAddTextToBoundRect();
/*N*/ }
-/*N*/ FASTBOOL SdrCircObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
+/*N*/ bool SdrCircObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
/*N*/ {
/*N*/ // Hidden objects on masterpages, draw nothing
/*N*/ if((rInfoRec.nPaintMode & SDRPAINTMODE_MASTERPAGE) && bNotVisibleAsMaster)
@@ -392,7 +392,7 @@ namespace binfilter {
/*N*/ ImpDrawColorLineGeometry(rXOut, rSet, *pLineGeometry);
/*N*/ }
/*N*/
-/*N*/ FASTBOOL bOk=TRUE;
+/*N*/ bool bOk=TRUE;
/*N*/ if (HasText()) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
/*N*/ if (bOk && (rInfoRec.nPaintMode & SDRPAINTMODE_GLUEPOINTS) !=0) {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
@@ -414,7 +414,7 @@ namespace binfilter {
/*N*/ aPnt2 = ((SdrCircObj&)rObj).aPnt2;
/*N*/ }
-/*N*/ void SdrCircObj::TakeXorPoly(XPolyPolygon& rPoly, FASTBOOL bDetail) const
+/*N*/ void SdrCircObj::TakeXorPoly(XPolyPolygon& rPoly, bool bDetail) const
/*N*/ {
/*N*/ XPolygon aP(ImpCalcXPoly(aRect,nStartWink,nEndWink));
/*N*/ if (!bXPolyIsLine) { // Polygon schliessen
@@ -465,12 +465,12 @@ namespace binfilter {
/*N*/ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
/*N*/ {
/*N*/ long nWink0=aGeo.nDrehWink;
-/*N*/ FASTBOOL bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
+/*N*/ bool bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
/*N*/ SdrTextObj::NbcResize(rRef,xFact,yFact);
/*N*/ bNoShearRota|=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
/*N*/ if (eKind!=OBJ_CIRC) {
-/*N*/ FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/ FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+/*N*/ bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+/*N*/ bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
/*N*/ if (bXMirr || bYMirr) {
/*N*/ // bei bXMirr!=bYMirr muessten eigentlich noch die beiden
/*N*/ // Linienende vertauscht werden. Das ist jedoch mal wieder
@@ -514,7 +514,7 @@ namespace binfilter {
/*N*/ ImpSetCircInfoToAttr();
/*N*/ }
-/*N*/ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+/*N*/ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
/*N*/ {
/*N*/ SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
/*N*/ SetXPolyDirty();
@@ -654,7 +654,7 @@ namespace binfilter {
/*N*/
/*N*/ }
-/*N*/ void SdrCircObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrCircObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ SetXPolyDirty();
/*N*/ SdrRectObj::NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
@@ -772,7 +772,7 @@ namespace binfilter {
/*N*/ {
/*N*/ XPolygon aXP(ImpCalcXPoly(aRect,nStartWink,nEndWink));
/*N*/ SdrObjKind ePathKind=OBJ_PATHFILL;
-/*N*/ FASTBOOL bFill=TRUE;
+/*N*/ bool bFill=TRUE;
/*N*/ if (eKind==OBJ_CARC) bFill=FALSE;
/*N*/ SdrObject* pRet=ImpConvertMakeObj(XPolyPolygon(aXP),bFill,bBezier);
/*N*/ pRet=ImpConvertAddText(pRet,bBezier);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
index 10ffc7a..dc37ade 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoedge.cxx
@@ -69,9 +69,9 @@ namespace binfilter {
/*N*/ bAutoCorner=FALSE;
/*N*/ }
-/*N*/ FASTBOOL SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsPos) const
+/*N*/ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const
/*N*/ {
-/*N*/ FASTBOOL bRet=FALSE;
+/*N*/ bool bRet=FALSE;
/*N*/ if (pObj!=NULL) { // Ein Obj muss schon angedockt sein!
/*N*/ if (bAutoVertex) {
/*N*/ rGP=pObj->GetVertexGluePoint(nConId);
@@ -188,10 +188,10 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-/*N*/ FASTBOOL SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
+/*N*/ bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
/*N*/ {
/*N*/ USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP);
-/*N*/ FASTBOOL bHorz=nAngle1==0 || nAngle1==18000;
+/*N*/ bool bHorz=nAngle1==0 || nAngle1==18000;
/*N*/ if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
/*N*/ nIdx=rXP.GetPointCount()-nIdx; // #36314#
/*N*/ bHorz=nAngle2==0 || nAngle2==18000; // #52000#
@@ -269,7 +269,7 @@ namespace binfilter {
/*N*/
/*N*/ // #109007#
/*N*/ // Default is to allow default connects
-/*N*/ mbSuppressDefaultConnect = (FASTBOOL)sal_False;
+/*N*/ mbSuppressDefaultConnect = (bool)sal_False;
/*N*/ }
/*N*/
/*N*/ SdrEdgeObj::~SdrEdgeObj()
@@ -312,7 +312,7 @@ namespace binfilter {
/*N*/
/*N*/ ////////////////////////////////////////////////////////////////////////////////////////////////////
/*N*/
-/*N*/ void SdrEdgeObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrEdgeObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ SdrTextObj::NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
/*N*/ ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren
@@ -533,7 +533,7 @@ namespace binfilter {
/*N*/ aR.Top() -=nMyTol;
/*N*/ aR.Bottom()+=nMyTol;
/*N*/
-/*N*/ FASTBOOL bHit=FALSE;
+/*N*/ bool bHit=FALSE;
/*N*/
/*N*/ Polygon aPoly=XOutCreatePolygon(*pEdgeTrack,NULL);
/*N*/ bHit=IsRectTouchesLine(aPoly,aR);
@@ -541,7 +541,7 @@ namespace binfilter {
/*N*/ return bHit ? (SdrObject*)this : NULL;
/*N*/ }
-/*N*/ FASTBOOL SdrEdgeObj::IsNode() const
+/*N*/ bool SdrEdgeObj::IsNode() const
/*N*/ {
/*N*/ return TRUE;
/*N*/ }
@@ -577,7 +577,7 @@ namespace binfilter {
-/*N*/ void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj)
+/*N*/ void SdrEdgeObj::ConnectToNode(bool bTail1, SdrObject* pObj)
/*N*/ {
/*N*/ SdrObjConnection& rCon=GetConnection(bTail1);
/*N*/ DisconnectFromNode(bTail1);
@@ -588,7 +588,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1)
+/*N*/ void SdrEdgeObj::DisconnectFromNode(bool bTail1)
/*N*/ {
/*N*/ SdrObjConnection& rCon=GetConnection(bTail1);
/*N*/ if (rCon.pObj!=NULL) {
@@ -597,7 +597,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ SdrObject* SdrEdgeObj::GetConnectedNode(FASTBOOL bTail1) const
+/*N*/ SdrObject* SdrEdgeObj::GetConnectedNode(bool bTail1) const
/*N*/ {
/*N*/ SdrObject* pObj=GetConnection(bTail1).pObj;
/*N*/ if (pObj!=NULL && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=NULL;
@@ -605,7 +605,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt)
+/*N*/ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
/*N*/ {
/*N*/ USHORT nPtAnz=pEdgeTrack->GetPointCount();
/*N*/ if (nPtAnz==0) {
@@ -643,11 +643,11 @@ namespace binfilter {
/*N*/ long dyo=rPt.Y()-aR.Top();
/*N*/ long dxr=aR.Right()-rPt.X();
/*N*/ long dyu=aR.Bottom()-rPt.Y();
-/*N*/ FASTBOOL bxMitt=Abs(dxl-dxr)<2;
-/*N*/ FASTBOOL byMitt=Abs(dyo-dyu)<2;
+/*N*/ bool bxMitt=Abs(dxl-dxr)<2;
+/*N*/ bool byMitt=Abs(dyo-dyu)<2;
/*N*/ long dx=Min(dxl,dxr);
/*N*/ long dy=Min(dyo,dyu);
-/*N*/ FASTBOOL bDiag=Abs(dx-dy)<2;
+/*N*/ bool bDiag=Abs(dx-dy)<2;
/*N*/ if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte
/*N*/ if (bDiag) { // diagonal
/*?*/ USHORT nRet=0;
@@ -678,12 +678,12 @@ namespace binfilter {
/*N*/ {
/*N*/ XPolygon aXP;
/*N*/ aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL);
-/*N*/ FASTBOOL bRts=nEscAngle==0;
-/*N*/ FASTBOOL bObn=nEscAngle==9000;
-/*N*/ FASTBOOL bLks=nEscAngle==18000;
-/*N*/ FASTBOOL bUnt=nEscAngle==27000;
-/*N*/ FASTBOOL bHor=bLks || bRts;
-/*N*/ FASTBOOL bVer=bObn || bUnt;
+/*N*/ bool bRts=nEscAngle==0;
+/*N*/ bool bObn=nEscAngle==9000;
+/*N*/ bool bLks=nEscAngle==18000;
+/*N*/ bool bUnt=nEscAngle==27000;
+/*N*/ bool bHor=bLks || bRts;
+/*N*/ bool bVer=bObn || bUnt;
/*N*/
/*N*/ Point aP1(rStPt); // erstmal den Pflichtabstand
/*N*/ if (bLks) aP1.X()=rRect.Left();
@@ -691,7 +691,7 @@ namespace binfilter {
/*N*/ if (bObn) aP1.Y()=rRect.Top();
/*N*/ if (bUnt) aP1.Y()=rRect.Bottom();
/*N*/
-/*N*/ FASTBOOL bFinish=FALSE;
+/*N*/ bool bFinish=FALSE;
/*N*/ if (!bFinish) {
/*N*/ Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern
/*N*/ if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X();
@@ -759,8 +759,8 @@ namespace binfilter {
/*?*/ aPt2=aOutRect.BottomRight();
/*?*/ }
/*N*/ }
-/*N*/ FASTBOOL bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted();
-/*N*/ FASTBOOL bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted();
+/*N*/ bool bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted();
+/*N*/ bool bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted();
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/
/*N*/ if (bCon1) {
@@ -808,8 +808,8 @@ namespace binfilter {
/*N*/ XPolygon aBestXP;
/*N*/ ULONG nBestQual=0xFFFFFFFF;
/*N*/ SdrEdgeInfoRec aBestInfo;
-/*N*/ FASTBOOL bAuto1=bCon1 && rCon1.bBestVertex;
-/*N*/ FASTBOOL bAuto2=bCon2 && rCon2.bBestVertex;
+/*N*/ bool bAuto1=bCon1 && rCon1.bBestVertex;
+/*N*/ bool bAuto2=bCon2 && rCon2.bBestVertex;
/*N*/ if (bAuto1) rCon1.bAutoVertex=TRUE;
/*N*/ if (bAuto2) rCon2.bAutoVertex=TRUE;
/*N*/ USHORT nBestAuto1=0;
@@ -862,19 +862,19 @@ namespace binfilter {
/*N*/ ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const
/*N*/ {
/*N*/ SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetItem(SDRATTR_EDGEKIND))).GetValue();
-/*N*/ FASTBOOL bRts1=nAngle1==0;
-/*N*/ FASTBOOL bObn1=nAngle1==9000;
-/*N*/ FASTBOOL bLks1=nAngle1==18000;
-/*N*/ FASTBOOL bUnt1=nAngle1==27000;
-/*N*/ FASTBOOL bHor1=bLks1 || bRts1;
-/*N*/ FASTBOOL bVer1=bObn1 || bUnt1;
-/*N*/ FASTBOOL bRts2=nAngle2==0;
-/*N*/ FASTBOOL bObn2=nAngle2==9000;
-/*N*/ FASTBOOL bLks2=nAngle2==18000;
-/*N*/ FASTBOOL bUnt2=nAngle2==27000;
-/*N*/ FASTBOOL bHor2=bLks2 || bRts2;
-/*N*/ FASTBOOL bVer2=bObn2 || bUnt2;
-/*N*/ FASTBOOL bInfo=pInfo!=NULL;
+/*N*/ bool bRts1=nAngle1==0;
+/*N*/ bool bObn1=nAngle1==9000;
+/*N*/ bool bLks1=nAngle1==18000;
+/*N*/ bool bUnt1=nAngle1==27000;
+/*N*/ bool bHor1=bLks1 || bRts1;
+/*N*/ bool bVer1=bObn1 || bUnt1;
+/*N*/ bool bRts2=nAngle2==0;
+/*N*/ bool bObn2=nAngle2==9000;
+/*N*/ bool bLks2=nAngle2==18000;
+/*N*/ bool bUnt2=nAngle2==27000;
+/*N*/ bool bHor2=bLks2 || bRts2;
+/*N*/ bool bVer2=bObn2 || bUnt2;
+/*N*/ bool bInfo=pInfo!=NULL;
/*N*/ if (bInfo) {
/*N*/ pInfo->cOrthoForm=0;
/*N*/ pInfo->nAngle1=nAngle1;
@@ -890,8 +890,8 @@ namespace binfilter {
/*N*/ Rectangle aBewareRect1(rBewareRect1);
/*N*/ Rectangle aBewareRect2(rBewareRect2);
/*N*/ Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2);
-/*N*/ FASTBOOL bMeetingXMid=TRUE;
-/*N*/ FASTBOOL bMeetingYMid=TRUE;
+/*N*/ bool bMeetingXMid=TRUE;
+/*N*/ bool bMeetingYMid=TRUE;
/*N*/ if (eKind==SDREDGE_ONELINE) {
/*?*/ XPolygon aXP(2);
/*?*/ aXP[0]=rPt1;
@@ -939,7 +939,7 @@ namespace binfilter {
/*?*/ return aXP;
/*N*/ }
/*N*/ USHORT nIntersections=0;
-/*N*/ FASTBOOL bForceMeeting=FALSE; // Muss die Linie durch den MeetingPoint laufen?
+/*N*/ bool bForceMeeting=FALSE; // Muss die Linie durch den MeetingPoint laufen?
/*N*/ {
/*N*/ Point aC1(aBewareRect1.Center());
/*N*/ Point aC2(aBewareRect2.Center());
@@ -977,9 +977,9 @@ namespace binfilter {
/*N*/ long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right());
/*N*/ long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top());
/*N*/ long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
-/*N*/ FASTBOOL bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
+/*N*/ bool bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
/*N*/ aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom();
-/*N*/ FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
+/*N*/ bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
/*N*/ aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
/*N*/ unsigned nMainCase=3;
/*N*/ if (nAngle1==nAngle2) nMainCase=1;
@@ -988,10 +988,10 @@ namespace binfilter {
/*N*/ if (bVer1) aMeeting.X()=(aPt1.X()+aPt2.X()+1)/2; // ist hier besser, als der
/*N*/ if (bHor1) aMeeting.Y()=(aPt1.Y()+aPt2.Y()+1)/2; // Mittelpunkt des Freiraums
/*N*/ // bX1Ok bedeutet, dass die Vertikale, die aus Obj1 austritt, keinen Konflikt mit Obj2 bildet, ...
-/*N*/ FASTBOOL bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right();
-/*N*/ FASTBOOL bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right();
-/*N*/ FASTBOOL bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom();
-/*N*/ FASTBOOL bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
+/*N*/ bool bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right();
+/*N*/ bool bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right();
+/*N*/ bool bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom();
+/*N*/ bool bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
/*N*/ if (bLks1 && (bY1Ok || aBewareRect1.Left()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) {
/*N*/ aMeeting.X()=nXMin;
/*N*/ bMeetingXMid=FALSE;
@@ -1050,8 +1050,8 @@ namespace binfilter {
/*N*/ // Ueberschneidung der BewareRects ohne Ueberschneidung der
/*N*/ // Boundrects wenn die Linienaustritte sonst das BewareRect
/*N*/ // des jeweils anderen Objekts verletzen wuerden.
-/*N*/ FASTBOOL bCase29Direct=FALSE;
-/*N*/ FASTBOOL bCase29=aBewR1.Right()>aBewR2.Left();
+/*N*/ bool bCase29Direct=FALSE;
+/*N*/ bool bCase29=aBewR1.Right()>aBewR2.Left();
/*N*/ 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())) {
@@ -1059,7 +1059,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ if (!bCase29Direct) {
-/*N*/ FASTBOOL bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
+/*N*/ bool bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
/*N*/ if (bObenLang) {
/*N*/ aMeeting.Y()=nYMin;
/*N*/ } else {
@@ -1110,8 +1110,8 @@ namespace binfilter {
/*N*/ // Ueberschneidung der BewareRects ohne Ueberschneidung der
/*N*/ // Boundrects wenn die Linienaustritte sonst das BewareRect
/*N*/ // des jeweils anderen Objekts verletzen wuerden.
-/*N*/ FASTBOOL bCase29Direct=FALSE;
-/*N*/ FASTBOOL bCase29=aBewR1.Bottom()>aBewR2.Top();
+/*N*/ bool bCase29Direct=FALSE;
+/*N*/ bool bCase29=aBewR1.Bottom()>aBewR2.Top();
/*N*/ if (aBndR1.Bottom()<=aBndR2.Top()) { // Fall 2.9 und keine Boundrectueberschneidung
/*N*/ if ((aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right()) ||
/*N*/ (aPt2.X()>aBewareRect1.Left() && aPt2.X()<aBewareRect1.Right())) {
@@ -1119,7 +1119,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ if (!bCase29Direct) {
-/*N*/ FASTBOOL bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
+/*N*/ bool bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
/*N*/ if (bLinksLang) {
/*N*/ aMeeting.X()=nXMin;
/*N*/ } else {
@@ -1246,9 +1246,9 @@ namespace binfilter {
/*N*/ }
/*N*/ Point aEP1(aXP1[nXP1Anz-1]);
/*N*/ Point aEP2(aXP2[nXP2Anz-1]);
-/*N*/ FASTBOOL bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
-/*N*/ FASTBOOL bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
-/*N*/ FASTBOOL bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
+/*N*/ bool bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
+/*N*/ bool bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
+/*N*/ bool bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
/*N*/ if (aEP1==aEP2 && (bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X())) {
/*N*/ // Sonderbehandlung fuer 'I'-Verbinder
/*N*/ nXP1Anz--; aXP1.Remove(nXP1Anz,1);
@@ -1334,7 +1334,7 @@ namespace binfilter {
/*N*/ if (pnQuality!=NULL) {
/*N*/ ULONG nQual=0;
/*N*/ ULONG nQual0=nQual; // Ueberlaeufe vorbeugen
-/*N*/ FASTBOOL bOverflow=FALSE;
+/*N*/ bool bOverflow=FALSE;
/*N*/ Point aPt0(aXP1[0]);
/*N*/ for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
/*N*/ Point aPt1(aXP1[nPntNum]);
@@ -1384,9 +1384,9 @@ namespace binfilter {
/*N*/
/*N*/ for (USHORT i=0; i<nPntAnz; i++) {
/*N*/ Point aPt1(aXP1[i]);
-/*N*/ FASTBOOL b1=aPt1.X()>aBewareRect1.Left() && aPt1.X()<aBewareRect1.Right() &&
+/*N*/ bool b1=aPt1.X()>aBewareRect1.Left() && aPt1.X()<aBewareRect1.Right() &&
/*N*/ aPt1.Y()>aBewareRect1.Top() && aPt1.Y()<aBewareRect1.Bottom();
-/*N*/ FASTBOOL b2=aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right() &&
+/*N*/ bool b2=aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right() &&
/*N*/ aPt1.Y()>aBewareRect2.Top() && aPt1.Y()<aBewareRect2.Bottom();
/*N*/ USHORT nInt0=nIntersections;
/*N*/ if (i==0 || i==nPntAnz-1) {
@@ -1584,10 +1584,10 @@ je Objekt variiert von 0-3:
/*N*/ {
/*N*/ SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
/*N*/ ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
-/*N*/ FASTBOOL bDataChg=nId==SFX_HINT_DATACHANGED;
-/*N*/ FASTBOOL bDying=nId==SFX_HINT_DYING;
-/*N*/ FASTBOOL bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
-/*N*/ FASTBOOL bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
+/*N*/ bool bDataChg=nId==SFX_HINT_DATACHANGED;
+/*N*/ bool bDying=nId==SFX_HINT_DYING;
+/*N*/ bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
+/*N*/ bool bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
/*N*/ if (bDying && (bObj1 || bObj2)) {
/*N*/ // #35605# Dying vorher abfangen, damit AttrObj nicht
/*N*/ // wg. vermeintlicher Vorlagenaenderung rumbroadcastet
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
index 8719c23..9e7050f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdograf.cxx
@@ -454,7 +454,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ void SdrGrafObj::ImpPaintReplacement(OutputDevice* pOutDev, const XubString& rText, const Bitmap* pBmp, FASTBOOL bFill) const
+/*N*/ void SdrGrafObj::ImpPaintReplacement(OutputDevice* pOutDev, const XubString& rText, const Bitmap* pBmp, bool bFill) const
/*N*/ {
/*N*/ Size aPixelSize( 1, 1 );
/*N*/ Size aBmpSize;
@@ -577,8 +577,8 @@ namespace binfilter {
/*N*/ Color a3DShadowColor( rStyleSettings.GetShadowColor() );
/*N*/ long nHWink=NormAngle360( aGeo.nDrehWink );
/*N*/ long nVWink=NormAngle360( aGeo.nDrehWink-aGeo.nShearWink );
-/*N*/ FASTBOOL bHorzChg=nHWink>13500 && nHWink<=31500;
-/*N*/ FASTBOOL bVertChg=nVWink>4500 && nVWink<=22500;
+/*N*/ bool bHorzChg=nHWink>13500 && nHWink<=31500;
+/*N*/ bool bVertChg=nVWink>4500 && nVWink<=22500;
/*N*/
/*N*/ pOutDev->SetLineColor( bHorzChg ? a3DShadowColor : a3DLightColor);
/*N*/ pOutDev->DrawLine( aPoly2[0], aPoly2[1] );
@@ -673,7 +673,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ FASTBOOL SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec ) const
+/*N*/ bool SdrGrafObj::Paint( ExtOutputDevice& rOut, const SdrPaintInfoRec& rInfoRec ) const
/*N*/ {
/*N*/ // Hidden objects on masterpages, draw nothing
/*N*/ if( ( ( rInfoRec.nPaintMode & SDRPAINTMODE_MASTERPAGE ) && bNotVisibleAsMaster ) ||
@@ -682,12 +682,12 @@ namespace binfilter {
/*?*/ return TRUE;
/*N*/ }
/*N*/
-/*N*/ FASTBOOL bDraft = ( 0 != ( rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTGRAF ) );
-/*N*/ FASTBOOL bSwappedOut = pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE );
-/*N*/ FASTBOOL bLoading = FALSE;
+/*N*/ bool bDraft = ( 0 != ( rInfoRec.nPaintMode & SDRPAINTMODE_DRAFTGRAF ) );
+/*N*/ bool bSwappedOut = pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE );
+/*N*/ bool bLoading = FALSE;
/*N*/ OutputDevice* pOutDev = rOut.GetOutDev();
/*N*/ GDIMetaFile* pRecMetaFile = pOutDev->GetConnectMetaFile();
-/*N*/ FASTBOOL bMtfRecording = ( pRecMetaFile && pRecMetaFile->IsRecord() && !pRecMetaFile->IsPause() );
+/*N*/ bool bMtfRecording = ( pRecMetaFile && pRecMetaFile->IsRecord() && !pRecMetaFile->IsPause() );
/*N*/ const SdrView* pView = ( rInfoRec.pPV ? &rInfoRec.pPV->GetView() : NULL );
/*N*/
/*N*/ if( bSwappedOut && !bDraft )
@@ -698,12 +698,12 @@ namespace binfilter {
/*?*/ bDraft=TRUE;
/*N*/
/*N*/ long nDrehWink = aGeo.nDrehWink, nShearWink = aGeo.nShearWink;
-/*N*/ FASTBOOL bRotate = ( nDrehWink != 0 && nDrehWink != 18000 );
-/*N*/ FASTBOOL bShear = ( nShearWink != 0 );
-/*N*/ FASTBOOL bRota180 = nDrehWink == 18000;
+/*N*/ bool bRotate = ( nDrehWink != 0 && nDrehWink != 18000 );
+/*N*/ bool bShear = ( nShearWink != 0 );
+/*N*/ bool bRota180 = nDrehWink == 18000;
/*N*/ USHORT nMirrorCase = ( bRota180 ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ) ); // 4 | 3 H&V gespiegelt | nur Vertikal
-/*N*/ FASTBOOL bHMirr = ( ( 2 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // ---+--- ---------------+-----------------
-/*N*/ FASTBOOL bVMirr = ( ( 3 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // 2 | 1 nur Horizontal | nicht gespiegelt
+/*N*/ bool bHMirr = ( ( 2 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // ---+--- ---------------+-----------------
+/*N*/ bool bVMirr = ( ( 3 == nMirrorCase ) || ( 4 == nMirrorCase ) ); // 2 | 1 nur Horizontal | nicht gespiegelt
/*N*/
/*N*/ if( !bEmptyPresObj && !bDraft )
/*N*/ {
@@ -727,7 +727,7 @@ namespace binfilter {
/*?*/ if( pGraphic->IsAnimated() )
/*?*/ {
/*?*/ SdrAnimationMode eAnimMode = SDR_ANIMATION_ANIMATE;
-/*?*/ FASTBOOL bEnable = TRUE;
+/*?*/ bool bEnable = TRUE;
/*?*/
/*?*/ if( pView )
/*?*/ {
@@ -794,7 +794,7 @@ namespace binfilter {
/*N*/ {
/*N*/ XubString aText;
/*N*/ Bitmap* pBmp = NULL;
-/*N*/ FASTBOOL bFill = FALSE;
+/*N*/ bool bFill = FALSE;
/*N*/
/*N*/ if( bEmptyPresObj )
/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 bFill = !ImpPaintEmptyPres( pOutDev );
@@ -811,7 +811,7 @@ namespace binfilter {
/*N*/ if( bLoading )
/*N*/ {
/*?*/ aText.AppendAscii(" ...");
-/*?*/ //FASTBOOL bNoName=aText.Len()==0;
+/*?*/ //bool bNoName=aText.Len()==0;
/*?*/ //if (!bNoName) aText.Insert(' ',0);
/*?*/ //else aText.Insert("...",0);
/*?*/ //aText.Insert("Loading",0);
@@ -886,8 +886,8 @@ namespace binfilter {
/*N*/ {
/*N*/ SdrRectObj::NbcResize( rRef, xFact, yFact );
/*N*/
-/*N*/ FASTBOOL bMirrX = xFact.GetNumerator() < 0;
-/*N*/ FASTBOOL bMirrY = yFact.GetNumerator() < 0;
+/*N*/ bool bMirrX = xFact.GetNumerator() < 0;
+/*N*/ bool bMirrY = yFact.GetNumerator() < 0;
/*N*/
/*N*/ if( bMirrX != bMirrY )
/*?*/ bMirrored = !bMirrored;
@@ -917,7 +917,7 @@ namespace binfilter {
/*N*/ void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect)
/*N*/ {
-/*N*/ FASTBOOL bChg=rRect.GetSize()!=aRect.GetSize();
+/*N*/ bool bChg=rRect.GetSize()!=aRect.GetSize();
/*N*/ SdrRectObj::NbcSetLogicRect(rRect);
/*N*/ }
@@ -944,8 +944,8 @@ namespace binfilter {
/*N*/ void SdrGrafObj::SetPage( SdrPage* pNewPage )
/*N*/ {
-/*N*/ FASTBOOL bRemove = pNewPage == NULL && pPage != NULL;
-/*N*/ FASTBOOL bInsert = pNewPage != NULL && pPage == NULL;
+/*N*/ bool bRemove = pNewPage == NULL && pPage != NULL;
+/*N*/ bool bInsert = pNewPage != NULL && pPage == NULL;
/*N*/
/*N*/ if( bRemove )
/*N*/ {
@@ -967,7 +967,7 @@ namespace binfilter {
/*N*/ void SdrGrafObj::SetModel( SdrModel* pNewModel )
/*N*/ {
-/*N*/ FASTBOOL bChg = pNewModel != pModel;
+/*N*/ bool bChg = pNewModel != pModel;
/*N*/
/*N*/ if( bChg )
/*N*/ {
@@ -1179,7 +1179,7 @@ namespace binfilter {
/*N*/ SdrRectObj::ReadData( rHead, rIn );
/*N*/
/*N*/ SdrDownCompat aCompat( rIn, STREAM_READ );
-/*N*/ FASTBOOL bDelayedLoad = ( pModel != NULL ) && pModel->IsSwapGraphics();
+/*N*/ bool bDelayedLoad = ( pModel != NULL ) && pModel->IsSwapGraphics();
/*N*/
/*N*/ #ifdef DBG_UTIL
/*N*/ aCompat.SetID("SdrGrafObj");
@@ -1355,7 +1355,7 @@ namespace binfilter {
// -----------------------------------------------------------------------------
-/*N*/ void SdrGrafObj::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr )
+/*N*/ void SdrGrafObj::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr )
/*N*/ {
/*N*/ SetXPolyDirty();
/*N*/ SdrRectObj::NbcSetStyleSheet( pNewStyleSheet, bDontRemoveHardAttr );
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index 732c7b4..c177863 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -332,7 +332,7 @@ namespace binfilter {
/*N*/ SdrLayerID SdrObjGroup::GetLayer() const
/*N*/ {
-/*N*/ FASTBOOL b1st=TRUE;
+/*N*/ bool b1st=TRUE;
/*N*/ SdrLayerID nLay=SdrLayerID(nLayerId);
/*N*/ SdrObjList* pOL=pSub;
/*N*/ ULONG nObjAnz=pOL->GetObjCount();
@@ -365,9 +365,9 @@ namespace binfilter {
/*N*/ void SdrObjGroup::SetPage(SdrPage* pNewPage)
/*N*/ {
-/*N*/ FASTBOOL bLinked=IsLinkedGroup();
-/*N*/ FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
-/*N*/ FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
+/*N*/ bool bLinked=IsLinkedGroup();
+/*N*/ bool bRemove=pNewPage==NULL && pPage!=NULL;
+/*N*/ bool bInsert=pNewPage!=NULL && pPage==NULL;
/*N*/
/*N*/ if (bLinked && bRemove) {
/*?*/ ImpLinkAbmeldung();
@@ -384,8 +384,8 @@ namespace binfilter {
/*N*/ void SdrObjGroup::SetModel(SdrModel* pNewModel)
/*N*/ {
-/*N*/ FASTBOOL bLinked=IsLinkedGroup();
-/*N*/ FASTBOOL bChg=pNewModel!=pModel;
+/*N*/ bool bLinked=IsLinkedGroup();
+/*N*/ bool bChg=pNewModel!=pModel;
/*N*/ if (bLinked && bChg) {
/*N*/ ImpLinkAbmeldung();
/*N*/ }
@@ -445,9 +445,9 @@ namespace binfilter {
/*N*/ }
-/*N*/ FASTBOOL SdrObjGroup::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
+/*N*/ bool SdrObjGroup::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
/*N*/ {
-/*N*/ FASTBOOL bOk=TRUE;
+/*N*/ bool bOk=TRUE;
/*N*/ if (pSub->GetObjCount()!=0) {
/*N*/ bOk=pSub->Paint(rXOut,rInfoRec);
/*N*/ } else { // ansonsten ist es eine leere Gruppe
@@ -509,7 +509,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrObjGroup::TakeXorPoly(XPolyPolygon& rPoly, FASTBOOL bDetail) const
+/*N*/ void SdrObjGroup::TakeXorPoly(XPolyPolygon& rPoly, bool bDetail) const
/*N*/ {
/*N*/ rPoly.Clear();
/*N*/ ULONG nAnz=pSub->GetObjCount();
@@ -538,7 +538,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ long SdrObjGroup::GetShearAngle(FASTBOOL bVertical) const
+/*N*/ long SdrObjGroup::GetShearAngle(bool bVertical) const
/*N*/ {
/*N*/ return nShearWink;
/*N*/ }
@@ -586,8 +586,8 @@ namespace binfilter {
/*N*/ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
/*N*/ {
-/*N*/ FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/ FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+/*N*/ bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+/*N*/ bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
/*N*/ if (bXMirr || bYMirr) {
/*N*/ Point aRef1(GetSnapRect().Center());
/*N*/ if (bXMirr) {
@@ -696,8 +696,8 @@ namespace binfilter {
/*N*/ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
/*N*/ {
/*N*/ if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
-/*N*/ FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
-/*N*/ FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+/*N*/ bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+/*N*/ bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
/*N*/ if (bXMirr || bYMirr) {
/*N*/ Point aRef1(GetSnapRect().Center());
/*N*/ if (bXMirr) {
@@ -748,7 +748,7 @@ namespace binfilter {
/*N*/ void SdrObjGroup::SetAnchorPos(const Point& rPnt)
/*N*/ {
/*N*/ Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetBoundRect();
-/*N*/ FASTBOOL bChg=aAnchor!=rPnt;
+/*N*/ bool bChg=aAnchor!=rPnt;
/*N*/ aAnchor=rPnt;
/*N*/ Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
/*N*/ MovePoint(aRefPoint,aSiz);
@@ -905,7 +905,7 @@ namespace binfilter {
/*N*/ // verschachteltes Gruppenobjekt wegen DontCare NULL liefert.
/*N*/ // Das koennte ich dann nicht unterscheiden von NotSet.
/*N*/ SfxStyleSheet* pRet=NULL;
-/*N*/ FASTBOOL b1st=TRUE;
+/*N*/ bool b1st=TRUE;
/*N*/ SdrObjListIter aIter(*this,IM_DEEPNOGROUPS);
/*N*/ while (aIter.IsMore()) {
/*N*/ SdrObject* pObj=aIter.Next();
@@ -921,7 +921,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrObjGroup::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrObjGroup::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ if (!IsLinkedGroup()) {
/*N*/ SdrObjList* pOL=pSub;
@@ -933,7 +933,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void SdrObjGroup::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrObjGroup::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ if (!IsLinkedGroup()) {
/*N*/ SdrObjList* pOL=pSub;
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
index 1ba74b2..0d10776 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdomeas.cxx
@@ -287,17 +287,17 @@ namespace binfilter {
/*N*/ long nHelplineDist;
/*N*/ long nHelpline1Len;
/*N*/ long nHelpline2Len;
-/*N*/ FASTBOOL bBelowRefEdge;
-/*N*/ FASTBOOL bTextRota90;
-/*N*/ FASTBOOL bTextUpsideDown;
+/*N*/ bool bBelowRefEdge;
+/*N*/ bool bTextRota90;
+/*N*/ bool bTextUpsideDown;
/*N*/ long nMeasureOverhang;
/*N*/ FieldUnit eMeasureUnit;
/*N*/ Fraction aMeasureScale;
-/*N*/ FASTBOOL bShowUnit;
+/*N*/ bool bShowUnit;
/*N*/ String aFormatString;
-/*N*/ FASTBOOL bTextAutoAngle;
+/*N*/ bool bTextAutoAngle;
/*N*/ long nTextAutoAngleView;
-/*N*/ FASTBOOL bTextIsFixedAngle;
+/*N*/ bool bTextIsFixedAngle;
/*N*/ long nTextFixedAngle;
/*N*/ };
/*N*/
@@ -333,11 +333,11 @@ namespace binfilter {
/*N*/ long nArrow1Wdt; // Breite des 1. Pfeils
/*N*/ long nArrow2Wdt; // Breite des 2. Pfeils
/*N*/ long nShortLineLen; // Linienlaenge, wenn PfeileAussen
-/*N*/ FASTBOOL bArrow1Center; // Pfeil 1 zentriert?
-/*N*/ FASTBOOL bArrow2Center; // Pfeil 2 zentriert?
-/*N*/ FASTBOOL bAutoUpsideDown; // UpsideDown durch Automatik
-/*N*/ FASTBOOL bPfeileAussen;
-/*N*/ FASTBOOL bBreakedLine;
+/*N*/ bool bArrow1Center; // Pfeil 1 zentriert?
+/*N*/ bool bArrow2Center; // Pfeil 2 zentriert?
+/*N*/ bool bAutoUpsideDown; // UpsideDown durch Automatik
+/*N*/ bool bPfeileAussen;
+/*N*/ bool bBreakedLine;
/*N*/ };
/*N*/ void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const
@@ -378,15 +378,15 @@ namespace binfilter {
/*N*/ rPol.nLineLen=GetLen(aDelt);
/*N*/
/*N*/ rPol.nLineWdt2=0;
-/*N*/ long nArrow1Len=0; FASTBOOL bArrow1Center=FALSE;
-/*N*/ long nArrow2Len=0; FASTBOOL bArrow2Center=FALSE;
+/*N*/ long nArrow1Len=0; bool bArrow1Center=FALSE;
+/*N*/ long nArrow2Len=0; bool bArrow2Center=FALSE;
/*N*/ long nArrow1Wdt=0;
/*N*/ long nArrow2Wdt=0;
/*N*/ rPol.nArrow1Wdt=0;
/*N*/ rPol.nArrow2Wdt=0;
/*N*/ long nArrowNeed=0;
/*N*/ long nShortLen=0;
-/*N*/ FASTBOOL bPfeileAussen=FALSE;
+/*N*/ bool bPfeileAussen=FALSE;
/*N*/
/*N*/ const SfxItemSet& rSet = GetItemSet();
/*N*/ sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke
@@ -416,13 +416,13 @@ namespace binfilter {
/*N*/ rPol.eUsedTextHPos=rRec.eWantTextHPos;
/*N*/ rPol.eUsedTextVPos=rRec.eWantTextVPos;
/*N*/ if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE;
-/*N*/ FASTBOOL bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
+/*N*/ bool bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
/*N*/ if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED) {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) {
/*N*/ }
/*N*/ rPol.bBreakedLine=bBrkLine;
/*N*/ if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben
-/*N*/ FASTBOOL bOutside=FALSE;
+/*N*/ bool bOutside=FALSE;
/*N*/ long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height();
/*N*/ if (nNeedSiz>rPol.nLineLen) bOutside=TRUE; // Text passt nicht in die Mitte
/*N*/ if (bBrkLine) {
@@ -562,8 +562,8 @@ namespace binfilter {
/*N*/ }
-/*N*/ FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
-/*N*/ FASTBOOL bEdit,
+/*N*/ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+/*N*/ bool bEdit,
/*N*/ Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const
/*N*/ {
/*N*/ const SvxFieldData* pField=rField.GetField();
@@ -642,9 +642,9 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ Point aTextPos;
-/*N*/ FASTBOOL bRota90=aRec.bTextRota90;
-/*N*/ FASTBOOL bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown;
-/*N*/ FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge;
+/*N*/ bool bRota90=aRec.bTextRota90;
+/*N*/ bool bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown;
+/*N*/ bool bBelowRefEdge=aRec.bBelowRefEdge;
/*N*/ SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos;
/*N*/ SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
/*N*/ if (!bRota90) {
@@ -825,7 +825,7 @@ namespace binfilter {
-/*N*/ FASTBOOL SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
+/*N*/ bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
/*N*/ {DBG_BF_ASSERT(0, "STRIP");return FALSE; //STRIP001
/*N*/ }
@@ -852,7 +852,7 @@ namespace binfilter {
/*N*/ if (pOutlinerParaObject==NULL) SetTextDirty(); // Text neu berechnen!
/*N*/ }
-/*N*/ void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
+/*N*/ void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText,
/*N*/ Rectangle* pAnchorRect, BOOL bLineWidth ) const
/*N*/ {
/*N*/ if (bTextDirty) UndirtyText();
@@ -886,7 +886,7 @@ namespace binfilter {
/*N*/ SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
/*N*/ }
-/*N*/ void SdrMeasureObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, FASTBOOL bDontRemoveHardAttr)
+/*N*/ void SdrMeasureObj::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
/*N*/ {
/*N*/ SetTextDirty();
/*N*/ SdrTextObj::NbcSetStyleSheet(pNewStyleSheet,bDontRemoveHardAttr);
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
index dc40cbf..be5a77f 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdoole2.cxx
@@ -101,7 +101,7 @@ SO2_DECL_REF(SvInPlaceObject)
/*N*/ TYPEINIT1(SdrOle2Obj,SdrRectObj);
/*N*/
-/*N*/ SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_)
+/*N*/ SdrOle2Obj::SdrOle2Obj(bool bFrame_)
/*N*/ {
/*N*/ bInDestruction = FALSE;
/*N*/ Init();
@@ -112,7 +112,7 @@ SO2_DECL_REF(SvInPlaceObject)
// -----------------------------------------------------------------------------
-/*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_):
+/*N*/ SdrOle2Obj::SdrOle2Obj(const SvInPlaceObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_):
/*N*/ SdrRectObj(rNewRect)
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ }
@@ -202,7 +202,7 @@ SO2_DECL_REF(SvInPlaceObject)
// -----------------------------------------------------------------------------
-/*N*/ FASTBOOL SdrOle2Obj::IsEmpty() const
+/*N*/ bool SdrOle2Obj::IsEmpty() const
/*N*/ {
/*N*/ return !ppObjRef->Is();
/*N*/ }
@@ -330,7 +330,7 @@ SO2_DECL_REF(SvInPlaceObject)
/*N*/ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
/*N*/ {
-/*N*/ FASTBOOL bChg = pNewModel!=pModel;
+/*N*/ bool bChg = pNewModel!=pModel;
/*N*/
/*N*/ if( bChg )
/*N*/ Disconnect(); // mit dem alten Namen
@@ -356,8 +356,8 @@ SO2_DECL_REF(SvInPlaceObject)
/*N*/ void SdrOle2Obj::SetPage(SdrPage* pNewPage)
/*N*/ {
-/*N*/ FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
-/*N*/ FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
+/*N*/ bool bRemove=pNewPage==NULL && pPage!=NULL;
+/*N*/ bool bInsert=pNewPage!=NULL && pPage==NULL;
/*N*/
/*N*/ if (bRemove) Disconnect();
/*N*/
@@ -573,7 +573,7 @@ SO2_DECL_REF(SvInPlaceObject)
// -----------------------------------------------------------------------------
-/*N*/ FASTBOOL SdrOle2Obj::HasGDIMetaFile() const
+/*N*/ bool SdrOle2Obj::HasGDIMetaFile() const
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
index 5cd05ae..dab4ce8 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
@@ -109,12 +109,12 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ }
-/*N*/ FASTBOOL SdrPathObj::FindPolyPnt(USHORT nAbsPnt, USHORT& rPolyNum,
-/*N*/ USHORT& rPointNum, FASTBOOL bAllPoints) const
+/*N*/ bool SdrPathObj::FindPolyPnt(USHORT nAbsPnt, USHORT& rPolyNum,
+/*N*/ USHORT& rPointNum, bool bAllPoints) const
/*N*/ {
/*N*/ USHORT nPolyCnt=aPathPolygon.Count();
/*N*/ USHORT nPoly=0;
-/*N*/ FASTBOOL bClosed=IsClosed();
+/*N*/ bool bClosed=IsClosed();
/*N*/ nAbsPnt+=1;
/*N*/
/*N*/ while (nPoly<nPolyCnt) {
@@ -163,8 +163,8 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/
/*N*/ USHORT nPolyAnz=aPathPolygon.Count();
/*N*/ USHORT nPoly1PointAnz=nPolyAnz==0 ? 0 : aPathPolygon[0].GetPointCount();
-/*N*/ FASTBOOL bHasCtrl=FALSE;
-/*N*/ FASTBOOL bHasLine=FALSE; // gemischt wird jedoch z.Zt. nicht in eKind festgehalten
+/*N*/ bool bHasCtrl=FALSE;
+/*N*/ bool bHasLine=FALSE; // gemischt wird jedoch z.Zt. nicht in eKind festgehalten
/*N*/ for (USHORT nPolyNum=0; nPolyNum<nPolyAnz && (!bHasCtrl || !bHasLine); nPolyNum++) {
/*N*/ const XPolygon& rPoly=aPathPolygon[nPolyNum];
/*N*/ USHORT nPointAnz=rPoly.GetPointCount();
@@ -249,7 +249,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ ImpAddTextToBoundRect();
/*N*/ }
-/*N*/ FASTBOOL SdrPathObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
+/*N*/ bool SdrPathObj::Paint(ExtOutputDevice& rXOut, const SdrPaintInfoRec& rInfoRec) const
/*N*/ {
/*N*/ // Hidden objects on masterpages, draw nothing
/*N*/ if((rInfoRec.nPaintMode & SDRPAINTMODE_MASTERPAGE) && bNotVisibleAsMaster)
@@ -332,7 +332,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ FASTBOOL bOk=TRUE;
+/*N*/ bool bOk=TRUE;
/*N*/ if (HasText()) {
/*?*/ bOk=SdrTextObj::Paint(rXOut,rInfoRec);
/*N*/ }
@@ -347,7 +347,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ {
/*N*/ if (pVisiLayer!=NULL && !pVisiLayer->IsSet(nLayerId)) return NULL;
/*N*/ INT32 nMyTol=nTol;
-/*N*/ FASTBOOL bFilled=IsClosed() && (bTextFrame || HasFill());
+/*N*/ bool bFilled=IsClosed() && (bTextFrame || HasFill());
/*N*/
/*N*/ INT32 nWdt=ImpGetLineWdt()/2; // Halbe Strichstaerke
/*N*/ if (nWdt>nMyTol) nMyTol=nWdt; // Bei dicker Linie keine Toleranz noetig
@@ -357,7 +357,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*N*/ aR.Top() -=nMyTol;
/*N*/ aR.Bottom()+=nMyTol;
/*N*/
-/*N*/ FASTBOOL bHit=FALSE;
+/*N*/ bool bHit=FALSE;
/*N*/ unsigned nPolyAnz=aPathPolygon.Count();
/*N*/ if (bFilled) {
/*N*/ PolyPolygon aPP;
@@ -386,7 +386,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-/*N*/ void SdrPathObj::TakeXorPoly(XPolyPolygon& rXPolyPoly, FASTBOOL bDetail) const
+/*N*/ void SdrPathObj::TakeXorPoly(XPolyPolygon& rXPolyPoly, bool bDetail) const
/*N*/ {
/*N*/ rXPolyPoly=aPathPolygon;
/*N*/ }
@@ -404,7 +404,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
-/*?*/ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
+/*?*/ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed)
/*?*/ {
/*?*/ if (nPnt>0) {
/*?*/ nPnt--;
@@ -415,7 +415,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
/*?*/ return nPnt;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list