editeng: sal_Bool->bool

this had to be done in conjunction with changing
include/svx/unoshtxt.hxx
because there are two virtual methods "bool IsValid" in two different
base classes and some subclasses are overriding both base-class
methods at once.

Change-Id: Ib43fc5000b443057caaa513b4efeaa6fd16e4260

5 files changed, 81 insertions, 95 deletions

diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 8643b7fce359..dcc35000838e 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -552,7 +552,7 @@ void SvxAccessibleTextAdapter::SetParaAttribs( sal_Int32 nPara, const SfxItemSet
     mpTextForwarder->SetParaAttribs( nPara, rSet );
 }
 
-void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 )
+void SvxAccessibleTextAdapter::RemoveAttribs( const ESelection& , bool , sal_uInt16 )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 }
@@ -672,14 +672,14 @@ sal_uInt16 SvxAccessibleTextAdapter::CalcEditEngineIndex( sal_Int32 nPara, sal_I
 
 
 
-sal_Bool SvxAccessibleTextAdapter::IsValid() const
+bool SvxAccessibleTextAdapter::IsValid() const
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     if( mpTextForwarder )
         return mpTextForwarder->IsValid();
     else
-        return sal_False;
+        return false;
 }
 
 LanguageType SvxAccessibleTextAdapter::GetLanguage( sal_Int32 nPara, sal_Int32 nPos ) const
@@ -714,12 +714,12 @@ EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_Int32 nPara ) const
     return mpTextForwarder->GetBulletInfo( nPara );
 }
 
-void SvxAccessibleTextAdapter::SetUpdateModeForAcc(sal_Bool bUp)
+void SvxAccessibleTextAdapter::SetUpdateModeForAcc(bool bUp)
 {
     return mpTextForwarder->SetUpdateModeForAcc(bUp);
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
+bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
 {
     return mpTextForwarder->GetUpdateModeForAcc();
 }
@@ -817,12 +817,12 @@ OutputDevice* SvxAccessibleTextAdapter::GetRefDevice() const
     return mpTextForwarder->GetRefDevice();
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int32& nPara, sal_Int32& nIndex ) const
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     if( !mpTextForwarder->GetIndexAtPoint( rPoint, nPara, nIndex ) )
-        return sal_False;
+        return false;
 
     SvxAccessibleTextIndex aIndex;
     aIndex.SetEEIndex(nPara, nIndex, *this);
@@ -846,7 +846,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
             DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
 
             if( !pOutDev )
-                return sal_False;
+                return false;
 
             AccessibleStringWrap aStringWrap( *pOutDev, aBulletInfo.aFont, aBulletInfo.aText );
 
@@ -858,7 +858,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
                        "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
             nIndex = aStringWrap.GetIndexAtPoint( aPoint );
-            return sal_True;
+            return true;
         }
     }
 
@@ -869,7 +869,7 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
         DBG_ASSERT(pOutDev!=NULL, "SvxAccessibleTextAdapter::GetIndexAtPoint: No ref device");
 
         if( !pOutDev )
-            return sal_False;
+            return false;
 
         ESelection aSelection = MakeEESelection( aIndex );
         SvxFont aFont = EditEngine::CreateSvxFontFromItemSet( mpTextForwarder->GetAttribs( aSelection ) );
@@ -886,13 +886,13 @@ sal_Bool SvxAccessibleTextAdapter::GetIndexAtPoint( const Point& rPoint, sal_Int
                    "SvxAccessibleTextIndex::SetIndex: index value overflow");
 
         nIndex = (aIndex.GetIndex() + aStringWrap.GetIndexAtPoint( aPoint ));
-        return sal_True;
+        return true;
     }
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -910,7 +910,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
         nStart = 0;
         nEnd = aIndex.GetBulletLen();
 
-        return sal_True;
+        return true;
     }
 
     if( aIndex.InField() )
@@ -926,11 +926,11 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
         nStart = aIndex.GetIndex() - aIndex.GetFieldOffset();
         nEnd = nStart + aIndex.GetFieldLen();
 
-        return sal_True;
+        return true;
     }
 
     if( !mpTextForwarder->GetWordIndices( nPara, nIndex, nStart, nEnd ) )
-        return sal_False;
+        return false;
 
     aIndex.SetEEIndex( nPara, nStart, *this );
     DBG_ASSERT(aIndex.GetIndex() >= 0 &&
@@ -944,7 +944,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
                "SvxAccessibleTextIndex::SetIndex: index value overflow");
     nEnd = aIndex.GetIndex();
 
