svtools: sal_Bool->bool

Change-Id: Ia0280d3d4f2d5b8a93a37a93847951391e928028

chart2/source/controller/dialogs/dlg_CreationWizard.cxx

@@ -88,7 +88,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM
         , WZS_INVALID_STATE
     );
     this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP );
-    this->SetRoadmapInteractive( sal_True );
+    this->SetRoadmapInteractive( true );
     Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) );
     Size aSize( this->GetSizePixel() );
     aSize.Width() += aAdditionalRoadmapSize.Width();

dbaccess/source/ui/dlg/dbwizsetup.cxx

@@ -181,7 +181,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     m_pCancel->SetHelpId(HID_DBWIZ_CANCEL);
     m_pFinish->SetHelpId(HID_DBWIZ_FINISH);
     m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
-    SetRoadmapInteractive( sal_True );
+    SetRoadmapInteractive( true );
     ActivatePage();
 }
 

include/svtools/roadmap.hxx

@@ -59,28 +59,28 @@ namespace svt
         ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 );
         ~ORoadmap( );
 
-        void            SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True );
+        void            SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true );
 
-        void            EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0  );
+        void            EnableRoadmapItem( ItemId _nItemId, bool _bEnable, ItemIndex _nStartIndex = 0  );
 
         void            ChangeRoadmapItemLabel( ItemId _nID, const OUString& sLabel, ItemIndex _nStartIndex = 0 );
         void            ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex = 0  );
 
-        void            SetRoadmapInteractive( sal_Bool _bInteractive );
-        sal_Bool        IsRoadmapInteractive();
+        void            SetRoadmapInteractive( bool _bInteractive );
+        bool            IsRoadmapInteractive();
 
-        void            SetRoadmapComplete( sal_Bool _bComplete );
-        sal_Bool        IsRoadmapComplete() const;
+        void            SetRoadmapComplete( bool _bComplete );
+        bool            IsRoadmapComplete() const;
 
         ItemIndex       GetItemCount() const;
         ItemId          GetItemID( ItemIndex _nIndex ) const;
 
-        void            InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled = sal_True );
-        void            ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled );
+        void            InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled = true );
+        void            ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled );
         void            DeleteRoadmapItem( ItemIndex _nIndex );
 
         ItemId          GetCurrentRoadmapItemID() const;
-        sal_Bool        SelectRoadmapItemByID( ItemId _nItemID );
+        bool            SelectRoadmapItemByID( ItemId _nItemID );
 
         void            SetItemSelectHdl( const Link& _rHdl );
         Link            GetItemSelectHdl( ) const;
@@ -110,7 +110,7 @@ namespace svt
         ItemId                      GetNextAvailableItemId( ItemIndex _NewIndex );
         ItemId                      GetPreviousAvailableItemId( ItemIndex _NewIndex );
         RoadmapItem*                GetByPointer(Window* pWindow);
-        RoadmapItem*                InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, sal_Bool _bEnabled = sal_True  );
+        RoadmapItem*                InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, bool _bEnabled = true  );
         void                        UpdatefollowingHyperLabels( ItemIndex _Index );
     };
 

include/svtools/roadmapwizard.hxx

@@ -81,7 +81,7 @@ namespace svt
 
         void            SetRoadmapHelpId( const OString& _rId );
 
-        void            SetRoadmapInteractive( sal_Bool _bInteractive );
+        void            SetRoadmapInteractive( bool _bInteractive );
         virtual void    Resize();
         virtual void    StateChanged( StateChangedType nStateChange );
 

include/svtools/rtfout.hxx

@@ -36,10 +36,10 @@ public:
     static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
                     int *pUCMode,
                     rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
-                    sal_Bool bWriteHelpFile = sal_False );
+                    bool bWriteHelpFile = false );
     static SvStream& Out_String( SvStream&, const rtl::OUString&,
                     rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
-                    sal_Bool bWriteHelpFile = sal_False );
+                    bool bWriteHelpFile = false );
 
     static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen );
 };

include/svtools/ruler.hxx

@@ -645,13 +645,13 @@ private:
     MapUnit         meSourceUnit;
     FieldUnit       meUnit;
     Fraction        maZoom;
-    sal_Bool        mbCalc;
-    sal_Bool        mbFormat;
-    sal_Bool        mbDrag;
-    sal_Bool        mbDragDelete;
-    sal_Bool        mbDragCanceled;
-    sal_Bool        mbAutoWinWidth;
-    sal_Bool        mbActive;
+    bool            mbCalc;
+    bool            mbFormat;
+    bool            mbDrag;
+    bool            mbDragDelete;
+    bool            mbDragCanceled;
+    bool            mbAutoWinWidth;
+    bool            mbActive;
     sal_uInt8       mnUpdateFlags;
 
     RulerSelection  maHoverSelection;
@@ -681,22 +681,22 @@ private:
 
     using Window::ImplInit;
     SVT_DLLPRIVATE void ImplInit( WinBits nWinBits );
-    SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
+    SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
     SVT_DLLPRIVATE void ImplCalc();
     SVT_DLLPRIVATE void ImplFormat();
-    SVT_DLLPRIVATE void ImplInitExtraField( sal_Bool bUpdate );
-    SVT_DLLPRIVATE void ImplInvertLines( sal_Bool bErase = sal_False );
+    SVT_DLLPRIVATE void ImplInitExtraField( bool bUpdate );
+    SVT_DLLPRIVATE void ImplInvertLines( bool bErase = false );
     SVT_DLLPRIVATE void ImplDraw();
-    SVT_DLLPRIVATE void ImplDrawExtra( sal_Bool bPaint = sal_False );
-    SVT_DLLPRIVATE void ImplUpdate( sal_Bool bMustCalc = sal_False );
+    SVT_DLLPRIVATE void ImplDrawExtra( bool bPaint = false );
+    SVT_DLLPRIVATE void ImplUpdate( bool bMustCalc = false );
 
     using Window::ImplHitTest;
-    SVT_DLLPRIVATE sal_Bool ImplHitTest( const Point& rPosition,
+    SVT_DLLPRIVATE bool ImplHitTest( const Point& rPosition,
                                          RulerSelection* pHitTest,
-                                         sal_Bool bRequiredStyle = sal_False,
+                                         bool bRequiredStyle = false,
                                          sal_uInt16 nRequiredStyle = 0 ) const;
-    SVT_DLLPRIVATE sal_Bool ImplDocHitTest( const Point& rPos, RulerType eDragType, RulerSelection* pHitTest ) const;
-    SVT_DLLPRIVATE sal_Bool ImplStartDrag( RulerSelection* pHitTest, sal_uInt16 nModifier );
+    SVT_DLLPRIVATE bool     ImplDocHitTest( const Point& rPos, RulerType eDragType, RulerSelection* pHitTest ) const;
+    SVT_DLLPRIVATE bool     ImplStartDrag( RulerSelection* pHitTest, sal_uInt16 nModifier );
     SVT_DLLPRIVATE void     ImplDrag( const Point& rPos );
     SVT_DLLPRIVATE void     ImplEndDrag();
 
@@ -732,7 +732,7 @@ public:
 
     void            Activate();
     void            Deactivate();
-    sal_Bool        IsActive() const { return mbActive; }
+    bool            IsActive() const { return mbActive; }
 
     void            SetWinPos( long nOff = 0, long nWidth = 0 );
     long            GetWinOffset() const { return mnWinOff; }
@@ -757,17 +757,17 @@ public:
     sal_uInt16      GetExtraClicks() const { return mnExtraClicks; }
     sal_uInt16      GetExtraModifier() const { return mnExtraModifier; }
 
-    sal_Bool        StartDocDrag( const MouseEvent& rMEvt,
+    bool            StartDocDrag( const MouseEvent& rMEvt,
                                   RulerType eDragType = RULER_TYPE_DONTKNOW );
     RulerType       GetDragType() const { return meDragType; }
     long            GetDragPos() const { return mnDragPos; }
     sal_uInt16      GetDragAryPos() const { return mnDragAryPos; }
     sal_uInt16      GetDragSize() const { return mnDragSize; }
-    sal_Bool        IsDragDelete() const { return mbDragDelete; }
-    sal_Bool        IsDragCanceled() const { return mbDragCanceled; }
+    bool            IsDragDelete() const { return mbDragDelete; }
+    bool            IsDragCanceled() const { return mbDragCanceled; }
     sal_uInt16      GetDragScroll() const { return mnDragScroll; }
     sal_uInt16      GetDragModifier() const { return mnDragModifier; }
-    sal_Bool        IsDrag() const { return mbDrag; }
+    bool            IsDrag() const { return mbDrag; }
     void            CancelDrag();
     long            GetClickPos() const { return mnDragPos; }
     RulerType       GetClickType() const { return meDragType; }
@@ -816,7 +816,7 @@ public:
     void            SetExtraDownHdl( const Link& rLink ) { maExtraDownHdl = rLink; }
     const Link&     GetExtraDownHdl() const { return maExtraDownHdl; }
 
-    void            SetTextRTL(sal_Bool bRTL);
+    void            SetTextRTL(bool bRTL);
     bool            GetTextRTL();
     void            SetCharWidth( long nWidth ) { mnCharWidth = nWidth ; }
     void            SetLineHeight( long nHeight ) { mnLineHeight = nHeight ; }

svtools/source/control/roadmap.cxx

@@ -98,11 +98,11 @@ namespace svt
         void                    SetPosition( RoadmapItem* OldHyperLabel );
 
         void                    ToggleBackgroundColor( const Color& _rGBColor );
-        void                    SetInteractive( sal_Bool _bInteractive );
+        void                    SetInteractive( bool _bInteractive );
 
         void                    SetClickHdl( const Link& rLink );
-        void                    Enable( sal_Bool bEnable = sal_True);
-        sal_Bool                    IsEnabled() const;
+        void                    Enable( bool bEnable = true);
+        bool                    IsEnabled() const;
         void                    GrabFocus();
 
         bool                    Contains( const Window* _pWindow ) const;
@@ -125,16 +125,16 @@ namespace svt
         BitmapEx            m_aPicture;
         HL_Vector           m_aRoadmapSteps;
         ItemId              m_iCurItemID;
-        sal_Bool            m_bInteractive;
-        sal_Bool            m_bComplete;
+        bool                m_bInteractive;
+        bool                m_bComplete;
         Size                m_aItemSizePixel;
 
     public:
         RoadmapImpl( const ORoadmap& _rAntiImpl )
             :m_rAntiImpl( _rAntiImpl )
             ,m_iCurItemID( -1 )
-            ,m_bInteractive( sal_True )
-            ,m_bComplete( sal_True )
+            ,m_bInteractive( true )
+            ,m_bComplete( true )
             ,InCompleteHyperLabel ( NULL )
         {
         }
@@ -153,11 +153,11 @@ namespace svt
         void                setCurItemID( ItemId i ) {m_iCurItemID = i; }
         ItemId              getCurItemID() const { return m_iCurItemID; }
 
-        void                setInteractive(const sal_Bool _bInteractive) {m_bInteractive = _bInteractive; }
-        sal_Bool            isInteractive() const { return m_bInteractive; };
+        void                setInteractive(const bool _bInteractive) {m_bInteractive = _bInteractive; }
+        bool                isInteractive() const { return m_bInteractive; };
 
-        void                setComplete(const sal_Bool _bComplete) {m_bComplete = _bComplete; }
-        sal_Bool            isComplete() const { return m_bComplete; };
+        void                setComplete(const bool _bComplete) {m_bComplete = _bComplete; }
+        bool                isComplete() const { return m_bComplete; };
 
         void                setPicture( const BitmapEx& _rPic ) { m_aPicture = _rPic; }
         const BitmapEx&     getPicture( ) const { return m_aPicture; }
@@ -212,7 +212,7 @@ namespace svt
         SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
         m_pImpl->InCompleteHyperLabel = NULL;
         m_pImpl->setCurItemID(-1 );
-        m_pImpl->setComplete( sal_True );
+        m_pImpl->setComplete( true );
 
         // Roadmap control should be reachable as one unit with a Tab key
         // the next Tab key should spring out of the control.
@@ -264,7 +264,7 @@ namespace svt
 
 
 
-    RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled)
+    RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, bool _bEnabled)
     {
         if ( m_pImpl->getItemCount() == 0 )
             m_pImpl->initItemSize();
@@ -280,7 +280,7 @@ namespace svt
         }
         else
         {
-            pItem->SetInteractive( sal_False );
+            pItem->SetInteractive( false );
         }
         pItem->SetPosition( pOldItem );
         pItem->Update( _Index, _sLabel );
@@ -293,7 +293,7 @@ namespace svt
     }
 
 
-    void ORoadmap::SetRoadmapBitmap( const BitmapEx& _rBmp, sal_Bool _bInvalidate )
+    void ORoadmap::SetRoadmapBitmap( const BitmapEx& _rBmp, bool _bInvalidate )
     {
         m_pImpl->setPicture( _rBmp );
         if ( _bInvalidate )
@@ -301,7 +301,7 @@ namespace svt
     }
 
 
-    void ORoadmap::SetRoadmapInteractive( sal_Bool _bInteractive )
+    void ORoadmap::SetRoadmapInteractive( bool _bInteractive )
     {
         m_pImpl->setInteractive( _bInteractive );
 
@@ -316,15 +316,15 @@ namespace svt
     }
 
 
-    sal_Bool ORoadmap::IsRoadmapInteractive()
+    bool ORoadmap::IsRoadmapInteractive()
     {
         return m_pImpl->isInteractive();
     }
 
 
-    void ORoadmap::SetRoadmapComplete( sal_Bool _bComplete )
+    void ORoadmap::SetRoadmapComplete( bool _bComplete )
     {
-        sal_Bool bWasComplete = m_pImpl->isComplete();
+        bool bWasComplete = m_pImpl->isComplete();
         m_pImpl->setComplete( _bComplete );
         if ( _bComplete )
         {
@@ -365,7 +365,7 @@ namespace svt
     }
 
 
-    void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled )
+    void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, bool _bEnabled )
     {
         RoadmapItem* pItem = GetByIndex( _Index);
         if ( pItem != NULL )
@@ -392,7 +392,7 @@ namespace svt
     }
 
 
-    void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled )
+    void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, bool _bEnabled )
     {
         InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled );
             // Todo: YPos is superfluous, if items are always appended
@@ -410,13 +410,13 @@ namespace svt
     }
 
 
-    sal_Bool ORoadmap::IsRoadmapComplete( ) const
+    bool ORoadmap::IsRoadmapComplete( ) const
     {
         return m_pImpl->isComplete();
     }
 
 
-    void ORoadmap::EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex )
+    void ORoadmap::EnableRoadmapItem( ItemId _nItemId, bool _bEnable, ItemIndex _nStartIndex )
     {
         RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex );
         if ( pItem != NULL )
@@ -564,7 +564,7 @@ namespace svt
     }
 
 
-    sal_Bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
+    bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
     {
         DeselectOldRoadmapItems();
         RoadmapItem* pItem = GetByID( _nNewID );
@@ -579,10 +579,10 @@ namespace svt
                 m_pImpl->setCurItemID(_nNewID);
 
                 Select();
-                return sal_True;
+                return true;
             }
         }
-        return sal_False;
+        return false;
     }
 
 
@@ -676,9 +676,9 @@ namespace svt
     }
 
 
-      IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel)
+    IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel)
     {
-       return SelectRoadmapItemByID( _CurHyperLabel->GetID() );
+       return SelectRoadmapItemByID( _CurHyperLabel->GetID() ) ? 1 : 0;
     }
 
 
@@ -732,7 +732,7 @@ namespace svt
     }
 
 
-    void RoadmapItem::SetInteractive( sal_Bool _bInteractive )
+    void RoadmapItem::SetInteractive( bool _bInteractive )
     {
         if ( mpDescription )
         mpDescription->SetInteractive(_bInteractive);
@@ -802,14 +802,14 @@ namespace svt
     }
 
 
-    void RoadmapItem::Enable( sal_Bool _bEnable)
+    void RoadmapItem::Enable( bool _bEnable)
     {
         mpID->Enable(_bEnable);
         mpDescription->Enable(_bEnable);
     }
 
 
-    sal_Bool RoadmapItem::IsEnabled() const
+    bool RoadmapItem::IsEnabled() const
     {
         return mpID->IsEnabled();
     }

svtools/source/dialogs/roadmapwizard.cxx

@@ -219,7 +219,7 @@ namespace svt
     }
 
 
-    void RoadmapWizard::SetRoadmapInteractive( sal_Bool _bInteractive )
+    void RoadmapWizard::SetRoadmapInteractive( bool _bInteractive )
     {
         m_pImpl->pRoadmap->SetRoadmapInteractive( _bInteractive );
     }

svtools/source/svrtf/rtfout.cxx

@@ -25,7 +25,7 @@
 #include <svtools/rtfout.hxx>
 
 SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
-    int *pUCMode, rtl_TextEncoding eDestEnc, sal_Bool bWriteHelpFile)
+    int *pUCMode, rtl_TextEncoding eDestEnc, bool bWriteHelpFile)
 {
     const sal_Char* pStr = 0;
     switch (c)
@@ -148,7 +148,7 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c,
 }
 
 SvStream& RTFOutFuncs::Out_String( SvStream& rStream, const OUString& rStr,
-    rtl_TextEncoding eDestEnc, sal_Bool bWriteHelpFile)
+    rtl_TextEncoding eDestEnc, bool bWriteHelpFile)
 {
     int nUCMode = 1;
     for (sal_Int32 n = 0; n < rStr.getLength(); ++n)