diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
commit | e8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch) | |
tree | dae18a3acbf29c192118e7c003f80df8da8e21ae /framework/source/uielement | |
parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'framework/source/uielement')
9 files changed, 27 insertions, 27 deletions
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index e90bbaf8ce3c..22752cd2686d 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -225,7 +225,7 @@ void FontSizeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r { m_pHeightArray[nPos] = *pTempAry; nPos++; // Id is nPos+1 - pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, sal_True, sal_False ), MIB_RADIOCHECK | MIB_AUTOCHECK ); + pVCLPopupMenu->InsertItem( nPos, rI18nHelper.GetNum( *pTempAry, 1, true, false ), MIB_RADIOCHECK | MIB_AUTOCHECK ); fPoint = float( m_pHeightArray[nPos-1] ) / 10; // Create dispatchable .uno command and set it diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index cb37064d5612..1854b8761d90 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -147,7 +147,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra pVCLPopupMenu->SetItemCommand( nId, aCommand ); if ( bHeaderIsOn ) - pVCLPopupMenu->CheckItem( nId, sal_True ); + pVCLPopupMenu->CheckItem( nId, true ); ++nId; // Check if all entries have the same state diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 7a687814e36d..5749f0013257 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -253,7 +253,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup if (rStr == m_aCurLang && eMode == MODE_SetLanguageSelectionMenu ) { //make a sign for the current language - pPopupMenu->CheckItem( nItemId, sal_True ); + pPopupMenu->CheckItem( nItemId, true ); } ++nItemId; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 61b1aaa6fd28..ec6e8469257e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -486,7 +486,7 @@ throw ( RuntimeException ) if ( Event.State >>= bCheckmark ) { // Checkmark or RadioButton - m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True ); + m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, bCheckmark ); MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId ); @@ -517,7 +517,7 @@ throw ( RuntimeException ) aItemText = aTmp; } - m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True ); + m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); m_pVCLMenu->SetItemText( pMenuItemHandler->nItemId, aItemText ); } else if ( Event.State >>= aVisibilityStatus ) @@ -526,7 +526,7 @@ throw ( RuntimeException ) m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, aVisibilityStatus.bVisible ); } else - m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, sal_True ); + m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); } if ( Event.Requery ) @@ -949,7 +949,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) } } else if ( !bPopupMenu ) - pMenu->EnableItem( pMenuItemHandler->nItemId, sal_False ); + pMenu->EnableItem( pMenuItemHandler->nItemId, false ); } } else if ( pMenuItemHandler->xPopupMenuController.is() ) @@ -1727,7 +1727,7 @@ void MenuBarManager::FillMenu( pMenu->HideItem( nId ); if ( !bEnabled) - pMenu->EnableItem( nId, sal_False ); + pMenu->EnableItem( nId, false ); if ( xIndexContainer.is() ) { diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 36c38e209ba8..f16bf43fc9e0 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -182,12 +182,12 @@ PopupMenuToolbarController::createPopupWindow() if ( !pToolBox ) return xRet; - pToolBox->SetItemDown( m_nToolBoxId, sal_True ); + pToolBox->SetItemDown( m_nToolBoxId, true ); sal_uInt16 nId = m_xPopupMenu->execute( css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ), VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ), css::awt::PopupMenuDirection::EXECUTE_DEFAULT ); - pToolBox->SetItemDown( m_nToolBoxId, sal_False ); + pToolBox->SetItemDown( m_nToolBoxId, false ); if ( nId ) functionExecuted( m_xPopupMenu->getCommand( nId ) ); diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 98c8df144e03..9669cf7364ea 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -113,11 +113,11 @@ throw (uno::RuntimeException) pStatusBar->StartProgressMode( Text ); else { - pStatusBar->SetUpdateMode( sal_False ); + pStatusBar->SetUpdateMode( false ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); pStatusBar->SetProgressValue( sal_uInt16( nValue )); - pStatusBar->SetUpdateMode( sal_True ); + pStatusBar->SetUpdateMode( true ); } pStatusBar->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE ); } @@ -179,11 +179,11 @@ throw (uno::RuntimeException) StatusBar* pStatusBar = (StatusBar *)pWindow; if( pStatusBar->IsProgressMode() ) { - pStatusBar->SetUpdateMode( sal_False ); + pStatusBar->SetUpdateMode( false ); pStatusBar->EndProgressMode(); pStatusBar->StartProgressMode( Text ); pStatusBar->SetProgressValue( sal_uInt16( nValue )); - pStatusBar->SetUpdateMode( sal_True ); + pStatusBar->SetUpdateMode( true ); } else pStatusBar->SetText( Text ); diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx index 0bfe4c58d5e4..4a15b3a33495 100644 --- a/framework/source/uielement/statusbaritem.cxx +++ b/framework/source/uielement/statusbaritem.cxx @@ -236,7 +236,7 @@ throw (RuntimeException) if ( !m_pStatusBar ) return; - if ( bVisible != m_pStatusBar->IsItemVisible( m_nId ) ) + if ( bool(bVisible) != m_pStatusBar->IsItemVisible( m_nId ) ) { if ( bVisible ) m_pStatusBar->ShowItem( m_nId ); diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 58bddcecfb67..03068017932d 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -119,15 +119,15 @@ throw (::com::sun::star::uno::RuntimeException) OUString aLabel( m_aDropdownMenuList[i] ); aPopup.InsertItem( sal_uInt16( i+1 ), aLabel ); if ( aLabel == m_aCurrentSelection ) - aPopup.CheckItem( sal_uInt16( i+1 ), sal_True ); + aPopup.CheckItem( sal_uInt16( i+1 ), true ); else - aPopup.CheckItem( sal_uInt16( i+1 ), sal_False ); + aPopup.CheckItem( sal_uInt16( i+1 ), false ); } - m_pToolbar->SetItemDown( m_nID, sal_True ); + m_pToolbar->SetItemDown( m_nID, true ); aPopup.SetSelectHdl( LINK( this, ToggleButtonToolbarController, MenuSelectHdl )); aPopup.Execute( m_pToolbar, m_pToolbar->GetItemRect( m_nID )); - m_pToolbar->SetItemDown( m_nID, sal_False ); + m_pToolbar->SetItemDown( m_nID, false ); } return xWindow; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 810fdf81b0b3..cecbb66ab78e 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -403,7 +403,7 @@ void ToolBarManager::UpdateImageOrientation() { if ( pIter->second.bRotated ) { - m_pToolBar->SetItemImageMirrorMode( nId, sal_False ); + m_pToolBar->SetItemImageMirrorMode( nId, false ); m_pToolBar->SetItemImageAngle( nId, m_lImageRotation ); } if ( pIter->second.bMirrored ) @@ -1708,25 +1708,25 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const if ( !bIsFloating ) { - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, sal_False ); - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, sal_False ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false ); Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY ); if( xDockable.is() ) aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() ); } else - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false ); if ( SvtMiscOptions().DisableUICustomization() ) { - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False ); - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False ); - aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false ); + aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false ); } // Disable menu item CLOSE if the toolbar has no closer if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) ) - aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, sal_False); + aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false); for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos ) { |