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

2 files changed, 33 insertions, 33 deletions

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 7054b71285d3..58b67eab60ee 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -878,7 +878,7 @@ SmViewForwarder::~SmViewForwarder()
 {
 }
 
-sal_Bool SmViewForwarder::IsValid() const
+bool SmViewForwarder::IsValid() const
 {
     return rEditAcc.GetEditView() != 0;
 }
@@ -1060,7 +1060,7 @@ SfxItemPool* SmTextForwarder::GetPool() const
     return pEditEngine ? pEditEngine->GetEmptyItemSet().GetPool() : 0;
 }
 
-void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
@@ -1102,12 +1102,12 @@ void SmTextForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESelection&
         pEditEngine->QuickSetAttribs( rSet, rSel );
 }
 
-sal_Bool SmTextForwarder::IsValid() const
+bool SmTextForwarder::IsValid() const
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     // cannot reliably query EditEngine state
     // while in the middle of an update
-    return pEditEngine ? pEditEngine->GetUpdateMode() : sal_False;
+    return pEditEngine && pEditEngine->GetUpdateMode();
 }
 
 OUString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor )
@@ -1308,23 +1308,23 @@ OutputDevice* SmTextForwarder::GetRefDevice() const
     return pEditEngine ? pEditEngine->GetRefDevice() : 0;
 }
 
-sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
+bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_Int32& nPara, sal_Int32& nIndex ) const
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
         EPosition aDocPos = pEditEngine->FindDocPosition( rPos );
         nPara   = aDocPos.nPara;
         nIndex  = aDocPos.nIndex;
-        bRes = sal_True;
+        bRes = true;
     }
     return bRes;
 }
 
-sal_Bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
+bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
@@ -1336,7 +1336,7 @@ sal_Bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal
             nStart = aRes.nStartPos;
             nEnd = aRes.nEndPos;
 
-            bRes = sal_True;
+            bRes = true;
         }
     }
 
@@ -1377,14 +1377,14 @@ sal_Int32 SmTextForwarder::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nInd
     return pEditEngine ? pEditEngine->GetLineNumberAtIndex(nPara, nIndex) : 0;
 }
 
-sal_Bool SmTextForwarder::QuickFormatDoc( sal_Bool /*bFull*/ )
+bool SmTextForwarder::QuickFormatDoc( bool /*bFull*/ )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
         pEditEngine->QuickFormatDoc();
-        bRes = sal_True;
+        bRes = true;
     }
     return bRes;
 }
@@ -1395,34 +1395,34 @@ sal_Int16 SmTextForwarder::GetDepth( sal_Int32 /*nPara*/ ) const
     return -1;
 }
 
-sal_Bool SmTextForwarder::SetDepth( sal_Int32 /*nPara*/, sal_Int16 nNewDepth )
+bool SmTextForwarder::SetDepth( sal_Int32 /*nPara*/, sal_Int16 nNewDepth )
 {
     // math has no outliner...
     return -1 == nNewDepth;  // is it the value from 'GetDepth' ?
 }
 
-sal_Bool SmTextForwarder::Delete( const ESelection& rSelection )
+bool SmTextForwarder::Delete( const ESelection& rSelection )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
         pEditEngine->QuickDelete( rSelection );
         pEditEngine->QuickFormatDoc();
-        bRes = sal_True;
+        bRes = true;
     }
     return bRes;
 }
 
-sal_Bool SmTextForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
+bool SmTextForwarder::InsertText( const OUString& rStr, const ESelection& rSelection )
 {
-    sal_Bool bRes = sal_False;
+    bool bRes = false;
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
     {
         pEditEngine->QuickInsertText( rStr, rSelection );
         pEditEngine->QuickFormatDoc();
-        bRes = sal_True;
+        bRes = true;
     }
     return bRes;
 }
@@ -1493,7 +1493,7 @@ SmEditViewForwarder::~SmEditViewForwarder()
 {
 }
 
-sal_Bool SmEditViewForwarder::IsValid() const
+bool SmEditViewForwarder::IsValid() const
 {
     return rEditAcc.GetEditView() != 0;
 }
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 9cc2578f512c..dc3025e0e377 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -178,7 +178,7 @@ public:
                         SmViewForwarder( SmEditAccessible &rAcc );
     virtual             ~SmViewForwarder();
 
-    virtual sal_Bool        IsValid() const;
+    virtual bool        IsValid() const;
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
     virtual Point       PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -207,7 +207,7 @@ public:
     virtual SfxItemSet  GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
     virtual SfxItemSet  GetParaAttribs( sal_Int32 nPara ) const;
     virtual void        SetParaAttribs( sal_Int32 nPara, const SfxItemSet& rSet );
-    virtual void        RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
+    virtual void        RemoveAttribs( const ESelection& rSelection, bool bRemoveParaAttribs, sal_uInt16 nWhich );
     virtual void        GetPortions( sal_Int32 nPara, std::vector<sal_Int32>& rList ) const;
 
     virtual sal_uInt16      GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
@@ -220,9 +220,9 @@ public:
 
     virtual SfxItemPool* GetPool() const;
 
-    virtual OUString    CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
-    virtual void        FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32);
-    virtual sal_Bool         IsValid() const;
+    virtual OUString        CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+    virtual void            FieldClicked(const SvxFieldItem&, sal_Int32, sal_Int32);
+    virtual bool            IsValid() const;
 
     virtual LanguageType    GetLanguage( sal_Int32, sal_Int32 ) const;
     virtual sal_Int32       GetFieldCount( sal_Int32 nPara ) const;
@@ -232,19 +232,19 @@ public:
     virtual Rectangle       GetParaBounds( sal_Int32 nPara ) const;
     virtual MapMode         GetMapMode() const;
     virtual OutputDevice*   GetRefDevice() const;
-    virtual sal_Bool        GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
-    virtual sal_Bool        GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
+    virtual bool            GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
+    virtual bool            GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
     virtual bool            GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
     virtual sal_Int32       GetLineCount( sal_Int32 nPara ) const;
     virtual sal_Int32       GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
     virtual void            GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
     virtual sal_Int32       GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nLine ) const;
-    virtual sal_Bool        Delete( const ESelection& );
-    virtual sal_Bool        InsertText( const OUString&, const ESelection& );
-    virtual sal_Bool        QuickFormatDoc( sal_Bool bFull=sal_False );
+    virtual bool            Delete( const ESelection& );
+    virtual bool            InsertText( const OUString&, const ESelection& );
+    virtual bool            QuickFormatDoc( bool bFull = false );
 
     virtual sal_Int16       GetDepth( sal_Int32 nPara ) const;
-    virtual sal_Bool        SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
+    virtual bool            SetDepth( sal_Int32 nPara, sal_Int16 nNewDepth );
 
     virtual const SfxItemSet*   GetEmptyItemSetPtr();
     // implementation functions for XParagraphAppend and XTextPortionAppend
@@ -268,7 +268,7 @@ public:
                         SmEditViewForwarder( SmEditAccessible& rAcc );
     virtual             ~SmEditViewForwarder();
 
-    virtual sal_Bool        IsValid() const;
+    virtual bool        IsValid() const;
 
     virtual Rectangle   GetVisArea() const;
     virtual Point       LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;