summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-02-15 00:40:26 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-02-15 10:53:37 +0900
commita4b4c0cdae9695f49d41f097fb891845b8e908f3 (patch)
tree218f9ee610ccac81a7a461ad92feee9fa8f6acda /sw
parent4d7cb46fa2f9552aa479483bde2fcf9c31e2ee13 (diff)
sal_Bool to bool
Change-Id: Ibc0cd792ee0d21ad4ed2958bad66e2536eec5250
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/fesh.hxx2
-rw-r--r--sw/source/core/frmedt/feshview.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx4
-rw-r--r--sw/source/ui/shells/drwbassh.cxx16
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx6
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/ui/shells/frmsh.cxx28
-rw-r--r--sw/source/ui/shells/tabsh.cxx64
8 files changed, 63 insertions, 63 deletions
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 3e11b048ce0f..c68a6c055944 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -494,7 +494,7 @@ public:
bool IsGroupAllowed() const;
- void MirrorSelection( sal_Bool bHorizontal ); ///< Vertical if FALSE.
+ void MirrorSelection( bool bHorizontal ); ///< Vertical if FALSE.
/** frmatr.hxx. Here no enum because of dependencies.
bool value only for internal use! Anchor is newly set according
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 84a5a53f08ee..7fa71fd0deaa 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -2359,7 +2359,7 @@ void SwFEShell::UnGroupSelection()
|*
*************************************************************************/
-void SwFEShell::MirrorSelection( sal_Bool bHorizontal )
+void SwFEShell::MirrorSelection( bool bHorizontal )
{
SdrView *pView = Imp()->GetDrawView();
if ( IsObjSelected() && pView->IsMirrorAllowed() )
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 2dfa017fc4cb..300938f9dbee 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -87,7 +87,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
if(pArgs)
pArgs->GetItemState(nSlotId, sal_False, &pItem);
- sal_Bool bMirror = sal_True;
+ bool bMirror = true;
switch (nSlotId)
{
@@ -157,7 +157,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
break;
case FN_FLIP_HORZ_GRAFIC:
- bMirror = sal_False;
+ bMirror = false;
/* no break */
case FN_FLIP_VERT_GRAFIC:
rSh.MirrorSelection( bMirror );
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index 6052c4192bf4..979b4397d78f 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -118,8 +118,8 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
sal_Bool bAlignPossible = pSh->IsAlignPossible();
sal_Bool bTopParam = sal_True, bBottomParam = sal_True;
- sal_Bool bNotify = sal_False;
- sal_Bool bDone = sal_False;
+ bool bNotify = false;
+ bool bDone = false;
SfxBindings& rBind = GetView().GetViewFrame()->GetBindings();
switch (nSlotId)
@@ -185,7 +185,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
{
SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
SfxAbstractTabDialog *pDlg=NULL;
- sal_Bool bCaption = sal_False;
+ bool bCaption = false;
// Erlaubte Verankerungen:
short nAnchor = pSh->GetAnchorId();
@@ -196,7 +196,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
nAllowedAnchors |= SVX_OBJ_AT_FLY;
if (pObj->GetObjIdentifier() == OBJ_CAPTION )
- bCaption = sal_True;
+ bCaption = true;
if (bCaption)
{
@@ -365,7 +365,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
case FN_BACKSPACE:
if (pSh->IsObjSelected() && !pSdrView->IsTextEdit())
{
- bDone = sal_True;
+ bDone = true;
if( GetView().IsDrawRotate() )
{
@@ -394,7 +394,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
pSh->LeaveSelFrmMode();
// #105852# FME
}
- bNotify = sal_True;
+ bNotify = true;
}
break;
@@ -522,7 +522,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
case FN_NAME_SHAPE:
{
- bDone = sal_True;
+ bDone = true;
if(1L == pSdrView->GetMarkedObjectCount())
{
@@ -554,7 +554,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
// #i68101#
case FN_TITLE_DESCRIPTION_SHAPE:
{
- bDone = sal_True;
+ bDone = true;
if(1L == pSdrView->GetMarkedObjectCount())
{
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index f2826c52ad39..ad921351ac3f 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -473,7 +473,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SdrView* pTmpView = pSdrView;
pSdrView->SdrEndTextEdit(sal_True);
- sal_Bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
+ bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
const SfxPoolItem* pPoolItem;
if( pNewAttrs && SFX_ITEM_SET == pNewAttrs->GetItemState( nSlot, sal_True, &pPoolItem ) )
@@ -821,7 +821,7 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest &rReq)
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
ESelection aSel(pOLV->GetSelection());
- const sal_Bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos);
+ const bool bCopy = (aSel.nStartPara != aSel.nEndPara) || (aSel.nStartPos != aSel.nEndPos);
sal_uInt16 nId = rReq.GetSlot();
switch( nId )
{
@@ -855,7 +855,7 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet)
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
ESelection aSel(pOLV->GetSelection());
- const sal_Bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
+ const bool bCopy = (aSel.nStartPara != aSel.nEndPara) ||
(aSel.nStartPos != aSel.nEndPos);
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 97d81a5bf31f..6c714431b344 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -517,7 +517,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
{
if( IsTextEdit() )
{
- sal_Bool bCallBase = sal_True;
+ bool bCallBase = true;
const SfxItemSet* pArgs = rReq.GetArgs();
if( pArgs )
{
@@ -541,7 +541,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
while( nCnt-- )
pUndoManager->Redo();
}
- bCallBase = sal_False;
+ bCallBase = false;
GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
}
break;
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 1db03126324e..e9db18267abe 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -108,7 +108,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
{
//Erstmal die, die keinen FrmMgr benoetigen.
SwWrtShell &rSh = GetShell();
- sal_Bool bMore = sal_False;
+ bool bMore = false;
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
sal_uInt16 nSlot = rReq.GetSlot();
@@ -278,7 +278,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
}
break;
- default: bMore = sal_True;
+ default: bMore = true;
}
if ( !bMore )
@@ -287,8 +287,8 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
SwFlyFrmAttrMgr aMgr( sal_False, &rSh, FRMMGR_TYPE_NONE );
- sal_Bool bUpdateMgr = sal_True;
- sal_Bool bCopyToFmt = sal_False;
+ bool bUpdateMgr = true;
+ bool bCopyToFmt = false;
switch ( nSlot )
{
case SID_OBJECT_ALIGN_MIDDLE:
@@ -351,7 +351,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if(pArgs)
{
aMgr.SetAttrSet( *pArgs );
- bCopyToFmt = sal_True;
+ bCopyToFmt = true;
}
}
break;
@@ -361,7 +361,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem))
{
aMgr.SetAttrSet( *pArgs );
- bCopyToFmt = sal_True;
+ bCopyToFmt = true;
}
}
break;
@@ -371,7 +371,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
if (nSel & nsSelectionType::SEL_GRF)
{
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_GRAFIC_DLG);
- bUpdateMgr = sal_False;
+ bUpdateMgr = false;
}
else
{
@@ -563,7 +563,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
}
}
else
- bUpdateMgr = sal_False;
+ bUpdateMgr = false;
delete pDlg;
}
}
@@ -576,14 +576,14 @@ void SwFrameShell::Execute(SfxRequest &rReq)
SfxItemSet aSet(GetPool(), RES_HORI_ORIENT, RES_HORI_ORIENT);
aSet.Put(aHori);
aMgr.SetAttrSet(aSet);
- bCopyToFmt = sal_True;
+ bCopyToFmt = true;
rReq.SetReturnValue(SfxBoolItem(nSlot, bMirror));
}
break;
// #i73249#
case FN_TITLE_DESCRIPTION_SHAPE:
{
- bUpdateMgr = sal_False;
+ bUpdateMgr = false;
SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList();
if ( pSdrView &&
pSdrView->GetMarkedObjectCount() == 1 )
@@ -633,7 +633,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
void SwFrameShell::GetState(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetShell();
- sal_Bool bHtmlMode = 0 != ::GetHtmlMode(rSh.GetView().GetDocShell());
+ bool bHtmlMode = 0 != ::GetHtmlMode(rSh.GetView().GetDocShell());
if (rSh.IsFrmSelected())
{
SfxItemSet aSet( rSh.GetAttrPool(),
@@ -888,7 +888,7 @@ SwFrameShell::~SwFrameShell()
void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
{
SwWrtShell &rSh = GetShell();
- sal_Bool bDefault = sal_False;
+ bool bDefault = false;
if (!rSh.IsFrmSelected())
return;
@@ -903,7 +903,7 @@ void SwFrameShell::ExecFrameStyle(SfxRequest& rReq)
const SvxBoxItem& rBoxItem = (const SvxBoxItem&)aFrameSet.Get(RES_BOX);
if (pPoolBoxItem == &rBoxItem)
- bDefault = sal_True;
+ bDefault = true;
SvxBoxItem aBoxItem(rBoxItem);
@@ -1074,7 +1074,7 @@ static void lcl_FrmGetMaxLineWidth(const SvxBorderLine* pBorderLine, SvxBorderLi
void SwFrameShell::GetLineStyleState(SfxItemSet &rSet)
{
SwWrtShell &rSh = GetShell();
- sal_Bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
+ bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
if (bParentCntProt)
{
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 443b96a2b76f..5d3360752c1d 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -274,7 +274,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
aUsrPref.SetTblDest((sal_uInt8)nBackgroundDestination);
SW_MOD()->ApplyUsrPref(aUsrPref, &rSh.GetView());
}
- sal_Bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
+ bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) ||
SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) );
pItem = 0;
sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem );
@@ -282,9 +282,9 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem );
bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem );
const SfxPoolItem* pSplit = 0;
- sal_Bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit );
+ bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit );
const SfxPoolItem* pBoxDirection = 0;
- sal_Bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection );
+ bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection );
if( bBackground || bBorder || bRowSplit || bBoxDirection)
{
/*
@@ -347,7 +347,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
}
SwTabCols aTabCols;
- sal_Bool bTabCols = sal_False;
+ bool bTabCols = false;
sal_Bool bSingleLine = sal_False;
SwTableRep* pRep = 0;
SwFrmFmt *pFmt = rSh.GetTableFmt();
@@ -389,7 +389,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
if(pRep->HasColsChanged())
{
- bTabCols = sal_True;
+ bTabCols = true;
}
}
@@ -451,12 +451,12 @@ void SwTableShell::Execute(SfxRequest &rReq)
SwWrtShell &rSh = GetShell();
//Erstmal die Slots, die keinen FrmMgr benoetigen.
- sal_Bool bMore = sal_False;
+ bool bMore = false;
const SfxPoolItem* pItem = 0;
sal_uInt16 nSlot = rReq.GetSlot();
if(pArgs)
pArgs->GetItemState(GetPool().GetWhich(nSlot), sal_False, &pItem);
- sal_Bool bCallDone = sal_False;
+ bool bCallDone = false;
switch ( nSlot )
{
case SID_ATTR_BORDER:
@@ -545,7 +545,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
// the SvxBoxItem
rReq.AppendItem( aBox );
rReq.AppendItem( aInfo );
- bCallDone = sal_True;
+ bCallDone = true;
}
break;
@@ -684,27 +684,27 @@ void SwTableShell::Execute(SfxRequest &rReq)
break;
case FN_CALC_TABLE:
rSh.UpdateTable();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_OPTIMAL_HEIGHT:
{
const SwFmtFrmSize aSz;
rSh.SetRowHeight( aSz );
- bCallDone = sal_True;
+ bCallDone = true;
}
break;
case FN_TABLE_DELETE_COL:
if ( rSh.DeleteCol() && rSh.HasSelection() )
rSh.EnterStdMode();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_END_TABLE:
rSh.MoveTable( fnTableCurr, fnTableEnd );
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_START_TABLE:
rSh.MoveTable( fnTableCurr, fnTableStart );
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_GOTO_NEXT_CELL:
{
@@ -713,24 +713,24 @@ void SwTableShell::Execute(SfxRequest &rReq)
bAppendLine = ((SfxBoolItem*)pItem)->GetValue();
rReq.SetReturnValue( SfxBoolItem( nSlot,
rSh.GoNextCell( bAppendLine ) ) );
- bCallDone = sal_True;
+ bCallDone = true;
}
break;
case FN_GOTO_PREV_CELL:
rReq.SetReturnValue( SfxBoolItem( nSlot, rSh.GoPrevCell() ) );
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_DELETE_ROW:
if ( rSh.DeleteRow() && rSh.HasSelection() )
rSh.EnterStdMode();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_MERGE_CELLS:
if ( rSh.IsTableMode() )
switch ( rSh.MergeTab() )
{
case TBLMERGE_OK:
- bCallDone = sal_True;
+ bCallDone = true;
//no break;
case TBLMERGE_NOSELECTION: break;
case TBLMERGE_TOOCOMPLEX:
@@ -755,13 +755,13 @@ void SwTableShell::Execute(SfxRequest &rReq)
}
rSh.AdjustCellWidth(bBalance);
}
- bCallDone = sal_True;
+ bCallDone = true;
}
break;
case FN_TABLE_BALANCE_ROWS:
if ( rSh.BalanceRowHeight(sal_True) )
rSh.BalanceRowHeight(sal_False);
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_SELECT_ALL:
rSh.EnterStdMode();
@@ -769,26 +769,26 @@ void SwTableShell::Execute(SfxRequest &rReq)
rSh.SttSelect();
rSh.MoveTable( fnTableCurr, fnTableEnd );
rSh.EndSelect();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_SELECT_COL:
rSh.EnterStdMode();
rSh.SelectTableCol();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_SELECT_ROW:
rSh.EnterStdMode();
rSh.SelectTableRow();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_SET_READ_ONLY_CELLS:
rSh.ProtectCells();
rSh.ResetSelect( 0, sal_False );
- bCallDone = sal_True;
+ bCallDone = true;
break;
case FN_TABLE_UNSET_READ_ONLY_CELLS:
rSh.UnProtectCells();
- bCallDone = sal_True;
+ bCallDone = true;
break;
case SID_AUTOFORMAT:
{
@@ -820,7 +820,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
case FN_TABLE_INSERT_COL:
case FN_TABLE_INSERT_ROW:
{
- sal_Bool bColumn = rReq.GetSlot() == FN_TABLE_INSERT_COL;
+ bool bColumn = rReq.GetSlot() == FN_TABLE_INSERT_COL;
sal_uInt16 nCount = 0;
sal_Bool bAfter = sal_True;
if (pItem)
@@ -869,7 +869,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
rSh.EndUndo( nUndoId );
}
- bCallDone = sal_True;
+ bCallDone = true;
break;
}
@@ -936,7 +936,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
if ( nCount>1 )
{
rSh.SplitTab(!bHorizontal, static_cast< sal_uInt16 >( nCount-1 ), bProportional );
- bCallDone = sal_True;
+ bCallDone = true;
}
else
rReq.Ignore();
@@ -969,7 +969,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
pDlg->Execute();
rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, pDlg->GetSplitMode() ) );
delete pDlg;
- bCallDone = sal_True;
+ bCallDone = true;
}
}
break;
@@ -1012,7 +1012,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
0
};
rBind.Invalidate( aInva );
- bCallDone = sal_True;
+ bCallDone = true;
}
break;
case FN_TABLE_AUTOSUM:
@@ -1051,7 +1051,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
return;
//break;
default:
- bMore = sal_True;
+ bMore = true;
}
if ( !bMore )
@@ -1061,7 +1061,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
return;
}
else
- bMore = sal_False;
+ bMore = false;
//Jetzt die Slots, die direkt auf dem TableFmt arbeiten.
SwFrmFmt *pFmt = rSh.GetTableFmt();
switch ( nSlot )
@@ -1109,7 +1109,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
nSlot == FN_TABLE_VERT_CENTER ?
text::VertOrientation::CENTER : text::VertOrientation::BOTTOM;
rSh.SetBoxAlign(nAlign);
- bCallDone = sal_True;
+ bCallDone = true;
}
break;