-    return sal_True;
+    return true;
 }
 
 bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool /* bInCell */ ) const
@@ -1042,7 +1042,7 @@ sal_Int32 SvxAccessibleTextAdapter::GetLineNumberAtIndex( sal_Int32 nPara, sal_I
     return mpTextForwarder->GetLineNumberAtIndex( nPara, nIndex );
 }
 
-sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
+bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1055,7 +1055,7 @@ sal_Bool SvxAccessibleTextAdapter::Delete( const ESelection& rSel )
     return mpTextForwarder->Delete( MakeEESelection(aStartIndex, aEndIndex ) );
 }
 
-sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
+bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESelection& rSel )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1068,7 +1068,7 @@ sal_Bool SvxAccessibleTextAdapter::InsertText( const OUString& rStr, const ESele
     return mpTextForwarder->InsertText( rStr, MakeEESelection(aStartIndex, aEndIndex) );
 }
 
-sal_Bool SvxAccessibleTextAdapter::QuickFormatDoc( sal_Bool bFull )
+bool SvxAccessibleTextAdapter::QuickFormatDoc( bool bFull )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1082,7 +1082,7 @@ sal_Int16 SvxAccessibleTextAdapter::GetDepth( sal_Int32 nPara ) const
     return mpTextForwarder->GetDepth( nPara );
 }
 
-sal_Bool SvxAccessibleTextAdapter::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
+bool SvxAccessibleTextAdapter::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1094,43 +1094,29 @@ void SvxAccessibleTextAdapter::SetForwarder( SvxTextForwarder& rForwarder )
     mpTextForwarder = &rForwarder;
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
+bool SvxAccessibleTextAdapter::HaveImageBullet( sal_Int32 nPara ) const
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     EBulletInfo aBulletInfo = GetBulletInfo( nPara );
 
-    if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
-        aBulletInfo.bVisible &&
-        aBulletInfo.nType == SVX_NUM_BITMAP )
-    {
-        return sal_True;
-    }
-    else
-    {
-        return sal_False;
-    }
+    return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
+            aBulletInfo.bVisible &&
+            aBulletInfo.nType == SVX_NUM_BITMAP );
 }
 
-sal_Bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
+bool SvxAccessibleTextAdapter::HaveTextBullet( sal_Int32 nPara ) const
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
     EBulletInfo aBulletInfo = GetBulletInfo( nPara );
 
-    if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
-        aBulletInfo.bVisible &&
-        aBulletInfo.nType != SVX_NUM_BITMAP )
-    {
-        return sal_True;
-    }
-    else
-    {
-        return sal_False;
-    }
+    return ( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
+            aBulletInfo.bVisible &&
+            aBulletInfo.nType != SVX_NUM_BITMAP );
 }
 
-sal_Bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
+bool SvxAccessibleTextAdapter::IsEditable( const ESelection& rSel )
 {
     DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
 
@@ -1185,14 +1171,14 @@ SvxAccessibleTextEditViewAdapter::~SvxAccessibleTextEditViewAdapter()
 {
 }
 
-sal_Bool SvxAccessibleTextEditViewAdapter::IsValid() const
+bool SvxAccessibleTextEditViewAdapter::IsValid() const
 {
     DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
 
     if( mpViewForwarder )
         return mpViewForwarder->IsValid();
     else
-        return sal_False;
+        return false;
 }
 
 Rectangle SvxAccessibleTextEditViewAdapter::GetVisArea() const
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 9b1b70e1a22f..88fce45d84b5 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -112,7 +112,7 @@ void SvxEditEngineForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet&
     rEditEngine.SetParaAttribs( nPara, rSet );
 }
 
-void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void SvxEditEngineForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     rEditEngine.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
 }
@@ -147,7 +147,7 @@ void SvxEditEngineForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESel
     rEditEngine.QuickSetAttribs( rSet, rSel );
 }
 
-sal_Bool SvxEditEngineForwarder::IsValid() const
+bool SvxEditEngineForwarder::IsValid() const
 {
     // cannot reliably query EditEngine state
     // while in the middle of an update
@@ -374,7 +374,7 @@ OutputDevice* SvxEditEngineForwarder::GetRefDevice() const
     return rEditEngine.GetRefDevice();
 }
 
-sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
 {
     Size aSize( rEditEngine.CalcTextWidth(), rEditEngine.GetTextHeight() );
     ::std::swap( aSize.Width(), aSize.Height() );
@@ -387,10 +387,10 @@ sal_Bool SvxEditEngineForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32&
     nPara = aDocPos.nPara;
     nIndex = aDocPos.nIndex;
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
 {
     ESelection aRes = rEditEngine.GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -400,10 +400,10 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nInd
         nStart = aRes.nStartPos;
         nEnd = aRes.nEndPos;
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 bool SvxEditEngineForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
@@ -432,27 +432,27 @@ sal_Int32 SvxEditEngineForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int
 }
 
 
-sal_Bool SvxEditEngineForwarder::QuickFormatDoc( sal_Bool )
+bool SvxEditEngineForwarder::QuickFormatDoc( bool )
 {
     rEditEngine.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxEditEngineForwarder::Delete( const ESelection& rSelection )
+bool SvxEditEngineForwarder::Delete( const ESelection& rSelection )
 {
     rEditEngine.QuickDelete( rSelection );
     rEditEngine.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
+bool SvxEditEngineForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
 {
     rEditEngine.QuickInsertText( rStr, rSelection );
     rEditEngine.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
 sal_Int16 SvxEditEngineForwarder::GetDepth( sal_Int32 ) const
@@ -461,10 +461,10 @@ sal_Int16 SvxEditEngineForwarder::GetDepth( sal_Int32 ) const
     return -1;
 }
 
-sal_Bool SvxEditEngineForwarder::SetDepth( sal_Int32, sal_Int16 nNewDepth )
+bool SvxEditEngineForwarder::SetDepth( sal_Int32, sal_Int16 nNewDepth )
 {
     // EditEngine does not support outline depth
-    return nNewDepth == -1 ? sal_True : sal_False;
+    return nNewDepth == -1;
 }
 
 const SfxItemSet * SvxEditEngineForwarder::GetEmptyItemSetPtr()
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 4163643828ad..6f5200009033 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -180,7 +180,7 @@ void SvxOutlinerForwarder::SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rS
         ((SfxItemSet*)&rSet)->SetParent( pOldParent );
 }
 
-void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void SvxOutlinerForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     rOutliner.RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
 }
@@ -236,7 +236,7 @@ void SvxOutlinerForwarder::FieldClicked( const SvxFieldItem& rField, sal_Int32 n
     rOutliner.FieldClicked( rField, nPara, nPos );
 }
 
-sal_Bool SvxOutlinerForwarder::IsValid() const
+bool SvxOutlinerForwarder::IsValid() const
 {
     // cannot reliably query outliner state
     // while in the middle of an update
@@ -371,7 +371,7 @@ OutputDevice* SvxOutlinerForwarder::GetRefDevice() const
     return rOutliner.GetRefDevice();
 }
 
-sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
 {
     Size aSize( rOutliner.CalcTextSize() );
     ::std::swap( aSize.Width(), aSize.Height() );
@@ -384,10 +384,10 @@ sal_Bool SvxOutlinerForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nP
     nPara = aDocPos.nPara;
     nIndex = aDocPos.nIndex;
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
 {
     ESelection aRes = rOutliner.GetEditEngine().GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
 
@@ -397,10 +397,10 @@ sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex
         nStart = aRes.nStartPos;
         nEnd = aRes.nEndPos;
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 bool SvxOutlinerForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
@@ -428,29 +428,29 @@ sal_Int32 SvxOutlinerForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32
     return rOutliner.GetEditEngine().GetLineNumberAtIndex( nPara, nIndex );
 }
 
-sal_Bool SvxOutlinerForwarder::QuickFormatDoc( sal_Bool )
+bool SvxOutlinerForwarder::QuickFormatDoc( bool )
 {
     rOutliner.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxOutlinerForwarder::Delete( const ESelection& rSelection )
+bool SvxOutlinerForwarder::Delete( const ESelection& rSelection )
 {
     flushCache();
     rOutliner.QuickDelete( rSelection );
     rOutliner.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
-sal_Bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
+bool SvxOutlinerForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
 {
     flushCache();
     rOutliner.QuickInsertText( rStr, rSelection );
     rOutliner.QuickFormatDoc();
 
-    return sal_True;
+    return true;
 }
 
 sal_Int16 SvxOutlinerForwarder::GetDepth( sal_Int32 nPara ) const
@@ -467,7 +467,7 @@ sal_Int16 SvxOutlinerForwarder::GetDepth( sal_Int32 nPara ) const
     return nLevel;
 }
 
-sal_Bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
+bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
 {
     DBG_ASSERT( 0 <= nPara && nPara < GetParagraphCount(), "SvxOutlinerForwarder::SetDepth: Invalid paragraph index");
 
@@ -482,11 +482,11 @@ sal_Bool SvxOutlinerForwarder::SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth )
             if( bOutlinerText )
                 rOutliner.SetLevelDependendStyleSheet( nPara );
 
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 sal_Int32 SvxOutlinerForwarder::GetNumberingStartValue( sal_Int32 nPara )
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 39505da286f7..b6581bc26b14 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2216,7 +2216,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion(
 
         // set properties for the new text portion
         ESelection aSel( nPara, nStart, nPara, nEnd );
-        pTextForwarder->RemoveAttribs( aSel, sal_False, 0 );
+        pTextForwarder->RemoveAttribs( aSel, false, 0 );
         pEditSource->UpdateData();
 
         SfxItemSet aItemSet( *pTextForwarder->GetEmptyItemSetPtr() );
@@ -2465,7 +2465,7 @@ void SvxDummyTextSource::SetParaAttribs( sal_Int32, const SfxItemSet& )
 {
 }
 
-void SvxDummyTextSource::RemoveAttribs( const ESelection& , sal_Bool , sal_uInt16 )
+void SvxDummyTextSource::RemoveAttribs( const ESelection& , bool , sal_uInt16 )
 {
 }
 
@@ -2513,9 +2513,9 @@ void SvxDummyTextSource::FieldClicked( const SvxFieldItem&, sal_Int32, sal_Int32
 {
 }
 
-sal_Bool SvxDummyTextSource::IsValid() const
+bool SvxDummyTextSource::IsValid() const
 {
-    return sal_False;
+    return false;
 }
 
 void SvxDummyTextSource::SetNotifyHdl( const Link& )
@@ -2562,14 +2562,14 @@ OutputDevice* SvxDummyTextSource::GetRefDevice() const
     return NULL;
 }
 
-sal_Bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const
+bool SvxDummyTextSource::GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SvxDummyTextSource::GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const
+bool SvxDummyTextSource::GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const
 {
-    return sal_False;
+    return false;
 }
 
 bool SvxDummyTextSource::GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const
@@ -2597,9 +2597,9 @@ sal_Int32 SvxDummyTextSource::GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int
     return 0;
 }
 
-sal_Bool SvxDummyTextSource::QuickFormatDoc( sal_Bool )
+bool SvxDummyTextSource::QuickFormatDoc( bool )
 {
-    return sal_False;
+    return false;
 }
 
 sal_Int16 SvxDummyTextSource::GetDepth( sal_Int32 ) const
@@ -2607,19 +2607,19 @@ sal_Int16 SvxDummyTextSource::GetDepth( sal_Int32 ) const
     return -1;
 }
 
-sal_Bool SvxDummyTextSource::SetDepth( sal_Int32, sal_Int16 nNewDepth )
+bool SvxDummyTextSource::SetDepth( sal_Int32, sal_Int16 nNewDepth )
 {
-    return nNewDepth == 0 ? sal_True : sal_False;
+    return nNewDepth == 0;
 }
 
-sal_Bool SvxDummyTextSource::Delete( const ESelection& )
+bool SvxDummyTextSource::Delete( const ESelection& )
 {
-    return sal_False;
+    return false;
 }
 
-sal_Bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
+bool SvxDummyTextSource::InsertText( const OUString&, const ESelection& )
 {
-    return sal_False;
+    return false;
 }
 
 const SfxItemSet * SvxDummyTextSource::GetEmptyItemSetPtr()
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index 6753fbb95093..a3554e572995 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -46,9 +46,9 @@ Point SvxDrawOutlinerViewForwarder::GetTextOffset() const
     return aOutputRect.TopLeft() - maTextShapeTopLeft;
 }
 
-sal_Bool SvxDrawOutlinerViewForwarder::IsValid() const
+bool SvxDrawOutlinerViewForwarder::IsValid() const
 {
-    return sal_True;
+    return true;
 }
 
 Rectangle SvxDrawOutlinerViewForwarder::GetVisArea() const