editeng: sal_Bool->bool

Change-Id: Ib1113ebcfc523c8c97731debb2bf456a8c99d802

21 files changed, 74 insertions, 74 deletions

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 84ab485aa989..1f12000cc884 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -632,7 +632,7 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     if( m_pLeftMF->IsVisible() )
     {
         // #i40405# enable distance controls for next dialog call
-        aBoxInfoItem.SetDist( sal_True );
+        aBoxInfoItem.SetDist( true );
 
         if( !mbUseMarginItem )
         {
@@ -675,10 +675,10 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
                         aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_TOP  ), BOX_LINE_TOP);
                         aBoxItem.SetDistance(pOldBoxItem->GetDistance(BOX_LINE_BOTTOM), BOX_LINE_BOTTOM);
                     }
-                    aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
+                    aBoxInfoItem.SetValid( VALID_DISTANCE, true );
                 }
                 else
-                    aBoxInfoItem.SetValid( VALID_DISTANCE, sal_False );
+                    aBoxInfoItem.SetValid( VALID_DISTANCE, false );
             }
         }
     }
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index a60eca102651..7c6de8202872 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1703,7 +1703,7 @@ bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
 }
 
 // -----------------------------------------------------------------------
-table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConvert)
+table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, bool bConvert)
 {
     table::BorderLine2 aLine;
     if(pLine)
@@ -1813,13 +1813,13 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
 }
 
 // -----------------------------------------------------------------------
-sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert)
 {
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True);
 }
 
-sal_Bool
-SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+bool
+SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, bool bConvert)
 {
     SvxBorderStyle const nStyle =
         (rLine.LineStyle < 0 || BORDER_LINE_STYLE_MAX < rLine.LineStyle)
@@ -2469,7 +2469,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;
@@ -2514,7 +2514,7 @@ SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) :
     mbEnableVer( false ),
     nDefDist( 0 )
 {
-    bDist = bMinDist = sal_False;
+    bDist = bMinDist = false;
     ResetFlags();
 }
 
diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx
index adc325f18aba..4fd98f83ae18 100644
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@@ -105,10 +105,10 @@ public:
 
     // Line width plus Space plus inward distance
     // bIgnoreLine = TRUE -> Also return distance, when no Line is set
-    sal_uInt16  CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine = sal_False ) const;
-    static com::sun::star::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, sal_Bool bConvert );
-    static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
-    static sal_Bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, editeng::SvxBorderLine& rSvxLine, sal_Bool bConvert);
+    sal_uInt16  CalcLineSpace( sal_uInt16 nLine, bool bIgnoreLine = false ) const;
+    static com::sun::star::table::BorderLine2 SvxLineToLine( const editeng::SvxBorderLine* pLine, bool bConvert );
+    static bool LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, editeng::SvxBorderLine& rSvxLine, bool bConvert);
+    static bool LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, editeng::SvxBorderLine& rSvxLine, bool bConvert);
 };
 
 inline void SvxBoxItem::SetDistance( sal_uInt16 nNew )
@@ -156,8 +156,8 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem
      forth to the dialogue.
     */
 
-    sal_Bool    bDist      :1;  // TRUE, Unlock Distance.
-    sal_Bool    bMinDist   :1;  // TRUE, Going below minimum Distance is prohibited
+    bool        bDist      :1;  // TRUE, Unlock Distance.
+    bool        bMinDist   :1;  // TRUE, Going below minimum Distance is prohibited
 
     sal_uInt8   nValidFlags;    // 0000 0000
                                 // 0000 0001 VALID_TOP
@@ -200,24 +200,24 @@ public:
     //The Pointers are being copied!
     void                    SetLine( const editeng::SvxBorderLine* pNew, sal_uInt16 nLine );
 
