[Libreoffice] [PATCH] harmonization of BOOL vs sal_Bool as a prep for BOOL to bool converstion

[PATCH] harmonization of BOOL vs sal_Bool as a prep for BOOL to bool converstion

The goal is to be able at some point to change solar.h
typedef sal_Bool BOOL into typedef bool BOOL
In order to do that the usage of BOOL/sal_Bool must be consistent
in interfaces/implementation parameters.

 basic/source/classes/propacc.cxx    |    4 +-
 basic/source/uno/scriptcont.cxx     |    2 +-
 editeng/inc/editeng/editdata.hxx    |    8 ++--
 editeng/inc/editeng/splwrap.hxx     |    6 +-
 editeng/inc/editeng/unofored.hxx    |    2 +-
 editeng/inc/editeng/unoforou.hxx    |    2 +-
 editeng/inc/editeng/unotext.hxx     |    4 +-
 editeng/source/editeng/editeng.cxx  |   74 +++++++++++++++++-----------------
 editeng/source/editeng/editview.cxx |   48 +++++++++++-----------
 editeng/source/editeng/edtspell.cxx |   38 +++++++++---------
 editeng/source/editeng/impedit.cxx  |   18 ++++----
 editeng/source/editeng/impedit2.cxx |   22 +++++-----
 editeng/source/editeng/impedit4.cxx |    2 +-
 editeng/source/editeng/impedit5.cxx |   16 ++++----
 editeng/source/items/frmitems.cxx   |    6 +-
 editeng/source/uno/unofored.cxx     |    2 +-
 editeng/source/uno/unoforou.cxx     |    4 +-
 editeng/source/uno/unotext.cxx      |    2 +-
 18 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 91564e7..b0308e0 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -302,7 +302,7 @@ Property
SbPropertySetInfo::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }

-BOOL SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertySetInfo::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
@@ -353,7 +353,7 @@ Property
SbPropertyContainer::getPropertyByName(const ::rtl::OUString& Name)
     return aImpl.getPropertyByName( Name );
 }

-BOOL SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
+sal_Bool SbPropertyContainer::hasPropertyByName(const ::rtl::OUString& Name)
     throw( RuntimeException )
 {
     return aImpl.hasPropertyByName( Name );
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index e10d111..5386b72 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -400,7 +400,7 @@ SfxLibraryContainer*
SfxScriptLibraryContainer::createInstanceImpl( void )
 void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const
::rtl::OUString& aFile )
 {
     // TODO: move loading from old storage to binary filters?
-    SotStorageRef xStorage = new SotStorage( sal_False, aFile );
+    SotStorageRef xStorage = new SotStorage( (BOOL)false, aFile );
     if( xStorage.Is() && xStorage->GetError() == ERRCODE_NONE )
     {
         // We need a BasicManager to avoid problems
diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index d39dc25..6997ca9 100644
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -163,19 +163,19 @@ inline BOOL ESelection::HasRange() const
     return ( nStartPara != nEndPara ) || ( nStartPos != nEndPos );
 }

-inline sal_Bool ESelection::IsZero() const
+inline BOOL ESelection::IsZero() const
 {
     return ( ( nStartPara == 0 ) && ( nStartPos == 0 ) &&
              ( nEndPara == 0 ) && ( nEndPos == 0 ) );
 }

-inline sal_Bool ESelection::IsEqual( const ESelection& rS ) const
+inline BOOL ESelection::IsEqual( const ESelection& rS ) const
 {
     return ( ( nStartPara == rS.nStartPara ) && ( nStartPos ==
rS.nStartPos ) &&
              ( nEndPara == rS.nEndPara ) && ( nEndPos == rS.nEndPos ) );
 }

-inline sal_Bool ESelection::IsLess( const ESelection& rS ) const
+inline BOOL ESelection::IsLess( const ESelection& rS ) const
 {
     // Selektion muss justiert sein.
     // => Nur pueffen, ob Ende von 'this' < Start von rS
@@ -188,7 +188,7 @@ inline sal_Bool ESelection::IsLess( const
ESelection& rS ) const
     return sal_False;
 }

-inline sal_Bool ESelection::IsGreater( const ESelection& rS ) const
+inline BOOL ESelection::IsGreater( const ESelection& rS ) const
 {
     // Selektion muss justiert sein.
     // => Nur pueffen, ob Ende von 'this' > Start von rS
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 8d2926a..3665adb 100755
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -134,10 +134,10 @@ protected:
     void                        SetLast(const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::uno::XInterface >  &xNewLast)
                             { xLast = xNewLast; }
-    virtual    sal_Bool SpellMore();                           //
weitere Dokumente pruefen?
-    virtual    sal_Bool HasOtherCnt();                         //
gibt es ueberhaupt Sonderbereiche
+    virtual    BOOL SpellMore();                               //
weitere Dokumente pruefen?
+    virtual    BOOL HasOtherCnt();                     // gibt es
ueberhaupt Sonderbereiche
     virtual    void     SpellStart( SvxSpellArea eSpell ); // Bereich
vorbereiten
-    virtual    sal_Bool SpellContinue();                       //
Bereich pruefen
+    virtual    BOOL     SpellContinue();                       //
Bereich pruefen
                                             // Ergebnis mit GetLast verfuegbar
     virtual void ReplaceAll( const String &rNewText, sal_Int16
nLanguage );    // Wort aus Replace-Liste ersetzen
     virtual void StartThesaurus( const String &rWord, sal_uInt16
nLang );      // Thesaurus starten
diff --git a/editeng/inc/editeng/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index be8d27e..202f680 100644
--- a/editeng/inc/editeng/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -46,7 +46,7 @@ public:
     virtual USHORT             GetParagraphCount() const;
     virtual USHORT             GetTextLen( USHORT nParagraph ) const;
     virtual String             GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL
bOnlyHardAttrib = EditEngineAttribs_All ) const;
+    virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_uInt8
bOnlyHardAttrib = EditEngineAttribs_All ) const;
     virtual    SfxItemSet      GetParaAttribs( USHORT nPara ) const;
     virtual void               SetParaAttribs( USHORT nPara, const
SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection,
sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
diff --git a/editeng/inc/editeng/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index aa0b9ed..c586d1b 100644
--- a/editeng/inc/editeng/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -64,7 +64,7 @@ public:
     virtual USHORT             GetParagraphCount() const;
     virtual USHORT             GetTextLen( USHORT nParagraph ) const;
     virtual String             GetText( const ESelection& rSel ) const;
-    virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL
bOnlyHardAttrib = 0 ) const;
+    virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_uInt8
bOnlyHardAttrib = 0 ) const;
     virtual    SfxItemSet      GetParaAttribs( USHORT nPara ) const;
     virtual void               SetParaAttribs( USHORT nPara, const
SfxItemSet& rSet );
     virtual void        RemoveAttribs( const ESelection& rSelection,
sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 965a8d5..6349845 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -208,8 +208,8 @@ public:

     virtual XubString          CalcFieldValue( const SvxFieldItem&
rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*&
rpFldColor );
     virtual void               FieldClicked( const SvxFieldItem&
rField, USHORT nPara, xub_StrLen nPos );
-
-    virtual sal_Bool           IsValid() const;
+
+    virtual BOOL            IsValid() const;

     virtual void                       SetNotifyHdl( const Link& );
     virtual LanguageType       GetLanguage( USHORT, USHORT ) const;
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 1a92b1d..6fb2083 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -127,19 +127,19 @@ EditEngine::~EditEngine()
     delete pImpEditEngine;
 }

