diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-14 14:43:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-18 11:26:05 +0200 |
| commit | 399724aba4b7297a262a775d000ddf4534e38b6c (patch) | |
| tree | 6d45b2e8e0f597e36f89454db6948740462b4520 /sfx2/source/menu | |
| parent | 96ef76c1b75332e4b8379276e396ea623153644d (diff) | |
sfx2: sal_Bool->bool
Change-Id: I128430fe446eb517b42a109a868b88d49bbc4eaa
Diffstat (limited to 'sfx2/source/menu')
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 56901f794d4d..b40e8924d40a 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -110,7 +110,7 @@ void SfxMenuControl::Bind( // Constructor for explicit registration -SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) +SfxMenuControl::SfxMenuControl( bool bShowStrings ) : pOwnMenu(0), pSubMenu(0), b_ShowStrings(bShowStrings) @@ -123,7 +123,7 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings ) SfxMenuControl::SfxMenuControl(): pOwnMenu(0), pSubMenu(0), - b_ShowStrings(sal_False) + b_ShowStrings(false) { } @@ -133,7 +133,7 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings): SfxControllerItem(nSlotId, rBindings), pOwnMenu(0), pSubMenu(0), - b_ShowStrings(sal_False) + b_ShowStrings(false) { // This constructor should make it possible already during the design // to fall back to the bindings, but can as always be bound later. @@ -240,7 +240,7 @@ void SfxMenuControl::StateChanged SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ ) { - return new SfxMenuControl( sal_True ); + return new SfxMenuControl( true ); } void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod ) @@ -333,7 +333,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); OUString sIconTheme = rSettings.DetermineIconTheme(); - sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus(); + bool bShowMenuImages = rSettings.GetUseImagesInMenus(); if (( sIconTheme != m_sIconTheme ) || ( bShowMenuImages != m_bShowMenuImages )) @@ -349,7 +349,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) { if ( bShowMenuImages ) { - sal_Bool bImageSet = sal_False; + bool bImageSet = false; OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); @@ -363,7 +363,7 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu ) Image aImage = GetImage( xFrame, aImageId, false ); if ( !!aImage ) { - bImageSet = sal_True; + bImageSet = true; pActMenu->SetItemImage( nItemId, aImage ); } } diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 122d9335fef4..500af4453999 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -263,7 +263,7 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) pResMgr(NULL), nType(0) { - bAddClipboardFuncs = sal_False; + bAddClipboardFuncs = false; SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True ); Construct(*pVMenu); } |