-    sal_Bool    IsTable() const             { return mbEnableHor && mbEnableVer; }
-    void    SetTable( sal_Bool bNew )       { mbEnableHor = mbEnableVer = bNew; }
+    bool    IsTable() const             { return mbEnableHor && mbEnableVer; }
+    void    SetTable( bool bNew )       { mbEnableHor = mbEnableVer = bNew; }
 
     inline bool         IsHorEnabled() const { return mbEnableHor; }
     inline void         EnableHor( bool bEnable ) { mbEnableHor = bEnable; }
     inline bool         IsVerEnabled() const { return mbEnableVer; }
     inline void         EnableVer( bool bEnable ) { mbEnableVer = bEnable; }
 
-    sal_Bool    IsDist() const              { return bDist; }
-    void    SetDist( sal_Bool bNew )        { bDist = bNew; }
-    sal_Bool    IsMinDist() const           { return bMinDist; }
-    void    SetMinDist( sal_Bool bNew )     { bMinDist = bNew; }
+    bool    IsDist() const              { return bDist; }
+    void    SetDist( bool bNew )        { bDist = bNew; }
+    bool    IsMinDist() const           { return bMinDist; }
+    void    SetMinDist( bool bNew )     { bMinDist = bNew; }
     sal_uInt16  GetDefDist() const          { return nDefDist; }
     void    SetDefDist( sal_uInt16 nNew )   { nDefDist = nNew; }
 
-    sal_Bool                    IsValid( sal_uInt8 nValid ) const
+    bool                    IsValid( sal_uInt8 nValid ) const
                                 { return ( nValidFlags & nValid ) == nValid; }
-    void                    SetValid( sal_uInt8 nValid, sal_Bool bValid = sal_True )
+    void                    SetValid( sal_uInt8 nValid, bool bValid = true )
                                 { bValid ? ( nValidFlags |= nValid )
                                          : ( nValidFlags &= ~nValid ); }
     void                    ResetFlags();
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 33b196a70e09..1990b2db7dc1 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -220,8 +220,8 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
 
     pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_HORI);
     pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_VERT);
-    pGlobalBorderInnerAttr->SetTable(sal_True);
-    pGlobalBorderInnerAttr->SetDist(sal_True);
+    pGlobalBorderInnerAttr->SetTable(true);
+    pGlobalBorderInnerAttr->SetDist(true);
     pGlobalBorderInnerAttr->SetMinDist(false);
 
     ppPoolDefaults = new SfxPoolItem*[ATTR_ENDINDEX-ATTR_STARTINDEX+1];
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 004e2bfb6425..9d4a4262b31e 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -415,13 +415,13 @@ void ScStyleSheetPool::CreateStandardStyles()
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_LEFT );
     aBoxItem.SetLine( &aBorderLine, BOX_LINE_RIGHT );
     aBoxItem.SetDistance( 10 ); // 0.2mm
-    aBoxInfoItem.SetValid( VALID_TOP, sal_True );
-    aBoxInfoItem.SetValid( VALID_BOTTOM, sal_True );
-    aBoxInfoItem.SetValid( VALID_LEFT, sal_True );
-    aBoxInfoItem.SetValid( VALID_RIGHT, sal_True );
-    aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
+    aBoxInfoItem.SetValid( VALID_TOP, true );
+    aBoxInfoItem.SetValid( VALID_BOTTOM, true );
+    aBoxInfoItem.SetValid( VALID_LEFT, true );
+    aBoxInfoItem.SetValid( VALID_RIGHT, true );
+    aBoxInfoItem.SetValid( VALID_DISTANCE, true );
     aBoxInfoItem.SetTable( false );
-    aBoxInfoItem.SetDist ( sal_True );
+    aBoxInfoItem.SetDist ( true );
 
     pHFSetItem = new SvxSetItem( ((SvxSetItem&)pSet->Get( ATTR_PAGE_HEADERSET ) ) );
     pHFSet = &(pHFSetItem->GetItemSet());
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 33e6fd05b477..04322d84824b 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -194,8 +194,8 @@ SfxItemSet& ScStyleSheet::GetItemSet()
                         SvxBoxInfoItem  aBoxInfoItem( ATTR_BORDER_INNER );
 
                         aBoxInfoItem.SetTable( false );
-                        aBoxInfoItem.SetDist( sal_True );
-                        aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
+                        aBoxInfoItem.SetDist( true );
+                        aBoxInfoItem.SetValid( VALID_DISTANCE, true );
 
                         aPageItem.SetLandscape( false );
 
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index b74de1228399..5887874e2938 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -984,7 +984,7 @@ void lcl_fillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const TableBo
     rInner.SetValid( VALID_HORI,     rBorder.IsHorizontalLineValid );
     rInner.SetValid( VALID_VERT,     rBorder.IsVerticalLineValid );
     rInner.SetValid( VALID_DISTANCE, rBorder.IsDistanceValid );
-    rInner.SetTable( sal_True );
+    rInner.SetTable( true );
 }
 }
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index f3162fcb8e3d..c6404248073e 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1464,8 +1464,8 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault()
             // (same content as in ScStyleSheet::GetItemSet, to control the dialog)
             SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER );
             aBoxInfoItem.SetTable( false );
-            aBoxInfoItem.SetDist( sal_True );
-            aBoxInfoItem.SetValid( VALID_DISTANCE, sal_True );
+            aBoxInfoItem.SetDist( true );
+            aBoxInfoItem.SetValid( VALID_DISTANCE, true );
             rSet.Put( aBoxInfoItem );
 
             pDocShell->PageStyleModified( aStyleName, true );
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index fdd4e4e69629..1654fa68790d 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -320,9 +320,9 @@ SdrItemPool::SdrItemPool(
 
     SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER );
 
-    pBoxInfoItem->SetTable( sal_True );
-    pBoxInfoItem->SetDist( sal_True);        // always show margin field
-    pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // some lines may have DontCare state only in tables
+    pBoxInfoItem->SetTable( true );
+    pBoxInfoItem->SetDist( true);        // always show margin field
+    pBoxInfoItem->SetValid( VALID_DISABLE, true ); // some lines may have DontCare state only in tables
 
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] =  pBoxInfoItem;
     mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_TLBR - SDRATTR_START ] = new SvxLineItem( SDRATTR_TABLE_BORDER_TLBR );
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index b1f51a9532d6..cf1475d376ba 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2775,7 +2775,7 @@ void SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem& rBox
             const sal_Int32 nLastRow = std::min( aEnd.mnRow + 2, nRowCount );
             const sal_Int32 nLastCol = std::min( aEnd.mnCol + 2, nColCount );
 