-void EditEngine::EnableUndo( sal_Bool bEnable )
+void EditEngine::EnableUndo( BOOL bEnable )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->EnableUndo( bEnable );
 }

-sal_Bool EditEngine::IsUndoEnabled()
+BOOL EditEngine::IsUndoEnabled()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsUndoEnabled();
 }

-sal_Bool EditEngine::IsInUndo()
+BOOL EditEngine::IsInUndo()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsInUndo();
@@ -274,7 +274,7 @@ void EditEngine::Draw( OutputDevice* pOutDev,
const Rectangle& rOutRect, const P
     Draw( pOutDev, rOutRect, rStartDocPos, sal_True );
 }

-void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle&
rOutRect, const Point& rStartDocPos, sal_Bool bClip )
+void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle&
rOutRect, const Point& rStartDocPos, BOOL bClip )
 {
     DBG_CHKTHIS( EditEngine, 0 );

@@ -424,7 +424,7 @@ sal_uInt16 EditEngine::GetViewCount() const
     return pImpEditEngine->GetEditViews().Count();
 }

-sal_Bool EditEngine::HasView( EditView* pView ) const
+BOOL EditEngine::HasView( EditView* pView ) const
 {
     return pImpEditEngine->GetEditViews().GetPos( pView ) != USHRT_MAX;
 }
@@ -821,7 +821,7 @@ ESelection EditEngine::SelectSentence( const
ESelection& rCurSel ) const
     return pE->pImpEditEngine->CreateESel( aSentenceSel );
 }

-sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent,
EditView* pEditView, Window* pFrameWin )
+BOOL EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView*
pEditView, Window* pFrameWin )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     DBG_CHKOBJ( pEditView, EditView, 0 );
@@ -1313,7 +1313,7 @@ sal_uInt32 EditEngine::CalcTextWidth()
      return nWidth;
 }

-void EditEngine::SetUpdateMode( sal_Bool bUpdate )
+void EditEngine::SetUpdateMode( BOOL bUpdate )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetUpdateMode( bUpdate );
@@ -1321,7 +1321,7 @@ void EditEngine::SetUpdateMode( sal_Bool bUpdate )
         pImpEditEngine->pActiveView->ShowCursor( sal_False, sal_False );
 }

-sal_Bool EditEngine::GetUpdateMode() const
+BOOL EditEngine::GetUpdateMode() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetUpdateMode();
@@ -1384,13 +1384,13 @@ void EditEngine::SetText( const
EditTextObject& rTextObject )
     pImpEditEngine->LeaveBlockNotifications();
 }

-void EditEngine::ShowParagraph( sal_uInt16 nParagraph, sal_Bool bShow )
+void EditEngine::ShowParagraph( sal_uInt16 nParagraph, BOOL bShow )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->ShowParagraph( nParagraph, bShow );
 }

-sal_Bool EditEngine::IsParagraphVisible( sal_uInt16 nParagraph )
+BOOL EditEngine::IsParagraphVisible( sal_uInt16 nParagraph )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsParagraphVisible( nParagraph );
@@ -1542,13 +1542,13 @@ void EditEngine::SetModified()
     pImpEditEngine->SetModifyFlag( sal_True );
 }

-sal_Bool EditEngine::IsModified() const
+BOOL EditEngine::IsModified() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->IsModified();
 }

-sal_Bool EditEngine::IsInSelectionMode() const
+BOOL EditEngine::IsInSelectionMode() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return ( pImpEditEngine->IsInSelectionMode() ||
@@ -1645,7 +1645,7 @@ const SfxItemSet& EditEngine::GetParaAttribs(
sal_uInt16 nPara ) const
     return pImpEditEngine->GetParaAttribs( nPara );
 }

-sal_Bool EditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
+BOOL EditEngine::HasParaAttrib( sal_uInt16 nPara, sal_uInt16 nWhich ) const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->HasParaAttrib( nPara, nWhich );
@@ -1733,13 +1733,13 @@ void EditEngine::GetPortions( sal_uInt16
nPara, SvUShorts& rList )
     }
 }

-void EditEngine::SetFlatMode( sal_Bool bFlat)
+void EditEngine::SetFlatMode( BOOL bFlat)
 {
     DBG_CHKTHIS( EditEngine, 0 );
     pImpEditEngine->SetFlatMode( bFlat );
 }

-sal_Bool EditEngine::IsFlatMode() const
+BOOL EditEngine::IsFlatMode() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return !( pImpEditEngine->aStatus.UseCharAttribs() );
@@ -1904,7 +1904,7 @@ BOOL EditEngine::IsRightToLeft( USHORT nPara ) const
     return pImpEditEngine->IsRightToLeft( nPara );
 }

-sal_Bool EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
+BOOL EditEngine::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
 {
     DBG_CHKTHIS( EditEngine, 0 );

@@ -2019,7 +2019,7 @@ void EditEngine::QuickInsertField( const
SvxFieldItem& rFld, const ESelection& r
     pImpEditEngine->ImpInsertFeature( aSel, rFld );
 }

-void EditEngine::QuickFormatDoc( sal_Bool bFull )
+void EditEngine::QuickFormatDoc( BOOL bFull )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( bFull )
@@ -2088,7 +2088,7 @@ XubString EditEngine::GetGroupChars() const
     return pImpEditEngine->aGroupChars;
 }

-void EditEngine::EnablePasteSpecial( sal_Bool bEnable )
+void EditEngine::EnablePasteSpecial( BOOL bEnable )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( bEnable )
@@ -2097,13 +2097,13 @@ void EditEngine::EnablePasteSpecial( sal_Bool bEnable )
         pImpEditEngine->GetStatus().TurnOffFlags( EE_CNTRL_PASTESPECIAL );
 }

-sal_Bool EditEngine::IsPasteSpecialEnabled() const
+BOOL EditEngine::IsPasteSpecialEnabled() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStatus().AllowPasteSpecial();
 }

-void EditEngine::EnableIdleFormatter( sal_Bool bEnable )
+void EditEngine::EnableIdleFormatter( BOOL bEnable )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     if ( bEnable )
@@ -2112,7 +2112,7 @@ void EditEngine::EnableIdleFormatter( sal_Bool bEnable )
         pImpEditEngine->GetStatus().TurnOffFlags( EE_CNTRL_DOIDLEFORMAT);
 }

-sal_Bool EditEngine::IsIdleFormatterEnabled() const
+BOOL EditEngine::IsIdleFormatterEnabled() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->GetStatus().UseIdleFormatter();
@@ -2171,7 +2171,7 @@ LanguageType EditEngine::GetDefaultLanguage() const
     return pImpEditEngine->GetDefaultLanguage();
 }

-sal_Bool __EXPORT EditEngine::SpellNextDocument()
+BOOL __EXPORT EditEngine::SpellNextDocument()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return sal_False;
@@ -2233,13 +2233,13 @@ sal_Bool
EditEngine::HasConvertibleTextPortion( LanguageType nLang )
     return pImpEditEngine->HasConvertibleTextPortion( nLang );
 }

-sal_Bool __EXPORT EditEngine::ConvertNextDocument()
+BOOL __EXPORT EditEngine::ConvertNextDocument()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return sal_False;
 }

-sal_Bool EditEngine::HasText( const SvxSearchItem& rSearchItem )
+BOOL EditEngine::HasText( const SvxSearchItem& rSearchItem )
 {
     DBG_CHKTHIS( EditEngine, 0 );
     return pImpEditEngine->HasText( rSearchItem );
@@ -2275,7 +2275,7 @@ sal_uInt16 EditEngine::GetBigTextObjectStart() const
     return pImpEditEngine->GetBigTextObjectStart();
 }

-sal_Bool EditEngine::ShouldCreateBigTextObject() const
+BOOL EditEngine::ShouldCreateBigTextObject() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     sal_uInt16 nTextPortions = 0;
@@ -2333,7 +2333,7 @@ EFieldInfo EditEngine::GetFieldInfo( USHORT
nPara, USHORT nField ) const
 }


-sal_Bool EditEngine::UpdateFields()
+BOOL EditEngine::UpdateFields()
 {
     DBG_CHKTHIS( EditEngine, 0 );
     sal_Bool bChanges = pImpEditEngine->UpdateFields();
@@ -2342,7 +2342,7 @@ sal_Bool EditEngine::UpdateFields()
     return bChanges;
 }

-void EditEngine::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
+void EditEngine::RemoveFields( BOOL bKeepFieldText, TypeId aType )
 {
     DBG_CHKTHIS( EditEngine, 0 );

@@ -2372,7 +2372,7 @@ void EditEngine::RemoveFields( sal_Bool
bKeepFieldText, TypeId aType )
     }
 }

-sal_Bool EditEngine::HasOnlineSpellErrors() const
+BOOL EditEngine::HasOnlineSpellErrors() const
 {
     DBG_CHKTHIS( EditEngine, 0 );
     sal_uInt16 nNodes = pImpEditEngine->GetEditDoc().Count();
@@ -2482,10 +2482,10 @@ void __EXPORT EditEngine::DrawingText( const
Point&, const XubString&, USHORT, U
     DBG_CHKTHIS( EditEngine, 0 );
 }

-void __EXPORT EditEngine::DrawingTab( const Point& rStartPos, long
nWidth, const String& rChar,
-    const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
-    bool bEndOfLine, bool bEndOfParagraph,
-    const Color& rOverlineColor, const Color& rTextLineColor)
+void __EXPORT EditEngine::DrawingTab( const Point& /*rStartPos*/,
long /*nWidth*/, const String& /*rChar*/,
+                                      const SvxFont& /*rFont*/,
USHORT /*nPara*/, xub_StrLen /*nIndex*/,
+                                      BYTE /*nRightToLeft*/, bool
/*bEndOfLine*/, bool /*bEndOfParagraph*/,
+                                      const Color&
/*rOverlineColor*/, const Color& /*rTextLineColor*/)
 {
     DBG_CHKTHIS( EditEngine, 0 );
 }
@@ -2525,7 +2525,7 @@ void EditEngine::ParagraphConnected( USHORT
/*nLeftParagraph*/, USHORT /*nRightP
     DBG_CHKTHIS( EditEngine, 0 );
 }

-sal_Bool __EXPORT EditEngine::FormattingParagraph( sal_uInt16 )
+BOOL __EXPORT EditEngine::FormattingParagraph( sal_uInt16 )
 {
     // return sal_True, wenn die Attribute geaendert wurden...
     DBG_CHKTHIS( EditEngine, 0 );
@@ -2632,7 +2632,7 @@ void __EXPORT EditEngine::FieldSelected( const
SvxFieldItem&, sal_uInt16, sal_uI

 // =====================================================================
 // ======================   Statische Methoden   =======================
 // =====================================================================
-SfxItemPool* EditEngine::CreatePool( sal_Bool bPersistentRefCounts )
+SfxItemPool* EditEngine::CreatePool( BOOL bPersistentRefCounts )
 {
     SfxItemPool* pPool = new EditEngineItemPool( bPersistentRefCounts );
     return pPool;
@@ -2710,7 +2710,7 @@ SvxFont EditEngine::CreateSvxFontFromItemSet(
const SfxItemSet& rItemSet )
     return aFont;
 }

-sal_Bool EditEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
+BOOL EditEngine::DoesKeyMoveCursor( const KeyEvent& rKeyEvent )
 {
     sal_Bool bDoesMove = sal_False;

@@ -2733,7 +2733,7 @@ sal_Bool EditEngine::DoesKeyMoveCursor( const
KeyEvent& rKeyEvent )
     return bDoesMove;
 }

-sal_Bool EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
+BOOL EditEngine::DoesKeyChangeText( const KeyEvent& rKeyEvent )
 {
     sal_Bool bDoesChange = sal_False;

@@ -2774,7 +2774,7 @@ sal_Bool EditEngine::DoesKeyChangeText( const
KeyEvent& rKeyEvent )
     return bDoesChange;
 }

-sal_Bool EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
+BOOL EditEngine::IsSimpleCharInput( const KeyEvent& rKeyEvent )
 {
     if( EditEngine::IsPrintable( rKeyEvent.GetCharCode() ) &&
         ( KEY_MOD2 != (rKeyEvent.GetKeyCode().GetModifier() & ~KEY_SHIFT ) ) &&
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 4258d7c..f3e9e7f 100755
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -213,13 +213,13 @@ void EditView::Invalidate()
     }
 }

-void EditView::SetReadOnly( sal_Bool bReadOnly )
+void EditView::SetReadOnly( BOOL bReadOnly )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditView->bReadOnly = bReadOnly;
 }

-sal_Bool EditView::IsReadOnly() const
+BOOL EditView::IsReadOnly() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->bReadOnly;
@@ -281,7 +281,7 @@ ESelection EditView::GetSelection() const
     return aSelection;
 }

-sal_Bool EditView::HasSelection() const
+BOOL EditView::HasSelection() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->HasSelection();
@@ -389,7 +389,7 @@ Cursor* EditView::GetCursor() const
     return pImpEditView->pCursor;
 }

-void EditView::InsertText( const XubString& rStr, sal_Bool bSelect )
+void EditView::InsertText( const XubString& rStr, BOOL bSelect )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -420,28 +420,28 @@ void EditView::InsertText( const XubString&
rStr, sal_Bool bSelect )
     pImpEE->FormatAndUpdate( this );
 }

-sal_Bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
+BOOL EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin );
 }

-sal_Bool EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
+BOOL EditView::MouseButtonUp( const MouseEvent& rMouseEvent )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->MouseButtonUp( rMouseEvent );
 }

-sal_Bool EditView::MouseButtonDown( const MouseEvent& rMouseEvent )
+BOOL EditView::MouseButtonDown( const MouseEvent& rMouseEvent )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     return pImpEditView->MouseButtonDown( rMouseEvent );
 }

-sal_Bool EditView::MouseMove( const MouseEvent& rMouseEvent )
+BOOL EditView::MouseMove( const MouseEvent& rMouseEvent )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -455,7 +455,7 @@ void EditView::Command( const CommandEvent& rCEvt )
     pImpEditView->Command( rCEvt );
 }

-void EditView::ShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor )
+void EditView::ShowCursor( BOOL bGotoCursor, BOOL bForceVisCursor )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -515,7 +515,7 @@ void EditView::SetParaAttribs( const SfxItemSet&
rSet, sal_uInt16 nPara )
     PIMPEE->FormatAndUpdate( this );
 }

-void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
+void EditView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -537,7 +537,7 @@ void EditView::RemoveAttribsKeepLanguages(
sal_Bool bRemoveParaAttribs )
     PIMPEE->FormatAndUpdate( this );
 }

-void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich )
+void EditView::RemoveAttribs( BOOL bRemoveParaAttribs, sal_uInt16 nWhich )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -581,7 +581,7 @@ void EditView::Redo()
     PIMPEE->Redo( this );
 }

-ULONG EditView::Read( SvStream& rInput, const String& rBaseURL,
EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator*
pHTTPHeaderAttrs )
+ULONG EditView::Read( SvStream& rInput, const String& rBaseURL,
EETextFormat eFormat, BOOL bSelect, SvKeyValueIterator*
pHTTPHeaderAttrs )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -649,14 +649,14 @@ void EditView::PasteSpecial()
     pImpEditView->Paste(aClipBoard, sal_True );
 }

-void EditView::EnablePaste( sal_Bool bEnable )
+void EditView::EnablePaste( BOOL bEnable )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
     pImpEditView->EnablePaste( bEnable );
 }

-sal_Bool EditView::IsPasteEnabled() const
+BOOL EditView::IsPasteEnabled() const
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -804,7 +804,7 @@ void EditView::InsertText(
::com::sun::star::uno::Reference< ::com::sun::star::d
     PIMPEE->FormatAndUpdate( this );
 }

-sal_Bool EditView::Drop( const DropEvent& )
+BOOL EditView::Drop( const DropEvent& )
 {
     return FALSE;
 }
@@ -815,12 +815,12 @@ ESelection EditView::GetDropPos()
     return ESelection();
 }

-sal_Bool EditView::QueryDrop( DropEvent& )
+BOOL EditView::QueryDrop( DropEvent& )
 {
     return FALSE;
 }

-void EditView::SetEditEngineUpdateMode( sal_Bool bUpdate )
+void EditView::SetEditEngineUpdateMode( BOOL bUpdate )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -867,13 +867,13 @@ SfxStyleSheet* EditView::GetStyleSheet() const
     return pStyle;
 }

-sal_Bool EditView::IsInsertMode() const
+BOOL EditView::IsInsertMode() const
 {
     DBG_CHKTHIS( EditView, 0 );
     return pImpEditView->IsInsertMode();
 }

-void EditView::SetInsertMode( sal_Bool bInsert )
+void EditView::SetInsertMode( BOOL bInsert )
 {
     DBG_CHKTHIS( EditView, 0 );
     pImpEditView->SetInsertMode( bInsert );
@@ -905,7 +905,7 @@ void EditView::TransliterateText( sal_Int32
nTransliterationMode )
 }


-sal_Bool EditView::MatchGroup()
+BOOL EditView::MatchGroup()
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -938,7 +938,7 @@ void EditView::CompleteAutoCorrect( Window* pFrameWin )
     }
 }

-EESpellState EditView::StartSpeller( sal_Bool bMultipleDoc )
+EESpellState EditView::StartSpeller( BOOL bMultipleDoc )
 {
 #ifdef SVX_LIGHT
     return EE_SPELL_NOSPELLER;
@@ -987,7 +987,7 @@ sal_uInt16 EditView::StartSearchAndReplace( const
SvxSearchItem& rSearchItem )
     return PIMPEE->StartSearchAndReplace( this, rSearchItem );
 }

-sal_Bool EditView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
+BOOL EditView::IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -1000,7 +1000,7 @@ sal_Bool EditView::IsCursorAtWrongSpelledWord(
sal_Bool bMarkIfWrong )
     return bIsWrong;
 }

-sal_Bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel,
sal_Bool bMarkIfWrong )
+BOOL EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL
bMarkIfWrong )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
@@ -1317,7 +1317,7 @@ void EditView::SpellIgnoreWord()
     pImpEditView->SpellIgnoreOrAddWord( sal_False );
 }

-sal_Bool EditView::SelectCurrentWord( sal_Int16 nWordType )
+BOOL EditView::SelectCurrentWord( sal_Int16 nWordType )
 {
     DBG_CHKTHIS( EditView, 0 );
     DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index 0d91f17..a6ae4c8 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -53,7 +53,7 @@ using namespace com::sun::star::linguistic2;

 EditSpellWrapper::EditSpellWrapper( Window* _pWin,
         Reference< XSpellChecker1 >  &xChecker,
-        sal_Bool bIsStart, sal_Bool bIsAllRight, EditView* pView ) :
+        BOOL bIsStart, BOOL bIsAllRight, EditView* pView ) :
     SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight )
 {
     DBG_ASSERT( pView, "Es muss eine View uebergeben werden!" );
@@ -119,7 +119,7 @@ void __EXPORT EditSpellWrapper::SpellStart(
SvxSpellArea eArea )
     }
 }

-sal_Bool EditSpellWrapper::SpellContinue()
+BOOL EditSpellWrapper::SpellContinue()
 {
     SetLast( pEditView->GetImpEditEngine()->ImpSpell( pEditView ) );
     return GetLast().is();
@@ -131,12 +131,12 @@ void __EXPORT EditSpellWrapper::SpellEnd()
     SvxSpellWrapper::SpellEnd();
 }

-sal_Bool __EXPORT EditSpellWrapper::HasOtherCnt()
+BOOL __EXPORT EditSpellWrapper::HasOtherCnt()
 {
     return sal_False;
 }

-sal_Bool __EXPORT EditSpellWrapper::SpellMore()
+BOOL __EXPORT EditSpellWrapper::SpellMore()
 {
     ImpEditEngine* pImpEE = pEditView->GetImpEditEngine();
     SpellInfo* pSpellInfo = pImpEE->GetSpellInfo();
@@ -231,7 +231,7 @@ void WrongList::MarkInvalid( USHORT nS, USHORT nE )
         nInvalidEnd = nE;
 }

-void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16 nNew,
sal_Bool bPosIsSep )
+void WrongList::TextInserted( sal_uInt16 nPos, sal_uInt16 nNew, BOOL
bPosIsSep )
 {
     if ( !IsInvalid() )
     {
@@ -364,7 +364,7 @@ void WrongList::TextDeleted( sal_uInt16 nPos,
sal_uInt16 nDeleted )
     DBG_ASSERT( !DbgIsBuggy(), "InsertWrong: WrongList kaputt!" );
 }

-sal_Bool WrongList::NextWrong( sal_uInt16& rnStart, sal_uInt16& rnEnd ) const
+BOOL WrongList::NextWrong( sal_uInt16& rnStart, sal_uInt16& rnEnd ) const
 {
     /*
         rnStart enthaelt die Startposition, wird ggf. auf Wrong-Start
korrigiert
@@ -383,7 +383,7 @@ sal_Bool WrongList::NextWrong( sal_uInt16&
rnStart, sal_uInt16& rnEnd ) const
     return sal_False;
 }

-sal_Bool WrongList::HasWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
+BOOL WrongList::HasWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
 {
     for ( sal_uInt16 n = 0; n < Count(); n++ )
     {
@@ -396,7 +396,7 @@ sal_Bool WrongList::HasWrong( sal_uInt16 nStart,
sal_uInt16 nEnd ) const
     return sal_False;
 }

-sal_Bool WrongList::HasAnyWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
+BOOL WrongList::HasAnyWrong( sal_uInt16 nStart, sal_uInt16 nEnd ) const
 {
     for ( sal_uInt16 n = 0; n < Count(); n++ )
     {
@@ -440,7 +440,7 @@ void WrongList::ClearWrongs( sal_uInt16 nStart,
sal_uInt16 nEnd,
 }

 void WrongList::InsertWrong( sal_uInt16 nStart, sal_uInt16 nEnd,
-            sal_Bool bClearRange )
+            BOOL bClearRange )
 {
     sal_uInt16 nPos = Count();
     for ( sal_uInt16 n = 0; n < Count(); n++ )
@@ -514,7 +514,7 @@ bool WrongList::operator==(const WrongList& rCompare) const
 }

 #ifdef DBG_UTIL
-sal_Bool WrongList::DbgIsBuggy() const
+BOOL WrongList::DbgIsBuggy() const
 {
     // Pruefen, ob sich Bereiche ueberlappen
     sal_Bool bError = sal_False;
@@ -557,7 +557,7 @@ EdtAutoCorrDoc::~EdtAutoCorrDoc()
         pImpEE->UndoActionEnd( EDITUNDO_INSERT );
 }

-sal_Bool EdtAutoCorrDoc::Delete( sal_uInt16 nStt, sal_uInt16 nEnd )
+BOOL EdtAutoCorrDoc::Delete( sal_uInt16 nStt, sal_uInt16 nEnd )
 {
     EditSelection aSel( EditPaM( pCurNode, nStt ), EditPaM( pCurNode, nEnd ) );
     pImpEE->ImpDeleteSelection( aSel );
@@ -567,7 +567,7 @@ sal_Bool EdtAutoCorrDoc::Delete( sal_uInt16 nStt,
sal_uInt16 nEnd )
     return sal_True;
 }

-sal_Bool EdtAutoCorrDoc::Insert( sal_uInt16 nPos, const String& rTxt )
+BOOL EdtAutoCorrDoc::Insert( sal_uInt16 nPos, const String& rTxt )
 {
     EditSelection aSel = EditPaM( pCurNode, nPos );
     pImpEE->ImpInsertText( aSel, rTxt );
@@ -581,7 +581,7 @@ sal_Bool EdtAutoCorrDoc::Insert( sal_uInt16 nPos,
const String& rTxt )
     return sal_True;
 }

-sal_Bool EdtAutoCorrDoc::Replace( sal_uInt16 nPos, const String& rTxt )
+BOOL EdtAutoCorrDoc::Replace( sal_uInt16 nPos, const String& rTxt )
 {
     // Eigentlich ein Replace einfuehren => Entspr. UNDO
     sal_uInt16 nEnd = nPos+rTxt.Len();
@@ -603,7 +603,7 @@ sal_Bool EdtAutoCorrDoc::Replace( sal_uInt16 nPos,
const String& rTxt )
     return sal_True;
 }

-sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
+BOOL EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
             sal_uInt16 nSlotId, SfxPoolItem& rItem )
 {
     SfxItemPool* pPool = &pImpEE->GetEditDoc().GetItemPool();
@@ -629,7 +629,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr( sal_uInt16 nStt,
sal_uInt16 nEnd,
     return sal_True;
 }

-sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
+BOOL EdtAutoCorrDoc::SetINetAttr( sal_uInt16 nStt, sal_uInt16 nEnd,
             const String& rURL )
 {
     // Aus dem Text ein Feldbefehl machen...
@@ -647,7 +647,7 @@ sal_Bool EdtAutoCorrDoc::SetINetAttr( sal_uInt16
nStt, sal_uInt16 nEnd,
     return sal_True;
 }

-sal_Bool EdtAutoCorrDoc::HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd )
+BOOL EdtAutoCorrDoc::HasSymbolChars( sal_uInt16 nStt, sal_uInt16 nEnd )
 {
     USHORT nScriptType = pImpEE->GetScriptType( EditPaM( pCurNode, nStt ) );
     USHORT nScriptFontInfoItemId = GetScriptItemId( EE_CHAR_FONTINFO,
nScriptType );
@@ -671,7 +671,7 @@ sal_Bool EdtAutoCorrDoc::HasSymbolChars(
sal_uInt16 nStt, sal_uInt16 nEnd )
     return sal_False;
 }

-const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool )
+const String* EdtAutoCorrDoc::GetPrevPara( BOOL )
 {
     // Vorherigen Absatz zurueck geben, damit ermittel werden kann,
     // ob es sich beim aktuellen Wort um einen Satzanfang handelt.
@@ -707,7 +707,7 @@ const String* EdtAutoCorrDoc::GetPrevPara( sal_Bool )

 }

-sal_Bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_uInt16& rSttPos,
+BOOL EdtAutoCorrDoc::ChgAutoCorrWord( sal_uInt16& rSttPos,
             sal_uInt16 nEndPos, SvxAutoCorrect& rACorrect,
             const String** ppPara )
 {
@@ -742,7 +742,7 @@ sal_Bool EdtAutoCorrDoc::ChgAutoCorrWord(
sal_uInt16& rSttPos,
     return bRet;
 }

-LanguageType EdtAutoCorrDoc::GetLanguage( sal_uInt16 nPos, sal_Bool ) const
+LanguageType EdtAutoCorrDoc::GetLanguage( sal_uInt16 nPos, BOOL ) const
 {
     return pImpEE->GetLanguage( EditPaM( pCurNode, nPos+1 ) );
 }
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index a6c4be7..e9f8b86 100755
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -993,7 +993,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, BYTE
nRangeCheck )
     return Pair( nRealDiffX, nRealDiffY );
 }

-sal_Bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent,
Window* pFrameWin )
+BOOL ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin )
 {
     BOOL bDone = FALSE;

@@ -1042,7 +1042,7 @@ sal_Bool ImpEditView::PostKeyEvent( const
KeyEvent& rKeyEvent, Window* pFrameWin
     return bDone;
 }

-sal_Bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
+BOOL ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
 {
     if ( pEditEngine->pImpEditEngine->aStatus.NotifyCursorMovements() )
     {
@@ -1072,7 +1072,7 @@ sal_Bool ImpEditView::MouseButtonUp( const
MouseEvent& rMouseEvent )
     return pEditEngine->pImpEditEngine->MouseButtonUp( rMouseEvent,
GetEditViewPtr() );
 }

-sal_Bool ImpEditView::MouseButtonDown( const MouseEvent& rMouseEvent )
+BOOL ImpEditView::MouseButtonDown( const MouseEvent& rMouseEvent )
 {
     pEditEngine->pImpEditEngine->CheckIdleFormatter(); // Falls
schnelles Tippen und MouseButtonDown
     if ( pEditEngine->pImpEditEngine->aStatus.NotifyCursorMovements() )
@@ -1084,7 +1084,7 @@ sal_Bool ImpEditView::MouseButtonDown( const
MouseEvent& rMouseEvent )
     return pEditEngine->pImpEditEngine->MouseButtonDown( rMouseEvent,
GetEditViewPtr() );
 }

-sal_Bool ImpEditView::MouseMove( const MouseEvent& rMouseEvent )
+BOOL ImpEditView::MouseMove( const MouseEvent& rMouseEvent )
 {
     return pEditEngine->pImpEditEngine->MouseMove( rMouseEvent,
GetEditViewPtr() );
 }
@@ -1252,7 +1252,7 @@ BOOL ImpEditView::IsBulletArea( const Point&
rPos, sal_uInt16* pPara )
     return FALSE;
 }

-void ImpEditView::CutCopy( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard,
BOOL bCut )
+void ImpEditView::CutCopy( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard,
sal_Bool bCut )
 {
     if ( rxClipboard.is() && GetEditSelection().HasRange() )
     {
@@ -1285,7 +1285,7 @@ void ImpEditView::CutCopy(
::com::sun::star::uno::Reference< ::com::sun::star::d
     }
 }

-void ImpEditView::Paste( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard,
BOOL bUseSpecial )
+void ImpEditView::Paste( ::com::sun::star::uno::Reference<
::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard,
sal_Bool bUseSpecial )
 {
     if ( rxClipboard.is() )
     {
@@ -1359,7 +1359,7 @@ void ImpEditView::Paste(
::com::sun::star::uno::Reference< ::com::sun::star::dat
 }


-BOOL ImpEditView::IsInSelection( const EditPaM& rPaM )
+sal_Bool ImpEditView::IsInSelection( const EditPaM& rPaM )
 {
     EditSelection aSel = GetEditSelection();
     if ( !aSel.HasRange() )
@@ -1401,7 +1401,7 @@ void ImpEditView::DeselectAll()
     GetEditSelection().Min() = GetEditSelection().Max();
 }

-BOOL ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
+sal_Bool ImpEditView::IsSelectionAtPoint( const Point& rPosPixel )
 {
     if ( pDragAndDropInfo && pDragAndDropInfo->pField )
         return TRUE;
@@ -1421,7 +1421,7 @@ BOOL ImpEditView::IsSelectionAtPoint( const
Point& rPosPixel )
     return IsInSelection( aPaM );
 }

-BOOL ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
+sal_Bool ImpEditView::SetCursorAtPoint( const Point& rPointPixel )
 {
     pEditEngine->pImpEditEngine->CheckIdleFormatter();

diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 401983d..346c03f 100755
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -329,7 +329,7 @@ XubString ImpEditEngine::GetSelected( const
EditSelection& rSel, const LineEnd e
     return aText;
 }

-BOOL ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonDown( const MouseEvent& rMEvt,
EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     SetActiveView( pView );
@@ -672,7 +672,7 @@ void ImpEditEngine::Command( const CommandEvent&
rCEvt, EditView* pView )
     GetSelEngine().Command( rCEvt );
 }

-BOOL ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseButtonUp( const MouseEvent& rMEvt,
EditView* pView )
 {
     GetSelEngine().SetCurView( pView );
     GetSelEngine().SelMouseButtonUp( rMEvt );
@@ -695,7 +695,7 @@ BOOL ImpEditEngine::MouseButtonUp( const
MouseEvent& rMEvt, EditView* pView )
     return TRUE;
 }

-BOOL ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
+sal_Bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt, EditView* pView )
 {
     // MouseMove wird sofort nach ShowQuickHelp() gerufen!
 //     if ( GetAutoCompleteText().Len() )
@@ -2298,7 +2298,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs(
Range aOldPositions, USHORT nNew
 }


-EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft,
ContentNode* pRight, BOOL bBackward )
+EditPaM ImpEditEngine::ImpConnectParagraphs( ContentNode* pLeft,
ContentNode* pRight, sal_Bool bBackward )
 {
     DBG_ASSERT( pLeft != pRight, "Den gleichen Absatz zusammenfuegen ?" );
     DBG_ASSERT( aEditDoc.GetPos( pLeft ) != USHRT_MAX,
"Einzufuegenden Node nicht gefunden(1)" );
@@ -2640,7 +2640,7 @@ EditPaM ImpEditEngine::AutoCorrect( const
EditSelection& rCurSel, xub_Unicode c,


 EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel,
-        xub_Unicode c, BOOL bOverwrite, sal_Bool bIsUserInput )
+        xub_Unicode c, sal_Bool bOverwrite, sal_Bool bIsUserInput )
 {
     DBG_ASSERT( c != '\t', "Tab bei InsertText ?" );
     DBG_ASSERT( c != '\n', "Zeilenumbruch bei InsertText ?" );
@@ -2885,7 +2885,7 @@ EditPaM ImpEditEngine::ImpInsertFeature(
EditSelection aCurSel, const SfxPoolIte
     return aPaM;
 }

-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection&
rCurSel, BOOL bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditSelection&
rCurSel, sal_Bool bKeepEndingAttribs )
 {
     EditPaM aPaM;
     if ( rCurSel.HasRange() )
@@ -2896,7 +2896,7 @@ EditPaM ImpEditEngine::ImpInsertParaBreak( const
EditSelection& rCurSel, BOOL bK
     return ImpInsertParaBreak( aPaM, bKeepEndingAttribs );
 }

-EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM, BOOL
bKeepEndingAttribs )
+EditPaM ImpEditEngine::ImpInsertParaBreak( const EditPaM& rPaM,
sal_Bool bKeepEndingAttribs )
 {
     if ( aEditDoc.Count() >= 0xFFFE )
     {
@@ -3032,7 +3032,7 @@ EditPaM ImpEditEngine::InsertField(
EditSelection aCurSel, const SvxFieldItem& r
     return aPaM;
 }

-BOOL ImpEditEngine::UpdateFields()
+sal_Bool ImpEditEngine::UpdateFields()
 {
     BOOL bChanges = FALSE;
     USHORT nParas = GetEditDoc().Count();
@@ -3115,7 +3115,7 @@ Rectangle ImpEditEngine::PaMtoEditCursor(
EditPaM aPaM, USHORT nFlags )
     return aEditCursor;
 }

-EditPaM ImpEditEngine::GetPaM( Point aDocPos, BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( Point aDocPos, sal_Bool bSmart )
 {
     DBG_ASSERT( GetUpdateMode(), "Darf bei Update=FALSE nicht
erreicht werden: GetPaM" );

@@ -3862,7 +3862,7 @@ Range ImpEditEngine::GetInvalidYOffsets(
ParaPortion* pPortion )
     return aRange;
 }

-EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos,
BOOL bSmart )
+EditPaM ImpEditEngine::GetPaM( ParaPortion* pPortion, Point aDocPos,
sal_Bool bSmart )
 {
     DBG_ASSERT( pPortion->IsVisible(), "Wozu GetPaM() bei einem
unsichtbaren Absatz?" );
     DBG_ASSERT( IsFormatted(), "GetPaM: Nicht formatiert" );
@@ -4473,7 +4473,7 @@ void ImpEditEngine::SetValidPaperSize( const
Size& rNewSz )
         aPaperSize.Height() = nMaxHeight;
 }

-void ImpEditEngine::IndentBlock( EditView* pEditView, BOOL bRight )
+void ImpEditEngine::IndentBlock( EditView* pEditView, sal_Bool bRight )
 {
     ESelection aESel( CreateESel(
pEditView->pImpEditView->GetEditSelection() ) );
     aESel.Adjust();
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 1f640c2..2fc280e 100755
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2687,7 +2687,7 @@ sal_uInt16 ImpEditEngine::StartSearchAndReplace(
EditView* pEditView, const SvxS
     return nFound;
 }

-BOOL ImpEditEngine::Search( const SvxSearchItem& rSearchItem,
EditView* pEditView )
+sal_Bool ImpEditEngine::Search( const SvxSearchItem& rSearchItem,
EditView* pEditView )
 {
     EditSelection aSel( pEditView->pImpEditView->GetEditSelection() );
     aSel.Adjust( aEditDoc );
diff --git a/editeng/source/editeng/impedit5.cxx
b/editeng/source/editeng/impedit5.cxx
index 55c65ef..e0dac91 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -275,7 +275,7 @@ void ImpEditEngine::UndoActionEnd( USHORT )
     }
 }

-void ImpEditEngine::InsertUndo( EditUndo* pUndo, BOOL bTryMerge )
+void ImpEditEngine::InsertUndo( EditUndo* pUndo, sal_Bool bTryMerge )
 {
     DBG_ASSERT( !IsInUndo(), "InsertUndo im Undomodus!" );
     if ( pUndoMarkSelection )
@@ -296,7 +296,7 @@ void ImpEditEngine::ResetUndoManager()
         GetUndoManager().Clear();
 }

-void ImpEditEngine::EnableUndo( BOOL bEnable )
+void ImpEditEngine::EnableUndo( sal_Bool bEnable )
 {
     // Beim Umschalten des Modus Liste loeschen:
     if ( bEnable != IsUndoEnabled() )
@@ -305,7 +305,7 @@ void ImpEditEngine::EnableUndo( BOOL bEnable )
     bUndoEnabled = bEnable;
 }

-BOOL ImpEditEngine::Undo( EditView* pView )
+sal_Bool ImpEditEngine::Undo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetUndoActionCount() )
     {
@@ -316,7 +316,7 @@ BOOL ImpEditEngine::Undo( EditView* pView )
     return FALSE;
 }

-BOOL ImpEditEngine::Redo( EditView* pView )
+sal_Bool ImpEditEngine::Redo( EditView* pView )
 {
     if ( HasUndoManager() && GetUndoManager().GetRedoActionCount() )
     {
@@ -327,7 +327,7 @@ BOOL ImpEditEngine::Redo( EditView* pView )
     return FALSE;
 }

-BOOL ImpEditEngine::Repeat( EditView* /* pView */ )
+sal_Bool ImpEditEngine::Repeat( EditView* /* pView */ )
 {
     if ( HasUndoManager() && GetUndoManager().GetRepeatActionCount() )
     {
@@ -638,7 +638,7 @@ void ImpEditEngine::SetAttribs( EditSelection
aSel, const SfxItemSet& rSet, BYTE
     }
 }

-void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, BOOL
bRemoveParaAttribs, USHORT nWhich )
+void ImpEditEngine::RemoveCharAttribs( EditSelection aSel, sal_Bool
bRemoveParaAttribs, USHORT nWhich )
 {
     aSel.Adjust( aEditDoc );

@@ -706,7 +706,7 @@ void ImpEditEngine::RemoveCharAttribs(
EditSelection aSel, BOOL bRemoveParaAttri

 typedef EditCharAttrib* EditCharAttribPtr;

-void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich,
BOOL bRemoveFeatures )
+void ImpEditEngine::RemoveCharAttribs( USHORT nPara, USHORT nWhich,
sal_Bool bRemoveFeatures )
 {
     ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
     ParaPortion* pPortion = GetParaPortions().SaveGetObject( nPara );
@@ -782,7 +782,7 @@ const SfxItemSet& ImpEditEngine::GetParaAttribs(
USHORT nPara ) const
     return pNode->GetContentAttribs().GetItems();
 }

-BOOL ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
+sal_Bool ImpEditEngine::HasParaAttrib( USHORT nPara, USHORT nWhich ) const
 {
     ContentNode* pNode = aEditDoc.GetObject( nPara );
     DBG_ASSERT( pNode, "Node nicht gefunden: HasParaAttrib" );
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index a7cc6bd..af6d837 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1605,7 +1605,7 @@ void SvxBorderLine::ScaleMetrics( long nMult, long nDiv )

 // -----------------------------------------------------------------------

-sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
+BOOL SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
 {
     return ( ( aColor    == rCmp.GetColor() )   &&
              ( nInWidth  == rCmp.GetInWidth() )  &&
@@ -1618,7 +1618,7 @@ sal_Bool SvxBorderLine::operator==( const
SvxBorderLine& rCmp ) const
 XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
                                       SfxMapUnit eDestUnit,
                                       const IntlWrapper* pIntl,
-                                      sal_Bool bMetricStr) const
+                                      BOOL bMetricStr) const
 {
 #ifndef SVX_LIGHT
     sal_uInt16 nResId = 0;
@@ -2501,7 +2501,7 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew,
sal_uInt16 nLine )

 // -----------------------------------------------------------------------

-sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, sal_Bool
bIgnoreLine ) const
+sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, BOOL
bIgnoreLine ) const
 {
     SvxBorderLine* pTmp = 0;
     sal_uInt16 nDist = 0;
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 46c1703..b188645 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -73,7 +73,7 @@ String SvxEditEngineForwarder::GetText( const
ESelection& rSel ) const
     return aRet;
 }

-SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection&
rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxEditEngineForwarder::GetAttribs( const ESelection&
rSel, sal_uInt8 bOnlyHardAttrib ) const
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 215d2ec..4cd10e8 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -81,7 +81,7 @@ String SvxOutlinerForwarder::GetText( const
ESelection& rSel ) const
     return pEditEngine->GetText( rSel, LINEEND_LF );
 }

-static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection&
rSel, BOOL bOnlyHardAttrib, EditEngine& rEditEngine )
+static SfxItemSet ImplOutlinerForwarderGetAttribs( const ESelection&
rSel, sal_uInt8 bOnlyHardAttrib, EditEngine& rEditEngine )
 {
     if( rSel.nStartPara == rSel.nEndPara )
     {
@@ -109,7 +109,7 @@ static SfxItemSet ImplOutlinerForwarderGetAttribs(
const ESelection& rSel, BOOL
     }
 }

-SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel,
BOOL bOnlyHardAttrib ) const
+SfxItemSet SvxOutlinerForwarder::GetAttribs( const ESelection& rSel,
sal_uInt8 bOnlyHardAttrib ) const
 {
     if( mpAttribsCache && ( 0 == bOnlyHardAttrib ) )
     {
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 98a993e..603559c 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2595,7 +2595,7 @@ void SvxDummyTextSource::FieldClicked( const
SvxFieldItem&, USHORT, xub_StrLen )
 {
 }

-sal_Bool SvxDummyTextSource::IsValid() const
+BOOL SvxDummyTextSource::IsValid() const
 {
     return sal_False;
 }
-- 
1.7.1