summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-21 15:46:35 +0200
committerNoel Grandin <noel@peralex.com>2014-02-27 12:30:24 +0200
commitbbe5d32ddac11fc7349c335ecec588859ea81362 (patch)
tree321973fa592657e96ff41113164633996646602d
parent46888b6f8dd5d9e89370c92d87320df13f430fe2 (diff)
editeng: sal_Bool->bool
Change-Id: If5b8269b35983e564f1002f6ed25ca607381eea7
-rw-r--r--editeng/source/items/frmitems.cxx4
-rw-r--r--editeng/source/rtf/rtfitem.cxx2
-rw-r--r--include/editeng/keepitem.hxx4
-rw-r--r--sw/source/core/bastyp/init.cxx2
-rw-r--r--sw/source/core/doc/doclay.cxx4
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
-rw-r--r--sw/source/core/doc/tblafmt.cxx4
-rw-r--r--sw/source/core/undo/unins.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
9 files changed, 13 insertions, 13 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3dd7a3aa51c0..19f89d7a7f62 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -155,7 +155,7 @@ TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0));
TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
@@ -3101,7 +3101,7 @@ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsKeep;
rStrm.ReadSChar( bIsKeep );
- return new SvxFmtKeepItem( sal_Bool( bIsKeep != 0 ), Which() );
+ return new SvxFmtKeepItem( bIsKeep != 0, Which() );
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 3722a8bfe673..6f483f3edeb8 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -314,7 +314,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_KEEPN:
if( PARDID->nKeep )
{
- pSet->Put( SvxFmtKeepItem( sal_True, PARDID->nKeep ));
+ pSet->Put( SvxFmtKeepItem( true, PARDID->nKeep ));
}
break;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index bdb16b839e0b..85eb197c46c2 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
public:
TYPEINFO();
- inline SvxFmtKeepItem( const sal_Bool bKeep /*= sal_False*/,
+ inline SvxFmtKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
@@ -50,7 +50,7 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const;
};
-inline SvxFmtKeepItem::SvxFmtKeepItem( const sal_Bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
SfxBoolItem( _nWhich, bKeep )
{}
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index e88efaeae5bf..e701add1582d 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -583,7 +583,7 @@ void _InitCore()
aAttrTab[ RES_SHADOW- POOLATTR_BEGIN ] = new SvxShadowItem( RES_SHADOW );
aAttrTab[ RES_FRMMACRO- POOLATTR_BEGIN ] = new SvxMacroItem( RES_FRMMACRO );
aAttrTab[ RES_COL- POOLATTR_BEGIN ] = new SwFmtCol;
- aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] = new SvxFmtKeepItem( sal_False, RES_KEEP );
+ aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] = new SvxFmtKeepItem( false, RES_KEEP );
aAttrTab[ RES_URL - POOLATTR_BEGIN ] = new SwFmtURL();
aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] = new SwFmtEditInReadonly;
aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] = new SwFmtLayoutSplit;
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index e383554830d7..6d222cc9e4bf 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1430,7 +1430,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
if ( bBefore )
{
if ( !pNew->GetSwAttrSet().GetKeep().GetValue() )
- pNew->SetAttr( SvxFmtKeepItem( sal_True, RES_KEEP ) );
+ pNew->SetAttr( SvxFmtKeepItem( true, RES_KEEP ) );
}
else
{
@@ -1438,7 +1438,7 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
rDoc.GetNodes()[nNdIdx]->GetStartNode()->GetTableNode();
SwTable &rTbl = pNd->GetTable();
if ( !rTbl.GetFrmFmt()->GetKeep().GetValue() )
- rTbl.GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem( sal_True, RES_KEEP ) );
+ rTbl.GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem( true, RES_KEEP ) );
if ( pUndo )
pUndo->SetUndoKeep();
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 5b832a04ca49..caeb057280fc 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -467,7 +467,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE );
if( get(IDocumentSettingAccess::HTML_MODE) )
aUL.SetLower( HTML_PARSPACE );
- aSet.Put( SvxFmtKeepItem( sal_True, RES_KEEP ));
+ aSet.Put( SvxFmtKeepItem( true, RES_KEEP ));
pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 3eb6c02ccc3f..398b062f1d86 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -584,7 +584,7 @@ SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
: m_aName( rName )
, nStrResId( USHRT_MAX )
, m_aBreak( SVX_BREAK_NONE, RES_BREAK )
- , m_aKeepWithNextPara( sal_False, RES_KEEP )
+ , m_aKeepWithNextPara( false, RES_KEEP )
, m_aRepeatHeading( 0 )
, m_bLayoutSplit( sal_True )
, m_bRowSplit( sal_True )
@@ -603,7 +603,7 @@ SwTableAutoFmt::SwTableAutoFmt( const OUString& rName )
SwTableAutoFmt::SwTableAutoFmt( const SwTableAutoFmt& rNew )
: m_aBreak( rNew.m_aBreak )
- , m_aKeepWithNextPara( sal_False, RES_KEEP )
+ , m_aKeepWithNextPara( false, RES_KEEP )
, m_aShadow( RES_SHADOW )
{
for( sal_uInt8 n = 0; n < 16; ++n )
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index d61d29f78996..6bb64a837d5d 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -984,7 +984,7 @@ void SwUndoInsertLabel::RedoImpl(::sw::UndoRedoContext & rContext)
SwTableNode *pNd = rDoc.GetNodes()[
rDoc.GetNodes()[NODE.nNode-1]->StartOfSectionIndex()]->GetTableNode();
if ( pNd )
- pNd->GetTable().GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem(sal_True, RES_KEEP) );
+ pNd->GetTable().GetFrmFmt()->SetFmtAttr( SvxFmtKeepItem(true, RES_KEEP) );
}
NODE.pUndoInsNd->UndoImpl(rContext);
delete NODE.pUndoInsNd, NODE.pUndoInsNd = 0;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 90d943ea524a..ba4bcfad3fd9 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2497,7 +2497,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
if ( !pTmpSet )
pTmpSet = new SfxItemSet(rNode.GetSwAttrSet());
- const SvxFmtKeepItem aKeepItem( sal_True, RES_KEEP );
+ const SvxFmtKeepItem aKeepItem( true, RES_KEEP );
pTmpSet->Put( aKeepItem );
}
}