summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/source/controller/main/ShapeController.cxx2
-rw-r--r--editeng/source/items/paraitem.cxx12
-rw-r--r--include/editeng/hyphenzoneitem.hxx14
-rw-r--r--sw/source/core/bastyp/init.cxx2
-rw-r--r--sw/source/ui/shells/annotsh.cxx2
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 24c32c1061f0..f239af40ef2d 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,7 +582,7 @@ void ShapeController::executeDispatch_ParagraphDialog()
SID_ATTR_PARA_ORPHANS, SID_ATTR_PARA_ORPHANS,
0 );
aNewAttr.Put( aAttr );
- aNewAttr.Put( SvxHyphenZoneItem( sal_False, SID_ATTR_PARA_HYPHENZONE ) );
+ aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
aNewAttr.Put( SvxFmtSplitItem( sal_True, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index d24ae985600c..5bd3184350a9 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -70,7 +70,7 @@ TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_
TYPEINIT1_FACTORY(SvxAdjustItem, SfxPoolItem, new SvxAdjustItem(SVX_ADJUST_LEFT, 0));
TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
-TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(sal_False, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
@@ -668,11 +668,11 @@ SfxItemPresentation SvxOrphansItem::GetPresentation
// class SvxHyphenZoneItem -----------------------------------------------
-SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId ) :
+SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
bHyphen = bHyph;
- bPageEnd = sal_True;
+ bPageEnd = true;
nMinLead = nMinTrail = 0;
nMaxHyphens = 255;
}
@@ -812,9 +812,9 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
sal_Int8 _bHyphen, _bHyphenPageEnd;
sal_Int8 _nMinLead, _nMinTrail, _nMaxHyphens;
rStrm.ReadSChar( _bHyphen ).ReadSChar( _bHyphenPageEnd ).ReadSChar( _nMinLead ).ReadSChar( _nMinTrail ).ReadSChar( _nMaxHyphens );
- SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( sal_False, Which() );
- pAttr->SetHyphen( sal_Bool( _bHyphen != 0 ) );
- pAttr->SetPageEnd( sal_Bool( _bHyphenPageEnd != 0 ) );
+ SvxHyphenZoneItem* pAttr = new SvxHyphenZoneItem( false, Which() );
+ pAttr->SetHyphen( _bHyphen != 0 );
+ pAttr->SetPageEnd( _bHyphenPageEnd != 0 );
pAttr->GetMinLead() = _nMinLead;
pAttr->GetMinTrail() = _nMinTrail;
pAttr->GetMaxHyphens() = _nMaxHyphens;
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 84bcec055b9a..7d7e04b37f75 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -34,8 +34,8 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
{
- sal_Bool bHyphen: 1;
- sal_Bool bPageEnd: 1;
+ bool bHyphen : 1;
+ bool bPageEnd : 1;
sal_uInt8 nMinLead;
sal_uInt8 nMinTrail;
sal_uInt8 nMaxHyphens;
@@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem
public:
TYPEINFO();
- SvxHyphenZoneItem( const sal_Bool bHyph /*= sal_False*/,
+ SvxHyphenZoneItem( const bool bHyph /*= false*/,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
@@ -62,11 +62,11 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
- inline void SetHyphen( const sal_Bool bNew ) { bHyphen = bNew; }
- inline sal_Bool IsHyphen() const { return bHyphen; }
+ inline void SetHyphen( const bool bNew ) { bHyphen = bNew; }
+ inline bool IsHyphen() const { return bHyphen; }
- inline void SetPageEnd( const sal_Bool bNew ) { bPageEnd = bNew; }
- inline sal_Bool IsPageEnd() const { return bPageEnd; }
+ inline void SetPageEnd( const bool bNew ) { bPageEnd = bNew; }
+ inline bool IsPageEnd() const { return bPageEnd; }
inline sal_uInt8 &GetMinLead() { return nMinLead; }
inline sal_uInt8 GetMinLead() const { return nMinLead; }
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1a965262ac75..f816d6c20390 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -534,7 +534,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] = new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] = new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
- pItem = new SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE );
+ pItem = new SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE );
((SvxHyphenZoneItem*)pItem)->GetMaxHyphens() = 0; // Default: 0
aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] = pItem;
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 6e3452f5a2e4..a53f918993e7 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -520,7 +520,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put(aEditAttr);
- aDlgAttr.Put( SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE) );
+ aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 2f9c543ad0cb..4180f95ca9df 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -414,7 +414,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
aDlgAttr.Put(aEditAttr);
- aDlgAttr.Put( SvxHyphenZoneItem( sal_False, RES_PARATR_HYPHENZONE) );
+ aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );