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 | |
| parent | 127f62ccbdf090e2b5fc4d92c30a9c152b60f0e0 (diff) | |
editeng: sal_Bool->bool
Change-Id: Id4174904487fc153d8e80471da7c829c52092f78
54 files changed, 461 insertions, 461 deletions
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 08939aa872c2..ea3b24a417b0 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -192,7 +192,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() // prevent flicker pOutlinerView->HideCursor(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); // delete current selection by inserting empty String, so current // attributes become unique (sel. has to be erased anyway) @@ -206,7 +206,7 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter() pOutlinerView->SetSelection(aSel); // show changes - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); pOutlinerView->ShowCursor(); } 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 ); } } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 3d2a7dc5b98a..a7de3077f957 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3549,7 +3549,7 @@ void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj ) rOutliner.Init( OUTLINERMODE_TEXTOBJECT ); sal_Bool bOldUpdateMode = rOutliner.GetUpdateMode(); - rOutliner.SetUpdateMode( sal_False ); + rOutliner.SetUpdateMode( false ); rOutliner.SetVertical( pText->IsVerticalWriting() ); sal_Int32 nParaIndex = 0; @@ -4338,7 +4338,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r SdrModel* pModel = pRet->GetModel(); if ( pModel ) rOutliner.SetStyleSheetPool( (SfxStyleSheetPool*)pModel->GetStyleSheetPool() ); - rOutliner.SetUpdateMode( sal_False ); + rOutliner.SetUpdateMode( false ); rOutliner.SetText( *pParaObj ); VirtualDevice aVirDev( 1 ); aVirDev.SetMapMode( MAP_100TH_MM ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 8716d49ebdeb..f52f47795f12 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2200,7 +2200,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* rOutliner.Init( OUTLINERMODE_TITLEOBJECT ); // Outliner reset sal_Bool bOldUpdateMode = rOutliner.GetUpdateMode(); - rOutliner.SetUpdateMode( sal_False ); + rOutliner.SetUpdateMode( false ); if ( pSheet ) { if ( rOutliner.GetStyleSheet( 0 ) != pSheet ) diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 7d6e8aeb3263..52255562ee7d 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -126,11 +126,11 @@ private: Paragraph& operator=(const Paragraph& rPara ); sal_uInt16 nFlags; - OUString aBulText; + OUString aBulText; Size aBulSize; - sal_Bool bVisible; + bool bVisible; - sal_Bool IsVisible() const { return bVisible; } + bool IsVisible() const { return bVisible; } void SetText( const OUString& rText ) { aBulText = rText; aBulSize.Width() = -1; } void Invalidate() { aBulSize.Width() = -1; } void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; } @@ -146,8 +146,8 @@ private: sal_Int16 GetNumberingStartValue() const { return mnNumberingStartValue; } void SetNumberingStartValue( sal_Int16 nNumberingStartValue ); - sal_Bool IsParaIsNumberingRestart() const { return mbParaIsNumberingRestart; } - void SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart ); + bool IsParaIsNumberingRestart() const { return mbParaIsNumberingRestart; } + void SetParaIsNumberingRestart( bool bParaIsNumberingRestart ); void SetFlag( sal_uInt16 nFlag ) { nFlags |= nFlag; } void RemoveFlag( sal_uInt16 nFlag ) { nFlags &= ~nFlag; } @@ -192,15 +192,15 @@ private: MouseDontKnow = 4 }; - EDITENG_DLLPRIVATE void ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, sal_Bool bExpand ); + EDITENG_DLLPRIVATE void ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, bool bExpand ); EDITENG_DLLPRIVATE sal_Int32 ImpCheckMousePos( const Point& rPosPixel, MouseTarget& reTarget); EDITENG_DLLPRIVATE void ImpToggleExpand( Paragraph* pParentPara ); - EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChildren ); + EDITENG_DLLPRIVATE ParaRange ImpGetSelectedParagraphs( bool bIncludeHiddenChildren ); EDITENG_DLLPRIVATE sal_Int32 ImpInitPaste( sal_Int32& rStart ); EDITENG_DLLPRIVATE void ImpPasted( sal_Int32 nStart, sal_Int32 nPrevParaCount, sal_Int32 nSize); - EDITENG_DLLPRIVATE sal_Int32 ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected ); + EDITENG_DLLPRIVATE sal_Int32 ImpCalcSelectedPages( bool bIncludeFirstSelected ); public: OutlinerView( Outliner* pOut, Window* pWindow ); @@ -211,12 +211,12 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); - sal_Bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); - sal_Bool MouseButtonDown( const MouseEvent& ); - sal_Bool MouseButtonUp( const MouseEvent& ); - sal_Bool MouseMove( const MouseEvent& ); + bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); + bool MouseButtonDown( const MouseEvent& ); + bool MouseButtonUp( const MouseEvent& ); + bool MouseMove( const MouseEvent& ); - void ShowCursor( sal_Bool bGotoCursor = sal_True ); + void ShowCursor( bool bGotoCursor = true ); void HideCursor(); Outliner* GetOutliner() const { return pOwner; } @@ -224,8 +224,8 @@ public: void SetWindow( Window* pWindow ); Window* GetWindow() const; - void SetReadOnly( sal_Bool bReadOnly ); - sal_Bool IsReadOnly() const; + void SetReadOnly( bool bReadOnly ); + bool IsReadOnly() const; void SetOutputArea( const Rectangle& rRect ); Rectangle GetOutputArea() const; @@ -236,8 +236,8 @@ public: // Retruns the number of selected paragraphs sal_Int32 Select( Paragraph* pParagraph, - sal_Bool bSelect=sal_True, - sal_Bool bWChildren=sal_True); + bool bSelect = true, + bool bWChildren = true); OUString GetSelected() const; void SelectRange( sal_Int32 nFirst, sal_Int32 nCount ); @@ -245,11 +245,11 @@ public: void Indent( short nDiff ); void AdjustDepth( short nDX ); // Later replace with Indent! - sal_Bool AdjustHeight( long nDY ); + bool AdjustHeight( long nDY ); - sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, sal_Bool bSelect = sal_False, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uLong Read( SvStream& rInput, const OUString& rBaseURL, EETextFormat eFormat, bool bSelect = false, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False ); + void InsertText( const OUString& rNew, bool bSelect = false ); void InsertText( const OutlinerParaObject& rParaObj ); void Expand(); void Collapse(); @@ -278,12 +278,12 @@ public: Pointer GetPointer( const Point& rPosPixel ); void Command( const CommandEvent& rCEvt ); - EESpellState StartSpeller( sal_Bool bMultipleDoc = sal_False ); + EESpellState StartSpeller( bool bMultipleDoc = false ); EESpellState StartThesaurus(); - sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); + sal_Int32 StartSearchAndReplace( const SvxSearchItem& rSearchItem ); // for text conversion - void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc ); + void StartTextConversion( LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont, sal_Int32 nOptions, bool bIsInteractive, bool bMultipleDoc ); void TransliterateText( sal_Int32 nTransliterationMode ); @@ -294,9 +294,9 @@ public: void SetVisArea( const Rectangle& rRect ); void SetSelection( const ESelection& ); - void RemoveAttribs( sal_Bool bRemoveParaAttribs = sal_False, sal_uInt16 nWhich = 0, sal_Bool bKeepLanguages = sal_False ); - void RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ); - sal_Bool HasSelection() const; + void RemoveAttribs( bool bRemoveParaAttribs = false, sal_uInt16 nWhich = 0, bool bKeepLanguages = false ); + void RemoveAttribsKeepLanguages( bool bRemoveParaAttribs ); + bool HasSelection() const; void InsertField( const SvxFieldItem& rFld ); const SvxFieldItem* GetFieldUnderMousePointer() const; @@ -345,8 +345,8 @@ public: */ void EnableBullets(); - sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False ); - sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False ); + bool IsCursorAtWrongSpelledWord( bool bMarkIfWrong = false ); + bool IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWrong = false ); void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 ); void SetInvalidateMore( sal_uInt16 nPixel ); @@ -392,7 +392,7 @@ public: bool mbEndOfBullet : 1; sal_uInt8 GetBiDiLevel() const { return mnBiDiLevel; } - sal_Bool IsRTL() const { return mnBiDiLevel % 2 ? sal_True : sal_False; } + bool IsRTL() const { return mnBiDiLevel % 2 == 1; } DrawPortionInfo( const Point& rPos, @@ -482,7 +482,7 @@ private: sal_Int32 nPara; sal_Int32 nPos; - sal_Bool bSimpleClick; + bool bSimpleClick; EditFieldInfo(); EditFieldInfo( const EditFieldInfo& ); @@ -495,7 +495,7 @@ public: { pOutliner = pOutl; nPara = nPa; nPos = nPo; - pTxtColor = 0; pFldColor = 0; bSimpleClick = sal_False; + pTxtColor = 0; pFldColor = 0; bSimpleClick = false; mpSdrPage = 0; } ~EditFieldInfo() @@ -518,11 +518,11 @@ public: void ClearFldColor() { delete pFldColor; pFldColor = 0; } - sal_Int32 GetPara() const { return nPara; } - sal_Int32 GetPos() const { return nPos; } + sal_Int32 GetPara() const { return nPara; } + sal_Int32 GetPos() const { return nPos; } - sal_Bool IsSimpleClick() const { return bSimpleClick; } - void SetSimpleClick( sal_Bool bSimple ) { bSimpleClick = bSimple; } + bool IsSimpleClick() const { return bSimpleClick; } + void SetSimpleClick( bool bSimple ) { bSimpleClick = bSimple; } const OUString& GetRepresentation() const { return aRepresentation; } OUString& GetRepresentation() { return aRepresentation; } @@ -534,7 +534,7 @@ public: struct EBulletInfo { - sal_Bool bVisible; + bool bVisible; sal_uInt16 nType; // see SvxNumberType OUString aText; SvxFont aFont; @@ -542,7 +542,7 @@ struct EBulletInfo sal_Int32 nParagraph; Rectangle aBounds; - EBulletInfo() : bVisible( sal_False ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {} + EBulletInfo() : bVisible( false ), nType( 0 ), nParagraph( EE_PARA_NOT_FOUND ) {} }; #define OUTLINERMODE_DONTKNOW 0x0000 @@ -596,13 +596,13 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster const sal_Int16 nMinDepth; sal_Int32 nFirstPage; - sal_uInt16 nOutlinerMode; + sal_uInt16 nOutlinerMode; - sal_Bool bIsExpanding; // Only valid in Expand/Collaps-Hdl, reset - sal_Bool bFirstParaIsEmpty; - sal_Bool bBlockInsCallback; - sal_Bool bStrippingPortions; - sal_Bool bPasting; + bool bIsExpanding; // Only valid in Expand/Collaps-Hdl, reset + bool bFirstParaIsEmpty; + sal_uInt8 nBlockInsCallback; + bool bStrippingPortions; + bool bPasting; sal_uLong nDummy; @@ -616,15 +616,15 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster bool ImplHasNumberFormat( sal_Int32 nPara ) const; Size ImplGetBulletSize( sal_Int32 nPara ); sal_uInt16 ImplGetNumbering( sal_Int32 nPara, const SvxNumberFormat* pParaFmt ); - void ImplCalcBulletText( sal_Int32 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChildren ); + void ImplCalcBulletText( sal_Int32 nPara, bool bRecalcLevel, bool bRecalcChildren ); OUString ImplGetBulletText( sal_Int32 nPara ); void ImplCheckNumBulletItem( sal_Int32 nPara ); - void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction = sal_False ); + void ImplInitDepth( sal_Int32 nPara, sal_Int16 nDepth, bool bCreateUndo, bool bUndoAction = false ); void ImplSetLevelDependendStyleSheet( sal_Int32 nPara, SfxStyleSheet* pLevelStyle = NULL ); - void ImplBlockInsertionCallbacks( sal_Bool b ); + void ImplBlockInsertionCallbacks( bool b ); - void ImplCheckStyleSheet( sal_Int32 nPara, sal_Bool bReplaceExistingStyle ); + void ImplCheckStyleSheet( sal_Int32 nPara, bool bReplaceExistingStyle ); void ImpRecalcBulletIndent( sal_Int32 nPara ); const SvxBulletItem& ImpGetBullet( sal_Int32 nPara, sal_uInt16& ); @@ -634,11 +634,11 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster void ImpTextPasted( sal_Int32 nStartPara, sal_Int32 nCount ); long ImpCalcMaxBulletWidth( sal_Int32 nPara, const SvxBulletItem& rBullet ); Font ImpCalcBulletFont( sal_Int32 nPara ) const; - Rectangle ImpCalcBulletArea( sal_Int32 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos ); + Rectangle ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bReturnPaperPos ); long ImpGetTextIndent( sal_Int32 nPara ); - sal_Bool ImpCanIndentSelectedPages( OutlinerView* pCurView ); - sal_Bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); - sal_Bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); + bool ImpCanIndentSelectedPages( OutlinerView* pCurView ); + bool ImpCanDeleteSelectedPages( OutlinerView* pCurView ); + bool ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_Int32 nFirstPage, sal_Int32 nPages ); sal_uInt16 ImplGetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } void ImplCheckDepth( sal_Int16& rnDepth ) const; @@ -667,10 +667,10 @@ public: void Init( sal_uInt16 nOutlinerMode ); sal_uInt16 GetMode() const { return nOutlinerMode; } - void SetVertical( sal_Bool bVertical ); + void SetVertical( bool bVertical ); bool IsVertical() const; - void SetFixedCellHeight( sal_Bool bUseFixedCellHeight ); + void SetFixedCellHeight( bool bUseFixedCellHeight ); void SetDefaultHorizontalTextDirection( EEHorizontalTextDirection eHTextDir ); EEHorizontalTextDirection GetDefaultHorizontalTextDirection() const; @@ -680,9 +680,9 @@ public: void SetAsianCompressionMode( sal_uInt16 nCompressionMode ); - void SetKernAsianPunctuation( sal_Bool bEnabled ); + void SetKernAsianPunctuation( bool bEnabled ); - void SetAddExtLeading( sal_Bool b ); + void SetAddExtLeading( bool b ); size_t InsertView( OutlinerView* pView, size_t nIndex = size_t(-1) ); OutlinerView* RemoveView( OutlinerView* pView ); @@ -708,43 +708,43 @@ public: sal_Int16 GetMinDepth() const { return -1; } - void SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParas = sal_False ); - sal_Int16 GetMaxDepth() const { return nMaxDepth; } + void SetMaxDepth( sal_Int16 nDepth, bool bCheckParas = false ); + sal_Int16 GetMaxDepth() const { return nMaxDepth; } - void SetUpdateMode( sal_Bool bUpdate ); - sal_Bool GetUpdateMode() const; + void SetUpdateMode( bool bUpdate ); + bool GetUpdateMode() const; void Clear(); - void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ); + void RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich ); sal_Int32 GetParagraphCount() const; Paragraph* GetParagraph( sal_Int32 nAbsPos ) const; - sal_Bool HasParent( Paragraph* pParagraph ) const; - sal_Bool HasChildren( Paragraph* pParagraph ) const; + bool HasParent( Paragraph* pParagraph ) const; + bool HasChildren( Paragraph* pParagraph ) const; sal_Int32 GetChildCount( Paragraph* pParent ) const; - sal_Bool IsExpanded( Paragraph* pPara ) const; - Paragraph* GetParent( Paragraph* pParagraph ) const; - sal_Int32 GetAbsPos( Paragraph* pPara ); + bool IsExpanded( Paragraph* pPara ) const; + Paragraph* GetParent( Paragraph* pParagraph ) const; + sal_Int32 GetAbsPos( Paragraph* pPara ); sal_Int16 GetDepth( sal_Int32 nPara ) const; void SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth ); - sal_Bool IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); } + bool IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); } - void EnableUndo( sal_Bool bEnable ); - sal_Bool IsUndoEnabled() const; + void EnableUndo( bool bEnable ); + bool IsUndoEnabled() const; void UndoActionStart( sal_uInt16 nId ); void UndoActionEnd( sal_uInt16 nId ); void InsertUndo( EditUndo* pUndo ); - sal_Bool IsInUndo(); + bool IsInUndo(); void ClearModifyFlag(); - sal_Bool IsModified() const; + bool IsModified() const; Paragraph* GetHdlParagraph() const { return pHdlParagraph; } - sal_Bool IsExpanding() const { return bIsExpanding; } + bool IsExpanding() const { return bIsExpanding; } virtual void ExpandHdl(); void SetExpandHdl( const Link& rLink ) { aExpandHdl = rLink; } @@ -820,13 +820,13 @@ public: void SetDefTab( sal_uInt16 nTab ); - sal_Bool IsFlatMode() const; - void SetFlatMode( sal_Bool bFlat ); + bool IsFlatMode() const; + void SetFlatMode( bool bFlat ); - void EnableAutoColor( sal_Bool b ); + void EnableAutoColor( bool b ); - void ForceAutoColor( sal_Bool b ); - sal_Bool IsForceAutoColor() const; + void ForceAutoColor( bool b ); + bool IsForceAutoColor() const; EBulletInfo GetBulletInfo( sal_Int32 nPara ); @@ -862,7 +862,7 @@ public: void SetStyleSheetPool( SfxStyleSheetPool* pSPool ); SfxStyleSheetPool* GetStyleSheetPool(); - sal_Bool IsInSelectionMode() const; + bool IsInSelectionMode() const; void SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle ); SfxStyleSheet* GetStyleSheet( sal_Int32 nPara ); @@ -871,8 +871,8 @@ public: SfxItemSet GetParaAttribs( sal_Int32 nPara ); void Remove( Paragraph* pPara, sal_Int32 nParaCount ); - sal_Bool Expand( Paragraph* ); - sal_Bool Collapse( Paragraph* ); + bool Expand( Paragraph* ); + bool Collapse( Paragraph* ); void SetParaFlag( Paragraph* pPara, sal_uInt16 nFlag ); bool HasParaFlag( const Paragraph* pPara, sal_uInt16 nFlag ) const; @@ -907,10 +907,10 @@ public: void QuickInsertText( const OUString& rText, const ESelection& rSel ); void QuickDelete( const ESelection& rSel ); void QuickRemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich = 0 ); - void QuickFormatDoc( sal_Bool bFull = sal_False ); + void QuickFormatDoc( bool bFull = false ); - sal_Bool UpdateFields(); - void RemoveFields( sal_Bool bKeepFieldText, TypeId aType = NULL ); + bool UpdateFields(); + void RemoveFields( bool bKeepFieldText, TypeId aType = NULL ); virtual void FieldClicked( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos ); @@ -933,12 +933,12 @@ public: void CompleteOnlineSpelling(); EESpellState HasSpellErrors(); - sal_Bool HasText( const SvxSearchItem& rSearchItem ); - virtual sal_Bool SpellNextDocument(); + bool HasText( const SvxSearchItem& rSearchItem ); + virtual bool SpellNextDocument(); // for text conversion - sal_Bool HasConvertibleTextPortion( LanguageType nLang ); - virtual sal_Bool ConvertNextDocument(); + bool HasConvertibleTextPortion( LanguageType nLang ); + virtual bool ConvertNextDocument(); void SetEditTextObjectPool( SfxItemPool* pPool ); SfxItemPool* GetEditTextObjectPool() const; @@ -950,14 +950,14 @@ public: sal_uLong GetTextHeight( sal_Int32 nParagraph ) const; Point GetDocPosTopLeft( sal_Int32 nParagraph ); Point GetDocPos( const Point& rPaperPos ) const; - sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 ); - sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBuuletPos ); + bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder = 0 ); + bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, bool* pbBulletPos ); void SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 ); void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const; void EraseVirtualDevice(); - sal_Bool ShouldCreateBigTextObject() const; + bool ShouldCreateBigTextObject() const; const EditEngine& GetEditEngine() const { return *((EditEngine*)pEditEngine); } @@ -966,7 +966,7 @@ public: sal_uInt16 GetOutlinerMode() const { return nOutlinerMode & OUTLINERMODE_USERMASK; } - void StartSpelling(EditView& rEditView, sal_Bool bMultipleDoc); + void StartSpelling(EditView& rEditView, bool bMultipleDoc); // spell and return a sentence bool SpellSentence(EditView& rEditView, ::svx::SpellPortions& rToFill, bool bIsGrammarChecking ); // put spell position to start of current sentence @@ -991,8 +991,8 @@ public: virtual sal_Int16 GetNumberingStartValue( sal_Int32 nPara ); virtual void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue ); - virtual sal_Bool IsParaIsNumberingRestart( sal_Int32 nPara ); - virtual void SetParaIsNumberingRestart( sal_Int32 nPara, sal_Bool bParaIsNumberingRestart ); + virtual bool IsParaIsNumberingRestart( sal_Int32 nPara ); + virtual void SetParaIsNumberingRestart( sal_Int32 nPara, bool bParaIsNumberingRestart ); /** determine the bullets/numbering status of the given paragraphs diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 8b46befb671d..7492bf84390e 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -654,7 +654,7 @@ static void lcl_RemoveFields( OutlinerView& rOutView ) if (bUpdate && bChanged) { pOutliner->GetUndoManager().LeaveListAction(); - pOutliner->SetUpdateMode( sal_True ); + pOutliner->SetUpdateMode( true ); } if ( aOldSel.IsEqual( aSel ) ) // aSel is adjusted diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index afd57abd52e5..12cd4bb8b9e2 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -150,7 +150,7 @@ public: void EndSpelling (void); /** callback for textconversion */ - sal_Bool ConvertNextDocument (void); + bool ConvertNextDocument (void); /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ @@ -526,7 +526,7 @@ private: required. When all text objects have been processed then <FALSE/> is returned. */ - virtual sal_Bool SpellNextDocument (void); + virtual bool SpellNextDocument (void); /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 5e84b13281ea..29514062728a 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -800,8 +800,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool // This outliner is only used to create special text objects. As no // information about portions is saved in this outliner, the update mode // can/should always remain sal_False. - mpInternalOutliner->SetUpdateMode( sal_False ); - mpInternalOutliner->EnableUndo( sal_False ); + mpInternalOutliner->SetUpdateMode( false ); + mpInternalOutliner->EnableUndo( false ); if (mpDocSh) mpInternalOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -810,8 +810,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); } - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == sal_False ) , "InternalOutliner: UpdateMode = sal_True !" ); - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == sal_False ), "InternalOutliner: Undo = sal_True !" ); + DBG_ASSERT( !mpInternalOutliner || ( ! mpInternalOutliner->GetUpdateMode() ) , "InternalOutliner: UpdateMode = sal_True !" ); + DBG_ASSERT( !mpInternalOutliner || ( ! mpInternalOutliner->IsUndoEnabled() ), "InternalOutliner: Undo = sal_True !" ); // If you add stuff here, always clear it out. // Advantages: diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index d92c342c1f77..85a9fa3e4aa2 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -884,7 +884,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) { mbHasOnlineSpellErrors = false; ::sd::Outliner* pOutl = GetInternalOutliner(sal_True); - pOutl->SetUpdateMode(sal_True); + pOutl->SetUpdateMode(true); Link aEvtHdl = pOutl->GetStatusEventHdl(); pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl)); @@ -925,7 +925,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) } pOutl->SetStatusEventHdl(aEvtHdl); - pOutl->SetUpdateMode(sal_False); + pOutl->SetUpdateMode(false); pOutl->Init( nOldOutlMode ); mbHasOnlineSpellErrors = false; } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 64d9d1407ec0..2fa462c74de7 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2375,14 +2375,14 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *( (SdDrawDocument*) GetModel() )->GetDocSh() ) ); pOutl->SetEditTextObjectPool(pPool); pOutl->SetStyleSheetPool((SfxStyleSheetPool*)GetModel()->GetStyleSheetPool()); - pOutl->EnableUndo(sal_False); - pOutl->SetUpdateMode( sal_False ); + pOutl->EnableUndo(false); + pOutl->SetUpdateMode( false ); } sal_uInt16 nOutlMode = pOutl->GetMode(); Size aPaperSize = pOutl->GetPaperSize(); sal_Bool bUpdateMode = pOutl->GetUpdateMode(); - pOutl->SetUpdateMode(sal_False); + pOutl->SetUpdateMode(false); pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() ); // Always set the object's StyleSheet at the Outliner to diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 88b9cae50598..730ab2b703a6 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -459,7 +459,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) boost::scoped_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); - pOutliner->SetUpdateMode( sal_True ); + pOutliner->SetUpdateMode( true ); OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY)); OUString sAuthor( xAnnotation->getAuthor() ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 700f316a5ada..0ffcf5d591c7 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -321,7 +321,7 @@ void AnnotationWindow::InitControls() mpOutliner = new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT); Doc()->SetCalcFieldValueHdl( mpOutliner ); - mpOutliner->SetUpdateMode( sal_True ); + mpOutliner->SetUpdateMode( true ); Rescale(); OutputDevice* pDev = Doc()->GetRefDevice(); @@ -348,11 +348,11 @@ void AnnotationWindow::InitControls() mpOutliner->SetControlWord(nCntrl); Engine()->SetModifyHdl( Link() ); - Engine()->EnableUndo( sal_False ); + Engine()->EnableUndo( false ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); - Engine()->EnableUndo( sal_True ); + Engine()->EnableUndo( true ); Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index c9719ccb533b..caa7043ef759 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -121,7 +121,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { // prevent flickering pOV->HideCursor(); - pOL->SetUpdateMode(sal_False); + pOL->SetUpdateMode(false); // remove old selected text pOV->InsertText( aEmptyStr ); @@ -133,7 +133,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) // insert given text OUString aStr( cMark ); - pOV->InsertText( aStr, sal_True); + pOV->InsertText( aStr, true); ESelection aSel = pOV->GetSelection(); aSel.nStartPara = aSel.nEndPara; @@ -143,7 +143,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) rUndoMgr.LeaveListAction(); // restart repainting - pOL->SetUpdateMode(sal_True); + pOL->SetUpdateMode(true); pOV->ShowCursor(); } } @@ -245,7 +245,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { // prevent flicker pOV->HideCursor(); - pOL->SetUpdateMode(sal_False); + pOL->SetUpdateMode(false); /* remember old attributes: To do that, remove selected area before (it has to go anyway). @@ -260,7 +260,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR), aEmptyStr ); - pOV->InsertText(aChars, sal_True); + pOV->InsertText(aChars, true); // set attributes (set font) SfxItemSet aSet(pOL->GetEmptyItemSet()); @@ -284,7 +284,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) rUndoMgr.LeaveListAction(); // show it again - pOL->SetUpdateMode(sal_True); + pOL->SetUpdateMode(true); pOV->ShowCursor(); } } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index eb5bd40a915f..bc9bcd57f758 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -89,8 +89,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(sal_False); - pOutl->EnableUndo(sal_False); + pOutl->SetUpdateMode(false); + pOutl->EnableUndo(false); if (mpDocSh) pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 6ee996c8611c..f1493534e360 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -159,8 +159,8 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings()); pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(sal_False); - pOutl->EnableUndo(sal_False); + pOutl->SetUpdateMode(false); + pOutl->EnableUndo(false); if (mpDocSh) pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh )); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index f232be019230..5555d3ab1cd8 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1059,7 +1059,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) { OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject(); if( ( pOPO && pOPO->IsVertical() ) || (nSlotId == SID_ATTR_CHAR_VERTICAL) || (nSlotId == SID_TEXT_FITTOSIZE_VERTICAL) ) - pOutl->SetVertical( sal_True ); + pOutl->SetVertical( true ); if( pTextObj->getTextCount() > 1 ) { @@ -1147,12 +1147,12 @@ sal_Bool FuText::DeleteDefaultText() SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 ); sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); if( bIsUndoEnabled ) - pOutliner->EnableUndo(sal_False); + pOutliner->EnableUndo(false); pOutliner->SetText( OUString(), pOutliner->GetParagraph( 0 ) ); if( bIsUndoEnabled ) - pOutliner->EnableUndo(sal_True); + pOutliner->EnableUndo(true); if (pSheet && (ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT)) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 2eaf443b6622..efe362661d36 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1142,7 +1142,7 @@ namespace { pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); pOutliner->Clear(); pOutliner->SetText(*mpParaObject); @@ -1663,7 +1663,7 @@ private: const Size aSavedPaperSize (pOutliner->GetPaperSize()); const MapMode aSavedMapMode (pOutliner->GetRefMapMode()); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); long nPageH = aOutRect.GetHeight(); diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index a34406f0a9d9..9b264a8f163a 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -343,7 +343,7 @@ void Outliner::EndSpelling (void) mpImpl->ReleaseOutlinerView(); } - SetUpdateMode(sal_True); + SetUpdateMode(true); } // Before clearing the modify flag use it as a hint that @@ -373,7 +373,7 @@ void Outliner::EndSpelling (void) -sal_Bool Outliner::SpellNextDocument (void) +bool Outliner::SpellNextDocument (void) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell->ISA(OutlineViewShell)) @@ -401,7 +401,7 @@ sal_Bool Outliner::SpellNextDocument (void) ClearModifyFlag(); } - return mbEndOfSearch ? sal_False : sal_True; + return mbEndOfSearch; } @@ -776,7 +776,7 @@ void Outliner::DetectChange (void) if (pPageView != NULL) mpView->UnmarkAllObj (pPageView); mpView->SdrEndTextEdit(); - SetUpdateMode(sal_False); + SetUpdateMode(false); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -988,7 +988,7 @@ void Outliner::ProvideNextTextObject (void) { DBG_UNHANDLED_EXCEPTION(); } - SetUpdateMode(sal_False); + SetUpdateMode(false); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -1379,7 +1379,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus) // Turn on the edit mode for the text object. mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus); - SetUpdateMode(sal_True); + SetUpdateMode(true); mbFoundObject = true; } } @@ -1581,10 +1581,10 @@ void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLan */ void Outliner::PrepareConversion (void) { - SetUpdateMode(sal_True); + SetUpdateMode(true); if( HasConvertibleTextPortion( mnConversionLanguage ) ) { - SetUpdateMode(sal_False); + SetUpdateMode(false); mbStringFound = true; mbMatchMayExist = true; @@ -1596,7 +1596,7 @@ void Outliner::PrepareConversion (void) } else { - SetUpdateMode(sal_False); + SetUpdateMode(false); } } @@ -1643,7 +1643,7 @@ void Outliner::EndConversion() -sal_Bool Outliner::ConvertNextDocument() +bool Outliner::ConvertNextDocument() { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell && pViewShell->ISA(OutlineViewShell) ) @@ -1796,7 +1796,7 @@ void Outliner::Implementation::ProvideOutlinerView ( mpOutlineView->SetControlWord(nStat); if (bInsert) rOutliner.InsertView( mpOutlineView ); - rOutliner.SetUpdateMode(sal_False); + rOutliner.SetUpdateMode(false); mpOutlineView->SetOutputArea (Rectangle (Point(), Size(1, 1))); rOutliner.SetPaperSize( Size(1, 1) ); rOutliner.SetText(OUString(), rOutliner.GetParagraph(0)); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 18c7a088518a..0b876b47d72e 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -176,7 +176,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, OutlinerView* pOV = GetTextEditOutlinerView(); ::Outliner* pOutliner = pOV->GetOutliner(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); mpDocSh->SetWaitCursor( sal_True ); // replace placeholder by template name @@ -237,7 +237,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, } mpDocSh->SetWaitCursor( sal_False ); - pOV->GetOutliner()->SetUpdateMode(sal_True); + pOV->GetOutliner()->SetUpdateMode(true); mpDocSh->GetUndoManager()->LeaveListAction(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 679471c96c47..b0eeb9e3b852 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -830,7 +830,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ::Outliner* pOutl = mpDrawView->GetTextEditOutliner(); if (pOutl) { - pOutl->RemoveFields(sal_True, (TypeId) SvxURLField::StaticType()); + pOutl->RemoveFields(true, (TypeId) SvxURLField::StaticType()); } pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); @@ -1898,10 +1898,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(sal_True)); pOutl->UpdateFields(); - pOutl->SetUpdateMode( sal_True ); + pOutl->SetUpdateMode( true ); Size aSize( pOutl->CalcTextSize() ); aSize.Width() *= nMul; - pOutl->SetUpdateMode( sal_False ); + pOutl->SetUpdateMode( false ); Point aPos; Rectangle aRect( aPos, GetActiveWindow()->GetOutputSizePixel() ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 9ef7de839d39..b31f946112c6 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1525,9 +1525,9 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, SdrRectObj* pRectObj = new SdrRectObj(OBJ_TEXT); pOutl->UpdateFields(); - pOutl->SetUpdateMode( sal_True ); + pOutl->SetUpdateMode( true ); Size aSize(pOutl->CalcTextSize()); - pOutl->SetUpdateMode( sal_False ); + pOutl->SetUpdateMode( false ); Point aPos; diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 8d1703c3bd06..305b71cabd7e 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -435,7 +435,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_SET_DEFAULT: { - pOutlinerView->RemoveAttribs(sal_True); // sal_True = also paragraph attributes + pOutlinerView->RemoveAttribs(true); // sal_True = also paragraph attributes Cancel(); rReq.Done(); } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 7531dfa0917c..b44e1df27f43 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -155,7 +155,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) ReadFrameViewData(mpFrameView); ::Outliner* pOutl = pOlView->GetOutliner(); - pOutl->SetUpdateMode(sal_True); + pOutl->SetUpdateMode(true); if (!bModified) { @@ -1136,7 +1136,7 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); - pOutlinerView->ShowCursor(sal_False); + pOutlinerView->ShowCursor(false); pOlView->InvalidateSlideNumberArea(); return 0; @@ -1160,7 +1160,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); - pOutlinerView->ShowCursor(sal_False); + pOutlinerView->ShowCursor(false); pOlView->InvalidateSlideNumberArea(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index a12427f8bd03..7ddf67d7aba7 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -122,7 +122,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh mpOutlinerView[0] = new OutlinerView(&mrOutliner, pWindow); Rectangle aNullRect; mpOutlinerView[0]->SetOutputArea(aNullRect); - mrOutliner.SetUpdateMode(sal_False); + mrOutliner.SetUpdateMode(false); mrOutliner.InsertView(mpOutlinerView[0], LIST_APPEND); onUpdateStyleSettings( true ); @@ -197,7 +197,7 @@ OutlineView::~OutlineView() // uninitialize Outliner: enable color display ResetLinks(); sal_uLong nCntrl = mrOutliner.GetControlWord(); - mrOutliner.SetUpdateMode(sal_False); // otherwise there will be drawn on SetControlWord + mrOutliner.SetUpdateMode(false); // otherwise there will be drawn on SetControlWord mrOutliner.SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); SvtAccessibilityOptions aOptions; mrOutliner.ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); @@ -1097,7 +1097,7 @@ sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const void OutlineView::FillOutliner() { mrOutliner.GetUndoManager().Clear(); - mrOutliner.EnableUndo(sal_False); + mrOutliner.EnableUndo(false); ResetLinks(); mrOutliner.SetUpdateMode(false); @@ -1183,16 +1183,16 @@ void OutlineView::FillOutliner() // place cursor at the start Paragraph* pFirstPara = mrOutliner.GetParagraph( 0 ); - mpOutlinerView[0]->Select( pFirstPara, sal_True, sal_False ); - mpOutlinerView[0]->Select( pFirstPara, sal_False, sal_False ); + mpOutlinerView[0]->Select( pFirstPara, true, false ); + mpOutlinerView[0]->Select( pFirstPara, false, false ); // select title of slide that was selected if (pTitleToSelect) - mpOutlinerView[0]->Select(pTitleToSelect, sal_True, sal_False); + mpOutlinerView[0]->Select(pTitleToSelect, true, false); SetLinks(); - mrOutliner.EnableUndo(sal_True); + mrOutliner.EnableUndo(true); mrOutliner.SetUpdateMode(true); } @@ -1313,7 +1313,7 @@ void OutlineView::SetActualPage( SdPage* pActual ) // if we found a paragraph, select its text at the outliner view Paragraph* pPara = GetParagraphForPage( mrOutliner, pActual ); if( pPara ) - mpOutlinerView[0]->Select( pPara, sal_True, sal_False ); + mpOutlinerView[0]->Select( pPara, true, false ); } } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index dc36ec97c9a2..295663c355f3 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -317,7 +317,7 @@ void View::DoPaste (::Window* pWindow) { sal_Bool bOldUpdateMode = pOutliner->GetUpdateMode(); - pOutliner->SetUpdateMode( sal_False ); + pOutliner->SetUpdateMode( false ); const EditEngine& rEdit = pOutliner->GetEditEngine(); const sal_Int32 nParaCount = rEdit.GetParagraphCount(); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 7cf130ca4a0e..be8330fe27e9 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1379,7 +1379,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, sal_False, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, false, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } @@ -1414,7 +1414,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, sal_False, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, false, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index fc1c7c850678..b2b32d3222ec 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -185,7 +185,7 @@ namespace sdr if(nParaCount) { ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL); - rOutliner.RemoveAttribs(aSelection, sal_True, 0); + rOutliner.RemoveAttribs(aSelection, true, 0); OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 283d36920df3..9e42ed049675 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -199,7 +199,7 @@ void SdrObjEditView::ModelHasChanged() pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) { aTextEditArea=aEditArea1; aMinTextEditArea=aMinArea1; - pTextEditOutliner->SetUpdateMode(sal_False); + pTextEditOutliner->SetUpdateMode(false); pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1); pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1); pTextEditOutliner->SetPaperSize(Size(0,0)); // re-format Outliner @@ -225,7 +225,7 @@ void SdrObjEditView::ModelHasChanged() else nStat&=~EV_CNTRL_AUTOSIZE; if (nStat!=nStat0) pOLV->SetControlWord(nStat); } - pTextEditOutliner->SetUpdateMode(sal_True); + pTextEditOutliner->SetUpdateMode(true); bAreaChg=true; } } @@ -328,7 +328,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang aBlankRect.Union(aMinTextEditArea); Rectangle aPixRect(rTargetDevice.LogicToPixel(aBlankRect)); aBlankRect.Intersection(rRect); - rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596# + rOutlView.GetOutliner()->SetUpdateMode(true); // Bugfix #22596# rOutlView.Paint(aBlankRect, &rTargetDevice); if(!bModifyMerk) @@ -431,8 +431,8 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint* bool bContourFrame=pText!=NULL && pText->IsContourTextFrame(); // create OutlinerView OutlinerView* pOutlView=pGivenView; - pTextEditOutliner->SetUpdateMode(sal_False); - if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin); + pTextEditOutliner->SetUpdateMode(false); + if (pOutlView==NULL) pOutlView = new OutlinerView(pTextEditOutliner,pWin); else pOutlView->SetWindow(pWin); // disallow scrolling sal_uIntPtr nStat=pOutlView->GetControlWord(); @@ -452,7 +452,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint* pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } // do update before setting output area so that aTextEditArea can be recalculated - pTextEditOutliner->SetUpdateMode(sal_True); + pTextEditOutliner->SetUpdateMode(true); pOutlView->SetOutputArea(aTextEditArea); ImpInvalidateOutlinerView(*pOutlView); return pOutlView; @@ -1607,7 +1607,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace { // and now the attributes to the EditEngine if (bReplaceAll) { - pTextEditOutlinerView->RemoveAttribs( sal_True ); + pTextEditOutlinerView->RemoveAttribs( true ); } pTextEditOutlinerView->SetAttribs(rSet); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index b1d4a05445bb..e47a83e34444 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -809,7 +809,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit ) if( bInit ) { pOutliner->EraseVirtualDevice(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); pOutliner->SetEditTextObjectPool(pItemPool); pOutliner->SetDefTab(nDefaultTabulator); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 70ead2ba1c25..0ae93339113d 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -2366,7 +2366,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); // TODO: add the optimization with bPortionInfoChecked again. OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); if( pOutlinerParaObject != NULL ) @@ -2725,7 +2725,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if( bHitTest ) rOutliner.SetTextObj( this ); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText(*pPara); } } @@ -2736,7 +2736,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetControlWord(nStat0); SdrText* pText = getActiveText(); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 5f31c1897b28..c4f2b1a9f4b0 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -630,7 +630,7 @@ void SdrMeasureObj::UndirtyText() const rOutliner.SetText(*pOutlinerParaObject); } - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.UpdateFields(); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 01f63c1c4899..ec701aa5bd69 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -210,7 +210,7 @@ void SdrTextObj::FitFrameToTextSize() { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top())); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText(*pText->GetOutlinerParaObject()); Size aNewSize(rOutliner.CalcTextSize()); rOutliner.Clear(); @@ -230,7 +230,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr) { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 )); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); Size aSiz(rOutliner.CalcTextSize()); @@ -255,7 +255,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt rOutliner.SetStyleSheet( 0, GetStyleSheet()); rOutliner.Read(rInput,rBaseURL,eFormat); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); @@ -282,7 +282,7 @@ const Size& SdrTextObj::GetTextSize() const { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetText(*pText->GetOutlinerParaObject()); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); aSiz=rOutliner.CalcTextSize(); rOutliner.Clear(); } @@ -770,7 +770,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText(*pPara); } } @@ -782,7 +782,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetControlWord(nStat0); if( pText ) @@ -1196,7 +1196,7 @@ void SdrTextObj::ImpCheckMasterCachable() // Extracted from ImpGetDrawOutliner() void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const { - rOutl.SetUpdateMode(sal_False); + rOutl.SetUpdateMode(false); sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 42657e0385a9..56c43ea014aa 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -92,7 +92,7 @@ namespace maFont(rInfo.mrFont), maDblDXArray(), maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()), - mbRTL(rInfo.mrFont.IsVertical() ? false : rInfo.IsRTL()) + mbRTL(rInfo.mrFont.IsVertical() ? sal_False : rInfo.IsRTL()) { if(mnTextLength && rInfo.mpDXArray) { diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 3961c0d0db62..792f82b85939 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -117,7 +117,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW } else { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); // TODO: add the optimization with bPortionInfoChecked etc. here OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); if ( pOutlinerParaObject != NULL ) diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index c40dfaa7a35a..eb5d9d8dd51c 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -315,7 +315,7 @@ void SdrTextObj::ImpSetTextEditParams() const { if (pEdtOutl!=NULL) { bool bUpdMerk=pEdtOutl->GetUpdateMode(); - if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False); + if (bUpdMerk) pEdtOutl->SetUpdateMode(false); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; @@ -329,7 +329,7 @@ void SdrTextObj::ImpSetTextEditParams() const TakeTextAnchorRect(aAnchorRect); ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True); } - if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True); + if (bUpdMerk) pEdtOutl->SetUpdateMode(true); } } diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index e0fa528778f8..7e46447ff208 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -46,7 +46,7 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) { if( pObj && pObj != mpTextObj.get() ) { - SetUpdateMode(sal_False); + SetUpdateMode(false); sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT; if ( !pObj->IsOutlText() ) nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index d56e5c7ae22c..26db3dfed1f0 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -451,7 +451,7 @@ void Cell::mergeContent( const CellRef& xSourceCell ) if( xSourceCell->hasText() ) { SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner(); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); if( hasText() ) { @@ -699,7 +699,7 @@ sal_Int32 Cell::getMinimumHeight() { Outliner& rOutliner=rTableObj.ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSize); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT ); if( GetOutlinerParaObject() ) @@ -1598,7 +1598,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault() if(nParaCount) { ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL); - rOutliner.RemoveAttribs(aSelection, sal_True, 0); + rOutliner.RemoveAttribs(aSelection, true, 0); OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount); rOutliner.Clear(); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 9e5a6fd31f02..a603afe30614 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1451,7 +1451,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec if( bHitTest ) // #i33696# take back fix #i27510# rOutliner.SetTextObj( this ); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText(*pPara); } } @@ -1463,7 +1463,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell ) delete pPara; - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetControlWord(nStat0); Point aTextPos(aAnkRect.TopLeft()); @@ -1835,7 +1835,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetRefDevice( pModel->GetRefDevice() ); bool bUpdMerk=rOutl.GetUpdateMode(); - if (bUpdMerk) rOutl.SetUpdateMode(sal_False); + if (bUpdMerk) rOutl.SetUpdateMode(false); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; @@ -1845,7 +1845,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetMaxAutoPaperSize(aPaperMax); rOutl.SetPaperSize(aPaperMax); - if (bUpdMerk) rOutl.SetUpdateMode(sal_True); + if (bUpdMerk) rOutl.SetUpdateMode(true); sal_uIntPtr nStat=rOutl.GetControlWord(); nStat |= EE_CNTRL_AUTOPAGESIZE; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index e999b52a95b0..d096b47332bc 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1690,7 +1690,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const // create new outliner, owner will be the SdrObjEditView SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel ); if( pTableObj->IsVerticalWriting() ) - pOutl->SetVertical( sal_True ); + pOutl->SetVertical( true ); if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl)) { diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index 009b71707329..2e93278b70d1 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -138,7 +138,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj ) , mpDefMerge( 0 ) , mxTable( rTableObj.getTable() ) { - mpOutliner->SetUpdateMode(sal_True); + mpOutliner->SetUpdateMode(true); mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() ); mpInsDefault = new RTFCellDefault( &mrItemPool ); } @@ -276,7 +276,7 @@ void SdrTableRTFParser::FillTable() if( pTextObject ) { SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner(); - rOutliner.SetUpdateMode(sal_True); + rOutliner.SetUpdateMode(true); rOutliner.SetText( *pTextObject ); mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() ); delete pTextObject; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 3c72deaa3ed1..070c065f532f 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -676,7 +676,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() mpOutliner->SetStyleSheet( 0, pStyleSheet ); if( bVertical ) - mpOutliner->SetVertical( sal_True ); + mpOutliner->SetVertical( true ); } // evtually we have to set the border attributes diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx index af3834e8a833..1dbaedce8ba7 100644 --- a/sw/source/filter/html/htmldraw.cxx +++ b/sw/source/filter/html/htmldraw.cxx @@ -832,7 +832,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt, // Was jetzt kommt ist das Gegenstueck zu SdrTextObjectt::SetText() Outliner aOutliner(0, OUTLINERMODE_TEXTOBJECT); - aOutliner.SetUpdateMode( sal_False ); + aOutliner.SetUpdateMode( false ); aOutliner.SetText( *pOutlinerParaObj ); OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0), aOutliner.GetParagraphCount() ) ); diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx index f6428d3c7fd3..9eed5b537e4c 100644 --- a/sw/source/ui/docvw/AnnotationWin.cxx +++ b/sw/source/ui/docvw/AnnotationWin.cxx @@ -91,7 +91,7 @@ void SwAnnotationWin::SetPostItText() // get text from SwPostItField and insert into our textview Engine()->SetModifyHdl( Link() ); - Engine()->EnableUndo( sal_False ); + Engine()->EnableUndo( false ); if( mpFld->GetTextObject() ) Engine()->SetText( *mpFld->GetTextObject() ); else @@ -103,7 +103,7 @@ void SwAnnotationWin::SetPostItText() Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); - Engine()->EnableUndo( sal_True ); + Engine()->EnableUndo( true ); Engine()->SetModifyHdl( LINK( this, SwAnnotationWin, ModifyHdl ) ); if (bTextUnchanged) GetOutlinerView()->GetEditView().SetSelection(aOrigSelection); diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index 0ae206f638fa..292950dd8c36 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -314,7 +314,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt ) { if ( !mrSidebarWin.IsProtected() && GetTextView() && - GetTextView()->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel(),sal_True )) + GetTextView()->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel(), true )) { Link aLink = LINK(this, SidebarTxtControl, OnlineSpellCallback); GetTextView()->ExecuteSpellPopup(rCEvt.GetMousePosPixel(),&aLink); diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 98dfcc7d5a73..742c116e09b1 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -329,7 +329,7 @@ void SwSidebarWin::InitControls() SwDocShell* aShell = mrView.GetDocShell(); mpOutliner = new Outliner(&aShell->GetPool(),OUTLINERMODE_TEXTOBJECT); aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner ); - mpOutliner->SetUpdateMode( sal_True ); + mpOutliner->SetUpdateMode( true ); Rescale(); mpSidebarTxtControl->EnableRTL( false ); @@ -1127,8 +1127,8 @@ IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl) void SwSidebarWin::ResetAttributes() { - mpOutlinerView->RemoveAttribsKeepLanguages(sal_True); - mpOutliner->RemoveFields(sal_True); + mpOutlinerView->RemoveAttribsKeepLanguages(true); + mpOutliner->RemoveFields(true); mpOutlinerView->SetAttribs(DefaultItem()); } diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx index f8ffa1a1c75c..7c3de8257ec4 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.cxx +++ b/sw/source/ui/lingu/sdrhhcwrap.cxx @@ -94,7 +94,7 @@ SdrHHCWrapper::~SdrHHCWrapper() SdrView *pSdrView = pView->GetWrtShell().GetDrawView(); OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" ); pSdrView->SdrEndTextEdit( sal_True ); - SetUpdateMode(sal_False); + SetUpdateMode(false); pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); } RemoveView( pOutlView ); @@ -104,20 +104,20 @@ SdrHHCWrapper::~SdrHHCWrapper() void SdrHHCWrapper::StartTextConversion() { - pOutlView->StartTextConversion( nSourceLang, nTargetLang, pTargetFont, nOptions, static_cast<sal_Bool>(bIsInteractive), sal_True ); + pOutlView->StartTextConversion( nSourceLang, nTargetLang, pTargetFont, nOptions, bIsInteractive, true ); } -sal_Bool SdrHHCWrapper::ConvertNextDocument() +bool SdrHHCWrapper::ConvertNextDocument() { - sal_Bool bNextDoc = sal_False; + bool bNextDoc = false; if ( pTextObj ) { SdrView *pSdrView = pView->GetWrtShell().GetDrawView(); OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" ); pSdrView->SdrEndTextEdit( sal_True ); - SetUpdateMode(sal_False); + SetUpdateMode(false); pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); SetPaperSize( Size(1, 1) ); Clear(); @@ -146,23 +146,23 @@ sal_Bool SdrHHCWrapper::ConvertNextDocument() //!! work correctly because the document may not be properly //!! formatted when some information is accessed, and thus //!! incorrect results get returned. - SetUpdateMode(sal_True); + SetUpdateMode(true); if (HasConvertibleTextPortion( nSourceLang )) { SdrView *pSdrView = pView->GetWrtShell().GetDrawView(); OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" ); SdrPageView* pPV = pSdrView->GetSdrPageView(); nDocIndex = n; - bNextDoc = sal_True; + bNextDoc = true; pOutlView->SetOutputArea( Rectangle( Point(), Size(1,1))); SetPaperSize( pTextObj->GetLogicRect().GetSize() ); - SetUpdateMode(sal_True); + SetUpdateMode(true); pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect()); pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), sal_False, this, pOutlView, sal_True, sal_True); } else - SetUpdateMode(sal_False); + SetUpdateMode(false); } if ( !bNextDoc ) diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/ui/lingu/sdrhhcwrap.hxx index f8b2fb95185b..c416124c04e1 100644 --- a/sw/source/ui/lingu/sdrhhcwrap.hxx +++ b/sw/source/ui/lingu/sdrhhcwrap.hxx @@ -49,7 +49,7 @@ public: virtual ~SdrHHCWrapper(); - virtual sal_Bool ConvertNextDocument(); + virtual bool ConvertNextDocument(); void StartTextConversion(); }; diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index a53f918993e7..3b7ea902cb27 100644 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -1214,7 +1214,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) } case SID_HANGUL_HANJA_CONVERSION: pOLV->StartTextConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL, - i18n::TextConversionOption::CHARACTER_BY_CHARACTER, sal_True, sal_False ); + i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true, false ); break; case SID_CHINESE_CONVERSION: @@ -1276,7 +1276,7 @@ void SwAnnotationShell::ExecLingu(SfxRequest &rReq) Font aTargetFont = pOLV->GetWindow()->GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); - pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, sal_False, sal_False ); + pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); } } Reference< lang::XComponent > xComponent( xDialog, UNO_QUERY ); @@ -1713,7 +1713,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) // do not flicker pOLV->HideCursor(); Outliner * pOutliner = pOLV->GetOutliner(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); SfxItemSet aOldSet( pOLV->GetAttribs() ); SfxItemSet aFontSet( *aOldSet.GetPool(), @@ -1751,7 +1751,7 @@ void SwAnnotationShell::InsertSymbol(SfxRequest& rReq) pOLV->SetAttribs( aFontSet ); // From now on show it again - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); pOLV->ShowCursor(); rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) ); diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 7aa8d57d4c6f..4b7ddb2db810 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -290,7 +290,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) case SID_HANGUL_HANJA_CONVERSION: pOLV->StartTextConversion( LANGUAGE_KOREAN, LANGUAGE_KOREAN, NULL, - i18n::TextConversionOption::CHARACTER_BY_CHARACTER, sal_True, sal_False ); + i18n::TextConversionOption::CHARACTER_BY_CHARACTER, true, false ); break; case SID_CHINESE_CONVERSION: @@ -352,7 +352,7 @@ void SwDrawTextShell::ExecDrawLingu(SfxRequest &rReq) Font aTargetFont = pOLV->GetWindow()->GetDefaultFont( DEFAULTFONT_CJK_TEXT, nTargetLang, DEFAULTFONT_FLAGS_ONLYONE ); - pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, sal_False, sal_False ); + pOLV->StartTextConversion( nSourceLang, nTargetLang, &aTargetFont, nOptions, false, false ); } } Reference< lang::XComponent > xComponent( xDialog, UNO_QUERY ); @@ -769,7 +769,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) // do not flicker pOLV->HideCursor(); SdrOutliner * pOutliner = pSdrView->GetTextEditOutliner(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); SfxItemSet aOldSet( pOLV->GetAttribs() ); SfxItemSet aFontSet( *aOldSet.GetPool(), @@ -807,7 +807,7 @@ void SwDrawTextShell::InsertSymbol(SfxRequest& rReq) pOLV->SetAttribs( aFontSet ); // From now on show again - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); pOLV->ShowCursor(); rReq.AppendItem( SfxStringItem( GetPool().GetWhich(SID_CHARMAP), sSym ) ); |