diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 14:58:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 15:00:54 +0100 |
| commit | bbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch) | |
| tree | 4e65b4d58e6a4298219b1909f524b710677606d9 /sw/source/ui/shells | |
| parent | 4eda1a0293a869bf804056f1e9e04c984c69454d (diff) | |
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/drawsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/drwbassh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/textsh.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index c3d31208af54..307789139a97 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -281,7 +281,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList(); SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); + bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); if (!bProtected) // Check the parent bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index ecee1ed97b29..e4f7c781658c 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -645,7 +645,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList(); SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); + bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); if (!bProtected) // Look in the parent bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 4152393812ab..1ad2ad926407 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -278,7 +278,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, 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 ); + bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; 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 ); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index efc5ae3a32b8..d2bbceef4606 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -475,7 +475,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_INSERT_FRAME_INTERACT: { sal_uInt16 nCols = 1; - sal_Bool bModifier1 = rReq.GetModifier() == KEY_MOD1; + bool bModifier1 = rReq.GetModifier() == KEY_MOD1; if(pArgs) { if(FN_INSERT_FRAME_INTERACT_NOCOL != nSlot && |