summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-20 08:44:03 +0200
committerNoel Grandin <noel@peralex.com>2014-02-21 12:19:23 +0200
commit5a5a80dd5c19541fd1c0d40d9b0ecbb60bc0a1ae (patch)
tree9bf09477d5e788fa8ffb65f53a518cdc689dcb59
parent32ef676504de5a35e9ee4ddcce9313dcab7d74ee (diff)
editeng: sal_Bool->bool
Change-Id: I92935238ff016dc441db72e3aadc28466fe84e68
-rw-r--r--editeng/source/items/textitem.cxx4
-rw-r--r--include/editeng/charrotateitem.hxx12
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx4
-rw-r--r--sw/source/core/bastyp/init.cxx2
-rw-r--r--sw/source/core/doc/poolfmt.cxx2
5 files changed, 12 insertions, 12 deletions
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index f26705768886..157ac624ed99 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -139,7 +139,7 @@ TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0));
TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0));
TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(sal_True, 0, 0, 0));
TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
-TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, sal_False, 0));
+TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0));
TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
TYPEINIT1_FACTORY(SvxCharReliefItem, SfxEnumItem, new SvxCharReliefItem(RELIEF_NONE, 0));
TYPEINIT1_FACTORY(SvxRsidItem, SfxUInt32Item, new SvxRsidItem(0, 0));
@@ -3130,7 +3130,7 @@ sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 nFFVer ) const
*************************************************************************/
SvxCharRotateItem::SvxCharRotateItem( sal_uInt16 nValue,
- sal_Bool bFitIntoLine,
+ bool bFitIntoLine,
const sal_uInt16 nW )
: SfxUInt16Item( nW, nValue ), bFitToLine( bFitIntoLine )
{
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 27b9433a6105..e0677e0818bf 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -35,12 +35,12 @@
class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item
{
- sal_Bool bFitToLine;
+ bool bFitToLine;
public:
TYPEINFO();
SvxCharRotateItem( sal_uInt16 nValue /*= 0*/,
- sal_Bool bFitIntoLine /*= sal_False*/,
+ bool bFitIntoLine /*= false*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -69,11 +69,11 @@ public:
// our currently only degree values
void SetTopToBotton() { SetValue( 2700 ); }
void SetBottomToTop() { SetValue( 900 ); }
- sal_Bool IsTopToBotton() const { return 2700 == GetValue(); }
- sal_Bool IsBottomToTop() const { return 900 == GetValue(); }
+ bool IsTopToBotton() const { return 2700 == GetValue(); }
+ bool IsBottomToTop() const { return 900 == GetValue(); }
- sal_Bool IsFitToLine() const { return bFitToLine; }
- void SetFitToLine( sal_Bool b ) { bFitToLine = b; }
+ bool IsFitToLine() const { return bFitToLine; }
+ void SetFitToLine( bool b ) { bFitToLine = b; }
};
#endif
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 002611ba2386..43a2b4037d30 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -347,7 +347,7 @@ namespace
_rItemSet.Put(SvxEmphasisMarkItem(static_cast<FontEmphasisMark>(_rxReportControlFormat->getCharEmphasis()),ITEMID_EMPHASISMARK));
_rItemSet.Put(SvxCharReliefItem(static_cast<FontRelief>(_rxReportControlFormat->getCharRelief()),ITEMID_CHARRELIEF));
_rItemSet.Put(SvxColorItem(::Color(_rxReportControlFormat->getCharColor()),ITEMID_COLOR));
- _rItemSet.Put(SvxCharRotateItem(_rxReportControlFormat->getCharRotation(),sal_False,ITEMID_CHARROTATE));
+ _rItemSet.Put(SvxCharRotateItem(_rxReportControlFormat->getCharRotation(),false,ITEMID_CHARROTATE));
_rItemSet.Put(SvxCharScaleWidthItem(_rxReportControlFormat->getCharScaleWidth(),ITEMID_CHARSCALE_W));
SvxHorJustifyItem aHorJustifyItem(ITEMID_HORJUSTIFY);
@@ -675,7 +675,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxBlinkItem(false,ITEMID_BLINK),
new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK),
new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES),
- new SvxCharRotateItem(0,sal_False,ITEMID_CHARROTATE),
+ new SvxCharRotateItem(0,false,ITEMID_CHARROTATE),
new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W),
new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF),
new SvxCharHiddenItem(sal_False,ITEMID_CHARHIDDEN),
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 18288c922d53..e5cb4cab49f9 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -490,7 +490,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_CTL_POSTURE - POOLATTR_BEGIN ] = new SvxPostureItem(ITALIC_NONE, RES_CHRATR_CTL_POSTURE );
aAttrTab[ RES_CHRATR_CTL_WEIGHT - POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT );
- aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( 0, sal_False, RES_CHRATR_ROTATE );
+ aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( 0, false, RES_CHRATR_ROTATE );
aAttrTab[ RES_CHRATR_EMPHASIS_MARK - POOLATTR_BEGIN ] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, RES_CHRATR_EMPHASIS_MARK );
aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( sal_False, 0, 0, RES_CHRATR_TWO_LINES );
aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] = new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 736abcbf4251..5b832a04ca49 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1284,7 +1284,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
}
break;
case RES_POOLCHR_VERT_NUM:
- aSet.Put( SvxCharRotateItem( 900, sal_False, RES_CHRATR_ROTATE ) );
+ aSet.Put( SvxCharRotateItem( 900, false, RES_CHRATR_ROTATE ) );
break;
case RES_POOLFRM_FRAME: