mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editeng: sal_Bool->bool

Browse Source 
Change-Id: I9e27453f0b77a23ae3d811f0a50a85d3fdf80978
This commit is contained in:
Noel Grandin
2014-02-26 14:11:45 +02:00
parent c521f07208
commit 015b80e852
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/tabpages/chardlg.cxx
View File

@@ -3471,7 +3471,7 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bModified = sal_False, bChanged = sal_True; sal_Bool bModified = sal_False, bChanged = sal_True;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES ); const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES );
sal_Bool bOn = m_pTwoLinesBtn->IsChecked(); bool bOn = m_pTwoLinesBtn->IsChecked();
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 ) sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
? m_pStartBracketLB->GetSelectEntry()[0] : 0; ? m_pStartBracketLB->GetSelectEntry()[0] : 0;
sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 ) sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )

2
editeng/source/editeng/editeng.cxx
View File

@@ -524,7 +524,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
} }
} }
TextRanger* pRanger = new TextRanger( rPolyPolygon, pLinePolyPolygon, 30, 2, 2, bSimple, sal_True ); TextRanger* pRanger = new TextRanger( rPolyPolygon, pLinePolyPolygon, 30, 2, 2, bSimple, true );
pImpEditEngine->SetTextRanger( pRanger ); pImpEditEngine->SetTextRanger( pRanger );
pImpEditEngine->SetPaperSize( pRanger->GetBoundRect().GetSize() ); pImpEditEngine->SetPaperSize( pRanger->GetBoundRect().GetSize() );
} }

4
editeng/source/items/textitem.cxx
View File

@@ -137,7 +137,7 @@ TYPEINIT1_FACTORY(SvxNoHyphenItem, SfxBoolItem, new SvxNoHyphenItem(true, 0));
TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0)); TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0));
TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0)); TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0));
TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0)); TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0));
TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(sal_True, 0, 0, 0)); TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(true, 0, 0, 0));
TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem); TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0)); TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0));
TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0)); TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
@@ -2975,7 +2975,7 @@ sal_uInt16 SvxEmphasisMarkItem::GetVersion( sal_uInt16 nFFVer ) const
|* class SvxTwoLinesItem |* class SvxTwoLinesItem
*************************************************************************/ *************************************************************************/
SvxTwoLinesItem::SvxTwoLinesItem( sal_Bool bFlag, sal_Unicode nStartBracket, SvxTwoLinesItem::SvxTwoLinesItem( bool bFlag, sal_Unicode nStartBracket,
sal_Unicode nEndBracket, sal_uInt16 nW ) sal_Unicode nEndBracket, sal_uInt16 nW )
: SfxPoolItem( nW ), : SfxPoolItem( nW ),
cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag ) cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag )

4
editeng/source/misc/txtrange.cxx
View File

@@ -30,7 +30,7 @@
TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght, sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght,
sal_Bool bSimpl, sal_Bool bInnr, sal_Bool bVert ) : bool bSimpl, bool bInnr, bool bVert ) :
pBound( NULL ), pBound( NULL ),
nCacheSize( nCacheSz ), nCacheSize( nCacheSz ),
nRight( nRght ), nRight( nRght ),
@@ -81,7 +81,7 @@ TextRanger::~TextRanger()
If there's is a change in the writing direction, If there's is a change in the writing direction,
the cache has to be cleared. the cache has to be cleared.
*/ */
void TextRanger::SetVertical( sal_Bool bNew ) void TextRanger::SetVertical( bool bNew )
{ {
if( IsVertical() != bNew ) if( IsVertical() != bNew )
{ {

2
editeng/source/rtf/rtfitem.cxx
View File

@@ -1041,7 +1041,7 @@ ATTR_SETEMPHASIS:
default: cStt = 0, cEnd = 0; break; default: cStt = 0, cEnd = 0; break;
} }
pSet->Put( SvxTwoLinesItem( sal_True, cStt, cEnd, pSet->Put( SvxTwoLinesItem( true, cStt, cEnd,
PLAINID->nTwoLines )); PLAINID->nTwoLines ));
} }
break; break;

8
include/editeng/tstpitem.hxx
View File

