diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-21 17:04:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-21 17:04:46 +0100 |
| commit | ed9af64644daad7abe6c839b02a89f5c2ef2ae80 (patch) | |
| tree | fab63acc2d604c72b29ea4d2c89533348786d633 | |
| parent | a375d0c539ac8ccd23a96c8e615a246aa3f374a7 (diff) | |
Just use plain bool here
Change-Id: I82c19f2f0e0ef88497db54f426c91af2aee0bc99
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtksalmenu.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7435e375baf1..95789a0fa1d2 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -92,8 +92,8 @@ public: sal_uInt16 nId, const gchar* aCommand, MenuItemBits nBits, - gboolean bChecked, - gboolean bIsSubmenu ); + bool bChecked, + bool bIsSubmenu ); void NativeSetEnableItem( gchar* aCommand, gboolean bEnable ); void NativeCheckItem( unsigned nSection, unsigned nItemPos, MenuItemBits bits, gboolean bCheck ); void NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ); diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx index 2b64f3fd6d37..6c904ced957e 100644 --- a/vcl/unx/gtk/gtksalmenu.cxx +++ b/vcl/unx/gtk/gtksalmenu.cxx @@ -286,7 +286,7 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) if ( g_strcmp0( aNativeCommand, "" ) != 0 && pSalMenuItem->mpSubMenu == nullptr ) { - NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, bChecked, FALSE ); + NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, bChecked, false ); NativeCheckItem( nSection, nItemPos, itemBits, bChecked ); NativeSetEnableItem( aNativeCommand, bEnabled ); @@ -297,7 +297,7 @@ void GtkSalMenu::ImplUpdate(bool bRecurse, bool bRemoveDisabledEntries) if ( pSubmenu && pSubmenu->GetMenu() ) { - bool bNonMenuChangedToMenu = NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, FALSE, TRUE ); + bool bNonMenuChangedToMenu = NativeSetItemCommand( nSection, nItemPos, nId, aNativeCommand, itemBits, false, true ); pNewCommandList = g_list_append( pNewCommandList, g_strdup( aNativeCommand ) ); GLOMenu* pSubMenuModel = g_lo_menu_get_submenu_from_item_in_section( pLOMenu, nSection, nItemPos ); @@ -803,8 +803,8 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection, sal_uInt16 nId, const gchar* aCommand, MenuItemBits nBits, - gboolean bChecked, - gboolean bIsSubmenu ) + bool bChecked, + bool bIsSubmenu ) { bool bSubMenuAddedOrRemoved = false; @@ -847,7 +847,7 @@ bool GtkSalMenu::NativeSetItemCommand( unsigned nSection, if ( aCurrentCommand == nullptr || g_strcmp0( aCurrentCommand, aCommand ) != 0 ) { - gboolean bOldHasSubmenu = g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos) != nullptr; + bool bOldHasSubmenu = g_lo_menu_get_submenu_from_item_in_section(pMenu, nSection, nItemPos) != nullptr; bSubMenuAddedOrRemoved = bOldHasSubmenu != bIsSubmenu; if (bSubMenuAddedOrRemoved) { |