diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/access/acctable.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/doc/docftn.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 8 | ||||
-rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1664e6921851..b6e30dd8c3a2 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -601,7 +601,7 @@ void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 ) class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl { - ::std::vector< sal_Bool > aSelected; + ::std::vector< bool > aSelected; sal_Int32 nCount; public: @@ -618,7 +618,7 @@ SwAccAllTableSelHander_Impl::~SwAccAllTableSelHander_Impl() } inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32 nSize ) : - aSelected( nSize, sal_True ), + aSelected( nSize, true ), nCount( nSize ) { } @@ -655,7 +655,7 @@ void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol, { if( aSelected[static_cast< size_t >( nRowOrCol )] ) { - aSelected[static_cast< size_t >( nRowOrCol )] = sal_False; + aSelected[static_cast< size_t >( nRowOrCol )] = false; nCount--; } nExt--; diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 409661950306..5842e589cc1d 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -284,7 +284,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) { std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums)); if ( bFtnDesc ) - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_False)); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false)); if ( bExtra ) { // For messages regarding ErgoSum etc. we save the extra code and use the @@ -352,7 +352,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) if ( bFtnDesc ) { std::set<SwRootFrm*> aAllLayouts = GetAllLayouts(); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_True)); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true)); } if ( bExtra ) { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index d333b6df580d..74b2829bb8bb 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -661,17 +661,17 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT } }; - sal_uInt16 aClearItems[3] = { sal_False, sal_False, sal_False }; + bool aClearItems[3] = { false, false, false }; switch( nScript ) { case CSS1_SCRIPT_WESTERN: - aClearItems[1] = aClearItems[2] = sal_True; + aClearItems[1] = aClearItems[2] = true; break; case CSS1_SCRIPT_CJK: - aClearItems[0] = aClearItems[2] = sal_True; + aClearItems[0] = aClearItems[2] = true; break; case CSS1_SCRIPT_CTL: - aClearItems[0] = aClearItems[1] = sal_True; + aClearItems[0] = aClearItems[1] = true; break; case CSS1_SCRIPT_ALL: break; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index e40d612a6f26..4434ddcc3af0 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -194,9 +194,9 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine, return bRet; } -static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders ); +static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, bool *pBorders ); -static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorders ) +static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, bool *pBorders ) { if( *pBorders ) return false; @@ -222,7 +222,7 @@ static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorde return !*pBorders; } -static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders ) +static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, bool *pBorders ) { if( *pBorders ) return false; @@ -245,7 +245,7 @@ bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox, { // MIB 30.6.97: Wenn schon eine Box expandiert wurde, wird eine // weitere nur expandiert, wenn sie Umrandungen besitzt. - sal_Bool bBorders = sal_False; + bool bBorders = false; lcl_TableBox_HasTabBorders( pBox, &bBorders ); if( !bBorders ) bBorders = HasTabBackground( *pBox, true, true, true, true ); |