diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-25 14:19:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-27 12:30:26 +0200 |
commit | 57779aa0195d77239b339c6dbe17209b3f0cc4ee (patch) | |
tree | fb07a1ccf2c6394da9d4c63ca0ae139af9669e8a /editeng | |
parent | 127f62ccbdf090e2b5fc4d92c30a9c152b60f0e0 (diff) |
editeng: sal_Bool->bool
Change-Id: Id4174904487fc153d8e80471da7c829c52092f78
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/outliner/outleeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlin2.cxx | 78 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 222 | ||||
-rw-r--r-- | editeng/source/outliner/outlundo.cxx | 8 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 158 | ||||
-rw-r--r-- | editeng/source/outliner/paralist.cxx | 10 |
6 files changed, 239 insertions, 239 deletions
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index 4b89a3fddfb0..bac8437de7c6 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -70,7 +70,7 @@ Rectangle OutlinerEditEng::GetBulletArea( sal_Int32 nPara ) if ( nPara < pOwner->pParaList->GetParagraphCount() ) { if ( pOwner->ImplHasNumberFormat( nPara ) ) - aBulletArea = pOwner->ImpCalcBulletArea( nPara, sal_False, sal_False ); + aBulletArea = pOwner->ImpCalcBulletArea( nPara, false, false ); } return aBulletArea; } diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 902df8d7ae25..53b8883b990b 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -46,13 +46,13 @@ using namespace ::com::sun::star::linguistic2; // ====================== Simple pass-through ======================= // ====================================================================== -void Outliner::SetUpdateMode( sal_Bool bUpdate ) +void Outliner::SetUpdateMode( bool bUpdate ) { pEditEngine->SetUpdateMode( bUpdate ); } -sal_Bool Outliner::GetUpdateMode() const +bool Outliner::GetUpdateMode() const { return pEditEngine->GetUpdateMode(); } @@ -62,12 +62,12 @@ const SfxItemSet& Outliner::GetEmptyItemSet() const return pEditEngine->GetEmptyItemSet(); } -void Outliner::EnableUndo( sal_Bool bEnable ) +void Outliner::EnableUndo( bool bEnable ) { pEditEngine->EnableUndo( bEnable ); } -sal_Bool Outliner::IsUndoEnabled() const +bool Outliner::IsUndoEnabled() const { return pEditEngine->IsUndoEnabled(); } @@ -98,7 +98,7 @@ void Outliner::ClearModifyFlag() pEditEngine->ClearModifyFlag(); } -sal_Bool Outliner::IsModified() const +bool Outliner::IsModified() const { return pEditEngine->IsModified(); } @@ -144,17 +144,17 @@ void Outliner::SetDefTab( sal_uInt16 nTab ) pEditEngine->SetDefTab( nTab ); } -sal_Bool Outliner::IsFlatMode() const +bool Outliner::IsFlatMode() const { return pEditEngine->IsFlatMode(); } -sal_Bool Outliner::UpdateFields() +bool Outliner::UpdateFields() { return pEditEngine->UpdateFields(); } -void Outliner::RemoveFields( sal_Bool bKeepFieldText, TypeId aType ) +void Outliner::RemoveFields( bool bKeepFieldText, TypeId aType ) { pEditEngine->RemoveFields( bKeepFieldText, aType ); } @@ -229,7 +229,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz ) pEditEngine->SetMaxAutoPaperSize( rSz ); } -sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const +bool Outliner::IsExpanded( Paragraph* pPara ) const { return pParaList->HasVisibleChildren( pPara ); } @@ -269,7 +269,7 @@ SfxStyleSheet* Outliner::GetStyleSheet( sal_Int32 nPara ) return pEditEngine->GetStyleSheet( nPara ); } -sal_Bool Outliner::IsInSelectionMode() const +bool Outliner::IsInSelectionMode() const { return pEditEngine->IsInSelectionMode(); } @@ -289,12 +289,12 @@ void Outliner::SetAsianCompressionMode( sal_uInt16 n ) pEditEngine->SetAsianCompressionMode( n ); } -void Outliner::SetKernAsianPunctuation( sal_Bool b ) +void Outliner::SetKernAsianPunctuation( bool b ) { pEditEngine->SetKernAsianPunctuation( b ); } -void Outliner::SetAddExtLeading( sal_Bool bExtLeading ) +void Outliner::SetAddExtLeading( bool bExtLeading ) { pEditEngine->SetAddExtLeading( bExtLeading ); } @@ -314,7 +314,7 @@ void Outliner::InsertUndo( EditUndo* pUndo ) pEditEngine->GetUndoManager().AddUndoAction( pUndo, false ); } -sal_Bool Outliner::IsInUndo() +bool Outliner::IsInUndo() { return pEditEngine->IsInUndo(); } @@ -344,14 +344,14 @@ EESpellState Outliner::HasSpellErrors() return pEditEngine->HasSpellErrors(); } -sal_Bool Outliner::HasConvertibleTextPortion( LanguageType nLang ) +bool Outliner::HasConvertibleTextPortion( LanguageType nLang ) { return pEditEngine->HasConvertibleTextPortion( nLang ); } -sal_Bool Outliner::ConvertNextDocument() +bool Outliner::ConvertNextDocument() { - return sal_False; + return false; } void Outliner::SetDefaultLanguage( LanguageType eLang ) @@ -369,7 +369,7 @@ void Outliner::CompleteOnlineSpelling() pEditEngine->CompleteOnlineSpelling(); } -sal_Bool Outliner::HasText( const SvxSearchItem& rSearchItem ) +bool Outliner::HasText( const SvxSearchItem& rSearchItem ) { return pEditEngine->HasText( rSearchItem ); } @@ -384,9 +384,9 @@ SfxItemPool* Outliner::GetEditTextObjectPool() const return pEditEngine->GetEditTextObjectPool(); } -sal_Bool Outliner::SpellNextDocument() +bool Outliner::SpellNextDocument() { - return sal_False; + return false; } @@ -429,28 +429,28 @@ Point Outliner::GetDocPosTopLeft( sal_Int32 nParagraph ) return pEditEngine->GetDocPosTopLeft( nParagraph ); } -sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder ) +bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder ) { return IsTextPos( rPaperPos, nBorder, NULL ); } -sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBullet ) +bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, bool* pbBullet ) { if ( pbBullet) - *pbBullet = sal_False; - sal_Bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder ); + *pbBullet = false; + bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder ); if ( !bTextPos ) { Point aDocPos = GetDocPos( rPaperPos ); sal_Int32 nPara = pEditEngine->FindParagraph( aDocPos.Y() ); if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasNumberFormat( nPara ) ) { - Rectangle aBulArea = ImpCalcBulletArea( nPara, sal_True, sal_True ); + Rectangle aBulArea = ImpCalcBulletArea( nPara, true, true ); if ( aBulArea.IsInside( rPaperPos ) ) { - bTextPos = sal_True; + bTextPos = true; if ( pbBullet) - *pbBullet = sal_True; + *pbBullet = true; } } } @@ -465,29 +465,29 @@ void Outliner::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ) void Outliner::QuickInsertText( const OUString& rText, const ESelection& rSel ) { - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; pEditEngine->QuickInsertText( rText, rSel ); } void Outliner::QuickDelete( const ESelection& rSel ) { - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; pEditEngine->QuickDelete( rSel ); } void Outliner::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel ) { - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; pEditEngine->QuickInsertField( rFld, rSel ); } void Outliner::QuickInsertLineBreak( const ESelection& rSel ) { - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; pEditEngine->QuickInsertLineBreak( rSel ); } -void Outliner::QuickFormatDoc( sal_Bool bFull ) +void Outliner::QuickFormatDoc( bool bFull ) { pEditEngine->QuickFormatDoc( bFull ); } @@ -517,12 +517,12 @@ void Outliner::EraseVirtualDevice() pEditEngine->EraseVirtualDevice(); } -sal_Bool Outliner::ShouldCreateBigTextObject() const +bool Outliner::ShouldCreateBigTextObject() const { return pEditEngine->ShouldCreateBigTextObject(); } -void Outliner::SetVertical( sal_Bool b ) +void Outliner::SetVertical( bool b ) { pEditEngine->SetVertical( b ); } @@ -532,7 +532,7 @@ bool Outliner::IsVertical() const return pEditEngine->IsVertical(); } -void Outliner::SetFixedCellHeight( sal_Bool bUseFixedCellHeight ) +void Outliner::SetFixedCellHeight( bool bUseFixedCellHeight ) { pEditEngine->SetFixedCellHeight( bUseFixedCellHeight ); } @@ -557,27 +557,27 @@ LanguageType Outliner::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const return pEditEngine->GetLanguage( nPara, nPos ); } -void Outliner::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) +void Outliner::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ) { pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich ); } -void Outliner::EnableAutoColor( sal_Bool b ) +void Outliner::EnableAutoColor( bool b ) { pEditEngine->EnableAutoColor( b ); } -void Outliner::ForceAutoColor( sal_Bool b ) +void Outliner::ForceAutoColor( bool b ) { pEditEngine->ForceAutoColor( b ); } -sal_Bool Outliner::IsForceAutoColor() const +bool Outliner::IsForceAutoColor() const { return pEditEngine->IsForceAutoColor(); } -void Outliner::StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc) +void Outliner::StartSpelling(EditView& rEditView, bool bMultipleDoc) { pEditEngine->StartSpelling(rEditView, bMultipleDoc); } diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 1dec1eaf538f..9ae852cc2615 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -96,22 +96,22 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16 } else { - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); pPara = new Paragraph( nDepth ); pParaList->Insert( pPara, nAbsPos ); pEditEngine->InsertParagraph( nAbsPos, OUString() ); DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed"); - ImplInitDepth( nAbsPos, nDepth, sal_False ); + ImplInitDepth( nAbsPos, nDepth, false ); pHdlParagraph = pPara; ParagraphInsertedHdl(); pPara->nFlags |= PARAFLAG_HOLDDEPTH; SetText( rText, pPara ); - ImplBlockInsertionCallbacks( sal_False ); + ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); } - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed"); return pPara; } @@ -120,7 +120,7 @@ Paragraph* Outliner::Insert(const OUString& rText, sal_Int32 nAbsPos, sal_Int16 void Outliner::ParagraphInserted( sal_Int32 nPara ) { - if ( bBlockInsCallback ) + if ( nBlockInsCallback ) return; if( bPasting || pEditEngine->IsInUndo() ) @@ -130,7 +130,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara ) if( pEditEngine->IsInUndo() ) { pPara->nFlags = PARAFLAG_SETBULLETTEXT; - pPara->bVisible = sal_True; + pPara->bVisible = true; const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL ); pPara->SetDepth( rLevel.GetValue() ); } @@ -147,7 +147,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara ) if( !pEditEngine->IsInUndo() ) { - ImplCalcBulletText( nPara, sal_True, sal_False ); + ImplCalcBulletText( nPara, true, false ); pHdlParagraph = pPara; ParagraphInsertedHdl(); } @@ -157,7 +157,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara ) void Outliner::ParagraphDeleted( sal_Int32 nPara ) { - if ( bBlockInsCallback || ( nPara == EE_PARA_ALL ) ) + if ( nBlockInsCallback || ( nPara == EE_PARA_ALL ) ) return; Paragraph* pPara = pParaList->GetParagraph( nPara ); @@ -180,14 +180,14 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara ) pPara = pParaList->GetParagraph( nPara ); if ( pPara && ( pPara->GetDepth() > nDepth ) ) { - ImplCalcBulletText( nPara, sal_True, sal_False ); + ImplCalcBulletText( nPara, true, false ); // Search for next on the this level ... while ( pPara && pPara->GetDepth() > nDepth ) pPara = pParaList->GetParagraph( ++nPara ); } if ( pPara && ( pPara->GetDepth() == nDepth ) ) - ImplCalcBulletText( nPara, sal_True, sal_False ); + ImplCalcBulletText( nPara, true, false ); } } @@ -222,12 +222,12 @@ void Outliner::Init( sal_uInt16 nMode ) const bool bWasUndoEnabled(IsUndoEnabled()); EnableUndo(false); - ImplInitDepth( 0, GetMinDepth(), sal_False ); + ImplInitDepth( 0, GetMinDepth(), false ); GetUndoManager().Clear(); EnableUndo(bWasUndoEnabled); } -void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs ) +void Outliner::SetMaxDepth( sal_Int16 nDepth, bool bCheckParagraphs ) { if( nMaxDepth != nDepth ) { @@ -267,8 +267,8 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth ) pHdlParagraph = pPara; sal_Int32 nPara = GetAbsPos( pPara ); - ImplInitDepth( nPara, nNewDepth, sal_True ); - ImplCalcBulletText( nPara, sal_False, sal_False ); + ImplInitDepth( nPara, nNewDepth, true ); + ImplCalcBulletText( nPara, false, false ); if ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) ImplSetLevelDependendStyleSheet( nPara ); @@ -301,14 +301,14 @@ void Outliner::SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStar } } -sal_Bool Outliner::IsParaIsNumberingRestart( sal_Int32 nPara ) +bool Outliner::IsParaIsNumberingRestart( sal_Int32 nPara ) { Paragraph* pPara = pParaList->GetParagraph( nPara ); DBG_ASSERT( pPara, "Outliner::IsParaIsNumberingRestart - Paragraph not found!" ); - return pPara ? pPara->IsParaIsNumberingRestart() : sal_False; + return pPara ? pPara->IsParaIsNumberingRestart() : false; } -void Outliner::SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart ) +void Outliner::SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ) { Paragraph* pPara = pParaList->GetParagraph( nPara ); DBG_ASSERT( pPara, "Outliner::SetParaIsNumberingRestart - Paragraph not found!" ); @@ -417,16 +417,16 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara ) { DBG_ASSERT(pPara,"SetText:No Para"); - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); sal_Int32 nPara = pParaList->GetAbsPos( pPara ); if (rText.isEmpty()) { pEditEngine->SetText( nPara, rText ); - ImplInitDepth( nPara, pPara->GetDepth(), sal_False ); + ImplInitDepth( nPara, pPara->GetDepth(), false ); } else { @@ -484,15 +484,15 @@ void Outliner::SetText( const OUString& rText, Paragraph* pPara ) nInsPos--; pEditEngine->SetText( nInsPos, aStr ); } - ImplInitDepth( nInsPos, nCurDepth, sal_False ); + ImplInitDepth( nInsPos, nCurDepth, false ); nInsPos++; nPos++; } } DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!"); - bFirstParaIsEmpty = sal_False; - ImplBlockInsertionCallbacks( sal_False ); + bFirstParaIsEmpty = false; + ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); } @@ -570,7 +570,7 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView) sal_Int16 nOutlLevel = rLevel.GetValue(); ImplCheckDepth( nOutlLevel ); - ImplInitDepth( nPara, nOutlLevel, sal_False ); + ImplInitDepth( nPara, nOutlLevel, false ); return bConverted; } @@ -578,20 +578,20 @@ bool Outliner::ImpConvertEdtToOut( sal_Int32 nPara,EditView* pView) void Outliner::SetText( const OutlinerParaObject& rPObj ) { - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); - sal_Bool bUndo = pEditEngine->IsUndoEnabled(); - EnableUndo( sal_False ); + bool bUndo = pEditEngine->IsUndoEnabled(); + EnableUndo( false ); Init( rPObj.GetOutlinerMode() ); - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); pEditEngine->SetText(rPObj.GetTextObject()); - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; - pParaList->Clear( sal_True ); + pParaList->Clear( true ); for( sal_Int32 nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ ) { Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(nCurPara)); @@ -604,7 +604,7 @@ void Outliner::SetText( const OutlinerParaObject& rPObj ) ImplCheckParagraphs( 0, pParaList->GetParagraphCount() ); EnableUndo( bUndo ); - ImplBlockInsertionCallbacks( sal_False ); + ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed"); @@ -615,14 +615,14 @@ void Outliner::AddText( const OutlinerParaObject& rPObj ) { Paragraph* pPara; - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); sal_Int32 nPara; if( bFirstParaIsEmpty ) { - pParaList->Clear( sal_True ); + pParaList->Clear( true ); pEditEngine->SetText(rPObj.GetTextObject()); nPara = 0; } @@ -631,7 +631,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj ) nPara = pParaList->GetParagraphCount(); pEditEngine->InsertParagraph( EE_PARA_APPEND, rPObj.GetTextObject() ); } - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; for( sal_Int32 n = 0; n < rPObj.Count(); n++ ) { @@ -639,13 +639,13 @@ void Outliner::AddText( const OutlinerParaObject& rPObj ) pParaList->Append(pPara); sal_Int32 nP = nPara+n; DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync"); - ImplInitDepth( nP, pPara->GetDepth(), sal_False ); + ImplInitDepth( nP, pPara->GetDepth(), false ); } DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" ); ImplCheckParagraphs( nPara, pParaList->GetParagraphCount() ); - ImplBlockInsertionCallbacks( sal_False ); + ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); } @@ -655,7 +655,7 @@ void Outliner::FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_In if ( aFieldClickedHdl.IsSet() ) { EditFieldInfo aFldInfo( this, rField, nPara, nPos ); - aFldInfo.SetSimpleClick( sal_True ); + aFldInfo.SetSimpleClick( true ); aFieldClickedHdl.Call( &aFldInfo ); } } @@ -667,7 +667,7 @@ void Outliner::FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_I return; EditFieldInfo aFldInfo( this, rField, nPara, nPos ); - aFldInfo.SetSimpleClick( sal_False ); + aFldInfo.SetSimpleClick( false ); aFieldClickedHdl.Call( &aFldInfo ); } @@ -747,7 +747,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* } } -void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction ) +void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction ) { DBG_ASSERT( ( nDepth >= nMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" ); @@ -762,10 +762,10 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreat // the old values are restored by the EditEngine. if( !IsInUndo() ) { - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); - sal_Bool bUndo = bCreateUndo && IsUndoEnabled(); + bool bUndo = bCreateUndo && IsUndoEnabled(); if ( bUndo && bUndoAction ) UndoActionStart( OLUNDO_DEPTH ); @@ -773,7 +773,7 @@ void Outliner::ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreat aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) ); pEditEngine->SetParaAttribs( nPara, aAttrs ); ImplCheckNumBulletItem( nPara ); - ImplCalcBulletText( nPara, sal_False, sal_False ); + ImplCalcBulletText( nPara, false, false ); if ( bUndo ) { @@ -792,13 +792,13 @@ void Outliner::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet ) pEditEngine->SetParaAttribs( nPara, rSet ); } -sal_Bool Outliner::Expand( Paragraph* pPara ) +bool Outliner::Expand( Paragraph* pPara ) { if ( pParaList->HasHiddenChildren( pPara ) ) { OLUndoExpand* pUndo = 0; - sal_Bool bUndo = IsUndoEnabled() && !IsInUndo(); + bool bUndo = IsUndoEnabled() && !IsInUndo(); if( bUndo ) { UndoActionStart( OLUNDO_EXPAND ); @@ -807,7 +807,7 @@ sal_Bool Outliner::Expand( Paragraph* pPara ) pUndo->nCount = pParaList->GetAbsPos( pPara ); } pHdlParagraph = pPara; - bIsExpanding = sal_True; + bIsExpanding = true; pParaList->Expand( pPara ); ExpandHdl(); InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); @@ -816,21 +816,21 @@ sal_Bool Outliner::Expand( Paragraph* pPara ) InsertUndo( pUndo ); UndoActionEnd( OLUNDO_EXPAND ); } - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool Outliner::Collapse( Paragraph* pPara ) +bool Outliner::Collapse( Paragraph* pPara ) { if ( pParaList->HasVisibleChildren( pPara ) ) // expanded { OLUndoExpand* pUndo = 0; - sal_Bool bUndo = sal_False; + bool bUndo = false; if( !IsInUndo() && IsUndoEnabled() ) - bUndo = sal_True; + bUndo = true; if( bUndo ) { UndoActionStart( OLUNDO_COLLAPSE ); @@ -840,7 +840,7 @@ sal_Bool Outliner::Collapse( Paragraph* pPara ) } pHdlParagraph = pPara; - bIsExpanding = sal_False; + bIsExpanding = false; pParaList->Collapse( pPara ); ExpandHdl(); InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) ); @@ -849,9 +849,9 @@ sal_Bool Outliner::Collapse( Paragraph* pPara ) InsertUndo( pUndo ); UndoActionEnd( OLUNDO_COLLAPSE ); } - return sal_True; + return true; } - return sal_False; + return false; } @@ -903,7 +903,7 @@ Font Outliner::ImpCalcBulletFont( sal_Int32 nPara ) const aBulletFont.SetAlign( ALIGN_BOTTOM ); aBulletFont.SetSize( Size( 0, nScaledLineHeight ) ); - sal_Bool bVertical = IsVertical(); + bool bVertical = IsVertical(); aBulletFont.SetVertical( bVertical ); aBulletFont.SetOrientation( bVertical ? 2700 : 0 ); @@ -933,11 +933,11 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, if ( ImplHasNumberFormat( nPara ) && bDrawBullet) { - sal_Bool bVertical = IsVertical(); + bool bVertical = IsVertical(); - sal_Bool bRightToLeftPara = pEditEngine->IsRightToLeft( nPara ); + bool bRightToLeftPara = pEditEngine->IsRightToLeft( nPara ); - Rectangle aBulletArea( ImpCalcBulletArea( nPara, sal_True, sal_False ) ); + Rectangle aBulletArea( ImpCalcBulletArea( nPara, true, false ) ); sal_uInt16 nStretchX, nStretchY; GetGlobalCharStretching(nStretchX, nStretchY); aBulletArea = Rectangle( Point(aBulletArea.Left()*nStretchX/100, @@ -953,7 +953,7 @@ void Outliner::PaintBullet( sal_Int32 nPara, const Point& rStartPos, { Font aBulletFont( ImpCalcBulletFont( nPara ) ); // Use baseline - sal_Bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL; + bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL; aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE ); Font aOldFont = pOutDev->GetFont(); pOutDev->SetFont( aBulletFont ); @@ -1127,21 +1127,21 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_Int32 nPara ) sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ) { - sal_Bool bOldUndo = pEditEngine->IsUndoEnabled(); - EnableUndo( sal_False ); + bool bOldUndo = pEditEngine->IsUndoEnabled(); + EnableUndo( false ); - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); Clear(); - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); sal_uLong nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs ); - bFirstParaIsEmpty = sal_False; + bFirstParaIsEmpty = false; sal_Int32 nParas = pEditEngine->GetParagraphCount(); - pParaList->Clear( sal_True ); + pParaList->Clear( true ); for ( sal_Int32 n = 0; n < nParas; n++ ) { Paragraph* pPara = new Paragraph( 0 ); @@ -1152,7 +1152,7 @@ sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n ); const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL ); sal_Int16 nDepth = rLevel.GetValue(); - ImplInitDepth( n, nDepth, sal_False ); + ImplInitDepth( n, nDepth, false ); } } @@ -1161,7 +1161,7 @@ sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 ImpFilterIndents( 0, nParas-1 ); } - ImplBlockInsertionCallbacks( sal_False ); + ImplBlockInsertionCallbacks( false ); pEditEngine->SetUpdateMode( bUpdate ); EnableUndo( bOldUndo ); @@ -1172,7 +1172,7 @@ sal_uLong Outliner::Read( SvStream& rInput, const OUString& rBaseURL, sal_uInt16 void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ) { - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); Paragraph* pLastConverted = NULL; @@ -1191,7 +1191,7 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ) pPara->SetDepth( pLastConverted->GetDepth() ); } - ImplInitDepth( nPara, pPara->GetDepth(), sal_False ); + ImplInitDepth( nPara, pPara->GetDepth(), false ); } } @@ -1211,7 +1211,7 @@ void Outliner::ImpFilterIndents( sal_Int32 nFirstPara, sal_Int32 nLastPara ) void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ) { - sal_Bool bUpdate = pEditEngine->GetUpdateMode(); + bool bUpdate = pEditEngine->GetUpdateMode(); pEditEngine->SetUpdateMode( false ); const sal_Int32 nStart = nStartPara; @@ -1246,7 +1246,7 @@ void Outliner::ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ) nDepth = rLevel.GetValue(); } if ( nDepth != GetDepth( nStartPara ) ) - ImplInitDepth( nStartPara, nDepth, sal_False ); + ImplInitDepth( nStartPara, nDepth, false ); } nCount--; @@ -1266,7 +1266,7 @@ long Outliner::IndentingPagesHdl( OutlinerView* pView ) return aIndentingPagesHdl.Call( pView ); } -sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView ) +bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView ) { // The selected pages must already be set in advance through // ImpCalcSelectedPages @@ -1276,30 +1276,30 @@ sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView ) if ( ( mnFirstSelPage == 0 ) && ( ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) ) { if ( nDepthChangedHdlPrevDepth == 1 ) // is the only page - return sal_False; + return false; else - pCurView->ImpCalcSelectedPages( sal_False ); // without the first + pCurView->ImpCalcSelectedPages( false ); // without the first } - return (sal_Bool)IndentingPagesHdl( pCurView ); + return IndentingPagesHdl( pCurView ); } -sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView ) +bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView ) { // The selected pages must already be set in advance through // ImpCalcSelectedPages - return (sal_Bool)RemovingPagesHdl( pCurView ); + return RemovingPagesHdl( pCurView ); } Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode ) : nMinDepth( -1 ) { - bStrippingPortions = sal_False; - bPasting = sal_False; + bStrippingPortions = false; + bPasting = false; nFirstPage = 1; - bBlockInsCallback = sal_False; + nBlockInsCallback = 0; nMaxDepth = 9; @@ -1307,7 +1307,7 @@ Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode ) pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) ); Paragraph* pPara = new Paragraph( 0 ); pParaList->Append(pPara); - bFirstParaIsEmpty = sal_True; + bFirstParaIsEmpty = true; pEditEngine = new OutlinerEditEng( this, pPool ); pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, BeginMovingParagraphsHdl ) ); @@ -1321,7 +1321,7 @@ Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode ) Outliner::~Outliner() { - pParaList->Clear( sal_True ); + pParaList->Clear( true ); delete pParaList; delete pEditEngine; } @@ -1426,7 +1426,7 @@ Paragraph* Outliner::GetParagraph( sal_Int32 nAbsPos ) const return pParaList->GetParagraph( nAbsPos ); } -sal_Bool Outliner::HasChildren( Paragraph* pParagraph ) const +bool Outliner::HasChildren( Paragraph* pParagraph ) const { return pParaList->HasChildren( pParagraph ); } @@ -1441,7 +1441,7 @@ bool Outliner::ImplHasNumberFormat( sal_Int32 nPara ) const return rBulletState.GetValue(); } else - return sal_False; + return false; #endif } @@ -1509,7 +1509,7 @@ void Outliner::ImplCheckParagraphs( sal_Int32 nStart, sal_Int32 nEnd ) if (pPara) { pPara->Invalidate(); - ImplCalcBulletText( n, sal_False, sal_False ); + ImplCalcBulletText( n, false, false ); } } } @@ -1540,7 +1540,7 @@ void Outliner::ParaAttribsChanged( sal_Int32 nPara ) if ( pPara && pPara->GetDepth() != rLevel.GetValue() ) { pPara->SetDepth( rLevel.GetValue() ); - ImplCalcBulletText( nPara, sal_True, sal_True ); + ImplCalcBulletText( nPara, true, true ); } } } @@ -1559,7 +1559,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle ) if ( pEditEngine->GetStyleSheet( nPara ) == pStyle ) { ImplCheckNumBulletItem( nPara ); - ImplCalcBulletText( nPara, sal_False, sal_False ); + ImplCalcBulletText( nPara, false, false ); // EditEngine formats changed paragraphs before calling this method, // so they are not reformatted now and use wrong bullet indent pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) ); @@ -1567,7 +1567,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle ) } } -Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos ) +Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos ) { // Bullet area within the paragraph ... Rectangle aBulletArea; @@ -1578,7 +1578,7 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, sal_Bool bAdjust, sal_Bo Point aTopLeft; Size aBulletSize( ImplGetBulletSize( nPara ) ); - sal_Bool bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0; + bool bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0; // the ODF attribut text:space-before which holds the spacing to add to the left of the label const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset(); @@ -1701,7 +1701,7 @@ EBulletInfo Outliner::GetBulletInfo( sal_Int32 nPara ) if ( aInfo.bVisible ) { - aInfo.aBounds = ImpCalcBulletArea( nPara, sal_True, sal_True ); + aInfo.aBounds = ImpCalcBulletArea( nPara, true, true ); } return aInfo; @@ -1738,9 +1738,9 @@ void Outliner::Remove( Paragraph* pPara, sal_Int32 nParaCount ) void Outliner::StripPortions() { - bStrippingPortions = sal_True; + bStrippingPortions = true; pEditEngine->StripPortions(); - bStrippingPortions = sal_False; + bStrippingPortions = false; } void Outliner::DrawingText( const Point& rStartPos, const OUString& rText, sal_Int32 nTextStart, sal_Int32 nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont, @@ -1782,13 +1782,13 @@ long Outliner::RemovingPagesHdl( OutlinerView* pView ) return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True; } -sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFirstPage, sal_Int32 nPages ) +bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 _nFirstPage, sal_Int32 nPages ) { nDepthChangedHdlPrevDepth = nPages; mnFirstSelPage = _nFirstPage; pHdlParagraph = 0; - return (sal_Bool)RemovingPagesHdl( pCurView ); + return RemovingPagesHdl( pCurView ); } SfxItemSet Outliner::GetParaAttribs( sal_Int32 nPara ) @@ -1823,7 +1823,7 @@ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos ) IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos ) { - bPasting = sal_False; + bPasting = false; ImpTextPasted( pInfos->nStartPara, pInfos->nEndPara - pInfos->nStartPara + 1 ); maEndPasteOrDropHdl.Call( pInfos ); UndoActionEnd( EDITUNDO_DRAGANDDROP ); @@ -1837,7 +1837,7 @@ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos ) sal_Int32 nChangesStart = std::min( pInfos->nStartPara, pInfos->nDestPara ); sal_Int32 nParas = pParaList->GetParagraphCount(); for ( sal_Int32 n = nChangesStart; n < nParas; n++ ) - ImplCalcBulletText( n, sal_False, sal_False ); + ImplCalcBulletText( n, false, false ); if( !IsInUndo() ) aEndMovingHdl.Call( this ); @@ -1913,7 +1913,7 @@ sal_uInt16 Outliner::ImplGetNumbering( sal_Int32 nPara, const SvxNumberFormat* p return nNumber; } -void Outliner::ImplCalcBulletText( sal_Int32 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren ) +void Outliner::ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRecalcChildren ) { Paragraph* pPara = pParaList->GetParagraph( nPara ); @@ -1966,12 +1966,12 @@ void Outliner::Clear() if( !bFirstParaIsEmpty ) { - ImplBlockInsertionCallbacks( sal_True ); + ImplBlockInsertionCallbacks( true ); pEditEngine->Clear(); - pParaList->Clear( sal_True ); + pParaList->Clear( true ); pParaList->Append( new Paragraph( nMinDepth )); - bFirstParaIsEmpty = sal_True; - ImplBlockInsertionCallbacks( sal_False ); + bFirstParaIsEmpty = true; + ImplBlockInsertionCallbacks( false ); } else { @@ -1981,10 +1981,10 @@ void Outliner::Clear() } } -void Outliner::SetFlatMode( sal_Bool bFlat ) +void Outliner::SetFlatMode( bool bFlat ) { - if( bFlat != (pEditEngine->IsFlatMode() ? 1 : 0) ) + if( bFlat != pEditEngine->IsFlatMode() ) { for ( sal_Int32 nPara = pParaList->GetParagraphCount(); nPara; ) pParaList->GetParagraph( --nPara )->aBulSize.Width() = -1; @@ -2001,7 +2001,7 @@ OUString Outliner::ImplGetBulletText( sal_Int32 nPara ) { // Enable optimization again ... // if( pPara->nFlags & PARAFLAG_SETBULLETTEXT ) - ImplCalcBulletText( nPara, sal_False, sal_False ); + ImplCalcBulletText( nPara, false, false ); aRes = pPara->GetText(); } return aRes; @@ -2015,17 +2015,17 @@ void Outliner::SetLevelDependendStyleSheet( sal_Int32 nPara ) pEditEngine->SetParaAttribs( nPara, aOldAttrs ); } -void Outliner::ImplBlockInsertionCallbacks( sal_Bool b ) +void Outliner::ImplBlockInsertionCallbacks( bool b ) { if ( b ) { - bBlockInsCallback++; + nBlockInsCallback++; } else { - DBG_ASSERT( bBlockInsCallback, "ImplBlockInsertionCallbacks ?!" ); - bBlockInsCallback--; - if ( !bBlockInsCallback ) + DBG_ASSERT( nBlockInsCallback, "ImplBlockInsertionCallbacks ?!" ); + nBlockInsCallback--; + if ( !nBlockInsCallback ) { // Call blocked notify events... while(!pEditEngine->aNotifyCache.empty()) @@ -2041,7 +2041,7 @@ void Outliner::ImplBlockInsertionCallbacks( sal_Bool b ) IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, pNotify ) { - if ( !bBlockInsCallback ) + if ( !nBlockInsCallback ) pEditEngine->aOutlinerNotifyHdl.Call( pNotify ); else pEditEngine->aNotifyCache.push_back(*pNotify); diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx index d7f155df5aa2..f350cac557ce 100644 --- a/editeng/source/outliner/outlundo.cxx +++ b/editeng/source/outliner/outlundo.cxx @@ -110,12 +110,12 @@ OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, sal_Int32 void OutlinerUndoChangeDepth::Undo() { - GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, sal_False ); + GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, false ); } void OutlinerUndoChangeDepth::Redo() { - GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, sal_False ); + GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, false ); } void OutlinerUndoChangeDepth::Repeat() @@ -134,14 +134,14 @@ void OutlinerUndoCheckPara::Undo() { Paragraph* pPara = GetOutliner()->GetParagraph( mnPara ); pPara->Invalidate(); - GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False ); + GetOutliner()->ImplCalcBulletText( mnPara, false, false ); } void OutlinerUndoCheckPara::Redo() { Paragraph* pPara = GetOutliner()->GetParagraph( mnPara ); pPara->Invalidate(); - GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False ); + GetOutliner()->ImplCalcBulletText( mnPara, false, false ); } void OutlinerUndoCheckPara::Repeat() diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 074d6beae45f..a91124df185a 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -73,25 +73,25 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice ) pEditView->Paint( rRect, pTargetDevice ); } -sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) +bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) { // For the first Paint/KeyInput/Drop an emty Outliner is turned into // an Outliner with exactly one paragraph. if( pOwner->bFirstParaIsEmpty ) pOwner->Insert( OUString() ); - sal_Bool bKeyProcessed = sal_False; + bool bKeyProcessed = false; ESelection aSel( pEditView->GetSelection() ); - sal_Bool bSelection = aSel.HasRange(); + bool bSelection = aSel.HasRange(); KeyCode aKeyCode = rKEvt.GetKeyCode(); KeyFuncType eFunc = aKeyCode.GetFunction(); sal_uInt16 nCode = aKeyCode.GetCode(); - sal_Bool bReadOnly = IsReadOnly(); + bool bReadOnly = IsReadOnly(); if( bSelection && ( nCode != KEY_TAB ) && EditEngine::DoesKeyChangeText( rKEvt ) ) { - if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) ) - return sal_True; + if ( ImpCalcSelectedPages( false ) && !pOwner->ImpCanDeleteSelectedPages( this ) ) + return true; } if ( eFunc != KEYFUNC_DONTKNOW ) @@ -103,14 +103,14 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) if ( !bReadOnly ) { Cut(); - bKeyProcessed = sal_True; + bKeyProcessed = true; } } break; case KEYFUNC_COPY: { Copy(); - bKeyProcessed = sal_True; + bKeyProcessed = true; } break; case KEYFUNC_PASTE: @@ -118,7 +118,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) if ( !bReadOnly ) { PasteSpecial(); - bKeyProcessed = sal_True; + bKeyProcessed = true; } } break; @@ -132,7 +132,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) if( pNext && pNext->HasFlag(PARAFLAG_ISPAGE) ) { if( !pOwner->ImpCanDeleteSelectedPages( this, aSel.nEndPara, 1 ) ) - return sal_False; + return false; } } } @@ -155,13 +155,13 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) ( bSelection || !aSel.nStartPos ) ) { Indent( aKeyCode.IsShift() ? (-1) : (+1) ); - bKeyProcessed = sal_True; + bKeyProcessed = true; } else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) && !bSelection && !aSel.nEndPos && pOwner->ImplHasNumberFormat( aSel.nEndPara ) ) { Indent( aKeyCode.IsShift() ? (-1) : (+1) ); - bKeyProcessed = sal_True; + bKeyProcessed = true; } } } @@ -173,11 +173,11 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara ); Paragraph* pPrev = pOwner->pParaList->GetParagraph( aSel.nEndPara-1 ); if( !pPrev->IsVisible() ) - return sal_True; + return true; if( !pPara->GetDepth() ) { if(!pOwner->ImpCanDeleteSelectedPages(this, aSel.nEndPara , 1 ) ) - return sal_True; + return true; } } } @@ -213,7 +213,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) } pEditView->ShowCursor( true, true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); - bKeyProcessed = sal_True; + bKeyProcessed = true; } } } @@ -231,7 +231,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) pEditView->SetSelection( aTmpSel ); pEditView->ShowCursor( true, true ); pOwner->UndoActionEnd( OLUNDO_INSERT ); - bKeyProcessed = sal_True; + bKeyProcessed = true; } } } @@ -239,7 +239,7 @@ sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) } } - return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt, pFrameWin ); + return bKeyProcessed ? true : pEditView->PostKeyEvent( rKEvt, pFrameWin ); } sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget) @@ -263,7 +263,7 @@ sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTa aPaperPos.Y() -= aOutArea.Top(); aPaperPos.Y() += aVisArea.Top(); - sal_Bool bBullet; + bool bBullet; if ( pOwner->IsTextPos( aPaperPos, 0, &bBullet ) ) { Point aDocPos = pOwner->GetDocPos( aPaperPos ); @@ -285,14 +285,14 @@ sal_Int32 OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTa return nPara; } -sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt ) +bool OutlinerView::MouseMove( const MouseEvent& rMEvt ) { if( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode()) return pEditView->MouseMove( rMEvt ); Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) - return sal_False; + return false; Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); @@ -300,14 +300,14 @@ sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt ) } -sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) +bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) { if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() ) return pEditView->MouseButtonDown( rMEvt ); Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) - return sal_False; + return false; Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); @@ -317,7 +317,7 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) if ( eTarget == MouseBullet ) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); - sal_Bool bHasChildren = (pPara && pOwner->pParaList->HasChildren(pPara)); + bool bHasChildren = (pPara && pOwner->pParaList->HasChildren(pPara)); if( rMEvt.GetClicks() == 1 ) { sal_Int32 nEndPara = nPara; @@ -330,7 +330,7 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) else if( rMEvt.GetClicks() == 2 && bHasChildren ) ImpToggleExpand( pPara ); - return sal_True; + return true; } // special case for outliner view in impress, check if double click hits the page icon for toggle @@ -348,14 +348,14 @@ sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt ) } -sal_Bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) +bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt ) { if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() ) return pEditView->MouseButtonUp( rMEvt ); Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) ); if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) ) - return sal_False; + return false; Pointer aPointer = GetPointer( rMEvt.GetPosPixel() ); pEditView->GetWindow()->SetPointer( aPointer ); @@ -371,8 +371,8 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara ) pEditView->ShowCursor(); } -sal_Int32 OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect, - sal_Bool bWithChildren ) +sal_Int32 OutlinerView::Select( Paragraph* pParagraph, bool bSelect, + bool bWithChildren ) { sal_Int32 nPara = pOwner->pParaList->GetAbsPos( pParagraph ); sal_Int32 nEnd = 0; @@ -391,13 +391,13 @@ sal_Int32 OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect, void OutlinerView::SetAttribs( const SfxItemSet& rAttrs ) { - sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); + bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); pOwner->pEditEngine->SetUpdateMode( false ); if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() ) pOwner->UndoActionStart( OLUNDO_ATTR ); - ParaRange aSel = ImpGetSelectedParagraphs( sal_False ); + ParaRange aSel = ImpGetSelectedParagraphs( false ); pEditView->SetAttribs( rAttrs ); @@ -405,7 +405,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs ) for( sal_Int32 nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { pOwner->ImplCheckNumBulletItem( nPara ); - pOwner->ImplCalcBulletText( nPara, sal_False, sal_False ); + pOwner->ImplCalcBulletText( nPara, false, false ); if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() ) pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) ); @@ -417,7 +417,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs ) pEditView->SetEditEngineUpdateMode( bUpdate ); } -ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren ) +ParaRange OutlinerView::ImpGetSelectedParagraphs( bool bIncludeHiddenChildren ) { ESelection aSel = pEditView->GetSelection(); ParaRange aParas( aSel.nStartPara, aSel.nEndPara ); @@ -441,21 +441,21 @@ void OutlinerView::AdjustDepth( short nDX ) void OutlinerView::Indent( short nDiff ) { - if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( sal_True ) && !pOwner->ImpCanIndentSelectedPages( this ) ) ) + if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( true ) && !pOwner->ImpCanIndentSelectedPages( this ) ) ) return; const bool bOutlinerView = pOwner->pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER; - sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); + bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); pOwner->pEditEngine->SetUpdateMode( false ); - sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled(); + bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled(); if( bUndo ) pOwner->UndoActionStart( OLUNDO_DEPTH ); sal_Int16 nMinDepth = -1; // Optimization: Not to recalculate to manny parargaphs when not really needed. - ParaRange aSel = ImpGetSelectedParagraphs( sal_True ); + ParaRange aSel = ImpGetSelectedParagraphs( true ); for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); @@ -537,8 +537,8 @@ void OutlinerView::Indent( short nDiff ) pOwner->mnDepthChangeHdlPrevFlags = pPara->nFlags; pOwner->pHdlParagraph = pPara; - pOwner->ImplInitDepth( nPara, nNewDepth, sal_True, sal_False ); - pOwner->ImplCalcBulletText( nPara, sal_False, sal_False ); + pOwner->ImplInitDepth( nPara, nNewDepth, true, false ); + pOwner->ImplCalcBulletText( nPara, false, false ); if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) pOwner->ImplSetLevelDependendStyleSheet( nPara ); @@ -559,7 +559,7 @@ void OutlinerView::Indent( short nDiff ) Paragraph* pPara = pOwner->pParaList->GetParagraph( n ); if ( pPara->GetDepth() < nMinDepth ) break; - pOwner->ImplCalcBulletText( n, sal_False, sal_False ); + pOwner->ImplCalcBulletText( n, false, false ); } if ( bUpdate ) @@ -572,10 +572,10 @@ void OutlinerView::Indent( short nDiff ) pOwner->UndoActionEnd( OLUNDO_DEPTH ); } -sal_Bool OutlinerView::AdjustHeight( long nDY ) +bool OutlinerView::AdjustHeight( long nDY ) { pEditView->MoveParagraphs( nDY ); - return sal_True; // remove return value... + return true; // remove return value... } Rectangle OutlinerView::GetVisArea() const @@ -585,42 +585,42 @@ Rectangle OutlinerView::GetVisArea() const void OutlinerView::Expand() { - ParaRange aParas = ImpGetSelectedParagraphs( sal_False ); - ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_True ); + ParaRange aParas = ImpGetSelectedParagraphs( false ); + ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, true ); } void OutlinerView::Collapse() { - ParaRange aParas = ImpGetSelectedParagraphs( sal_False ); - ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_False ); + ParaRange aParas = ImpGetSelectedParagraphs( false ); + ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, false ); } void OutlinerView::ExpandAll() { - ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, sal_True ); + ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, true ); } void OutlinerView::CollapseAll() { - ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, sal_False ); + ImplExpandOrCollaps( 0, pOwner->pParaList->GetParagraphCount()-1, false ); } -void OutlinerView::ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, sal_Bool bExpand ) +void OutlinerView::ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, bool bExpand ) { - sal_Bool bUpdate = pOwner->GetUpdateMode(); - pOwner->SetUpdateMode( sal_False ); + bool bUpdate = pOwner->GetUpdateMode(); + pOwner->SetUpdateMode( false ); - sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled(); + bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled(); if( bUndo ) pOwner->UndoActionStart( bExpand ? OLUNDO_EXPAND : OLUNDO_COLLAPSE ); for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ ) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); - sal_Bool bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara ); + bool bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara ); if( bDone ) { // The line under the paragraph should disappear ... @@ -633,7 +633,7 @@ void OutlinerView::ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara if ( bUpdate ) { - pOwner->SetUpdateMode( sal_True ); + pOwner->SetUpdateMode( true ); pEditView->ShowCursor(); } } @@ -649,7 +649,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj ) // Possibly problematic: // EditEngine, RTF => Splitting the area, later join together. - if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) ) + if ( ImpCalcSelectedPages( false ) && !pOwner->ImpCanDeleteSelectedPages( this ) ) return; pOwner->UndoActionStart( OLUNDO_INSERT ); @@ -671,7 +671,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj ) void OutlinerView::Cut() { - if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) ) + if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) pEditView->Cut(); } @@ -682,12 +682,12 @@ void OutlinerView::Paste() void OutlinerView::PasteSpecial() { - if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) ) + if ( !ImpCalcSelectedPages( false ) || pOwner->ImpCanDeleteSelectedPages( this ) ) { pOwner->UndoActionStart( OLUNDO_INSERT ); pOwner->pEditEngine->SetUpdateMode( false ); - pOwner->bPasting = sal_True; + pOwner->bPasting = true; pEditView->PasteSpecial(); if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) @@ -706,7 +706,7 @@ void OutlinerView::PasteSpecial() void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList) { - ParaRange aParas = ImpGetSelectedParagraphs( sal_True ); + ParaRange aParas = ImpGetSelectedParagraphs( true ); for ( sal_Int32 nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ ) { @@ -750,7 +750,7 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel ) sal_Int32 OutlinerView::ImpInitPaste( sal_Int32& rStart ) { - pOwner->bPasting = sal_True; + pOwner->bPasting = true; ESelection aSelection( pEditView->GetSelection() ); aSelection.Adjust(); rStart = aSelection.nStartPara; @@ -761,7 +761,7 @@ sal_Int32 OutlinerView::ImpInitPaste( sal_Int32& rStart ) void OutlinerView::ImpPasted( sal_Int32 nStart, sal_Int32 nPrevParaCount, sal_Int32 nSize) { - pOwner->bPasting = sal_False; + pOwner->bPasting = false; sal_Int32 nCurParaCount = pOwner->pEditEngine->GetParagraphCount(); if( nCurParaCount < nPrevParaCount ) nSize = nSize - ( nPrevParaCount - nCurParaCount ); @@ -788,7 +788,7 @@ void OutlinerView::SelectRange( sal_Int32 nFirst, sal_Int32 nCount ) } -sal_Int32 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected ) +sal_Int32 OutlinerView::ImpCalcSelectedPages( bool bIncludeFirstSelected ) { ESelection aSel( pEditView->GetSelection() ); aSel.Adjust(); @@ -982,7 +982,7 @@ void OutlinerView::ApplyBulletsNumbering( } pOwner->UndoActionStart(OLUNDO_DEPTH); - const sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); + const bool bUpdate = pOwner->pEditEngine->GetUpdateMode(); pOwner->pEditEngine->SetUpdateMode(false); sal_Int32 nStartPara = 0; @@ -1155,15 +1155,15 @@ void OutlinerView::SwitchOffBulletsNumbering( } -void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) +void OutlinerView::RemoveAttribsKeepLanguages( bool bRemoveParaAttribs ) { - RemoveAttribs( bRemoveParaAttribs, 0, sal_True /*keep language attribs*/ ); + RemoveAttribs( bRemoveParaAttribs, 0, true /*keep language attribs*/ ); } -void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich, sal_Bool bKeepLanguages ) +void OutlinerView::RemoveAttribs( bool bRemoveParaAttribs, sal_uInt16 nWhich, bool bKeepLanguages ) { - sal_Bool bUpdate = pOwner->GetUpdateMode(); - pOwner->SetUpdateMode( sal_False ); + bool bUpdate = pOwner->GetUpdateMode(); + pOwner->SetUpdateMode( false ); pOwner->UndoActionStart( OLUNDO_ATTR ); if (bKeepLanguages) pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); @@ -1177,7 +1177,7 @@ void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich for ( sal_Int32 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ ) { Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara ); - pOwner->ImplInitDepth( nPara, pPara->GetDepth(), sal_False, sal_False ); + pOwner->ImplInitDepth( nPara, pPara->GetDepth(), false, false ); } } pOwner->UndoActionEnd( OLUNDO_ATTR ); @@ -1191,7 +1191,7 @@ void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich // ====================================================================== -void OutlinerView::InsertText( const OUString& rNew, sal_Bool bSelect ) +void OutlinerView::InsertText( const OUString& rNew, bool bSelect ) { if( pOwner->bFirstParaIsEmpty ) pOwner->Insert( OUString() ); @@ -1209,22 +1209,22 @@ void OutlinerView::SetSelection( const ESelection& rSel ) pEditView->SetSelection( rSel ); } -void OutlinerView::SetReadOnly( sal_Bool bReadOnly ) +void OutlinerView::SetReadOnly( bool bReadOnly ) { pEditView->SetReadOnly( bReadOnly ); } -sal_Bool OutlinerView::IsReadOnly() const +bool OutlinerView::IsReadOnly() const { return pEditView->IsReadOnly(); } -sal_Bool OutlinerView::HasSelection() const +bool OutlinerView::HasSelection() const { return pEditView->HasSelection(); } -void OutlinerView::ShowCursor( sal_Bool bGotoCursor ) +void OutlinerView::ShowCursor( bool bGotoCursor ) { pEditView->ShowCursor( bGotoCursor ); } @@ -1259,7 +1259,7 @@ OUString OutlinerView::GetSelected() const return pEditView->GetSelected(); } -EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc ) +EESpellState OutlinerView::StartSpeller( bool bMultiDoc ) { return pEditView->StartSpeller( bMultiDoc ); } @@ -1271,7 +1271,7 @@ EESpellState OutlinerView::StartThesaurus() void OutlinerView::StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, - sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ) + sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ) { if ( (LANGUAGE_KOREAN == nSrcLang && LANGUAGE_KOREAN == nDestLang) || @@ -1361,13 +1361,13 @@ sal_uInt16 OutlinerView::GetInvalidateMore() const } -sal_Bool OutlinerView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong ) +bool OutlinerView::IsCursorAtWrongSpelledWord( bool bMarkIfWrong ) { return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong ); } -sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong ) +bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong ) { return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong ); } @@ -1377,7 +1377,7 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg ) pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg ); } -sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) +sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs ) { sal_Int32 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount(); ESelection aOldSel = pEditView->GetSelection(); @@ -1396,7 +1396,7 @@ sal_uLong OutlinerView::Read( SvStream& rInput, const OUString& rBaseURL, EEText const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n ); const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL ); sal_uInt16 nDepth = rLevel.GetValue(); - pOwner->ImplInitDepth( n, nDepth, sal_False ); + pOwner->ImplInitDepth( n, nDepth, false ); } if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT ) diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index ff5e38060c80..27afbdcbb038 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -63,7 +63,7 @@ Paragraph::Paragraph( sal_Int16 nDDepth ) nDepth = nDDepth; nFlags = 0; - bVisible = sal_True; + bVisible = true; } Paragraph::Paragraph( const Paragraph& rPara ) @@ -80,7 +80,7 @@ Paragraph::Paragraph( const Paragraph& rPara ) Paragraph::Paragraph( const ParagraphData& rData ) : nFlags( 0 ) , aBulSize( -1, -1) -, bVisible( sal_True ) +, bVisible( true ) { nDepth = rData.nDepth; mnNumberingStartValue = rData.mnNumberingStartValue; @@ -98,7 +98,7 @@ void Paragraph::SetNumberingStartValue( sal_Int16 nNumberingStartValue ) mbParaIsNumberingRestart = true; } -void Paragraph::SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart ) +void Paragraph::SetParaIsNumberingRestart( bool bParaIsNumberingRestart ) { mbParaIsNumberingRestart = bParaIsNumberingRestart; if( !mbParaIsNumberingRestart ) @@ -232,7 +232,7 @@ void ParagraphList::Expand( Paragraph* pParent ) Paragraph* pPara = GetParagraph( nPos+n ); if ( !( pPara->IsVisible() ) ) { - pPara->bVisible = sal_True; + pPara->bVisible = true; aVisibleStateChangedHdl.Call( pPara ); } } @@ -248,7 +248,7 @@ void ParagraphList::Collapse( Paragraph* pParent ) Paragraph* pPara = GetParagraph( nPos+n ); if ( pPara->IsVisible() ) { - pPara->bVisible = sal_False; + pPara->bVisible = false; aVisibleStateChangedHdl.Call( pPara ); } } |