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 /svx | |
parent | 4eda1a0293a869bf804056f1e9e04c984c69454d (diff) |
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/navigatortreemodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/galleryitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/viewlayoutitem.cxx | 2 | ||||
-rw-r--r-- | svx/source/items/zoomslideritem.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 69398e8ff49c..530362782596 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2640,7 +2640,7 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMe rMenu.EnableItem(SID_FM_RECORD_SAVE, IsModified()); // the undo is more difficult - sal_Bool bCanUndo = IsModified(); + bool bCanUndo = IsModified(); long nState = -1; if (m_aMasterStateProvider.IsSet()) nState = m_aMasterStateProvider.Call((void*)SID_FM_RECORD_UNDO); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index bbcfcb31c393..b4f480c36bda 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -821,7 +821,7 @@ namespace svxform { // gehen wir durch alle markierten Objekte und suchen wir die raus, mit denen ich was anfangen kann FmNavRequestSelectHint rshRequestSelection; - sal_Bool bIsMixedSelection = sal_False; + bool bIsMixedSelection = false; for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++) { diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index ace2edd4af85..83bec06e6273 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -75,7 +75,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId return false; int nConverted(0); - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Bool bIsSetType( sal_False ); sal_Int8 nType(0); diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 5d6ec82ecfda..06b393c0a9f9 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -129,7 +129,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt { sal_Int32 nColumns( 0 ); sal_Bool bBookMode = sal_False; - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 23b47f6fd5df..ff646f30a0a6 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -149,7 +149,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt sal_Int32 nCurrentZoom( 0 ); com::sun::star::uno::Sequence < sal_Int32 > aValues; - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); sal_Int32 nMinZoom( 0 ), nMaxZoom( 0 ); |