@@ -53,7 +53,7 @@ public:
const sal_Unicode cFil = cDfltFillChar ); const sal_Unicode cFil = cDfltFillChar );
sal_Int32& GetTabPos() { return nTabPos; } sal_Int32& GetTabPos() { return nTabPos; }
sal_Int32 GetTabPos() const { return nTabPos; } sal_Int32 GetTabPos() const { return nTabPos; }
SvxTabAdjust& GetAdjustment() { return eAdjustment; } SvxTabAdjust& GetAdjustment() { return eAdjustment; }
SvxTabAdjust GetAdjustment() const { return eAdjustment; } SvxTabAdjust GetAdjustment() const { return eAdjustment; }
@@ -67,7 +67,7 @@ public:
OUString GetValueString() const; OUString GetValueString() const;
// the "old" operator==() // the "old" operator==()
sal_Bool IsEqual( const SvxTabStop& rTS ) const bool IsEqual( const SvxTabStop& rTS ) const
{ {
return ( nTabPos == rTS.nTabPos && return ( nTabPos == rTS.nTabPos &&
eAdjustment == rTS.eAdjustment && eAdjustment == rTS.eAdjustment &&
@@ -76,9 +76,9 @@ public:
} }
// For the SortedArray: // For the SortedArray:
sal_Bool operator==( const SvxTabStop& rTS ) const bool operator==( const SvxTabStop& rTS ) const
{ return nTabPos == rTS.nTabPos; } { return nTabPos == rTS.nTabPos; }
sal_Bool operator <( const SvxTabStop& rTS ) const bool operator <( const SvxTabStop& rTS ) const
{ return nTabPos < rTS.nTabPos; } { return nTabPos < rTS.nTabPos; }
SvxTabStop& operator=( const SvxTabStop& rTS ) SvxTabStop& operator=( const SvxTabStop& rTS )

8
include/editeng/twolinesitem.hxx
View File

@@ -28,10 +28,10 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
{ {
sal_Unicode cStartBracket, cEndBracket; sal_Unicode cStartBracket, cEndBracket;
sal_Bool bOn; bool bOn;
public: public:
TYPEINFO(); TYPEINFO();
SvxTwoLinesItem( sal_Bool bOn /*= sal_True*/, SvxTwoLinesItem( bool bOn /*= true*/,
sal_Unicode nStartBracket /*= 0*/, sal_Unicode nStartBracket /*= 0*/,
sal_Unicode nEndBracket /*= 0*/, sal_Unicode nEndBracket /*= 0*/,
sal_uInt16 nId ); sal_uInt16 nId );
@@ -62,8 +62,8 @@ public:
return *this; return *this;
} }
sal_Bool GetValue() const { return bOn; } bool GetValue() const { return bOn; }
void SetValue( sal_Bool bFlag ) { bOn = bFlag; } void SetValue( bool bFlag ) { bOn = bFlag; }
sal_Unicode GetStartBracket() const { return cStartBracket; } sal_Unicode GetStartBracket() const { return cStartBracket; }
void SetStartBracket( sal_Unicode c ) { cStartBracket = c; } void SetStartBracket( sal_Unicode c ) { cStartBracket = c; }

20
include/editeng/txtrange.hxx
View File

@@ -52,10 +52,10 @@ class EDITENG_DLLPUBLIC TextRanger
sal_uInt16 nUpper; // Distance Contour-Text sal_uInt16 nUpper; // Distance Contour-Text
sal_uInt16 nLower; // Distance Text-Contour sal_uInt16 nLower; // Distance Text-Contour
sal_uInt32 nPointCount; // Number of polygon points sal_uInt32 nPointCount; // Number of polygon points
sal_Bool bSimple : 1; // Just outside edge bool bSimple : 1; // Just outside edge
sal_Bool bInner : 1; // TRUE: Objekt inline (EditEngine); bool bInner : 1; // TRUE: Objekt inline (EditEngine);
// FALSE: Objekt flow (StarWriter); // FALSE: Objekt flow (StarWriter);
sal_Bool bVertical :1; // for vertical writing mode bool bVertical :1;// for vertical writing mode
TextRanger( const TextRanger& ); // not implemented TextRanger( const TextRanger& ); // not implemented
const Rectangle& _GetBoundRect(); const Rectangle& _GetBoundRect();
@@ -63,7 +63,7 @@ public:
TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon, TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon, const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSize, sal_uInt16 nLeft, sal_uInt16 nRight, sal_uInt16 nCacheSize, sal_uInt16 nLeft, sal_uInt16 nRight,
sal_Bool bSimple, sal_Bool bInner, sal_Bool bVert = sal_False ); bool bSimple, bool bInner, bool bVert = false );
~TextRanger(); ~TextRanger();
LongDqPtr GetTextRanges( const Range& rRange ); LongDqPtr GetTextRanges( const Range& rRange );
sal_uInt16 GetRight() const { return nRight; } sal_uInt16 GetRight() const { return nRight; }
@@ -71,17 +71,17 @@ public:
sal_uInt16 GetUpper() const { return nUpper; } sal_uInt16 GetUpper() const { return nUpper; }
sal_uInt16 GetLower() const { return nLower; } sal_uInt16 GetLower() const { return nLower; }
sal_uInt32 GetPointCount() const { return nPointCount; } sal_uInt32 GetPointCount() const { return nPointCount; }
sal_Bool IsSimple() const { return bSimple; } bool IsSimple() const { return bSimple; }
sal_Bool IsInner() const { return bInner; } bool IsInner() const { return bInner; }
sal_Bool IsVertical() const { return bVertical; } bool IsVertical() const { return bVertical; }
sal_Bool HasBorder() const { return nRight || nLeft; } bool HasBorder() const { return nRight || nLeft; }
const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; } const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; } const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; }
const Rectangle& GetBoundRect() const Rectangle& GetBoundRect()
{ return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); } { return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); }
void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; } void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
void SetLower( sal_uInt16 nNew ){ nLower = nNew; } void SetLower( sal_uInt16 nNew ){ nLower = nNew; }
void SetVertical( sal_Bool bNew ); void SetVertical( bool bNew );
}; };
#endif // _TXTRANGE_HXX #endif // _TXTRANGE_HXX

2
reportdesign/source/ui/misc/UITools.cxx
View File

@@ -674,7 +674,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxColorListItem(pColorList.get(),ITEMID_COLOR_TABLE), new SvxColorListItem(pColorList.get(),ITEMID_COLOR_TABLE),
new SvxBlinkItem(false,ITEMID_BLINK), new SvxBlinkItem(false,ITEMID_BLINK),
new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK), new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK),
new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES), new SvxTwoLinesItem(true,0,0,ITEMID_TWOLINES),
new SvxCharRotateItem(0,false,ITEMID_CHARROTATE), new SvxCharRotateItem(0,false,ITEMID_CHARROTATE),
new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W), new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W),
new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF), new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF),

2
sw/source/core/bastyp/init.cxx
View File

@@ -493,7 +493,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( 0, 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_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_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( false, 0, 0, RES_CHRATR_TWO_LINES );
aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] = new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW ); aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] = new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW );
aAttrTab[ RES_CHRATR_RELIEF - POOLATTR_BEGIN ] = new SvxCharReliefItem( RELIEF_NONE, RES_CHRATR_RELIEF ); aAttrTab[ RES_CHRATR_RELIEF - POOLATTR_BEGIN ] = new SvxCharReliefItem( RELIEF_NONE, RES_CHRATR_RELIEF );
aAttrTab[ RES_CHRATR_HIDDEN - POOLATTR_BEGIN ] = new SvxCharHiddenItem( false, RES_CHRATR_HIDDEN ); aAttrTab[ RES_CHRATR_HIDDEN - POOLATTR_BEGIN ] = new SvxCharHiddenItem( false, RES_CHRATR_HIDDEN );

2
sw/source/filter/ww8/ww8par6.cxx
View File

@@ -3276,7 +3276,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
case 3: cStt = '<', cEnd = '>'; break; case 3: cStt = '<', cEnd = '>'; break;
case 4: cStt = '{', cEnd = '}'; break; case 4: cStt = '{', cEnd = '}'; break;
} }
NewAttr( SvxTwoLinesItem( sal_True, cStt, cEnd, RES_CHRATR_TWO_LINES )); NewAttr( SvxTwoLinesItem( true, cStt, cEnd, RES_CHRATR_TWO_LINES ));
} }
break; break;