[Libreoffice-commits] .: 2 commits - basic/source editeng/inc editeng/source fpicker/source sfx2/inc sfx2/source svx/inc svx/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Oct 8 06:30:59 PDT 2010
basic/source/sbx/sbxobj.cxx | 4
editeng/inc/editeng/bolnitem.hxx | 4
editeng/inc/editeng/boxitem.hxx | 8
editeng/inc/editeng/editstat.hxx | 4
editeng/inc/editeng/fhgtitem.hxx | 4
editeng/inc/editeng/fwdtitem.hxx | 4
editeng/inc/editeng/kernitem.hxx | 4
editeng/inc/editeng/lrspitem.hxx | 4
editeng/inc/editeng/shaditem.hxx | 4
editeng/inc/editeng/sizeitem.hxx | 4
editeng/inc/editeng/ulspitem.hxx | 4
editeng/source/items/frmitems.cxx | 56 +++---
editeng/source/items/itemtype.cxx | 13 -
editeng/source/items/paraitem.cxx | 4
editeng/source/items/textitem.cxx | 24 +-
fpicker/source/office/iodlg.cxx | 2
sfx2/inc/sfx2/app.hxx | 8
sfx2/inc/sfx2/bindings.hxx | 2
sfx2/inc/sfx2/prnmon.hxx | 2
sfx2/inc/sfx2/progress.hxx | 2
sfx2/inc/sfx2/request.hxx | 6
sfx2/inc/sfx2/shell.hxx | 2
sfx2/inc/sfx2/viewsh.hxx | 6
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appbas.cxx | 2
sfx2/source/appl/appcfg.cxx | 2
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/appserv.cxx | 20 +-
sfx2/source/appl/workwin.cxx | 6
sfx2/source/bastyp/progress.cxx | 2
sfx2/source/control/bindings.cxx | 8
sfx2/source/control/dispatch.cxx | 18 +-
sfx2/source/control/macro.cxx | 14 -
sfx2/source/control/request.cxx | 6
sfx2/source/control/shell.cxx | 2
sfx2/source/control/statcach.cxx | 4
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/tplcitem.cxx | 2
sfx2/source/inc/virtmenu.hxx | 2
sfx2/source/inc/workwin.hxx | 2
sfx2/source/menu/mnuitem.cxx | 2
sfx2/source/menu/virtmenu.cxx | 4
sfx2/source/view/prnmon.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
sfx2/source/view/viewprn.cxx | 4
sfx2/source/view/viewsh.cxx | 8
svx/inc/layctrl.hxx | 4
svx/inc/srchdlg.hxx | 6
svx/inc/svdibrow.hxx | 18 +-
svx/inc/svx/camera3d.hxx | 6
svx/inc/svx/fmmodel.hxx | 6
svx/inc/svx/fmpage.hxx | 2
svx/inc/svx/hdft.hxx | 2
svx/inc/svx/scene3d.hxx | 8
svx/inc/svx/sdmetitm.hxx | 4
svx/inc/svx/sdtaaitm.hxx | 4
svx/inc/svx/svddrag.hxx | 68 ++++----
svx/inc/svx/svdetc.hxx | 10 -
svx/inc/svx/svdglue.hxx | 30 +--
svx/inc/svx/svdhlpln.hxx | 2
svx/inc/svx/svdlayer.hxx | 12 -
svx/inc/svx/svdmodel.hxx | 126 +++++++--------
svx/inc/svx/svdoashp.hxx | 24 +-
svx/inc/svx/svdobj.hxx | 48 ++---
svx/inc/svx/svdocapt.hxx | 8
svx/inc/svx/svdocirc.hxx | 12 -
svx/inc/svx/svdoedge.hxx | 34 ++--
svx/inc/svx/svdograf.hxx | 4
svx/inc/svx/svdogrp.hxx | 12 -
svx/inc/svx/svdomeas.hxx | 18 +-
svx/inc/svx/svdomedia.hxx | 2
svx/inc/svx/svdoole2.hxx | 10 -
svx/inc/svx/svdopath.hxx | 10 -
svx/inc/svx/svdorect.hxx | 6
svx/inc/svx/svdotable.hxx | 22 +-
svx/inc/svx/svdotext.hxx | 84 +++++-----
svx/inc/svx/svdovirt.hxx | 18 +-
svx/inc/svx/svdpage.hxx | 24 +-
svx/inc/svx/svdtrans.hxx | 56 +++---
svx/inc/svx/svdtypes.hxx | 2
svx/inc/svx/svdundo.hxx | 36 ++--
svx/inc/svx/xflbmsxy.hxx | 4
svx/inc/svx/xflhtit.hxx | 4
svx/inc/svx/xlndsit.hxx | 4
svx/inc/svx/zoomitem.hxx | 2
svx/source/dialog/graphctl.cxx | 2
svx/source/dialog/pagectrl.cxx | 2
svx/source/dialog/srchdlg.cxx | 22 +-
svx/source/dialog/svxruler.cxx | 2
svx/source/engine3d/scene3d.cxx | 8
svx/source/form/fmmodel.cxx | 6
svx/source/form/fmobj.cxx | 2
svx/source/form/fmpage.cxx | 2
svx/source/inc/fmobj.hxx | 2
svx/source/svdraw/svdattr.cxx | 8
svx/source/svdraw/svddrag.cxx | 6
svx/source/svdraw/svdetc.cxx | 16 -
svx/source/svdraw/svdfmtf.cxx | 10 -
svx/source/svdraw/svdfmtf.hxx | 2
svx/source/svdraw/svdglue.cxx | 20 +-
svx/source/svdraw/svdhlpln.cxx | 12 -
svx/source/svdraw/svdibrow.cxx | 96 +++++------
svx/source/svdraw/svdlayer.cxx | 8
svx/source/svdraw/svdmodel.cxx | 82 +++++-----
svx/source/svdraw/svdoashp.cxx | 32 +--
svx/source/svdraw/svdobj.cxx | 76 ++++-----
svx/source/svdraw/svdocapt.cxx | 32 +--
svx/source/svdraw/svdocirc.cxx | 32 +--
svx/source/svdraw/svdoedge.cxx | 307 ++++++++++++++++++--------------------
svx/source/svdraw/svdograf.cxx | 28 +--
svx/source/svdraw/svdogrp.cxx | 24 +-
svx/source/svdraw/svdomeas.cxx | 84 +++++-----
svx/source/svdraw/svdomedia.cxx | 4
svx/source/svdraw/svdoole2.cxx | 14 -
svx/source/svdraw/svdopath.cxx | 198 ++++++++++++------------
svx/source/svdraw/svdorect.cxx | 12 -
svx/source/svdraw/svdotext.cxx | 116 +++++++-------
svx/source/svdraw/svdotxat.cxx | 22 +-
svx/source/svdraw/svdotxdr.cxx | 34 ++--
svx/source/svdraw/svdotxed.cxx | 16 -
svx/source/svdraw/svdotxfl.cxx | 4
svx/source/svdraw/svdotxln.cxx | 10 -
svx/source/svdraw/svdotxtr.cxx | 22 +-
svx/source/svdraw/svdoutl.cxx | 2
svx/source/svdraw/svdovirt.cxx | 18 +-
svx/source/svdraw/svdpage.cxx | 14 -
svx/source/svdraw/svdpagv.cxx | 20 +-
svx/source/svdraw/svdtext.cxx | 2
svx/source/svdraw/svdtrans.cxx | 120 +++++++-------
svx/source/svdraw/svdundo.cxx | 14 -
svx/source/table/svdotable.cxx | 38 ++--
svx/source/tbxctrls/fillctrl.cxx | 12 -
svx/source/tbxctrls/itemwin.cxx | 6
svx/source/xoutdev/xattr.cxx | 16 -
svx/source/xoutdev/xattr2.cxx | 4
135 files changed, 1340 insertions(+), 1346 deletions(-)
New commits:
commit 469249094dfd6bff326815481ec84668b75a8f27
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Oct 5 07:57:54 2010 -0500
FASTBOOL to bool conversion
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index c96d9b5..a930f71 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -801,7 +801,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);
@@ -814,7 +814,7 @@ XubString SbxObject::GenerateSource( const XubString &rLinePrefix,
if ( bLineFeed )
aSource.AppendAscii( "\n" );
else
- bLineFeed = TRUE;
+ bLineFeed = true;
aSource += rLinePrefix;
aSource += '.';
diff --git a/editeng/inc/editeng/bolnitem.hxx b/editeng/inc/editeng/bolnitem.hxx
index 4718ef1..5586b0c 100644
--- a/editeng/inc/editeng/bolnitem.hxx
+++ b/editeng/inc/editeng/bolnitem.hxx
@@ -67,8 +67,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
const SvxBorderLine* GetLine () const { return pLine; }
void SetLine ( const SvxBorderLine *pNew );
diff --git a/editeng/inc/editeng/boxitem.hxx b/editeng/inc/editeng/boxitem.hxx
index 0ea363d..10163ab 100644
--- a/editeng/inc/editeng/boxitem.hxx
+++ b/editeng/inc/editeng/boxitem.hxx
@@ -83,8 +83,8 @@ public:
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
virtual USHORT GetVersion( USHORT nFileVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
const SvxBorderLine* GetTop() const { return pTop; }
const SvxBorderLine* GetBottom() const { return pBottom; }
@@ -191,8 +191,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
const SvxBorderLine* GetHori() const { return pHori; }
const SvxBorderLine* GetVert() const { return pVert; }
diff --git a/editeng/inc/editeng/editstat.hxx b/editeng/inc/editeng/editstat.hxx
index 230ace8..a3c0f6a 100644
--- a/editeng/inc/editeng/editstat.hxx
+++ b/editeng/inc/editeng/editstat.hxx
@@ -88,7 +88,7 @@
EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return.
*/
-inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn )
+inline void SetFlags( ULONG& rBits, const ULONG nMask, bool bOn )
{
if ( bOn )
rBits |= nMask;
@@ -107,7 +107,7 @@ public:
EditStatus() { nStatusBits = 0; nControlBits = 0; nPrevPara = 0xFFFF; }
void Clear() { nStatusBits = 0; }
- void SetControlBits( ULONG nMask, FASTBOOL bOn )
+ void SetControlBits( ULONG nMask, bool bOn )
{ SetFlags( nControlBits, nMask, bOn ); }
ULONG GetStatusWord() const { return nStatusBits; }
diff --git a/editeng/inc/editeng/fhgtitem.hxx b/editeng/inc/editeng/fhgtitem.hxx
index 7b8b45f..c69e325 100644
--- a/editeng/inc/editeng/fhgtitem.hxx
+++ b/editeng/inc/editeng/fhgtitem.hxx
@@ -75,8 +75,8 @@ public:
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
virtual USHORT GetVersion( USHORT nItemVersion) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
inline SvxFontHeightItem& operator=(const SvxFontHeightItem& rSize)
{
diff --git a/editeng/inc/editeng/fwdtitem.hxx b/editeng/inc/editeng/fwdtitem.hxx
index 1328dc6..efe4f92 100644
--- a/editeng/inc/editeng/fwdtitem.hxx
+++ b/editeng/inc/editeng/fwdtitem.hxx
@@ -65,8 +65,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
inline SvxFontWidthItem& operator=(const SvxFontWidthItem& rItem )
{
diff --git a/editeng/inc/editeng/kernitem.hxx b/editeng/inc/editeng/kernitem.hxx
index 9a60b51..64ffe0c 100644
--- a/editeng/inc/editeng/kernitem.hxx
+++ b/editeng/inc/editeng/kernitem.hxx
@@ -59,8 +59,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/editeng/inc/editeng/lrspitem.hxx b/editeng/inc/editeng/lrspitem.hxx
index 6860fe2..8057d26 100644
--- a/editeng/inc/editeng/lrspitem.hxx
+++ b/editeng/inc/editeng/lrspitem.hxx
@@ -99,8 +99,8 @@ public:
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
virtual USHORT GetVersion( USHORT nFileVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
// Die "Layout-Schnittstelle":
inline void SetLeft ( const long nL, const USHORT nProp = 100 );
diff --git a/editeng/inc/editeng/shaditem.hxx b/editeng/inc/editeng/shaditem.hxx
index 1664d11..af36178 100644
--- a/editeng/inc/editeng/shaditem.hxx
+++ b/editeng/inc/editeng/shaditem.hxx
@@ -78,8 +78,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
const Color& GetColor() const { return aShadowColor;}
void SetColor( const Color &rNew ) { aShadowColor = rNew; }
diff --git a/editeng/inc/editeng/sizeitem.hxx b/editeng/inc/editeng/sizeitem.hxx
index 2de7ff0..f08371e 100644
--- a/editeng/inc/editeng/sizeitem.hxx
+++ b/editeng/inc/editeng/sizeitem.hxx
@@ -66,8 +66,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
const Size& GetSize() const { return aSize; }
void SetSize(const Size& rSize) { aSize = rSize; }
diff --git a/editeng/inc/editeng/ulspitem.hxx b/editeng/inc/editeng/ulspitem.hxx
index 790cb1c..89d8562 100644
--- a/editeng/inc/editeng/ulspitem.hxx
+++ b/editeng/inc/editeng/ulspitem.hxx
@@ -74,8 +74,8 @@ public:
virtual SfxPoolItem* Create(SvStream &, USHORT) const;
virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
virtual USHORT GetVersion( USHORT nFileVersion ) const;
- virtual int ScaleMetrics( long nMult, long nDiv );
- virtual int HasMetrics() const;
+ virtual bool ScaleMetrics( long nMult, long nDiv );
+ virtual bool HasMetrics() const;
inline void SetUpper( const USHORT nU, const USHORT nProp = 100 );
inline void SetLower( const USHORT nL, const USHORT nProp = 100 );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index b89667d..eaa2118 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -365,18 +365,18 @@ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
// -----------------------------------------------------------------------
-int SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
{
aSize.Width() = Scale( aSize.Width(), nMult, nDiv );
aSize.Height() = Scale( aSize.Height(), nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxSizeItem::HasMetrics() const
+bool SvxSizeItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
@@ -780,20 +780,20 @@ sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
// -----------------------------------------------------------------------
-int SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
{
nFirstLineOfst = (short)Scale( nFirstLineOfst, nMult, nDiv );
nTxtLeft = Scale( nTxtLeft, nMult, nDiv );
nLeftMargin = Scale( nLeftMargin, nMult, nDiv );
nRightMargin = Scale( nRightMargin, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxLRSpaceItem::HasMetrics() const
+bool SvxLRSpaceItem::HasMetrics() const
{
- return 1;
+ return true;
}
// class SvxULSpaceItem --------------------------------------------------
@@ -1025,18 +1025,18 @@ sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
// -----------------------------------------------------------------------
-int SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
{
nUpper = (sal_uInt16)Scale( nUpper, nMult, nDiv );
nLower = (sal_uInt16)Scale( nLower, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxULSpaceItem::HasMetrics() const
+bool SvxULSpaceItem::HasMetrics() const
{
- return 1;
+ return true;
}
@@ -1507,17 +1507,17 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
// -----------------------------------------------------------------------
-int SvxShadowItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv )
{
nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxShadowItem::HasMetrics() const
+bool SvxShadowItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
@@ -2338,7 +2338,7 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const
// -----------------------------------------------------------------------
-int SvxBoxItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv )
{
if ( pTop ) pTop->ScaleMetrics( nMult, nDiv );
if ( pBottom ) pBottom->ScaleMetrics( nMult, nDiv );
@@ -2348,14 +2348,14 @@ int SvxBoxItem::ScaleMetrics( long nMult, long nDiv )
nBottomDist = (sal_uInt16)Scale( nBottomDist, nMult, nDiv );
nLeftDist = (sal_uInt16)Scale( nLeftDist, nMult, nDiv );
nRightDist = (sal_uInt16)Scale( nRightDist, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxBoxItem::HasMetrics() const
+bool SvxBoxItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
@@ -2745,19 +2745,19 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
// -----------------------------------------------------------------------
-int SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv )
{
if ( pHori ) pHori->ScaleMetrics( nMult, nDiv );
if ( pVert ) pVert->ScaleMetrics( nMult, nDiv );
nDefDist = (sal_uInt16)Scale( nDefDist, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxBoxInfoItem::HasMetrics() const
+bool SvxBoxInfoItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
@@ -3408,17 +3408,17 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
// -----------------------------------------------------------------------
-int SvxLineItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxLineItem::ScaleMetrics( long nMult, long nDiv )
{
if ( pLine ) pLine->ScaleMetrics( nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxLineItem::HasMetrics() const
+bool SvxLineItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 9c7d67c..a12d39b 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -1242,7 +1242,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
//Alles nur SWG!
const SfxItemPool *pPool = SfxItemPool::GetStoringPool();
- const FASTBOOL bStoreDefTabs = pPool
+ const bool bStoreDefTabs = pPool
&& pPool->GetName().EqualsAscii("SWG")
&& ::IsDefaultItem( this );
@@ -1420,7 +1420,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
) const
{
rText.Erase();
- FASTBOOL bSet = ( GetValue().Len() > 0 );
+ bool bSet = ( GetValue().Len() > 0 );
switch ( ePres )
{
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 6d749b3..e47a3fa 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1131,17 +1131,17 @@ USHORT SvxFontHeightItem::GetVersion(USHORT nFileVersion) const
// -----------------------------------------------------------------------
-int SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv )
{
nHeight = (sal_uInt32)Scale( nHeight, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxFontHeightItem::HasMetrics() const
+bool SvxFontHeightItem::HasMetrics() const
{
- return 1;
+ return true;
}
void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
@@ -1212,17 +1212,17 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) c
// -----------------------------------------------------------------------
-int SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
{
nWidth = (USHORT)Scale( nWidth, nMult, nDiv );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxFontWidthItem::HasMetrics() const
+bool SvxFontWidthItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
@@ -2211,17 +2211,17 @@ SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) con
// -----------------------------------------------------------------------
-int SvxKerningItem::ScaleMetrics( long nMult, long nDiv )
+bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv )
{
SetValue( (sal_Int16)Scale( GetValue(), nMult, nDiv ) );
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
-int SvxKerningItem::HasMetrics() const
+bool SvxKerningItem::HasMetrics() const
{
- return 1;
+ return true;
}
// -----------------------------------------------------------------------
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 331806b..217c122 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -3263,7 +3263,6 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
Point aNewControlPos;
Size* pNewDlgSize = NULL;
BOOL bNewRow = bNewLine;
- FASTBOOL bFirstNewRow = FALSE;
if ( nType == WINDOW_WINDOW )
{
@@ -3296,7 +3295,6 @@ BOOL SvtFileDialog::AddControl( Window* pControl, BOOL bNewLine )
{
// Create a new row if there was no usercontrol before.
bNewRow = TRUE;
- bFirstNewRow = TRUE;
}
// Check if a new row has to be created.
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 6c330b0..fd5f906 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -238,7 +238,7 @@ public:
USHORT SaveBasicManager() const;
USHORT SaveBasicAndDialogContainer() const;
void EnterBasicCall();
- FASTBOOL IsInBasicCall() const;
+ bool IsInBasicCall() const;
void LeaveBasicCall();
void RegisterBasicConstants( const char *pPrefix,
const SfxConstant *pConsts,
@@ -248,7 +248,7 @@ public:
BOOL GetOptions(SfxItemSet &);
void SetOptions(const SfxItemSet &);
virtual void Invalidate(USHORT nId = 0);
- void NotifyEvent(const SfxEventHint& rEvent, FASTBOOL bSynchron = TRUE );
+ void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true );
BOOL IsDowning() const;
BOOL IsSecureURL( const INetURLObject &rURL, const String *pReferer ) const;
static SfxObjectShellRef DocAlreadyLoaded( const String &rName,
@@ -265,7 +265,7 @@ public:
SAL_DLLPRIVATE BOOL QueryExit_Impl();
SAL_DLLPRIVATE void SetOptions_Impl(const SfxItemSet &);
- SAL_DLLPRIVATE FASTBOOL Initialize_Impl();
+ SAL_DLLPRIVATE bool Initialize_Impl();
SAL_DLLPRIVATE SfxAppData_Impl* Get_Impl() const { return pAppData_Impl; }
@@ -306,7 +306,7 @@ public:
SAL_DLLPRIVATE void PlayMacro_Impl( SfxRequest &rReq, StarBASIC *pBas );
SAL_DLLPRIVATE void EnterAsynchronCall_Impl();
- SAL_DLLPRIVATE FASTBOOL IsInAsynchronCall_Impl() const;
+ SAL_DLLPRIVATE bool IsInAsynchronCall_Impl() const;
SAL_DLLPRIVATE void LeaveAsynchronCall_Impl();
SAL_DLLPRIVATE void Registrations_Impl();
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=0) const;
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 6eab21e..d7fc939 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -142,7 +142,7 @@ public:
~SfxBindings();
void HidePopups( bool bHide = true );
- SAL_DLLPRIVATE void HidePopupCtrls_Impl( FASTBOOL bHide = sal_True );
+ SAL_DLLPRIVATE void HidePopupCtrls_Impl( bool bHide = true );
void SetDispatcher(SfxDispatcher *pDisp);
diff --git a/sfx2/inc/sfx2/prnmon.hxx b/sfx2/inc/sfx2/prnmon.hxx
index e9a698d..3d7553a 100644
--- a/sfx2/inc/sfx2/prnmon.hxx
+++ b/sfx2/inc/sfx2/prnmon.hxx
@@ -57,7 +57,7 @@ private:
//#endif
public:
SfxPrintProgress( SfxViewShell* pViewSh,
- FASTBOOL bShow = TRUE );
+ bool bShow = TRUE );
virtual ~SfxPrintProgress();
virtual void SetText( const String &rText );
diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx
index e9681d5..182996b 100644
--- a/sfx2/inc/sfx2/progress.hxx
+++ b/sfx2/inc/sfx2/progress.hxx
@@ -82,7 +82,7 @@ public:
//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, SetStateHdl, PlugInLoadStatus* );
DECL_DLLPRIVATE_STATIC_LINK( SfxProgress, DefaultBindingProgress, SvProgressArg* );
- SAL_DLLPRIVATE FASTBOOL StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
+ SAL_DLLPRIVATE bool StatusBarManagerGone_Impl(SfxStatusBarManager*pStb);
SAL_DLLPRIVATE const String& GetStateText_Impl() const;
//#endif
};
diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx
index 6893725..50104f8 100644
--- a/sfx2/inc/sfx2/request.hxx
+++ b/sfx2/inc/sfx2/request.hxx
@@ -96,7 +96,7 @@ public:
static const SfxPoolItem* GetItem( const SfxItemSet*, USHORT nSlotId,
bool bDeep = false,
TypeId aType = 0 );
- const SfxPoolItem* GetArg( USHORT nSlotId, FASTBOOL bDeep = FALSE, TypeId aType = 0 ) const;
+ const SfxPoolItem* GetArg( USHORT nSlotId, bool bDeep = false, TypeId aType = 0 ) const;
void ReleaseArgs();
void SetReturnValue(const SfxPoolItem &);
const SfxPoolItem* GetReturnValue() const;
@@ -105,7 +105,7 @@ public:
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static BOOL HasMacroRecorder( SfxViewFrame* pFrame=NULL );
USHORT GetCallMode() const;
- FASTBOOL IsRecording() const;
+ bool IsRecording() const;
void AllowRecording( BOOL );
BOOL AllowsRecording() const;
BOOL IsAPI() const;
@@ -119,7 +119,7 @@ public:
void Ignore();
void Cancel();
BOOL IsCancelled() const;
- void Done(const SfxItemSet &, FASTBOOL bKeep = TRUE );
+ void Done(const SfxItemSet &, bool bKeep = true );
void ForgetAllArgs();
diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx
index 9d2ef73..076d028 100644
--- a/sfx2/inc/sfx2/shell.hxx
+++ b/sfx2/inc/sfx2/shell.hxx
@@ -254,7 +254,7 @@ public:
virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
#ifndef _SFXSH_HXX
- SAL_DLLPRIVATE FASTBOOL CanExecuteSlot_Impl( const SfxSlot &rSlot );
+ SAL_DLLPRIVATE bool CanExecuteSlot_Impl( const SfxSlot &rSlot );
SAL_DLLPRIVATE void DoActivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
SAL_DLLPRIVATE void DoDeactivate_Impl( SfxViewFrame *pFrame, BOOL bMDI);
#endif
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index f60c58b..0983905 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -223,8 +223,8 @@ public:
// Focus, KeyInput, Cursor
void GotFocus() const;
inline void LostFocus() const;
- virtual void ShowCursor( FASTBOOL bOn = TRUE );
- virtual FASTBOOL KeyInput( const KeyEvent &rKeyEvent );
+ virtual void ShowCursor( bool bOn = true );
+ virtual bool KeyInput( const KeyEvent &rKeyEvent );
BOOL Escape();
// Viewing Interface
@@ -298,7 +298,7 @@ public:
SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
- SAL_DLLPRIVATE FASTBOOL GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
+ SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
{ GetIPClientList_Impl(TRUE)->Insert(pIPClient); }
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 6ef015a..a06ab4d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -655,7 +655,7 @@ void SfxApplication::LeaveAsynchronCall_Impl()
//--------------------------------------------------------------------
-FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const
+bool SfxApplication::IsInAsynchronCall_Impl() const
{
return pAppData_Impl->nAsynchronCalls > 0;
}
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 641991c..2482f98 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -293,7 +293,7 @@ StarBASIC* SfxApplication::GetBasic()
//--------------------------------------------------------------------
-FASTBOOL SfxApplication::IsInBasicCall() const
+bool SfxApplication::IsInBasicCall() const
{
return 0 != pAppData_Impl->nBasicCallLevel;
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 74c79c1..d8a6967 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -1015,7 +1015,7 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const
//--------------------------------------------------------------------
//--------------------------------------------------------------------
-void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron )
+void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
{
//DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!");
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 279aff8..6bdee82 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -230,7 +230,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont)
//====================================================================
-FASTBOOL SfxApplication::Initialize_Impl()
+bool SfxApplication::Initialize_Impl()
{
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" );
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 6a14d81..d62dfeb 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -177,7 +177,7 @@ namespace {
void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- FASTBOOL bDone = FALSE;
+ bool bDone = false;
switch ( rReq.GetSlot() )
{
case SID_SETOPTIONS:
@@ -289,7 +289,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
const short nRet = pDlg->Execute();
if ( nRet )
- bDone = TRUE;
+ bDone = true;
delete pDlg;
}
@@ -328,7 +328,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
BOOL bOk = ( n == 0);
rReq.SetReturnValue( SfxBoolItem( 0, bOk ) );
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -385,7 +385,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
ULONG nHelpId = 0;
pHelp->Start( nHelpId, NULL ); // show start page
- bDone = TRUE;
+ bDone = true;
}
break;
}
@@ -406,7 +406,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::DisableQuickHelp();
SvtHelpOptions().SetHelpTips( bOn );
Invalidate(SID_HELPTIPS);
- bDone = TRUE;
+ bDone = true;
// ggf. recorden
if ( !rReq.IsAPI() )
@@ -434,7 +434,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Help::DisableBalloonHelp();
SvtHelpOptions().SetExtendedHelp( bOn );
Invalidate(SID_HELPBALLOONS);
- bDone = TRUE;
+ bDone = true;
// ggf. recorden
if ( !rReq.IsAPI() )
@@ -452,7 +452,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
: !aHelpOpt.IsHelpAgentAutoStartMode();
aHelpOpt.SetHelpAgentAutoStartMode( bOn );
Invalidate(SID_HELP_PI);
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -538,7 +538,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
AboutDialog* pDlg = new AboutDialog( 0, aDialogResId, sBuildId );
pDlg->Execute();
delete pDlg;
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -549,7 +549,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
new SfxTemplateOrganizeDlg(NULL);
pDlg->Execute();
delete pDlg;
- bDone = TRUE;
+ bDone = true;
break;
}
@@ -557,7 +557,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
{
svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory());
aDialog.Execute();
- bDone = TRUE;
+ bDone = true;
break;
}
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index fc45667..ea18d5b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1290,7 +1290,7 @@ void SfxWorkWindow::SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
//------------------------------------------------------------------------
-FASTBOOL SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
+bool SfxWorkWindow::KnowsObjectBar_Impl( USHORT nPos ) const
/* [Beschreibung]
@@ -1485,13 +1485,13 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
// die Modi bestimmen, f"ur die die ToolBox gilt
USHORT nTbxMode = aObjBarList[n].nMode;
- FASTBOOL bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
+ bool bFullScreenTbx = SFX_VISIBILITY_FULLSCREEN ==
( nTbxMode & SFX_VISIBILITY_FULLSCREEN );
nTbxMode &= ~SFX_VISIBILITY_FULLSCREEN;
nTbxMode &= ~SFX_VISIBILITY_VIEWER;
// wird in diesem Kontext eine ToolBox gefordert?
- FASTBOOL bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
+ bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode );
if ( bDestroy )
{
rtl::OUString aTbxId( m_aTbxTypeName );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index aa740c9..5269bc7 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -733,7 +733,7 @@ void SfxProgress::LeaveLock()
// -----------------------------------------------------------------------
-FASTBOOL SfxProgress::StatusBarManagerGone_Impl
+bool SfxProgress::StatusBarManagerGone_Impl
(
SfxStatusBarManager * // dieser <SfxStatusBarManager> wird zerst"ort
)
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index ef0c1e8..d3a1a69 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -373,7 +373,7 @@ void SfxBindings::HidePopups( bool bHide )
pImp->pWorkWin->HidePopups_Impl( bHide, sal_True );
}
-void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide )
+void SfxBindings::HidePopupCtrls_Impl( bool bHide )
{
if ( bHide )
{
@@ -1503,10 +1503,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl
}
// Mu\s der Slot "uberhaupt upgedatet werden ?
- FASTBOOL bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
+ bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
// Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !!
- FASTBOOL bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
+ bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
// Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht
// einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt.
@@ -1736,7 +1736,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
// at least 10 loops and further if more jobs are available but no input
- FASTBOOL bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+ bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
sal_uInt16 nLoops = 10;
pImp->bInNextJob = sal_True;
const sal_uInt16 nCount = pImp->pCaches->Count();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 4bb3759..0649cc1 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2019,7 +2019,7 @@ void SfxDispatcher::FlushImpl()
{
// tats"aechlich poppen
SfxShell* pPopped = 0;
- FASTBOOL bFound = sal_False;
+ bool bFound = false;
do
{
DBG_ASSERT( pImp->aStack.Count(), "popping from empty stack" );
@@ -2400,12 +2400,12 @@ sal_Bool SfxDispatcher::_FindServer
if ( pSlot )
{
// Slot geh"ort zum Container?
- FASTBOOL bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
- FASTBOOL bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+ bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+ bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
// Shell geh"ort zum Server?
// AppDispatcher oder IPFrame-Dispatcher
- FASTBOOL bIsServerShell = !pImp->pFrame || bIsInPlace;
+ bool bIsServerShell = !pImp->pFrame || bIsInPlace;
// Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
// einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2417,7 +2417,7 @@ sal_Bool SfxDispatcher::_FindServer
// Shell geh"ort zum Container?
// AppDispatcher oder kein IPFrameDispatcher
- FASTBOOL bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+ bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
// Shell und Slot passen zusammen
if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
( !bIsContainerSlot && bIsServerShell ) ) )
@@ -2518,12 +2518,12 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
if ( pSlot )
{
// Slot geh"ort zum Container?
- FASTBOOL bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
- FASTBOOL bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+ bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+ bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
// Shell geh"ort zum Server?
// AppDispatcher oder IPFrame-Dispatcher
- FASTBOOL bIsServerShell = !pImp->pFrame || bIsInPlace;
+ bool bIsServerShell = !pImp->pFrame || bIsInPlace;
// Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
// einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2535,7 +2535,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
// Shell geh"ort zum Container?
// AppDispatcher oder kein IPFrameDispatcher
- FASTBOOL bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+ bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
// Shell und Slot passen zusammen
if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index da904d4..190b4b5 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -126,11 +126,11 @@ SfxMacroStatement::SfxMacroStatement
return;
/*
// Objekt-Typ bestimmen
- FASTBOOL bIsApp = rShell.ISA(SfxApplication);
- FASTBOOL bIsDoc = rShell.ISA(SfxObjectShell);
- FASTBOOL bIsWin = !bIsApp && !bIsDoc &&
+ bool bIsApp = rShell.ISA(SfxApplication);
+ bool bIsDoc = rShell.ISA(SfxObjectShell);
+ bool bIsWin = !bIsApp && !bIsDoc &&
( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) );
- FASTBOOL bIsSel = !bIsApp && !bIsDoc && !bIsWin;
+ bool bIsSel = !bIsApp && !bIsDoc && !bIsWin;
// Objekt nicht schon im Slot-Namen enthalten?
if ( bIsSel || rSlot.pName[0] == '.' )
@@ -387,7 +387,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
}
// nicht druckbare Zeichen werden als chr$(...) geschrieben
- FASTBOOL bPrevReplaced = FALSE;
+ bool bPrevReplaced = false;
for ( USHORT n = 0; n < aRecordable.Len(); ++n )
{
sal_Unicode cChar = aRecordable.GetChar(n);
@@ -411,10 +411,10 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
aRecordable.Insert( aReplacement, n + 1 );
n = n + aReplacement.Len();
}
- bPrevReplaced = TRUE;
+ bPrevReplaced = true;
}
else
- bPrevReplaced = FALSE;
+ bPrevReplaced = false;
// Argument in Anf"uhrungszeichen
aArg = '"';
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index de46da8..2d6b739 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -469,7 +469,7 @@ void SfxRequest::RemoveItem( USHORT nID )
const SfxPoolItem* SfxRequest::GetArg
(
USHORT nSlotId, // Slot-Id oder Which-Id des Parameters
- FASTBOOL bDeep, // FALSE: nicht in Parent-ItemSets suchen
+ bool bDeep, // FALSE: nicht in Parent-ItemSets suchen
TypeId aType // != 0: RTTI Pruefung mit Assertion
) const
{
@@ -572,7 +572,7 @@ void SfxRequest::Done
erfragt wurden, ggf. 0 falls keine
Parameter gesetzt wurden */
- FASTBOOL bKeep /* TRUE (default)
+ bool bKeep /* TRUE (default)
'rSet' wird gepeichert und ist "uber
GetArgs() abfragbar
@@ -902,7 +902,7 @@ BOOL SfxRequest::IsAPI() const
//--------------------------------------------------------------------
-FASTBOOL SfxRequest::IsRecording() const
+bool SfxRequest::IsRecording() const
/* [Beschreibung]
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 7fabce6..3b5feaa 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -853,7 +853,7 @@ ResMgr* SfxShell::GetResMgr() const
//--------------------------------------------------------------------
-FASTBOOL SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
+bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
/* [Beschreibung]
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 3c4d89f..5f908d6 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -457,10 +457,10 @@ void SfxStateCache::SetState_Impl
DBG_PROFSTART(SfxStateCacheSetState);
// m"ussen die Controller "uberhaupt benachrichtigt werden?
- FASTBOOL bNotify = bItemDirty;
+ bool bNotify = bItemDirty;
if ( !bItemDirty )
{
- FASTBOOL bBothAvailable = pLastItem && pState &&
+ bool bBothAvailable = pLastItem && pState &&
!IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
if ( bBothAvailable )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 5bb4a26..b368af1 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1761,7 +1761,7 @@ void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
*/
{
- FASTBOOL bSet = ( pSet != NULL );
+ bool bSet = ( pSet != NULL );
pSet = pInSet;
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 0438ef4..99f6fa1 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -82,7 +82,7 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
case SID_STYLE_FAMILY4:
case SID_STYLE_FAMILY5:
{
- FASTBOOL bAvailable = SFX_ITEM_AVAILABLE == eState;
+ bool bAvailable = SFX_ITEM_AVAILABLE == eState;
if ( !bAvailable )
rTemplateDlg.SetFamilyState(GetId(), 0);
else {
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 3d7e02d..ad0b935 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -68,7 +68,7 @@ private:
private:
void Construct_Impl();
- FASTBOOL Bind_Impl( Menu *pMenu );
+ bool Bind_Impl( Menu *pMenu );
inline SfxMenuCtrlArr_Impl& GetAppCtrl_Impl()
{
return pAppCtrl? *pAppCtrl: *(pAppCtrl = new SfxMenuCtrlArr_Impl) ;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 32ebaa9..eb3b6a9 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -333,7 +333,7 @@ public:
void SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
SfxInterface *pIFace, const String* pName=0 );
Window* GetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId );
- FASTBOOL KnowsObjectBar_Impl( USHORT nPos ) const;
+ bool KnowsObjectBar_Impl( USHORT nPos ) const;
BOOL IsVisible_Impl();
void MakeVisible_Impl( BOOL );
void SetObjectBarVisibility_Impl( USHORT nVis );
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 1f0de0e..6b75fcc 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -254,7 +254,7 @@ void SfxMenuControl::StateChanged
DBG_ASSERT( nSID == GetId(), "strange SID" );
DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
- FASTBOOL bIsObjMenu =
+ bool bIsObjMenu =
GetId() >= SID_OBJECTMENU0 && GetId() < SID_OBJECTMENU_LAST;
// enabled/disabled-Flag pauschal korrigieren
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index ed22ac9..ebd23cf 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -776,7 +776,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
//--------------------------------------------------------------------
-FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
+bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
{
// Selber suchen, da SV mit 'USHORT nSID = pSVMenu->GetCurItemId();' immer
// 0 liefert. Das ist so, weil die Event-Weiterleitung lt. TH nichts mit
@@ -786,7 +786,7 @@ FASTBOOL SfxVirtualMenu::Bind_Impl( Menu *pMenu )
for ( USHORT nPos = 0; nPos < nCount; ++nPos )
{
// angesprochenes Sub-Menu gefunden?
- FASTBOOL bFound = FALSE;
+ bool bFound = false;
USHORT nSID = pSVMenu->GetItemId(nPos);
SfxMenuControl &rCtrl = pItems[nPos];
bFound = pSVMenu->GetPopupMenu(nSID) == pMenu;
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index d84e4a0..2d7a0a9 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -266,7 +266,7 @@ BOOL SfxPrintMonitor_Impl::Close()
//--------------------------------------------------------------------
-SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, FASTBOOL bShow )
+SfxPrintProgress::SfxPrintProgress( SfxViewShell* pViewSh, bool bShow )
: SfxProgress( pViewSh->GetViewFrame()->GetObjectShell(),
String(SfxResId(STR_PRINTING)), 1, FALSE ),
pImp( new SfxPrintProgress_Impl( pViewSh, pViewSh->GetPrinter() ) )
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 8ae94f1..6a0e757 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3036,7 +3036,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
{
DBG_MEMTEST();
- FASTBOOL bDone = FALSE;
+ bool bDone = false;
switch ( rReq.GetSlot() )
{
case SID_STOP_RECORDING :
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 43c9c8b..6780561 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -514,8 +514,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter )
SfxPrinter *pDocPrinter = GetPrinter();
// Printer-Options auswerten
- FASTBOOL bOriToDoc = FALSE;
- FASTBOOL bSizeToDoc = FALSE;
+ bool bOriToDoc = false;
+ bool bSizeToDoc = false;
if ( &pDocPrinter->GetOptions() )
{
USHORT nWhich = GetPool().GetWhich(SID_PRINTER_CHANGESTODOC);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index d009d63..90aca85 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1688,7 +1688,7 @@ BOOL SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
//--------------------------------------------------------------------
-FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
+bool SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
/* [Beschreibung]
@@ -1699,7 +1699,7 @@ FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
[R"uckgabewert]
- FASTBOOL TRUE
+ bool TRUE
die Taste ist konfiguriert, der betreffende
Handler wurde gerufen
@@ -1715,14 +1715,14 @@ FASTBOOL SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
return ExecKey_Impl(rKeyEvent);
}
-FASTBOOL SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
+bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
{
return ExecKey_Impl(rKeyEvent);
}
//--------------------------------------------------------------------
-void SfxViewShell::ShowCursor( FASTBOOL /*bOn*/ )
+void SfxViewShell::ShowCursor( bool /*bOn*/ )
/* [Beschreibung]
diff --git a/svx/inc/layctrl.hxx b/svx/inc/layctrl.hxx
index 26e3f1f..f554f5f 100644
--- a/svx/inc/layctrl.hxx
+++ b/svx/inc/layctrl.hxx
@@ -38,7 +38,7 @@
class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl
{
private:
- FASTBOOL bEnabled;
+ bool bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
@@ -58,7 +58,7 @@ public:
class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl
{
- FASTBOOL bEnabled;
+ bool bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx
index fad0f4b..42f57a7 100644
--- a/svx/inc/srchdlg.hxx
+++ b/svx/inc/srchdlg.hxx
@@ -220,9 +220,9 @@ private:
BOOL bSearch;
BOOL bFormat;
USHORT nOptions;
- FASTBOOL bSet;
- FASTBOOL bReadOnly;
- FASTBOOL bConstruct;
+ bool bSet;
+ bool bReadOnly;
+ bool bConstruct;
ULONG nModifyFlag;
String aStylesStr;
String aLayoutStr;
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index a48f552..bb78fb3 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -50,11 +50,11 @@ friend class ImpItemEdit;
USHORT nLastWhich;
USHORT nLastWhichOben;
USHORT nLastWhichUnten;
- FASTBOOL bWhichesButNames;
- FASTBOOL bDontHideIneffectiveItems;
- FASTBOOL bDontSortItems;
- FASTBOOL bShowWhichIds;
- FASTBOOL bShowRealValues;
+ bool bWhichesButNames;
+ bool bDontHideIneffectiveItems;
+ bool bDontSortItems;
+ bool bShowWhichIds;
+ bool bShowRealValues;
private:
#if _SOLAR__PRIVATE
void ImpCtor();
@@ -80,8 +80,8 @@ public:
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
ULONG GetCurrentPos() const;
USHORT GetCurrentWhich() const;
- virtual FASTBOOL BegChangeEntry(ULONG nPos);
- virtual FASTBOOL EndChangeEntry();
+ virtual bool BegChangeEntry(ULONG nPos);
+ virtual bool EndChangeEntry();
virtual void BrkChangeEntry();
/** GetCellText returns the text at the given position
@@ -114,7 +114,7 @@ public:
virtual void GetFocus();
void Clear() { aBrowse.Clear(); }
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); }
- void SetFloatingMode(FASTBOOL /*bOn*/) {}
+ void SetFloatingMode(bool /*bOn*/) {}
const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; }
_SdrItemBrowserControl& GetBrowserControl() { return aBrowse; }
};
@@ -124,7 +124,7 @@ class SdrView;
class SdrItemBrowser: public _SdrItemBrowserWindow {
Timer aIdleTimer;
SdrView* pView;
- FASTBOOL bDirty;
+ bool bDirty;
private:
static Window* ImpGetViewWin(SdrView& rView);
DECL_LINK(IdleHdl,Timer*);
diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx
index ee4bd71..6f9e98b 100644
--- a/svx/inc/svx/camera3d.hxx
+++ b/svx/inc/svx/camera3d.hxx
@@ -50,7 +50,7 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
double fFocalLength;
double fBankAngle;
- FASTBOOL bAutoAdjustProjection;
+ bool bAutoAdjustProjection;
public:
Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
@@ -86,9 +86,9 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
// Um den Blickpunkt drehen, Position wird dabei veraendert
void RotateAroundLookAt(double fHAngle, double fVAngle);
- void SetAutoAdjustProjection(FASTBOOL bAdjust = TRUE)
+ void SetAutoAdjustProjection(bool bAdjust = true)
{ bAutoAdjustProjection = bAdjust; }
- FASTBOOL IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
+ bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
};
#endif // _CAMERA3D_HXX
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index ee5c157..a0d29f5 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -60,13 +60,13 @@ public:
FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL,
SfxObjectShell* pPers=NULL );
- FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable);
+ FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, bool bUseExtColorTable);
FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
- FASTBOOL bUseExtColorTable);
+ bool bUseExtColorTable);
virtual ~FmFormModel();
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(bool bMasterPage);
virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
virtual void MovePage(USHORT nPgNum, USHORT nNewPos);
diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx
index 12296f6..3b6d10a 100644
--- a/svx/inc/svx/fmpage.hxx
+++ b/svx/inc/svx/fmpage.hxx
@@ -52,7 +52,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
public:
TYPEINFO();
- FmFormPage(FmFormModel& rModel,StarBASIC*, FASTBOOL bMasterPage=sal_False);
+ FmFormPage(FmFormModel& rModel,StarBASIC*, bool bMasterPage=sal_False);
FmFormPage(const FmFormPage& rPage);
~FmFormPage();
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index c40a610..dbdd557 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -84,7 +84,7 @@ protected:
SfxItemSet* pBBSet;
BOOL bDisableQueryBox;
BOOL bEnableBackgroundSelector;
- FASTBOOL bInReset;
+ bool bInReset;
void InitHandler();
DECL_LINK( TurnOnHdl, CheckBox*);
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index 3021447..f40ca3a 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -242,10 +242,10 @@ public:
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
// create moves
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual bool BegCreate(SdrDragStat& rStat);
+ virtual bool MovCreate(SdrDragStat& rStat); // true=Xor muss repainted werden
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
};
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index a1b4904..5d994d2 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -44,8 +44,8 @@ public:
SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual bool HasMetrics() const;
+ virtual bool ScaleMetrics(long nMul, long nDiv);
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index d157330..2fb3f00 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -38,8 +38,8 @@ public:
SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual bool HasMetrics() const;
+ virtual bool ScaleMetrics(long nMul, long nDiv);
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index 0b3c7a5..5833720 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -69,11 +69,11 @@ protected:
Point aReservePoint4;
Rectangle aReserveRect1;
Rectangle aReserveRect2;
- FASTBOOL bEndDragChangesAttributes;
- FASTBOOL bEndDragChangesGeoAndAttributes;
- FASTBOOL bMouseIsUp;
- FASTBOOL aReserveBool3;
- FASTBOOL aReserveBool4;
+ bool bEndDragChangesAttributes;
+ bool bEndDragChangesGeoAndAttributes;
+ bool bMouseIsUp;
+ bool aReserveBool3;
+ bool aReserveBool4;
long aReserveLong1;
long aReserveLong2;
long aReserveLong3;
@@ -83,21 +83,21 @@ protected:
void* aReservePtr3;
void* aReservePtr4;
- FASTBOOL bShown; // Xor sichrbar?
+ bool bShown; // Xor sichrbar?
USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden
- FASTBOOL bMinMoved; // MinMove durchbrochen?
+ bool bMinMoved; // MinMove durchbrochen?
- FASTBOOL bHorFixed; // nur Vertikal draggen
- FASTBOOL bVerFixed; // nur Horizontal draggen
- FASTBOOL bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
+ bool bHorFixed; // nur Vertikal draggen
+ bool bVerFixed; // nur Horizontal draggen
+ bool bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
// werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben.
- FASTBOOL bOrtho4;
- FASTBOOL bOrtho8;
+ bool bOrtho4;
+ bool bOrtho8;
SdrDragMethod* pDragMethod;
protected:
- void Clear(FASTBOOL bLeaveOne);
+ void Clear(bool bLeaveOne);
Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); }
//public:
SdrDragStatUserData* pUser; // Userdata
@@ -129,50 +129,50 @@ public:
void SetHdl(SdrHdl* pH) { pHdl=pH; }
SdrDragStatUserData* GetUser() const { return pUser; }
void SetUser(SdrDragStatUserData* pU) { pUser=pU; }
- FASTBOOL IsShown() const { return bShown; }
- void SetShown(FASTBOOL bOn) { bShown=bOn; }
+ bool IsShown() const { return bShown; }
+ void SetShown(bool bOn) { bShown=bOn; }
- FASTBOOL IsMinMoved() const { return bMinMoved; }
+ bool IsMinMoved() const { return bMinMoved; }
void SetMinMoved() { bMinMoved=TRUE; }
void ResetMinMoved() { bMinMoved=FALSE; }
void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
USHORT GetMinMove() const { return nMinMov; }
- FASTBOOL IsHorFixed() const { return bHorFixed; }
- void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; }
- FASTBOOL IsVerFixed() const { return bVerFixed; }
- void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; }
+ bool IsHorFixed() const { return bHorFixed; }
+ void SetHorFixed(bool bOn) { bHorFixed=bOn; }
+ bool IsVerFixed() const { return bVerFixed; }
+ void SetVerFixed(bool bOn) { bVerFixed=bOn; }
// Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!"
// z.B. fuer den Winkel des Kreisbogen...
- FASTBOOL IsNoSnap() const { return bWantNoSnap; }
- void SetNoSnap(FASTBOOL bOn=TRUE) { bWantNoSnap=bOn; }
+ bool IsNoSnap() const { return bWantNoSnap; }
+ void SetNoSnap(bool bOn = true) { bWantNoSnap=bOn; }
// Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins)
// sinnvoll auf ihm angewendet werden kann.
// Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt)
- FASTBOOL IsOrtho4Possible() const { return bOrtho4; }
- void SetOrtho4Possible(FASTBOOL bOn=TRUE) { bOrtho4=bOn; }
+ bool IsOrtho4Possible() const { return bOrtho4; }
+ void SetOrtho4Possible(bool bOn = true) { bOrtho4=bOn; }
// Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien)
- FASTBOOL IsOrtho8Possible() const { return bOrtho8; }
- void SetOrtho8Possible(FASTBOOL bOn=TRUE) { bOrtho8=bOn; }
+ bool IsOrtho8Possible() const { return bOrtho8; }
+ void SetOrtho8Possible(bool bOn = true) { bOrtho8=bOn; }
// Wird vom gedraggten Objekt gesetzt
- FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
- void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; }
- FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
- void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; }
+ bool IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
+ void SetEndDragChangesAttributes(bool bOn) { bEndDragChangesAttributes=bOn; }
+ bool IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
+ void SetEndDragChangesGeoAndAttributes(bool bOn) { bEndDragChangesGeoAndAttributes=bOn; }
// Wird von der View gesetzt und kann vom Obj ausgewertet werden
- FASTBOOL IsMouseDown() const { return !bMouseIsUp; }
- void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; }
+ bool IsMouseDown() const { return !bMouseIsUp; }
+ void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; }
Point KorregPos(const Point& rNow, const Point& rPrev) const;
void Reset(const Point& rPnt);
void NextMove(const Point& rPnt);
- void NextPoint(FASTBOOL bSaveReal=FALSE);
+ void NextPoint(bool bSaveReal=FALSE);
void PrevPoint();
- FASTBOOL CheckMinMoved(const Point& rPnt);
+ bool CheckMinMoved(const Point& rPnt);
long GetDX() const { return GetNow().X()-GetPrev().X(); }
long GetDY() const { return GetNow().Y()-GetPrev().Y(); }
Fraction GetXFact() const;
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 3d99487..87aa5cd 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -123,7 +123,7 @@ public:
class SfxItemSet;
// Liefert eine Ersatzdarstellung fuer einen XFillStyle
// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert.
-SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
+SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
// Ein Container fuer USHORTs (im Prinzip ein dynamisches Array)
class UShortCont {
@@ -161,7 +161,7 @@ private: // damit keiner vergessen wird
virtual
void
Is1stLessThan2nd(const void* pElem1, const void* pElem2) const;
-// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL;
+// virtual bool Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -184,10 +184,10 @@ class ImpSdrHdcMerk
Color* pLineColorMerk;
USHORT nMode;
public:
- ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=TRUE);
+ ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true);
~ImpSdrHdcMerk();
void Save(const OutputDevice& rOut);
- FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
+ bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const;
};
//#endif // __PRIVATE
@@ -273,7 +273,7 @@ public:
const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); }
void InsertLink(const Link& rLink, unsigned nPos=0xFFFF);
void RemoveLink(const Link& rLink);
- FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
+ bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
};
// Fuer die Factory in SvdObj.CXX
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index 34d2ec3..a6eefcd 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -69,12 +69,12 @@ class SVX_DLLPUBLIC SdrGluePoint {
USHORT nEscDir;
USHORT nId;
USHORT nAlign;
- FASTBOOL bNoPercent:1;
- FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- FASTBOOL bUserDefined:1; // #i38892#
+ sal_uInt8 bNoPercent:1;
+ sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
+ sal_uInt8 bUserDefined:1; // #i38892#
public:
SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
- SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
+ SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; }
bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); }
const Point& GetPos() const { return aPos; }
@@ -83,15 +83,15 @@ public:
void SetEscDir(USHORT nNewEsc) { nEscDir=nNewEsc; }
USHORT GetId() const { return nId; }
void SetId(USHORT nNewId) { nId=nNewId; }
- bool IsPercent() const { return !bNoPercent; }
- void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; }
+ bool IsPercent() const { return bNoPercent ? false : true; }
+ void SetPercent(bool bOn) { bNoPercent = !bOn; }
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; }
- void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj);
+ bool IsReallyAbsolute() const { return bReallyAbsolute ? true : false; }
+ void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
// #i38892#
- FASTBOOL IsUserDefined() const { return bUserDefined; }
- void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; }
+ bool IsUserDefined() const { return bUserDefined ? true : false; }
+ void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; }
USHORT GetAlign() const { return nAlign; }
void SetAlign(USHORT nAlg) { nAlign=nAlg; }
@@ -100,7 +100,7 @@ public:
USHORT GetVertAlign() const { return nAlign&0xFF00; }
void SetVertAlign(USHORT nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
void Draw(OutputDevice& rOut, const SdrObject* pObj) const;
- FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
+ bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
Point GetAbsolutePos(const SdrObject& rObj) const;
void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
@@ -111,7 +111,7 @@ public:
void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj);
};
#define SDRGLUEPOINT_NOTFOUND 0xFFFF
@@ -134,14 +134,14 @@ public:
SdrGluePoint& operator[](USHORT nPos) { return *GetObject(nPos); }
const SdrGluePoint& operator[](USHORT nPos) const { return *GetObject(nPos); }
USHORT FindGluePoint(USHORT nId) const;
- USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=FALSE, FASTBOOL bNext=FALSE, USHORT nId0=0) const;
+ USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack=FALSE, bool bNext = false, USHORT nId0=0) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj);
+ void SetReallyAbsolute(bool bOn, const SdrObject& rObj);
void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj);
};
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 401ae80..ee031c0 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -66,7 +66,7 @@ public:
const Point& GetPos() const { return aPos; }
Pointer GetPointer() const;
- FASTBOOL IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+ bool IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
// OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben
Rectangle GetBoundRect(const OutputDevice& rOut) const;
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index f6edf9f..1f61b62 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -36,7 +36,7 @@
class SdrModel;
-class SVX_DLLPUBLIC SdrLayer
+class SVX_DLLPUBLIC SdrLayer
{
friend class SdrLayerAdmin;
protected:
@@ -69,8 +69,8 @@ public:
// Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll.
// Es wird dann laenderspeziefisch der passende Name gesetzt. SetName()
// setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined".
- void SetStandardLayer(FASTBOOL bStd=TRUE);
- FASTBOOL IsStandardLayer() const { return nType==1; }
+ void SetStandardLayer(bool bStd = true);
+ bool IsStandardLayer() const { return nType==1; }
};
// Beim Aendern von Layerdaten muss man derzeit
@@ -124,9 +124,9 @@ public:
USHORT GetLayerPos(SdrLayer* pLayer) const;
- SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
- const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const;
- SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const;
+ SdrLayer* GetLayer(const String& rName, bool bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
+ const SdrLayer* GetLayer(const String& rName, bool bInherited) const;
+ SdrLayerID GetLayerID(const String& rName, bool bInherited) const;
SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
const SdrLayer* GetLayerPerID(USHORT nID) const;
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index 39411ea..950b7dc 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -167,11 +167,11 @@ public:
// Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts
// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv
-#define LOADREFCOUNTS (FALSE)
+#define LOADREFCOUNTS (false)
struct SdrDocumentStreamInfo
{
- FASTBOOL mbDeleteAfterUse;
+ bool mbDeleteAfterUse;
String maUserData;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef;
BOOL mbDummy1 : 1;
@@ -196,12 +196,12 @@ protected:
String aUIUnitStr; // see above
Fraction aUIUnitFact; // see above
int nUIUnitKomma; // see above
- FASTBOOL bUIOnlyKomma; // see above
+ bool bUIOnlyKomma; // see above
SdrLayerAdmin* pLayerAdmin;
SfxItemPool* pItemPool;
- FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a
- comphelper::IEmbeddedHelper*
+ bool bMyPool; // zum Aufraeumen von pMyPool ab 303a
+ comphelper::IEmbeddedHelper*
m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell
SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe
SdrOutliner* pHitTestOutliner;// ein Outliner fuer den HitTest
@@ -220,25 +220,25 @@ protected:
bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action
USHORT nProgressPercent; // fuer den ProgressBar-Handler
USHORT nLoadVersion; // Versionsnummer der geladenen Datei
- FASTBOOL bExtColorTable; // Keinen eigenen ColorTable
+ bool bExtColorTable; // Keinen eigenen ColorTable
sal_Bool mbChanged;
- FASTBOOL bInfoChanged;
- FASTBOOL bPagNumsDirty;
- FASTBOOL bMPgNumsDirty;
- FASTBOOL bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
- FASTBOOL bSavePortable; // Metafiles portabel speichern
- FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen
- FASTBOOL bReadOnly;
- FASTBOOL bTransparentTextFrames;
- FASTBOOL bSaveCompressed;
- FASTBOOL bSwapGraphics;
- FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
- FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects
+ bool bInfoChanged;
+ bool bPagNumsDirty;
+ bool bMPgNumsDirty;
+ bool bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
+ bool bSavePortable; // Metafiles portabel speichern
+ bool bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen
+ bool bReadOnly;
+ bool bTransparentTextFrames;
+ bool bSaveCompressed;
+ bool bSwapGraphics;
+ bool bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
+ bool bSaveOLEPreview; // save preview metafile of OLE objects
UINT16 nStreamCompressMode; // Komprimiert schreiben?
UINT16 nStreamNumberFormat;
UINT16 nDefaultTabulator;
UINT32 nMaxUndoCount;
- FASTBOOL bSaveNative;
+ bool bSaveNative;
BOOL bStarDrawPreviewMode;
@@ -279,10 +279,10 @@ public:
UINT16 mnHandoutPageCount;
UINT16 nReserveUInt6;
UINT16 nReserveUInt7;
- FASTBOOL mbModelLocked;
- FASTBOOL mbKernAsianPunctuation;
- FASTBOOL mbAddExtLeading;
- FASTBOOL mbInDestruction;
+ bool mbModelLocked;
+ bool mbKernAsianPunctuation;
+ bool mbAddExtLeading;
+ bool mbInDestruction;
// Zeiger auf Paletten, Listen und Tabellen
XColorTable* pColorTable;
@@ -310,7 +310,7 @@ private:
// Nicht implementiert:
SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel);
SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel);
- SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const;
+ SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const;
//#if 0 // _SOLAR__PRIVATE
SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
SVX_DLLPRIVATE void ImpSetUIUnit();
@@ -328,8 +328,8 @@ private:
public:
//#if 0 // _SOLAR__PRIVATE
- FASTBOOL IsPasteResize() const { return bPasteResize; }
- void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; }
+ bool IsPasteResize() const { return bPasteResize; }
+ void SetPasteResize(bool bOn) { bPasteResize=bOn; }
//#endif // __PRIVATE
TYPEINFO();
// Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch
@@ -345,13 +345,13 @@ public:
// Wahl des Pools.
SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
+ SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
+ SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
virtual ~SdrModel();
void ClearModel(sal_Bool bCalledFromDestructor);
// Hier kann man erfragen, ob das Model gerade eingrstreamt wird
- FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; }
+ bool IsLoading() const { return sal_False /*BFS01 bLoading */; }
// Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken
// zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird
// die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert.
@@ -364,7 +364,7 @@ public:
void BurnInStyleSheetAttributes();
// Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten
// und diese beiden VM AllocPage() und AllocModel() ueberladen...
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(bool bMasterPage);
virtual SdrModel* AllocModel() const;
// Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model!
@@ -449,17 +449,17 @@ public:
const Fraction& GetUIUnitFact() const { return aUIUnitFact; }
const String& GetUIUnitStr() const { return aUIUnitStr; }
int GetUIUnitKomma() const { return nUIUnitKomma; }
- FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; }
+ bool IsUIOnlyKomma() const { return bUIOnlyKomma; }
static void TakeUnitStr(FieldUnit eUnit, String& rStr);
- void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=FALSE, sal_Int32 nNumDigits = -1) const;
- void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=FALSE) const;
- void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=FALSE) const;
+ void TakeMetricStr(long nVal, String& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
+ void TakeWinkStr(long nWink, String& rStr, bool bNoDegChar = false) const;
+ void TakePercentStr(const Fraction& rVal, String& rStr, bool bNoPercentChar = false) const;
// RecalcPageNums wird idR. nur von der Page gerufen.
- FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; };
- FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; };
- void RecalcPageNums(FASTBOOL bMaster);
+ bool IsPagNumsDirty() const { return bPagNumsDirty; };
+ bool IsMPgNumsDirty() const { return bMPgNumsDirty; };
+ void RecalcPageNums(bool bMaster);
// Nach dem Insert gehoert die Page dem SdrModel.
virtual void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
virtual void DeletePage(USHORT nPgNum);
@@ -493,28 +493,28 @@ public:
// PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar
// auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese
// Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt.
- FASTBOOL IsPageNotValid() const { return bPageNotValid; }
- void SetPageNotValid(FASTBOOL bJa=TRUE) { bPageNotValid=bJa; }
+ bool IsPageNotValid() const { return bPageNotValid; }
+ void SetPageNotValid(bool bJa = true) { bPageNotValid=bJa; }
// Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte
// portabel gespeichert. Es findet dann beim Speichern ggf.
// eine implizite Wandlung von Metafiles statt.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSavePortable() const { return bSavePortable; }
- void SetSavePortable(FASTBOOL bJa=TRUE) { bSavePortable=bJa; }
+ bool IsSavePortable() const { return bSavePortable; }
+ void SetSavePortable(bool bJa = true) { bSavePortable=bJa; }
// Schaltet man dieses Flag auf TRUE, so werden
// Pixelobjekte (stark) komprimiert gespeichert.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSaveCompressed() const { return bSaveCompressed; }
- void SetSaveCompressed(FASTBOOL bJa=TRUE) { bSaveCompressed=bJa; }
+ bool IsSaveCompressed() const { return bSaveCompressed; }
+ void SetSaveCompressed(bool bJa = true) { bSaveCompressed=bJa; }
// Schaltet man dieses Flag auf TRUE, so werden
// Grafikobjekte mit gesetztem Native-Link
// native gespeichert.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSaveNative() const { return bSaveNative; }
- void SetSaveNative(FASTBOOL bJa=TRUE) { bSaveNative=bJa; }
+ bool IsSaveNative() const { return bSaveNative; }
+ void SetSaveNative(bool bJa = true) { bSaveNative=bJa; }
// Schaltet man dieses Flag auf TRUE, so werden die Grafiken
// von Grafikobjekten:
@@ -525,13 +525,13 @@ public:
// Damit das funktioniert, muss die virtuelle Methode
// GetDocumentStream() ueberladen werden.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSwapGraphics() const { return bSwapGraphics; }
- void SetSwapGraphics(FASTBOOL bJa=TRUE);
+ bool IsSwapGraphics() const { return bSwapGraphics; }
+ void SetSwapGraphics(bool bJa = true);
void SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; }
ULONG GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
- FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; }
- void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; }
+ bool IsSaveOLEPreview() const { return bSaveOLEPreview; }
+ void SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; }
// Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten)
// etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit
@@ -540,14 +540,14 @@ public:
// in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet
// (Speicher sparen).
// Default=Cache eingeschaltet. Flag ist nicht persistent.
- FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; }
- void SetBitmapCaching(FASTBOOL bJa=TRUE) { bNoBitmapCaching=!bJa; }
+ bool IsBitmapCaching() const { return !bNoBitmapCaching; }
+ void SetBitmapCaching(bool bJa = true) { bNoBitmapCaching=!bJa; }
// Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch
// Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie
// nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet.
- FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; }
- void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; }
+ bool IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; }
+ void SetPickThroughTransparentTextFrames(bool bOn) { bTransparentTextFrames=bOn; }
// Darf denn das Model ueberhaupt veraendert werden?
// Wird nur von den Possibility-Methoden der View ausgewerdet.
@@ -555,8 +555,8 @@ public:
// Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files
// TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag
// verwenden!).
- virtual FASTBOOL IsReadOnly() const;
- virtual void SetReadOnly(FASTBOOL bYes);
+ virtual bool IsReadOnly() const;
+ virtual void SetReadOnly(bool bYes);
// Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht
// const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved.
@@ -576,13 +576,13 @@ public:
virtual void Merge(SdrModel& rSourceModel,
USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF,
USHORT nDestPos=0xFFFF,
- FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE,
- FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE);
+ bool bMergeMasterPages = false, bool bAllMasterPages = false,
+ bool bUndo = true, bool bTreadSourceAsConst = false);
// Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy);
void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
USHORT nDestPos,
- FASTBOOL bUndo=TRUE, FASTBOOL bMoveNoCopy=FALSE);
+ bool bUndo = true, bool bMoveNoCopy = false);
// Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions
// beliebig tief zu klammern. Als Kommentar der
@@ -617,9 +617,9 @@ public:
ULONG GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
const SfxUndoAction* GetRedoAction(ULONG nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
- FASTBOOL Undo();
- FASTBOOL Redo();
- FASTBOOL Repeat(SfxRepeatTarget&);
+ bool Undo();
+ bool Redo();
+ bool Repeat(SfxRepeatTarget&);
// Hier kann die Applikation einen Handler setzen, der die auflaufenden
// UndoActions einsammelt. Der Handler hat folgendes Aussehen:
@@ -681,7 +681,7 @@ public:
// Methode TRUE, andernfalls FALSE.
// Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL
// uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni)
- FASTBOOL CheckConsistence() const;
+ bool CheckConsistence() const;
void SetStarDrawPreviewMode(BOOL bPreview);
BOOL IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
@@ -711,7 +711,7 @@ public:
void ReformatAllTextObjects();
- FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+ bool HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
SdrOutliner* createOutliner( USHORT nOutlinerMode );
void disposeOutliner( SdrOutliner* pOutliner );
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 572212c..6299494 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -124,7 +124,7 @@ public:
void ImpCheckCustomGluePointsAreAdded();
// returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed.
- Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt );
+ Rectangle ImpCalculateTextFrame( const bool bHgt, const bool bWdt );
public:
// #i37011#
@@ -187,7 +187,7 @@ public:
virtual void Move(const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear);
virtual void SetSnapRect(const Rectangle& rRect);
virtual void SetLogicRect(const Rectangle& rRect);
@@ -195,7 +195,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcSetLogicRect(const Rectangle& rRect);
@@ -208,21 +208,21 @@ public:
virtual bool beginSpecialDrag(SdrDragStat& rDrag) const;
virtual bool applySpecialDrag(SdrDragStat& rDrag);
- virtual FASTBOOL BegCreate( SdrDragStat& rStat );
- virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448#
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool BegCreate( SdrDragStat& rStat );
+ virtual bool MovCreate(SdrDragStat& rStat); // #i37448#
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
- virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
- virtual FASTBOOL IsAutoGrowHeight() const;
- virtual FASTBOOL IsAutoGrowWidth() const;
+ virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const;
+ virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
+ virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
+ virtual bool IsAutoGrowHeight() const;
+ virtual bool IsAutoGrowWidth() const;
virtual void SetVerticalWriting( sal_Bool bVertical );
virtual sal_Bool BegTextEdit( SdrOutliner& rOutl );
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void EndTextEdit( SdrOutliner& rOutl );
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
virtual void operator=(const SdrObject& rObj);
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index ae3bea8..87dc35a 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -183,7 +183,7 @@ public:
const SetOfByte* pVisiLayer;
const SdrPageView* pPageView;
USHORT nTol;
- FASTBOOL bDown;
+ bool bDown;
public:
SdrObjMacroHitRec()
@@ -236,11 +236,11 @@ public:
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
- virtual FASTBOOL HasMacro (const SdrObject* pObj) const;
+ virtual bool HasMacro (const SdrObject* pObj) const;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
+ virtual bool DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
};
@@ -522,8 +522,8 @@ protected:
void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); }
- String GetWinkStr(long nWink, FASTBOOL bNoDegChar=FALSE) const;
- String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=FALSE) const;
+ String GetWinkStr(long nWink, bool bNoDegChar = false) const;
+ String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const;
// bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
// Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
@@ -596,7 +596,7 @@ public:
// Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der
// der beim Einfuegen des Symbols auf das Raster gefangen werden soll
// oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes.
- virtual FASTBOOL HasRefPoint() const;
+ virtual bool HasRefPoint() const;
virtual Point GetRefPoint() const;
virtual void SetRefPoint(const Point& rPnt);
@@ -757,10 +757,10 @@ public:
// BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten
// Polygonpunkt wieder loeschen).
// RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen.
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual bool BegCreate(SdrDragStat& rStat);
+ virtual bool MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual bool BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
// damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert
@@ -778,13 +778,13 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
virtual void Move (const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
- virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void Shear (const Point& rRef, long nWink, double tn, bool bVShear);
// Die relative Position eines Zeichenobjektes ist die Entfernung der
// linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect)
@@ -821,7 +821,7 @@ public:
// Drehwinkel und Shear
virtual long GetRotateAngle() const;
- virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+ virtual long GetShearAngle(bool bVertical = false) const;
// Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte,
// Kreismittelpunkt, ...)
@@ -864,7 +864,7 @@ public:
void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
// NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ...
- void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const;
+ void TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const;
void ApplyNotPersistAttr(const SfxItemSet& rAttr);
void NbcApplyNotPersistAttr(const SfxItemSet& rAttr);
@@ -875,7 +875,7 @@ public:
SfxStyleSheet* GetStyleSheet() const;
// TextEdit
- virtual FASTBOOL HasTextEdit() const;
+ virtual bool HasTextEdit() const;
// Return==TRUE: TextEditMode gestartet
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
@@ -892,11 +892,11 @@ public:
void BurnInStyleSheetAttributes();
// Macrofaehigkeit, z.B. ein Rechteck als PushButton.
- virtual FASTBOOL HasMacro() const;
+ virtual bool HasMacro() const;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const;
- virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec);
+ virtual bool DoMacro (const SdrObjMacroHitRec& rRec);
virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; }
@@ -917,7 +917,7 @@ public:
// Beim Verschieben/Resizen der Kante wird dagegen die Verbindung
// geloesst.
// Objekt ist ein Knoten?
- virtual FASTBOOL IsNode() const;
+ virtual bool IsNode() const;
// Automatische Klebepunkte:
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list