-            rBoxInfoItem.SetValid( sal_uInt8( ~0 ), sal_False );
+            rBoxInfoItem.SetValid( sal_uInt8( ~0 ), false );
             LinesState aLinesState( rBoxItem, rBoxInfoItem );
 
             /* Here we go through all the selected cells (enhanced by
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 6ef5313364c6..7990834ab244 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1452,8 +1452,8 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
     aBorderInner.SetValid( VALID_RIGHT,     0 != (nValidFlags&FRM_VALID_RIGHT ));
     aBorderInner.SetValid( VALID_HORI,      0 != (nValidFlags&FRM_VALID_HINNER ));
     aBorderInner.SetValid( VALID_VERT,      0 != (nValidFlags&FRM_VALID_VINNER));
-    aBorderInner.SetValid( VALID_DISTANCE, sal_True );
-    aBorderInner.SetValid( VALID_DISABLE, sal_False );
+    aBorderInner.SetValid( VALID_DISTANCE,  true );
+    aBorderInner.SetValid( VALID_DISABLE,   false );
 
     if ( IsInPopupMode() )
         EndPopupMode();
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 1d3e71bdd336..4de82f0333bf 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -988,7 +988,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                                  !(*aSetBox.GetTop() == *rBox.GetTop())) ||
                                  ((!aSetBox.GetTop()) != (!rBox.GetTop()))) // XOR expression is sal_True, if one of the two pointers is 0
                         {
-                            aSetBoxInfo.SetValid(VALID_TOP, sal_False );
+                            aSetBoxInfo.SetValid(VALID_TOP, false );
                             aSetBox.SetLine( 0, BOX_LINE_TOP );
                         }
                     }
@@ -1007,7 +1007,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                                  !(*aSetBox.GetLeft() == *rBox.GetLeft())) ||
                                  ((!aSetBox.GetLeft()) != (!rBox.GetLeft())))
                         {
-                            aSetBoxInfo.SetValid(VALID_LEFT, sal_False );
+                            aSetBoxInfo.SetValid(VALID_LEFT, false );
                             aSetBox.SetLine( 0, BOX_LINE_LEFT );
                         }
                     }
@@ -1023,7 +1023,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                         else if ((aSetBoxInfo.GetVert() && rBox.GetLeft() &&
                                  !(*aSetBoxInfo.GetVert() == *rBox.GetLeft())) ||
                                  ((!aSetBoxInfo.GetVert()) != (!rBox.GetLeft())))
-                        {   aSetBoxInfo.SetValid( VALID_VERT, sal_False );
+                        {   aSetBoxInfo.SetValid( VALID_VERT, false );
                             aSetBoxInfo.SetLine( 0, BOXINFO_LINE_VERT );
                         }
                     }
@@ -1039,7 +1039,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                     else if ((aSetBox.GetRight() && rBox.GetRight() &&
                              !(*aSetBox.GetRight() == *rBox.GetRight())) ||
                              (!aSetBox.GetRight() != !rBox.GetRight()))
-                    {   aSetBoxInfo.SetValid( VALID_RIGHT, sal_False );
+                    {   aSetBoxInfo.SetValid( VALID_RIGHT, false );
                         aSetBox.SetLine( 0, BOX_LINE_RIGHT );
                     }
                 }
@@ -1056,7 +1056,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                         else if ((aSetBox.GetBottom() && rBox.GetBottom() &&
                                  !(*aSetBox.GetBottom() == *rBox.GetBottom())) ||
                                  (!aSetBox.GetBottom() != !rBox.GetBottom()))
-                        {   aSetBoxInfo.SetValid( VALID_BOTTOM, sal_False );
+                        {   aSetBoxInfo.SetValid( VALID_BOTTOM, false );
                             aSetBox.SetLine( 0, BOX_LINE_BOTTOM );
                         }
                     }
@@ -1075,7 +1075,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                                  !(*aSetBoxInfo.GetHori() == *rBox.GetBottom())) ||
                                  ((!aSetBoxInfo.GetHori()) != (!rBox.GetBottom())))
                         {
-                            aSetBoxInfo.SetValid( VALID_HORI, sal_False );
+                            aSetBoxInfo.SetValid( VALID_HORI, false );
                             aSetBoxInfo.SetLine( 0, BOXINFO_LINE_HORI );
                         }
                     }
@@ -1101,7 +1101,7 @@ void SwDoc::GetTabBorders( const SwCursor& rCursor, SfxItemSet& rSet ) const
                             if( aSetBox.GetDistance( *pBrd ) !=
                                 rBox.GetDistance( *pBrd ) )
                             {
-                                aSetBoxInfo.SetValid( VALID_DISTANCE, sal_False );
+                                aSetBoxInfo.SetValid( VALID_DISTANCE, false );
                                 aSetBox.SetDistance( (sal_uInt16) 0 );
                                 break;
                             }
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 6ee3b0ece4d2..0c20c7b3a46b 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3850,7 +3850,7 @@ static sal_uInt16 lcl_GetTopSpace( const SwRowFrm& rRow )
         {
             const SwAttrSet& rSet = ((SwCellFrm*)pCurrLower)->GetFmt()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
-            nTmpTopSpace = rBoxItem.CalcLineSpace( BOX_LINE_TOP, sal_True );
+            nTmpTopSpace = rBoxItem.CalcLineSpace( BOX_LINE_TOP, true );
         }
         nTopSpace  = std::max( nTopSpace, nTmpTopSpace );
     }
@@ -3895,7 +3895,7 @@ static sal_uInt16 lcl_GetBottomLineSize( const SwRowFrm& rRow )
         {
             const SwAttrSet& rSet = ((SwCellFrm*)pCurrLower)->GetFmt()->GetAttrSet();
             const SvxBoxItem& rBoxItem = rSet.GetBox();
-            nTmpBottomLineSize = rBoxItem.CalcLineSpace( BOX_LINE_BOTTOM, sal_True ) -
+            nTmpBottomLineSize = rBoxItem.CalcLineSpace( BOX_LINE_BOTTOM, true ) -
                                  rBoxItem.GetDistance( BOX_LINE_BOTTOM );
         }
         nBottomLineSize = std::max( nBottomLineSize, nTmpBottomLineSize );
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 8d83dbbe0d11..20a873d5c92c 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3942,7 +3942,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
                                     SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
                                     0);
                     SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
-                    aBoxInfo.SetValid(0xff, sal_False);
+                    aBoxInfo.SetValid(0xff, false);
                     sal_uInt8 nValid = 0;
                     switch(pEntry->nMemberId & ~CONVERT_TWIPS)
                     {
@@ -3957,7 +3957,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
                             nValid = VALID_DISTANCE;
                         break;
                     }
-                    aBoxInfo.SetValid(nValid, sal_True);
+                    aBoxInfo.SetValid(nValid, true);
 
 
                     aSet.Put(aBoxInfo);
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 44548d90a6b9..5927ef04d4de 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1124,12 +1124,12 @@ SfxItemSet&   SwDocStyleSheet::GetItemSet()
         case SFX_STYLE_FAMILY_FRAME:
             {
                 SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
-                aBoxInfo.SetTable( sal_False );
-                aBoxInfo.SetDist( sal_True );   // always show gap field
-                aBoxInfo.SetMinDist( sal_True );// set minimum size in tables and paragraphs
+                aBoxInfo.SetTable( false );
+                aBoxInfo.SetDist( true );   // always show gap field
+                aBoxInfo.SetMinDist( true );// set minimum size in tables and paragraphs
                 aBoxInfo.SetDefDist( MIN_BORDER_DIST );// always set Default-Gap
                     // Single lines can only have DontCare-Status in tables
-                aBoxInfo.SetValid( VALID_DISABLE, sal_True );
+                aBoxInfo.SetValid( VALID_DISABLE, true );
 
                 if( nFamily == SFX_STYLE_FAMILY_CHAR )
                 {
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 3ca58060d976..fdb7bc8069d4 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -657,15 +657,15 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblFmtHdl, PushButton*, pButton )
 
         SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
             // table variant, when multiple table cells are selected
-        aBoxInfo.SetTable( sal_True );
+        aBoxInfo.SetTable( true );
             // always show gap field
-        aBoxInfo.SetDist( sal_True);
+        aBoxInfo.SetDist( true);
             // set minimum size in tables and paragraphs
-        aBoxInfo.SetMinDist( sal_False );
+        aBoxInfo.SetMinDist( false );
             // always set default-gap
         aBoxInfo.SetDefDist( MIN_BORDER_DIST );
             // Single lines can have DontCare-status only in tables
-        aBoxInfo.SetValid( VALID_DISABLE, sal_True );
+        aBoxInfo.SetValid( VALID_DISABLE, true );
         pTblSet->Put( aBoxInfo );
 
         SwGetCurColNumPara aPara;
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 9e8f55d28a29..048b18a57636 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -432,9 +432,9 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot )
                                                         true, &pBoxInfo) )
                     aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo;
 
-                aBoxInfo.SetTable( sal_False );
-                aBoxInfo.SetDist( sal_True);
-                aBoxInfo.SetMinDist( sal_False );
+                aBoxInfo.SetTable( false );
+                aBoxInfo.SetDist( true);
+                aBoxInfo.SetMinDist( false );
                 aBoxInfo.SetDefDist( MIN_BORDER_DIST );
                 aBoxInfo.SetValid( VALID_DISABLE );
                 aSet.Put( aBoxInfo );
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index d315be15c2f0..53b2d3a28ef6 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -181,7 +181,7 @@ static SwTableRep*  lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
     aBoxInfo.SetTable          ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) ||
                                     !bTableSel);
         // Always show distance field.
-    aBoxInfo.SetDist           ((sal_Bool) sal_True);
+    aBoxInfo.SetDist           (true);
         // Set minimum size in tables and paragraphs.
     aBoxInfo.SetMinDist( !bTableSel || rSh.IsTableMode() ||
                             rSh.GetSelectionType() &
@@ -494,8 +494,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
                 aInfo.SetWhich(SID_ATTR_BORDER_INNER);
             }
 
-            aInfo.SetTable( sal_True );
-            aInfo.SetValid( VALID_DISABLE, sal_False );
+            aInfo.SetTable( true );
+            aInfo.SetValid( VALID_DISABLE, false );
 
 
 // The attributes of all lines will be read and the strongest wins.
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index daa0b1c4f663..57314e0e8848 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -591,7 +591,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
             // Delete minimum size in columns.
             SvxBoxInfoItem aBoxInfo((SvxBoxInfoItem &)aSet.Get(SID_ATTR_BORDER_INNER));
             const SvxBoxItem& rBox = (const SvxBoxItem&)aSet.Get(RES_BOX);
-            aBoxInfo.SetMinDist(sal_False);
+            aBoxInfo.SetMinDist(false);
             aBoxInfo.SetDefDist(rBox.GetDistance(BOX_LINE_LEFT));
             aSet.Put(aBoxInfo);
 
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 1125ca580d6d..3791c2a27975 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -1324,8 +1324,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
                                             RES_BOX, RES_BOX,
                                             SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, 0 );
                     SvxBoxInfoItem aBoxInfo( SID_ATTR_BORDER_INNER );
-                    aBoxInfo.SetTable(sal_False);
-                    aBoxInfo.SetDist((sal_Bool) sal_True);
+                    aBoxInfo.SetTable(false);
+                    aBoxInfo.SetDist(true);
                     aCoreSet2.Put(aBoxInfo);
                     rSh.GetTabBorders( aCoreSet2 );
                     const SvxBoxItem& rBox = (const SvxBoxItem&)aCoreSet2.Get(RES_BOX);
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index ea08eca97850..d1512e814033 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -108,7 +108,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh)
     rSh.GetCrsr();                  //So that GetCrsrCnt() returns the right thing
     aBoxInfo.SetTable          (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1);
         // Always show the distance field
-    aBoxInfo.SetDist           ((sal_Bool) sal_True);
+    aBoxInfo.SetDist           (true);
         // Set minimal size in tables and paragraphs
     aBoxInfo.SetMinDist        (rSh.IsTableMode() || rSh.GetSelectionType() & (nsSelectionType::SEL_TXT | nsSelectionType::SEL_TBL));
         // Set always the default distance
@@ -424,11 +424,11 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
                                             true, &pBoxInfo) )
         aBoxInfo = *(SvxBoxInfoItem*)pBoxInfo;
 
-    aBoxInfo.SetTable( sal_False );
+    aBoxInfo.SetTable( false );
         // Show always the distance field
-    aBoxInfo.SetDist( sal_True);
+    aBoxInfo.SetDist( true);
         // Set minimal size in tables and paragraphs
-    aBoxInfo.SetMinDist( sal_False );
+    aBoxInfo.SetMinDist( false );
         // Set always the default distance
     aBoxInfo.SetDefDist( MIN_BORDER_DIST );
         // Single lines can have only in tables DontCare-Status