diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-19 15:40:53 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-21 12:19:21 +0200 |
commit | 327dde336ed3a318c08dd19894b0fd84c9a0eb57 (patch) | |
tree | 7c8e02f6cd07ed4f8c3e22f8226c1a08787aa646 /sw/source | |
parent | a1d5ff63dbdae3406c81c4b2edcbb8d22112582b (diff) |
editeng: sal_Bool->bool
Change-Id: Ib1113ebcfc523c8c97731debb2bf456a8c99d802
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 14 | ||||
-rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/app/docstyle.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/docvw/HeaderFooterWin.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/uiview/viewtab.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/uitool.cxx | 8 |
10 files changed, 32 insertions, 32 deletions
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 |