diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-07 17:54:14 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-07 18:43:32 +0100 |
commit | 85cdb06fd5ba0c974e729a56dcb0e323c4cdfd25 (patch) | |
tree | 4118701347d05fb5287e51cf0033f95ae34dff39 | |
parent | b20888e1299464249875652ac3794258a75c593b (diff) |
sal_Bool -> bool
Change-Id: Ifc80202e0865b59931af6e50d3d60f5021f8b52e
-rw-r--r-- | chart2/source/controller/dialogs/dlg_DataEditor.cxx | 14 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/complextoolbarcontroller.cxx | 10 | ||||
-rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 8 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmerger.cxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/navipi/navipi.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 12 | ||||
-rw-r--r-- | svtools/source/contnr/templwin.cxx | 10 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.cxx | 18 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 16 | ||||
-rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 36 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 12 | ||||
-rw-r--r-- | vcl/inc/toolbox.h | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 18 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 24 |
19 files changed, 105 insertions, 105 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index ddd9cc5370c2..20f345c30acc 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -168,13 +168,13 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_bReadOnly = bReadOnly; if( m_bReadOnly ) { - m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, sal_False ); - m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, sal_False ); + m_aTbxData.EnableItem( TBI_DATA_INSERT_ROW, false ); + m_aTbxData.EnableItem( TBI_DATA_INSERT_COL, false ); + m_aTbxData.EnableItem( TBI_DATA_INSERT_TEXT_COL, false ); + m_aTbxData.EnableItem( TBI_DATA_DELETE_ROW, false ); + m_aTbxData.EnableItem( TBI_DATA_DELETE_COL, false ); + m_aTbxData.EnableItem( TBI_DATA_SWAP_COL, false ); + m_aTbxData.EnableItem( TBI_DATA_SWAP_ROW, false ); } m_apBrwData->SetReadOnly( m_bReadOnly ); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index e87dfe0ef764..d302a039f3e8 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -268,8 +268,8 @@ namespace dbaui } else { - m_aActions.EnableItem(ID_INDEX_SAVE, sal_False); - m_aActions.EnableItem(ID_INDEX_RESET, sal_False); + m_aActions.EnableItem(ID_INDEX_SAVE, false); + m_aActions.EnableItem(ID_INDEX_RESET, false); } m_aActions.EnableItem(ID_INDEX_DROP, bSelectedAnything); m_aActions.EnableItem(ID_INDEX_RENAME, bSelectedAnything); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 1a987d984ee0..80498550560f 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -163,7 +163,7 @@ throw ( RuntimeException ) { // Boolean, treat it as checked/unchecked if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) eTri = STATE_CHECK; @@ -176,14 +176,14 @@ throw ( RuntimeException ) m_pToolbar->SetQuickHelpText( m_nID, aText ); if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); } else if ( Event.State >>= aItemState ) { eTri = STATE_DONTKNOW; nItemBits |= TIB_CHECKABLE; if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); } else if ( Event.State >>= aItemVisibility ) { @@ -194,11 +194,11 @@ throw ( RuntimeException ) { executeControlCommand( aControlCommand ); if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); } else if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->SetItemState( m_nID, eTri ); m_pToolbar->SetItemBits( m_nID, nItemBits ); diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index c8df613f4da0..55fcd6fd2cd0 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -202,7 +202,7 @@ throw ( RuntimeException ) { // Boolean, treat it as checked/unchecked if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->CheckItem( m_nID, bValue ); if ( bValue ) eTri = STATE_CHECK; @@ -250,14 +250,14 @@ throw ( RuntimeException ) } if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); } else if (( Event.State >>= aItemState ) && !m_bEnumCommand ) { eTri = STATE_DONTKNOW; nItemBits |= TIB_CHECKABLE; if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); } else if ( Event.State >>= aItemVisibility ) { @@ -265,7 +265,7 @@ throw ( RuntimeException ) m_bMadeInvisible = !aItemVisibility.bVisible; } else if ( m_bMadeInvisible ) - m_pToolbar->ShowItem( m_nID, sal_True ); + m_pToolbar->ShowItem( m_nID, true ); m_pToolbar->SetItemState( m_nID, eTri ); m_pToolbar->SetItemBits( m_nID, nItemBits ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index e36f49aa8860..1b4417467c94 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1313,7 +1313,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine { m_pToolBar->SetItemText( nId, aString ); } - m_pToolBar->EnableItem( nId, sal_True ); + m_pToolBar->EnableItem( nId, true ); m_pToolBar->SetItemState( nId, STATE_NOCHECK ); // Fill command map. It stores all our commands and from what diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index b0d725625e12..4d398a153dc0 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -667,7 +667,7 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCom pToolbar->SetItemCommand( nItemId, rItem.aCommandURL ); pToolbar->SetQuickHelpText( nItemId, rItem.aLabel ); pToolbar->SetItemText( nItemId, rItem.aLabel ); - pToolbar->EnableItem( nItemId, sal_True ); + pToolbar->EnableItem( nItemId, true ); pToolbar->SetItemState( nItemId, STATE_NOCHECK ); CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index bcc444ed05db..8d421bbd8c62 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -428,18 +428,18 @@ public: void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True ); sal_Bool IsItemChecked( sal_uInt16 nItemId ) const; - void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True ); + void EnableItem( sal_uInt16 nItemId, bool bEnable = true ); sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; void TriggerItem( sal_uInt16 nItemId, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False ); /// Shows or hides items. - void ShowItem(sal_uInt16 nItemId, sal_Bool bVisible = sal_True); + void ShowItem(sal_uInt16 nItemId, bool bVisible = true); /// Overload to provide ShowItem via command id. void ShowItem(const OUString& rCommand, bool bVisible = true) { ShowItem(GetItemId(rCommand), bVisible); } /// Convenience method to hide items (via ShowItem). - void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, sal_False ); } + void HideItem(sal_uInt16 nItemId) { ShowItem( nItemId, false ); } /// Overload to provide HideItem via command id. void HideItem(const OUString& rCommand) { ShowItem(rCommand, false); } diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index d301053b16f2..9c5f33f0e54a 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -171,7 +171,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent m_aActions.SetSelectHdl(LINK(this, OAddFieldWindow, OnSortAction)); setToolBox(&m_aActions); m_aActions.CheckItem(SID_FM_SORTUP); - m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, sal_False); + m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, false); m_pListBox->SetDoubleClickHdl(LINK( this, OAddFieldWindow, OnDoubleClickHdl ) ); m_pListBox->SetSelectHdl(LINK( this, OAddFieldWindow, OnSelectHdl ) ); @@ -310,7 +310,7 @@ void OAddFieldWindow::Update() const sal_uInt16 nItemCount = m_aActions.GetItemCount(); for (sal_uInt16 j = 0; j< nItemCount; ++j) { - m_aActions.EnableItem(m_aActions.GetItemId(j),sal_False); + m_aActions.EnableItem(m_aActions.GetItemId(j),false); } OUString aTitle(ModuleRes(RID_STR_FIELDSELECTION)); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index aba1052c824c..fa705dd0d6d0 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1379,19 +1379,19 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) if (bEnabled && _nRow > 0 ) { - m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_True); + m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, true); } else { - m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_False); + m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, false); } if (bEnabled && _nRow < (nRowCount - 1) ) { - m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_True); + m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, true); } else { - m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_False); + m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, false); } sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow); @@ -1402,7 +1402,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow) } else { - m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, sal_False); + m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, false); } } diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index b1e3e51e6bee..09140ebdadef 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -485,7 +485,7 @@ void CommandToolBox::UpdateButtons() } else { - EnableItem( IID_CHANGEROOT, sal_True ); + EnableItem( IID_CHANGEROOT, true ); sal_Bool bRootSet = rDlg.aLbEntries.GetRootType() != SC_CONTENT_ROOT; CheckItem( IID_CHANGEROOT, bRootSet ); } diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 9f960c6f4d31..bf25bbed693d 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -197,7 +197,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc ) // Disable the shape filter drop down menu when there is a running slide // show. if (pViewShell!=NULL && sd::SlideShow::IsRunning( pViewShell->GetViewShellBase() )) - maToolbox.EnableItem(TBI_SHAPE_FILTER, sal_False); + maToolbox.EnableItem(TBI_SHAPE_FILTER, false); else maToolbox.EnableItem(TBI_SHAPE_FILTER); @@ -904,7 +904,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PEN ); if( nState & NAVBTN_PEN_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PEN ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PEN, sal_False ); + pNavigatorWin->maToolbox.EnableItem( TBI_PEN, false ); if( nState & NAVBTN_PEN_CHECKED && !pNavigatorWin->maToolbox.IsItemChecked( TBI_PEN ) ) pNavigatorWin->maToolbox.CheckItem( TBI_PEN ); @@ -922,7 +922,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.EnableItem( TBI_FIRST ); if( nState & NAVBTN_FIRST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_FIRST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, sal_False ); + pNavigatorWin->maToolbox.EnableItem( TBI_FIRST, false ); // Prev if( nState & NAVBTN_PREV_ENABLED && @@ -930,7 +930,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS ); if( nState & NAVBTN_PREV_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_PREVIOUS ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, sal_False ); + pNavigatorWin->maToolbox.EnableItem( TBI_PREVIOUS, false ); // Last if( nState & NAVBTN_LAST_ENABLED && @@ -938,7 +938,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.EnableItem( TBI_LAST ); if( nState & NAVBTN_LAST_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_LAST ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_LAST, sal_False ); + pNavigatorWin->maToolbox.EnableItem( TBI_LAST, false ); // Next if( nState & NAVBTN_NEXT_ENABLED && @@ -946,7 +946,7 @@ void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId, pNavigatorWin->maToolbox.EnableItem( TBI_NEXT ); if( nState & NAVBTN_NEXT_DISABLED && pNavigatorWin->maToolbox.IsItemEnabled( TBI_NEXT ) ) - pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, sal_False ); + pNavigatorWin->maToolbox.EnableItem( TBI_NEXT, false ); if( nState & NAVTLB_UPDATE ) { diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 95e16bdb286c..41e2f514d26a 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -864,7 +864,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl) { pFileWin->OpenRoot( aURL ); pIconWin->InvalidateIconControl(); - aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False ); + aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false ); } return 0; } @@ -901,7 +901,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl) IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl) { pFrameWin->OpenFile( "", sal_True, sal_False, sal_False ); - aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False ); + aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false ); OUString sURL = pFileWin->GetFolderURL(); sal_uLong nPos = pIconWin->GetRootPos( sURL ); @@ -1065,9 +1065,9 @@ void SvtTemplateWindow::InitToolBoxes() aFrameWinTB.SetOutStyle( TOOLBOX_STYLE_FLAT ); } - aFileViewTB.EnableItem( TI_DOCTEMPLATE_BACK, sal_False ); - aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, sal_False ); - aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False ); + aFileViewTB.EnableItem( TI_DOCTEMPLATE_BACK, false ); + aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, false ); + aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, false ); Link aLink = LINK( this, SvtTemplateWindow, ClickHdl_Impl ); aFileViewTB.SetClickHdl( aLink ); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index c873f6a2c4cb..c7c1cd4f59fe 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -180,9 +180,9 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, pOwnData->aTimer.SetTimeout( 100 ); pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, false ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, false ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, false ); } SvxIMapDlg::~SvxIMapDlg() @@ -599,9 +599,9 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) if ( !rInfo.bOneMarked ) { aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, false ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, false ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, false ); aStbStatus.SetItemText( 1, aStr ); aFtURL.Disable(); @@ -616,10 +616,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) } else { - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, true ); aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, true ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, true ); aFtURL.Enable(); maURLBox.Enable(); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index ed1ec44e2da5..fb483ed01a3d 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -777,8 +777,8 @@ void GalleryBrowser2::SelectTheme( const OUString& rThemeName ) Resize(); ImplUpdateViews( 1 ); - maViewBox.EnableItem( TBX_ID_ICON, sal_True ); - maViewBox.EnableItem( TBX_ID_LIST, sal_True ); + maViewBox.EnableItem( TBX_ID_ICON, true ); + maViewBox.EnableItem( TBX_ID_LIST, true ); maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True ); if(maInfoBar.GetText().isEmpty()) @@ -806,8 +806,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpIconView->Show(); - maViewBox.EnableItem( TBX_ID_ICON, sal_True ); - maViewBox.EnableItem( TBX_ID_LIST, sal_True ); + maViewBox.EnableItem( TBX_ID_ICON, true ); + maViewBox.EnableItem( TBX_ID_LIST, true ); maViewBox.CheckItem( TBX_ID_ICON, sal_True ); maViewBox.CheckItem( TBX_ID_LIST, sal_False ); @@ -824,8 +824,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpListView->Show(); - maViewBox.EnableItem( TBX_ID_ICON, sal_True ); - maViewBox.EnableItem( TBX_ID_LIST, sal_True ); + maViewBox.EnableItem( TBX_ID_ICON, true ); + maViewBox.EnableItem( TBX_ID_LIST, true ); maViewBox.CheckItem( TBX_ID_ICON, sal_False ); maViewBox.CheckItem( TBX_ID_LIST, sal_True ); @@ -854,8 +854,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND ) mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); - maViewBox.EnableItem( TBX_ID_ICON, sal_False ); - maViewBox.EnableItem( TBX_ID_LIST, sal_False ); + maViewBox.EnableItem( TBX_ID_ICON, false ); + maViewBox.EnableItem( TBX_ID_LIST, false ); } } break; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 219d8fcddc97..f307c20e9221 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -538,15 +538,15 @@ void ParaPropertyPanel::VertStateChanged(sal_uInt16 nSID, SfxItemState eState, c mpTBxVertAlign->SetItemState(nIdVertTop, STATE_NOCHECK); mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_NOCHECK); mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_NOCHECK); - mpTBxVertAlign->EnableItem(nIdVertTop, sal_False); - mpTBxVertAlign->EnableItem(nIdVertCenter, sal_False); - mpTBxVertAlign->EnableItem(nIdVertBottom, sal_False); + mpTBxVertAlign->EnableItem(nIdVertTop, false); + mpTBxVertAlign->EnableItem(nIdVertCenter, false); + mpTBxVertAlign->EnableItem(nIdVertBottom, false); } else { - mpTBxVertAlign->EnableItem(nIdVertTop, sal_True); - mpTBxVertAlign->EnableItem(nIdVertCenter, sal_True); - mpTBxVertAlign->EnableItem(nIdVertBottom, sal_True); + mpTBxVertAlign->EnableItem(nIdVertTop, true); + mpTBxVertAlign->EnableItem(nIdVertCenter, true); + mpTBxVertAlign->EnableItem(nIdVertBottom, true); if ( (eState >= SFX_ITEM_DEFAULT) && (pState->ISA(SfxBoolItem))) { const SfxBoolItem* pItem= (const SfxBoolItem*)pState; @@ -1163,16 +1163,16 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat const sal_uInt16 nIdIncrIndent = mpTbxIndent_IncDec->GetItemId(UNO_INCREMENTINDENT); const sal_uInt16 nIdDecrIndent = mpTbxIndent_IncDec->GetItemId(UNO_DECREMENTINDENT); - mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_True); + mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, true); if ( maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Text) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Default) && maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) { - mpTbxIndent_IncDec->EnableItem(nIdIncrIndent, sal_True); - mpTbxIndent_IncDec->EnableItem(nIdDecrIndent, sal_True); + mpTbxIndent_IncDec->EnableItem(nIdIncrIndent, true); + mpTbxIndent_IncDec->EnableItem(nIdDecrIndent, true); } - mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_True); + mpTbxProDemote->EnableItem(nIdHangingIndent2, true); } else if( eState == SFX_ITEM_DISABLED ) { @@ -1185,10 +1185,10 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) mpTbxIndent_IncDec->Disable(); else - mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_False); + mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false); // maTbxProDemote->Disable(); - mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_False); + mpTbxProDemote->EnableItem(nIdHangingIndent2, false); } else { @@ -1200,8 +1200,8 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat maContext.GetCombinedContext_DI() != CombinedEnumContext(Application_WriterVariants, Context_Table) ) mpTbxIndent_IncDec->Disable(); else - mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, sal_False); - mpTbxProDemote->EnableItem(nIdHangingIndent2, sal_False); + mpTbxIndent_IncDec->EnableItem(nIdHangingIndent, false); + mpTbxProDemote->EnableItem(nIdHangingIndent2, false); } } @@ -1276,15 +1276,15 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE); if(mbOutLineLeft) - mpTbxProDemote->EnableItem(nIdDemote, sal_True); + mpTbxProDemote->EnableItem(nIdDemote, true); else - mpTbxProDemote->EnableItem(nIdDemote, sal_False); + mpTbxProDemote->EnableItem(nIdDemote, false); const sal_uInt16 nIdPromote = mpTbxProDemote->GetItemId(UNO_PROMOTE); if(mbOutLineRight) - mpTbxProDemote->EnableItem(nIdPromote, sal_True); + mpTbxProDemote->EnableItem(nIdPromote, true); else - mpTbxProDemote->EnableItem(nIdPromote, sal_False); + mpTbxProDemote->EnableItem(nIdPromote, false); } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 9a425d202b2c..04b141e4914b 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -427,12 +427,12 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_DOWNSEARCH ) { - pToolBox->EnableItem(i, sal_False); + pToolBox->EnableItem(i, false); m_nDownSearchId = i; } else if ( sItemCommand == COMMAND_UPSEARCH ) { - pToolBox->EnableItem(i, sal_False); + pToolBox->EnableItem(i, false); m_nUpSearchId = i; } } @@ -486,16 +486,16 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) if (!m_pFindTextFieldControl->GetText().isEmpty()) { if ( !pToolBox->IsItemEnabled(m_nDownSearchId) ) - pToolBox->EnableItem(m_nDownSearchId, sal_True); + pToolBox->EnableItem(m_nDownSearchId, true); if ( !pToolBox->IsItemEnabled(m_nUpSearchId) ) - pToolBox->EnableItem(m_nUpSearchId, sal_True); + pToolBox->EnableItem(m_nUpSearchId, true); } else { if ( pToolBox->IsItemEnabled(m_nDownSearchId) ) - pToolBox->EnableItem(m_nDownSearchId, sal_False); + pToolBox->EnableItem(m_nDownSearchId, false); if ( pToolBox->IsItemEnabled(m_nUpSearchId) ) - pToolBox->EnableItem(m_nUpSearchId, sal_False); + pToolBox->EnableItem(m_nUpSearchId, false); } } diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 8ea1cb171028..6c8bd8e39621 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -70,7 +70,7 @@ struct ImplToolItem ToolBoxItemBits mnBits; TriState meState; sal_uInt16 mnId; - sal_Bool mbEnabled:1, + bool mbEnabled:1, mbVisible:1, mbEmptyBtn:1, mbShowWindow:1, diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 9a54b3f97a8a..3cc5a8ffc6de 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1817,7 +1817,7 @@ sal_Bool ToolBox::ImplCalcItem() sal_Bool bImage; sal_Bool bText; - it->mbVisibleText = sal_False; // indicates if text will definitely be drawn, influences dropdown pos + it->mbVisibleText = false; // indicates if text will definitely be drawn, influences dropdown pos if ( it->meType == TOOLBOXITEM_BUTTON ) { @@ -1834,7 +1834,7 @@ sal_Bool ToolBox::ImplCalcItem() if ( bImage || bText ) { - it->mbEmptyBtn = sal_False; + it->mbEmptyBtn = false; if ( tmpButtonType == BUTTON_SYMBOL ) { @@ -1847,7 +1847,7 @@ sal_Bool ToolBox::ImplCalcItem() { it->maItemSize = Size( GetCtrlTextWidth( it->maText )+TB_TEXTOFFSET, GetTextHeight() ); - it->mbVisibleText = sal_True; + it->mbVisibleText = true; } } else if ( tmpButtonType == BUTTON_TEXT ) @@ -1857,7 +1857,7 @@ sal_Bool ToolBox::ImplCalcItem() { it->maItemSize = Size( GetCtrlTextWidth( it->maText )+TB_TEXTOFFSET, GetTextHeight() ); - it->mbVisibleText = sal_True; + it->mbVisibleText = true; } else { @@ -1885,7 +1885,7 @@ sal_Bool ToolBox::ImplCalcItem() else { // no image and no text it->maItemSize = Size( nDefWidth, nDefHeight ); - it->mbEmptyBtn = sal_True; + it->mbEmptyBtn = true; } // save the content size @@ -2099,7 +2099,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool b nLineWidth = 0; nLineStart = it - mpData->m_aItems.begin(); nGroupStart = nLineStart; - it->mbBreak = sal_True; + it->mbBreak = true; bBreak = sal_False; } else @@ -2229,7 +2229,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems ) { if ( it->meType == TOOLBOXITEM_SEPARATOR ) { - it->mbVisible = sal_False; + it->mbVisible = false; if ( !bLastSep ) { // check if any visible items have to appear behind it @@ -2239,7 +2239,7 @@ static void lcl_hideDoubleSeparators( std::vector< ImplToolItem >& rItems ) if ( ((temp_it->meType == TOOLBOXITEM_BUTTON) && temp_it->mbVisible) ) { - it->mbVisible = sal_True; + it->mbVisible = true; break; } } @@ -2521,7 +2521,7 @@ void ToolBox::ImplFormat( sal_Bool bResize ) it = mpData->m_aItems.begin(); while ( it != mpData->m_aItems.end() ) { - it->mbShowWindow = sal_False; + it->mbShowWindow = false; // check for line break and advance nX/nY accordingly if ( it->mbBreak ) diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index aced93fe6617..3fc9e3e85d83 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -105,11 +105,11 @@ void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; - mbEnabled = sal_True; - mbVisible = sal_True; + mbEnabled = true; + mbVisible = true; mbEmptyBtn = bEmptyBtn; - mbShowWindow = sal_False; - mbBreak = sal_False; + mbShowWindow = false; + mbBreak = false; mnSepSize = TB_SEP_SIZE; mnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH; mnImageAngle = 0; @@ -248,7 +248,7 @@ Size ImplToolItem::GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWid { aSize.Width() = aWinSize.Width(); aSize.Height() = aWinSize.Height(); - mbShowWindow = sal_True; + mbShowWindow = true; } else { @@ -831,7 +831,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos ) // Item anlegen und in die Liste einfuegen ImplToolItem aItem; aItem.meType = TOOLBOXITEM_SPACE; - aItem.mbEnabled = sal_False; + aItem.mbEnabled = false; mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); mpData->ImplClearLayoutData(); @@ -849,7 +849,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) // Item anlegen und in die Liste einfuegen ImplToolItem aItem; aItem.meType = TOOLBOXITEM_SEPARATOR; - aItem.mbEnabled = sal_False; + aItem.mbEnabled = false; if ( nPixSize ) aItem.mnSepSize = nPixSize; mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); @@ -869,7 +869,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos ) // Item anlegen und in die Liste einfuegen ImplToolItem aItem; aItem.meType = TOOLBOXITEM_BREAK; - aItem.mbEnabled = sal_False; + aItem.mbEnabled = false; mpData->m_aItems.insert( (nPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nPos : mpData->m_aItems.end(), aItem ); mpData->ImplClearLayoutData(); @@ -931,7 +931,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, ImplToolItem aNewItem = rToolBox.mpData->m_aItems[nPos]; // Bestimme Daten zuruecksetzen aNewItem.mpWindow = NULL; - aNewItem.mbShowWindow = sal_False; + aNewItem.mbShowWindow = false; mpData->m_aItems.insert( (nNewPos < mpData->m_aItems.size()) ? mpData->m_aItems.begin()+nNewPos : mpData->m_aItems.end(), aNewItem ); mpData->ImplClearLayoutData(); @@ -1755,7 +1755,7 @@ TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) +void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1763,7 +1763,7 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) { ImplToolItem* pItem = &mpData->m_aItems[nPos]; if ( bEnable ) - bEnable = sal_True; + bEnable = true; if ( pItem->mbEnabled != bEnable ) { pItem->mbEnabled = bEnable; @@ -1799,7 +1799,7 @@ sal_Bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::ShowItem( sal_uInt16 nItemId, sal_Bool bVisible ) +void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible ) { sal_uInt16 nPos = GetItemPos( nItemId ); mpData->ImplClearLayoutData(); |