summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2012-10-25 17:01:26 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2012-10-25 17:01:50 +0900
commit9e44e1a819cb919015a8e268029b7e979300ed5c (patch)
treeffdf4140de492f3469c6e37838a7e7e39fafa906 /sw/inc
parent923e85b89549a3c09fe625c4f2faee5287974f72 (diff)
sal_Bool to bool
Change-Id: I8b76ba6d6a27cebefca3307a648bd5baafd27262
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/doc.hxx34
-rw-r--r--sw/inc/editsh.hxx6
-rw-r--r--sw/inc/format.hxx6
3 files changed, 23 insertions, 23 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2e7357c47784..b124a5af012f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -637,7 +637,7 @@ private:
const bool bCopyFlyAtFly = false ) const;
sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
- typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool, sal_Bool );
+ typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, bool, bool );
SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
@@ -697,9 +697,9 @@ private:
void DoUpdateAllCharts();
DECL_LINK( DoUpdateModifiedOLE, Timer * );
- SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
- SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
- SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
+ SwFmt *_MakeCharFmt(const String &, SwFmt *, bool, bool );
+ SwFmt *_MakeFrmFmt(const String &, SwFmt *, bool, bool );
+ SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, bool, bool );
void InitTOXTypes();
void Paste( const SwDoc& );
@@ -1225,14 +1225,14 @@ public:
void RemoveAllFmtLanguageDependencies();
SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
- sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True);
+ bool bBroadcast = false, bool bAuto = true);
void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
{ return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName ); }
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
- sal_Bool bBroadcast = sal_False,
- sal_Bool bAuto = sal_True );
+ bool bBroadcast = false,
+ bool bAuto = true );
void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
SwCharFmt* FindCharFmtByName( const String& rName ) const
@@ -1244,13 +1244,13 @@ public:
const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- sal_Bool bBroadcast = sal_False,
- sal_Bool bAuto = sal_True );
+ bool bBroadcast = false,
+ bool bAuto = true );
SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- sal_Bool bBroadcast = sal_False);
- void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
- void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = sal_False );
+ bool bBroadcast = false);
+ void DelTxtFmtColl(sal_uInt16 nFmt, bool bBroadcast = false);
+ void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
/** Add 4th optional parameter <bResetListAttrs>.
'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
attributes of the affected text nodes are cleared, except the break
@@ -1258,7 +1258,7 @@ public:
The new parameter <bResetListAttrs> indicates, if the list attributes
(list style, restart at and restart with) are cleared as well in case
that <bReset = true> and the paragraph style has a list style attribute set. */
- sal_Bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
+ bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
bool bReset = true,
bool bResetListAttrs = false );
SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const
@@ -1348,7 +1348,7 @@ public:
/** Copy the complete PageDesc - beyond document and "deep"!
Optionally copying of PoolFmtId, -HlpId can be prevented. */
void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
- sal_Bool bCopyPoolIds = sal_True );
+ bool bCopyPoolIds = true );
/** Copy header (with contents) from SrcFmt to DestFmt
(can also be copied into other document). */
@@ -1821,9 +1821,9 @@ public:
/** Adjust left margin via object bar (similar to adjustment of numerations).
One can either change the margin "by" adding or substracting a given
- offset or set it "to" this position (bModulus = sal_True). */
- void MoveLeftMargin( const SwPaM& rPam, sal_Bool bRight = sal_True,
- sal_Bool bModulus = sal_True );
+ offset or set it "to" this position (bModulus = true). */
+ void MoveLeftMargin( const SwPaM& rPam, bool bRight = true,
+ bool bModulus = true );
/// Query NumberFormatter.
inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 3b1c1bb5b0bd..2c76a42a4aaa 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -872,9 +872,9 @@ public:
/** Adjust left margin via object bar (similar to adjustment of numerations).
One can either change the margin "by" adding or substracting a given
- offset or set it "to" this position @param (bModulus = sal_True). */
- sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ) const;
- void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True );
+ offset or set it "to" this position @param (bModulus = true). */
+ bool IsMoveLeftMargin( bool bRight = true, bool bModulus = true ) const;
+ void MoveLeftMargin( bool bRight = true, bool bModulus = true );
/// Query NumberFormater from document.
SvNumberFormatter* GetNumberFormatter();
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 883165f62cf3..593cb55b38ab 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -55,7 +55,7 @@ class SW_DLLPUBLIC SwFmt : public SwModify
sal_uInt16 nPoolHelpId; ///< HelpId for this Pool-style.
sal_uInt8 nPoolHlpFileId; ///< FilePos to Doc to these style helps.
sal_Bool bWritten : 1; ///< TRUE: already written.
- sal_Bool bAutoFmt : 1; /**< FALSE: it is a template.
+ bool bAutoFmt : 1; /**< FALSE: it is a template.
default is true! */
sal_Bool bFmtInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able
to recognize this in FmtChg-message!! */
@@ -161,8 +161,8 @@ public:
void ResetWritten() { bWritten = sal_False; }
/// Query / set AutoFmt-flag.
- sal_Bool IsAuto() const { return bAutoFmt; }
- void SetAuto( sal_Bool bNew = sal_False ) { bAutoFmt = bNew; }
+ bool IsAuto() const { return bAutoFmt; }
+ void SetAuto( bool bNew = false ) { bAutoFmt = bNew; }
/// Query / set bAutoUpdateFmt-flag.
sal_Bool IsAutoUpdateFmt() const { return bAutoUpdateFmt; }