svx: sal_Bool->bool

Change-Id: I061f1e15c816f8077c0fbb0abbc1474eb286796b

7 files changed, 137 insertions, 137 deletions

diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 36bd381a0d9a..686173137b6b 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -48,8 +48,8 @@ private:
     Rectangle           aPreviewRect;
     GalleryTheme*       mpTheme;
 
-    SVX_DLLPRIVATE sal_Bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
-    SVX_DLLPRIVATE void                InitSettings();
+    SVX_DLLPRIVATE bool             ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+    SVX_DLLPRIVATE void             InitSettings();
 
     // Window
     SVX_DLLPRIVATE virtual void         Paint(const Rectangle& rRect);
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index 830d64c0f333..95d48d01ab5d 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -53,35 +53,35 @@ public:
     static bool                 FillThemeList( std::vector<OUString>& rThemeList );
 
                                 // FillObjList is filling rObjList with Strings of the internal Gallery Object URL
-    static sal_Bool             FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList );
+    static bool                 FillObjList( const OUString& rThemeName, std::vector<OUString> &rObjList );
     static bool                 FillObjList( const sal_uInt32 nThemeId, std::vector<OUString> &rObjList );
 
                                 // FillObjTitleList is filling the rList with the title for each gallery object
-    static sal_Bool             FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
+    static bool                 FillObjListTitle( const sal_uInt32 nThemeId, std::vector< OUString >& rList );
 
-    static sal_Bool                 InsertURL( const OUString& rThemeName, const OUString& rURL );
-    static sal_Bool                 InsertURL( sal_uIntPtr nThemeId, const OUString& rURL );
+    static bool                 InsertURL( const OUString& rThemeName, const OUString& rURL );
+    static bool                 InsertURL( sal_uIntPtr nThemeId, const OUString& rURL );
 
-    static sal_Bool                 GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
+    static bool                 GetGraphicObj( const OUString& rThemeName, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
-                                               sal_Bool bProgess = sal_False );
-    static sal_Bool                 GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
+                                               bool bProgess = false );
+    static bool                 GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
                                                Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
-                                               sal_Bool bProgess = sal_False );
+                                               bool bProgess = false );
 
-    static sal_uIntPtr              GetSdrObjCount( const OUString& rThemeName );
-    static sal_uIntPtr              GetSdrObjCount( sal_uIntPtr nThemeId );
+    static sal_uIntPtr          GetSdrObjCount( const OUString& rThemeName );
+    static sal_uIntPtr          GetSdrObjCount( sal_uIntPtr nThemeId );
 
-    static sal_Bool                 GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
+    static bool                 GetSdrObj( const OUString& rThemeName, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
-    static sal_Bool                 GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
+    static bool                 GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
                                            SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
 
-    static sal_Bool                 BeginLocking( const OUString& rThemeName );
-    static sal_Bool                 BeginLocking( sal_uIntPtr nThemeId );
+    static bool                 BeginLocking( const OUString& rThemeName );
+    static bool                 BeginLocking( sal_uIntPtr nThemeId );
 
-    static sal_Bool                 EndLocking( const OUString& rThemeName );
-    static sal_Bool                 EndLocking( sal_uIntPtr nThemeId );
+    static bool                 EndLocking( const OUString& rThemeName );
+    static bool                 EndLocking( sal_uIntPtr nThemeId );
 };
 
 #endif // INCLUDED_SVX_GALLERY_HXX
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 74ce015345e6..f60ee4089604 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -44,9 +44,9 @@ private:
     INetURLObject           aSdvURL;
     INetURLObject           aStrURL;
     sal_uInt32              nId;
-    sal_Bool                bReadOnly;
-    sal_Bool                bModified;
-    sal_Bool                bThemeNameFromResource;
+    bool                    bReadOnly;
+    bool                    bModified;
+    bool                    bThemeNameFromResource;
 
                             GalleryThemeEntry();
     INetURLObject           ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
@@ -56,8 +56,8 @@ public:
                             GalleryThemeEntry( bool bCreateUniqueURL,
                                                const INetURLObject& rBaseURL,
                                                const OUString& rName,
-                                               sal_Bool bReadOnly, sal_Bool bNewFile,
-                                               sal_uInt32 nId, sal_Bool bThemeNameFromResource );
+                                               bool bReadOnly, bool bNewFile,
+                                               sal_uInt32 nId, bool bThemeNameFromResource );
                             ~GalleryThemeEntry() {};
 
     const OUString&         GetThemeName() const { return aName; }
@@ -69,19 +69,19 @@ public:
 
     OUString                ReadStrFromIni(const OUString &aKeyName );
 
-    sal_Bool                IsReadOnly() const { return bReadOnly; }
-    sal_Bool                IsDefault() const;
+    bool                    IsReadOnly() const { return bReadOnly; }
+    bool                    IsDefault() const;
 
-    sal_Bool                IsHidden() const { return aName.match("private://gallery/hidden/"); }
+    bool                    IsHidden() const { return aName.match("private://gallery/hidden/"); }
 
-    sal_Bool                IsModified() const { return bModified; }
-    void                    SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsReadOnly() ); }
+    bool                    IsModified() const { return bModified; }
+    void                    SetModified( bool bSet ) { bModified = ( bSet && !IsReadOnly() ); }
 
     void                    SetName( const OUString& rNewName );
-    sal_Bool                IsNameFromResource() const { return bThemeNameFromResource; }
+    bool                    IsNameFromResource() const { return bThemeNameFromResource; }
 
     sal_uInt32              GetId() const { return nId; }
-    void                    SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
+    void                    SetId( sal_uInt32 nNewId, bool bResetThemeName );
 };
 
 typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList;
@@ -109,10 +109,10 @@ private:
     INetURLObject               aRelURL;
     INetURLObject               aUserURL;
     rtl_TextEncoding            nReadTextEncoding;
-    sal_Bool                    bMultiPath;
+    bool                        bMultiPath;
 
     void                        ImplLoad( const OUString& rMultiPath );
-    void                        ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
+    void                        ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbIsReadOnly );
 
     SVX_DLLPUBLIC GalleryThemeEntry*            ImplGetThemeEntry( const OUString& rThemeName );
     GalleryThemeEntry*          ImplGetThemeEntry( sal_uIntPtr nThemeId );
@@ -132,12 +132,12 @@ public:
                                 { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; }
     const GalleryThemeEntry*    GetThemeInfo( const OUString& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
 
-    SVX_DLLPUBLIC sal_Bool      HasTheme( const OUString& rThemeName );
+    SVX_DLLPUBLIC bool          HasTheme( const OUString& rThemeName );
     OUString                    GetThemeName( sal_uIntPtr nThemeId ) const;
 
-    SVX_DLLPUBLIC sal_Bool      CreateTheme( const OUString& rThemeName );
-    sal_Bool                    RenameTheme( const OUString& rOldName, const OUString& rNewName );
-    SVX_DLLPUBLIC sal_Bool      RemoveTheme( const OUString& rThemeName );
+    SVX_DLLPUBLIC bool          CreateTheme( const OUString& rThemeName );
+    bool                        RenameTheme( const OUString& rOldName, const OUString& rNewName );
+    SVX_DLLPUBLIC bool          RemoveTheme( const OUString& rThemeName );
 
     SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const OUString& rThemeName, SfxListener& rListener );
     SVX_DLLPUBLIC void          ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
@@ -147,7 +147,7 @@ public:
     const INetURLObject&        GetUserURL() const { return aUserURL; }
     const INetURLObject&        GetRelativeURL() const { return aRelURL; }
 
-    sal_Bool                    IsMultiPath() const { return bMultiPath; }
+    bool                        IsMultiPath() const { return bMultiPath; }
 };
 
 #endif // INCLUDED_SVX_GALLERY1_HXX
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 5716f77a4e24..9526ecb94a9e 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -86,17 +86,17 @@ class Gallery;
 
 SVX_DLLPUBLIC ResMgr*
                     GetGalleryResMgr();
-sal_uInt16          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, sal_Bool bShowProgress = sal_False );
-sal_Bool            GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
-sal_Bool            CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
+sal_uInt16          GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName, bool bShowProgress = false );
+bool                GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
+bool                CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
 SVX_DLLPUBLIC OUString
                     GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen );
 OUString            GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
 
-sal_Bool            FileExists( const INetURLObject& rURL );
-sal_Bool            CreateDir(  const INetURLObject& rURL );
-sal_Bool            CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
-sal_Bool            KillFile( const INetURLObject& rURL );
+bool                FileExists( const INetURLObject& rURL );
+bool                CreateDir(  const INetURLObject& rURL );
+bool                CopyFile(  const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
+bool                KillFile( const INetURLObject& rURL );
 BitmapEx            GalleryResGetBitmapEx( sal_uInt32 nId );
 
 class SgaIMapInfo : public SdrObjUserData, public SfxListener
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 9e40cb4f94f5..a842b79f2da3 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -101,15 +101,15 @@ private:
     SotStorageRef               aSvDrawStorageRef;
     Gallery*                    pParent;
     GalleryThemeEntry*          pThm;
-    sal_uIntPtr                     mnThemeLockCount;
-    sal_uIntPtr                     mnBroadcasterLockCount;
-    sal_uIntPtr                     nDragPos;
-    sal_Bool                        bDragging;
-    sal_Bool                        bAbortActualize;
+    sal_uIntPtr                 mnThemeLockCount;
+    sal_uIntPtr                 mnBroadcasterLockCount;
+    sal_uIntPtr                 nDragPos;
+    bool                        bDragging;
+    bool                        bAbortActualize;
 
     void                        ImplCreateSvDrawStorage();
     SVX_DLLPUBLIC SgaObject*                    ImplReadSgaObject( GalleryObject* pEntry );
-    sal_Bool                    ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry );
+    bool                        ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry );
     void                        ImplWrite();
     const GalleryObject*        ImplGetGalleryObject( size_t nPos ) const
                                 { return ( nPos < aObjectList.size() ) ? aObjectList[ nPos ] : NULL; }
@@ -124,7 +124,7 @@ private:
                                 }
     INetURLObject               ImplGetURL( const GalleryObject* pObject ) const;
     INetURLObject               ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
-    void                        ImplSetModified( sal_Bool bModified );
+    void                        ImplSetModified( bool bModified );
     void                        ImplBroadcast( sal_uIntPtr nUpdatePos );
 
                                 GalleryTheme();
@@ -133,7 +133,7 @@ private:
 
 public:
 
-    static GalleryThemeEntry*   CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly );
+    static GalleryThemeEntry*   CreateThemeEntry( const INetURLObject& rURL, bool bReadOnly );
 
     size_t                      GetObjectCount() const { return aObjectList.size(); }
 
@@ -156,30 +156,30 @@ public:
     SVX_DLLPUBLIC const INetURLObject&      GetSdgURL() const;
     const INetURLObject&        GetSdvURL() const;
 
-    SVX_DLLPUBLIC sal_uInt32        GetId() const;
-    void                        SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
+    SVX_DLLPUBLIC sal_uInt32    GetId() const;
+    void                        SetId( sal_uInt32 nNewId, bool bResetThemeName );
 
-    void                        SetDragging( sal_Bool bSet ) { bDragging = bSet; }
-    sal_Bool                        IsDragging() const { return bDragging; }
+    void                        SetDragging( bool bSet ) { bDragging = bSet; }
+    bool                        IsDragging() const { return bDragging; }
 
     void                        LockTheme() { ++mnThemeLockCount; }
-    sal_Bool                        UnlockTheme();
+    bool                        UnlockTheme();
 
     void                        LockBroadcaster() { mnBroadcasterLockCount++; }
     SVX_DLLPUBLIC void          UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
-    sal_Bool                        IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
+    bool                        IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
 
     void                        SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
     sal_uIntPtr                     GetDragPos() const { return nDragPos; }
 
-    sal_Bool                        IsThemeNameFromResource() const;
+    bool                        IsThemeNameFromResource() const;
 
-    SVX_DLLPUBLIC sal_Bool          IsReadOnly() const;
-    SVX_DLLPUBLIC sal_Bool          IsDefault() const;
-    sal_Bool                        IsModified() const;
+    SVX_DLLPUBLIC bool          IsReadOnly() const;
+    SVX_DLLPUBLIC bool          IsDefault() const;
+    bool                        IsModified() const;
 
     SVX_DLLPUBLIC void                      Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
-    void                        AbortActualize() { bAbortActualize = sal_True; }
+    void                        AbortActualize() { bAbortActualize = true; }
 
     Gallery*                    GetParent() const { return pParent; }
     SotStorageRef               GetSvDrawStorage() const { return aSvDrawStorageRef; }
@@ -199,22 +199,22 @@ public:
                                     return ImplGetGalleryObject( nPos )->aURL;
                                 }
 
-    sal_Bool                        GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, sal_Bool bProgress = sal_False );
+    bool                        GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, bool bProgress = false );
 
-    SVX_DLLPUBLIC sal_Bool                      GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False );
-    SVX_DLLPUBLIC sal_Bool                      InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    SVX_DLLPUBLIC bool         GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, bool bProgress = false );
+    SVX_DLLPUBLIC bool         InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    SVX_DLLPUBLIC sal_Bool                      GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False );
-    SVX_DLLPUBLIC sal_Bool                      InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    SVX_DLLPUBLIC bool          GetModel( sal_uIntPtr nPos, SdrModel& rModel, bool bProgress = false );
+    SVX_DLLPUBLIC bool          InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    sal_Bool                        GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False );
-    sal_Bool                        InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    bool                        GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, bool bProgress = false );
+    bool                        InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    sal_Bool                        GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False );
-    SVX_DLLPUBLIC sal_Bool                      InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
-    sal_Bool                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    bool                        GetURL( sal_uIntPtr nPos, INetURLObject& rURL, bool bProgress = false );
+    SVX_DLLPUBLIC bool          InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
+    bool                        InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = CONTAINER_APPEND );
 
-    sal_Bool                        InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
+    bool                        InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
 
     void                        CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
     void                        StartDrag( Window* pWindow, sal_uIntPtr nPos );
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index ee183bbb8dd8..41d214e7f349 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -49,10 +49,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
     GraphCtrlUserCall*  pUserCall;
     WinBits             nWinStyle;
     SdrObjKind          eObjKind;
-    sal_uInt16              nPolyEdit;
-    sal_Bool                bEditMode;
-    sal_Bool                bSdrMode;
-    sal_Bool                bAnim;
+    sal_uInt16          nPolyEdit;
+    bool                bEditMode;
+    bool                bSdrMode;
+    bool                bAnim;
 
                         DECL_LINK( UpdateHdl, Timer* );
 
@@ -87,17 +87,17 @@ public:
     void                SetWinStyle( WinBits nWinBits );
     WinBits             GetWinStyle() const { return nWinStyle; }
 
-    void                SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True );
+    void                SetGraphic( const Graphic& rGraphic, bool bNewModel = true );
     const Graphic&      GetGraphic() const { return aGraphic; }
     const Size&         GetGraphicSize() const { return aGraphSize; }
 
     const Point&        GetMousePos() const { return aMousePos; }
 
-    void                SetEditMode( const sal_Bool bEditMode );
-    sal_Bool                IsEditMode() const { return bEditMode; }
+    void                SetEditMode( const bool bEditMode );
+    bool                IsEditMode() const { return bEditMode; }
 
     void                SetPolyEditMode( const sal_uInt16 nPolyEdit );
-    sal_uInt16              GetPolyEditMode() const { return nPolyEdit; }
+    sal_uInt16          GetPolyEditMode() const { return nPolyEdit; }
 
     void                SetObjKind( const SdrObjKind eObjKind );
     SdrObjKind          GetObjKind() const { return eObjKind; }
@@ -105,7 +105,7 @@ public:
     SdrModel*           GetSdrModel() const { return pModel; }
     SdrView*            GetSdrView() const { return pView; }
     SdrObject*          GetSelectedSdrObject() const;
-    sal_Bool                IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; }
+    bool                IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; }
 
     void                SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; }
     const Link&         GetMousePosLink() const { return aMousePosLink; }
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index d534eff00e0d..7fb5626f9698 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -41,7 +41,7 @@
 class DbGridControl;
 class CursorWrapper;
 
-sal_Bool CompareBookmark(const ::com::sun::star::uno::Any& aLeft, const ::com::sun::star::uno::Any& aRight);
+bool CompareBookmark(const ::com::sun::star::uno::Any& aLeft, const ::com::sun::star::uno::Any& aRight);
 
 namespace svxform
 {
@@ -66,28 +66,28 @@ class DbGridRow : public SvRefBase
     ::com::sun::star::uno::Any  m_aBookmark;        // ::com::sun::star::text::Bookmark of the row, can be set
     DbDataColumns               m_aVariants;
     GridRowStatus               m_eStatus;
-    sal_Bool                    m_bIsNew;
+    bool                        m_bIsNew;
                                                     // row is no longer valid
                                                     // is removed on the next positioning
 public:
-    DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(sal_True) { }
-    DbGridRow(CursorWrapper* pCur, sal_Bool bPaintCursor);
-    void SetState(CursorWrapper* pCur, sal_Bool bPaintCursor);
+    DbGridRow():m_eStatus(GRS_CLEAN), m_bIsNew(true) { }
+    DbGridRow(CursorWrapper* pCur, bool bPaintCursor);
+    void SetState(CursorWrapper* pCur, bool bPaintCursor);
 
     ~DbGridRow();
 
-    sal_Bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); }
+    bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); }
     const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; }
 
     void            SetStatus(GridRowStatus _eStat) { m_eStatus = _eStat; }
     GridRowStatus   GetStatus() const               { return m_eStatus; }
-    void            SetNew(sal_Bool _bNew)              { m_bIsNew = _bNew; }
-    sal_Bool            IsNew() const                   { return m_bIsNew; }
+    void            SetNew(bool _bNew)              { m_bIsNew = _bNew; }
+    bool            IsNew() const                   { return m_bIsNew; }
 
     const ::com::sun::star::uno::Any& GetBookmark() const { return m_aBookmark; }
 
-    sal_Bool    IsValid() const { return m_eStatus == GRS_CLEAN || m_eStatus == GRS_MODIFIED; }
-    sal_Bool    IsModified() const { return m_eStatus == GRS_MODIFIED; }
+    bool    IsValid() const { return m_eStatus == GRS_CLEAN || m_eStatus == GRS_MODIFIED; }
+    bool    IsModified() const { return m_eStatus == GRS_MODIFIED; }
 };
 
 SV_DECL_REF(DbGridRow)
@@ -164,7 +164,7 @@ public:
         sal_uInt16      m_nDefaultWidth;
         sal_Int32       m_nCurrentPos;
 
-        sal_Bool            m_bPositioning;     // protect PositionDataSource against recursion
+        bool            m_bPositioning;     // protect PositionDataSource against recursion
 
     public:
         //  StatusIds for Controls of the Bar
@@ -185,10 +185,10 @@ public:
         NavigationBar(Window* pParent, WinBits nStyle = 0);
 
         // Status methods for Controls
-        void InvalidateAll(sal_Int32 nCurrentPos = -1, sal_Bool bAll = sal_False);
+        void InvalidateAll(sal_Int32 nCurrentPos = -1, bool bAll = false);
         void InvalidateState(sal_uInt16 nWhich) {SetState(nWhich);}
         void SetState(sal_uInt16 nWhich);
-        sal_Bool GetState(sal_uInt16 nWhich) const;
+        bool GetState(sal_uInt16 nWhich) const;
         sal_uInt16 GetDefaultWidth() const {return m_nDefaultWidth;}
 
     protected:
@@ -278,25 +278,25 @@ private:
     sal_uInt16          m_nOptionMask;      // the mask of options to be enabled in setDataSource
                                         // (with respect to the data source capabilities)
                                         // defaults to (insert | update | delete)
-    sal_uInt16              m_nLastColId;
+    sal_uInt16          m_nLastColId;
     long                m_nLastRowId;
 
-    sal_Bool            m_bDesignMode : 1;      // default = sal_False
-    sal_Bool            m_bRecordCountFinal : 1;
-    sal_Bool            m_bMultiSelection   : 1;
-    sal_Bool            m_bNavigationBar      : 1;
+    bool                m_bDesignMode : 1;      // default = sal_False
+    bool                m_bRecordCountFinal : 1;
+    bool                m_bMultiSelection   : 1;
+    bool                m_bNavigationBar      : 1;
 
-    sal_Bool            m_bSynchDisplay : 1;
-    sal_Bool            m_bForceROController : 1;
-    sal_Bool            m_bHandle : 1;
-    sal_Bool            m_bFilterMode : 1;
-    sal_Bool            m_bWantDestruction : 1;
-    sal_Bool            m_bInAdjustDataSource : 1;
-    sal_Bool            m_bPendingAdjustRows : 1;   // if an async adjust is pending, is it for AdjustRows or AdjustDataSource ?
-    sal_Bool            m_bHideScrollbars : 1;
+    bool                m_bSynchDisplay : 1;
+    bool                m_bForceROController : 1;
+    bool                m_bHandle : 1;
+    bool                m_bFilterMode : 1;
+    bool                m_bWantDestruction : 1;
+    bool                m_bInAdjustDataSource : 1;
+    bool                m_bPendingAdjustRows : 1;   // if an async adjust is pending, is it for AdjustRows or AdjustDataSource ?
+    bool                m_bHideScrollbars : 1;
 
 protected:
-    sal_Bool            m_bUpdating : 1;            // are any updates being executed right now?
+    bool                m_bUpdating : 1;            // are any updates being executed right now?
 
 protected:
     virtual sal_Bool SeekRow(long nRow);
@@ -385,7 +385,7 @@ public:
     */
     virtual OUString  GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
-    void RemoveRows(sal_Bool bNewCursor);
+    void RemoveRows(bool bNewCursor);
 
     void InvalidateStatus();
 
@@ -400,8 +400,8 @@ public:
     CursorWrapper* getDataSource() const {return m_pDataCursor;}
     const DbGridColumns& GetColumns() const {return m_aColumns;}
 
-    void EnableHandle(sal_Bool bEnable);
-    sal_Bool HasHandle() const {return m_bHandle;}
+    void EnableHandle(bool bEnable);
+    bool HasHandle() const {return m_bHandle;}
     void InsertHandleColumn();
 
     // which position does the column with the id in the ::com::sun::star::sdbcx::View have, the handle column doesn't count
@@ -420,15 +420,15 @@ public:
     sal_uInt16 GetColumnIdFromModelPos( sal_uInt16 nPos ) const;
 
     virtual void SetDesignMode(bool bMode);
-    sal_Bool IsDesignMode() const {return m_bDesignMode;}
-    sal_Bool IsOpen() const {return m_pSeekCursor != NULL;}
+    bool IsDesignMode() const {return m_bDesignMode;}
+    bool IsOpen() const {return m_pSeekCursor != NULL;}
 
-    virtual void SetFilterMode(sal_Bool bMode);
-    sal_Bool IsFilterMode() const {return m_bFilterMode;}
-    sal_Bool IsFilterRow(long nRow) const {return m_bFilterMode && nRow == 0;}
+    virtual void SetFilterMode(bool bMode);
+    bool IsFilterMode() const {return m_bFilterMode;}
+    bool IsFilterRow(long nRow) const {return m_bFilterMode && nRow == 0;}
 
