[Libreoffice-commits] core.git: framework/inc

[Stephan Bergmann]

 framework/inc/uielement/menubarmanager.hxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 34806c91fb790dc8ab196b492dea82d87344b412
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Apr 12 18:13:15 2016 +0200

    Don't use bitfield bool members in MenuBarManager
    
    For one, there's likely few enough instances of MenuBarManager that the code
    pessimization of using bitfields probably weighs worse than the space
    optimization.  For another, the code generated by at least Clang trunk tends to
    confuse Valgrind, <https://bugs.kde.org/show_bug.cgi?id=242137> "Valgrind on
    LLVM compiled code reports tons of 'Conditional jump or move depends on
    uninitialised' false positives".
    
    Change-Id: I4c2ef22e7e54e2a220e2cb490ca0566af4f81f52

diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 394d0a3..0405df3 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -202,15 +202,15 @@ class MenuBarManager : public css::frame::XStatusListener                ,
         void             Init(const css::uno::Reference< css::frame::XFrame >& rFrame,Menu* pAddonMenu,bool bDelete,bool bDeleteChildren,bool _bHandlePopUp);
         void             SetHdl();
 
-        bool                                                         m_bDisposed : 1,
-                                                                     m_bInitialized : 1,
-                                                                     m_bDeleteMenu : 1,
-                                                                     m_bDeleteChildren : 1,
-                                                                     m_bActive : 1,
-                                                                     m_bIsBookmarkMenu : 1,
-                                                                     m_bShowMenuImages : 1;
-        bool                                                         m_bRetrieveImages : 1,
-                                                                     m_bAcceleratorCfg : 1;
+        bool                                                         m_bDisposed;
+        bool                                                         m_bInitialized;
+        bool                                                         m_bDeleteMenu;
+        bool                                                         m_bDeleteChildren;
+        bool                                                         m_bActive;
+        bool                                                         m_bIsBookmarkMenu;
+        bool                                                         m_bShowMenuImages;
+        bool                                                         m_bRetrieveImages;
+        bool                                                         m_bAcceleratorCfg;
         bool                                                         m_bModuleIdentified;
         bool                                                         m_bHasMenuBar;
         OUString                                                     m_aMenuItemCommand;