[Libreoffice-commits] core.git: 2 commits - svx/source vcl/inc vcl/unx

[Stephan Bergmann]

 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 vcl/inc/unx/gtk/gtksalmenu.hxx   |    4 ++--
 vcl/unx/gtk/gtksalmenu.cxx       |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ed9af64644daad7abe6c839b02a89f5c2ef2ae80
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 21 17:04:46 2016 +0100

    Just use plain bool here
    
    Change-Id: I82c19f2f0e0ef88497db54f426c91af2aee0bc99

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 7435e37..95789a0 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 2b64f3f..6c904ce 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)
         {
commit a375d0c539ac8ccd23a96c8e615a246aa3f374a7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 21 17:04:28 2016 +0100

    Redundant explicit cast to void*
    
    Change-Id: Ife89d8362031534169c5e70ff09e20c916cd61f8

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 96e79d5..50a55a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1919,7 +1919,7 @@ SvxCurrencyList_Impl::SvxCurrencyList_Impl(
     {
         m_pCurrencyLb->InsertEntry (*i);
         OUString *pFormatStr = &m_aFormatEntries[nPos];
-        m_pCurrencyLb->SetEntryData( nPos, static_cast<void*>( pFormatStr ) );
+        m_pCurrencyLb->SetEntryData( nPos, pFormatStr );
         if( *pFormatStr == m_rSelectedFormat )
             nSelectedPos = nPos;
     }