-    void EnableNavigationBar(sal_Bool bEnable);
-    sal_Bool HasNavigationBar() const {return m_bNavigationBar;}
+    void EnableNavigationBar(bool bEnable);
+    bool HasNavigationBar() const {return m_bNavigationBar;}
 
     sal_uInt16 GetOptions() const {return m_nOptions;}
     NavigationBar& GetNavigationBar() {return m_aBar;}
@@ -451,23 +451,23 @@ public:
     // moved from the outside.
     // the flag indicates if an adjustment of the row count should be
     // done as well
-    void AdjustDataSource(sal_Bool bFull = sal_False);
+    void AdjustDataSource(bool bFull = false);
     void Undo();
 
     virtual void BeginCursorAction();
     virtual void EndCursorAction();
 
     // is the current line being updated
-    sal_Bool IsUpdating() const {return m_bUpdating;}
+    bool IsUpdating() const {return m_bUpdating;}
 
-    virtual void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True );
-    virtual void RowInserted( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True, sal_Bool bKeepSelection = sal_False );
+    virtual void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true );
+    virtual void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false );
     virtual void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX );
 
     void resetCurrentRow();
 
-    sal_Bool getDisplaySynchron() const { return m_bSynchDisplay; }
-    void setDisplaySynchron(sal_Bool bSync);
+    bool getDisplaySynchron() const { return m_bSynchDisplay; }
+    void setDisplaySynchron(bool bSync);
         // when set to sal_False, the display is no longer in sync with the current cursor position
         // (means that in AdjustDataSource we are jumping to a row not belonging to CursorPosition)
         // when using this, you should know what you are doing, because for example entering data
@@ -485,8 +485,8 @@ public:
         // analogous : if this link is set, all nav-bar slots will be routed through it when executed
         // if the handler returns nonzero, no further handling of the slot occurs
 
-    void EnablePermanentCursor(sal_Bool bEnable);
-    sal_Bool IsPermanentCursorEnabled() const;
+    void EnablePermanentCursor(bool bEnable);
+    bool IsPermanentCursorEnabled() const;
 
     /** forces both scrollbars to be hidden
 
@@ -494,13 +494,13 @@ public:
         bar <b>always</b> implies a horizontal scroll bar
         @seealso EnableNavigationBar
     */
-    void        ForceHideScrollbars( sal_Bool _bForce );
+    void        ForceHideScrollbars( bool _bForce );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
         getContext() const { return m_xContext; }
 
     /// returns <TRUE/> if the text of the given cell can be copied into the clipboard
-    sal_Bool    canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
+    bool    canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
     /// copies the text of the given cell into the clipboard
     void        copyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
 
@@ -550,22 +550,22 @@ public:
     CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId );
 
 protected:
-    void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, sal_Bool bUpdateCursor);
-    sal_Bool SeekCursor(long nRow, sal_Bool bAbsolute = sal_False);
+    void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor);
+    bool SeekCursor(long nRow, bool bAbsolute = false);
     void RemoveColumns();       // cleaning of own structures
     void AdjustRows();
     sal_Int32 AlignSeekCursor();
-    sal_Bool SetCurrent(long nNewRow);
+    bool SetCurrent(long nNewRow);
 
     OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const;
     virtual void DeleteSelectedRows();
-    sal_Bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
+    bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
 
     // row which is currently being appended
-    sal_Bool IsCurrentAppending() const;
+    bool IsCurrentAppending() const;
 
     // empty row for insertion
-    sal_Bool IsInsertionRow(long nRow) const;
+    bool IsInsertionRow(long nRow) const;
 
     void  SetSeekPos(sal_Int32 nPos) {m_nSeekPos = nPos;}
     sal_Int32 GetCurrentPos() const {return m_nCurrentPos;}
@@ -581,7 +581,7 @@ protected:
     void ConnectToFields();
     void DisconnectFromFields();
 
-    void implAdjustInSolarThread(sal_Bool _bRows);
+    void implAdjustInSolarThread(bool _bRows);
         // calls AdjustRows or AdjustDataSource, synchron if the caller is running in the solar thread, else asynchron
 
 protected: