getting rid of warnings as far as possible

10 files changed, 148 insertions, 142 deletions

diff --git a/framework/source/lomenubar/DesktopJob.cxx b/framework/source/lomenubar/DesktopJob.cxx
index 425deb54dc..2913215c40 100644
--- a/framework/source/lomenubar/DesktopJob.cxx
+++ b/framework/source/lomenubar/DesktopJob.cxx
@@ -70,23 +70,23 @@ using com::sun::star::uno::XInterface;
 
 //-------------------------- D-Bus Callbacks ----------------------------------
 static void
-on_bus (GDBusConnection * connection,
-        const gchar * name,
-        gpointer user_data)
+on_bus (GDBusConnection * /*connection*/,
+        const gchar * /*name*/,
+        gpointer /*user_data*/)
 {
     //TODO: Should we actually do something here?
     return;
 }
 
 static void
-name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+name_lost (GDBusConnection * /*connection*/, const gchar * name, gpointer /*user_data*/)
 {
     g_error ("Unable to get name '%s' on DBus", name);
     return;
 }
 
 // --------------------------- DesktopJob ----------------------------------
-Any SAL_CALL DesktopJob::execute( const Sequence< NamedValue >& aArguments )
+Any SAL_CALL DesktopJob::execute( const Sequence< NamedValue >& /*aArguments*/ )
     throw ( IllegalArgumentException, Exception, RuntimeException )
 {
     g_type_init ();
diff --git a/framework/source/lomenubar/FrameHelper.cxx b/framework/source/lomenubar/FrameHelper.cxx
index b45cf0f911..f9998deafa 100644
--- a/framework/source/lomenubar/FrameHelper.cxx
+++ b/framework/source/lomenubar/FrameHelper.cxx
@@ -62,7 +62,10 @@
 #include <rtl/process.h>
 
 #include <gio/gio.h>
+//#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/client.h>
+//#pragma GCC diagnostic pop
 #include <libdbusmenu-gtk/menuitem.h>
 
 using rtl::OUString;
@@ -112,7 +115,7 @@ using com::sun::star::util::XURLTransformer;
 // ------------------------ Item callbacks ---------------------------
 // Item activated. It distpatches the command associated to a given menu item.
 void
-item_activated (DbusmenuMenuitem *item, guint timestamp, gpointer user_data)
+item_activated (DbusmenuMenuitem *item, guint /*timestamp*/, gpointer user_data)
 {
     FrameHelper *helper =  (FrameHelper*)user_data;
     OUString command = OUString::createFromAscii(dbusmenu_menuitem_property_get (item, "CommandURL"));
@@ -195,114 +198,114 @@ FrameHelper::FrameHelper(const Reference< XMultiServiceFactory >&  rServiceManag
                          const Reference< XFrame >&        xFrame,
                          DbusmenuServer*                   server)
 {
-    xMSF = rServiceManager;
-    this->xFrame = xFrame;
-    this->server = server;
+    m_xMSF = rServiceManager;
+    this->m_xFrame = xFrame;
+    this->m_server = server;
     
     //Get xUICommands database (to retrieve labels, see FrameJob::getLabelFromCommandURL ())                                          
-    Reference < XNameAccess > xNameAccess (xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.UICommandDescription")),
+    Reference < XNameAccess > xNameAccess (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.UICommandDescription")),
                                            UNO_QUERY);
-    xMM = Reference < XModuleManager> (xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.ModuleManager")),
+    m_xMM = Reference < XModuleManager> (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.ModuleManager")),
                                        UNO_QUERY);
-    xNameAccess->getByName(xMM->identify(xFrame)) >>= xUICommands;
+    xNameAccess->getByName(m_xMM->identify(xFrame)) >>= m_xUICommands;
     
-    xdp = Reference < XDispatchProvider > (xFrame, UNO_QUERY);
-    xTrans = Reference < XURLTransformer > (xMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY);
+    m_xdp = Reference < XDispatchProvider > (xFrame, UNO_QUERY);
+    m_xTrans = Reference < XURLTransformer > (m_xMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY);
     
-    xSL = (XStatusListener*)new MenuItemStatusListener (this);
+    m_xSL = (XStatusListener*)new MenuItemStatusListener (this);
                                               
     // This initializes the shortcut database
-    getAcceleratorConfigurations (xFrame->getController()->getModel (), xMM);
+    getAcceleratorConfigurations (xFrame->getController()->getModel (), m_xMM);
 
     // This information is needed for the dynamic submenus
-    xPCF = Reference < XMultiComponentFactory > (xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.PopupMenuControllerFactory")),
+    m_xPCF = Reference < XMultiComponentFactory > (m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.PopupMenuControllerFactory")),
                                                  UNO_QUERY);
     
 
     // This is a hash table that maps Command URLs to MenuItemInfo classes
     //   to cache command information
-    commandsInfo = g_hash_table_new_full (g_str_hash,
+    m_commandsInfo = g_hash_table_new_full (g_str_hash,
                                           g_str_equal,
                                           g_free,
                                           destroy_menu_item_info);
 
     // These are the arguments needed for the XPopupMenuController
-    args = Sequence < Any > (2);    
+    m_args = Sequence < Any > (2);
     PropertyValue item;
     
     item.Name = OUString::createFromAscii("ModuleName");
-    item.Value <<= xMM->identify (xFrame);
-    args[0] <<= item;
+    item.Value <<= m_xMM->identify (xFrame);
+    m_args[0] <<= item;
     
     item.Name = OUString::createFromAscii("Frame");
     item.Value <<= xFrame;
-    args[1] <<= item;
+    m_args[1] <<= item;
     
-    root = NULL;
-    watcher_set = FALSE;
+    m_root = NULL;
+    m_watcher_set = FALSE;
 
     //This variable prevents the helper from being disconnected from the frame
     //for special cases of component dettaching like print preview
-    blockDetach = FALSE;
+    m_blockDetach = FALSE;
 }
 
 void SAL_CALL 
-FrameHelper::disposing (const EventObject& aEvent) throw (RuntimeException)
+FrameHelper::disposing (const EventObject& /*aEvent*/ ) throw (RuntimeException)
 {}
 
 FrameHelper::~FrameHelper()
 {
-    if (server)
-        g_object_unref (server);
+    if (m_server)
+        g_object_unref (m_server);
 
-    if (watcher_set)
-        g_bus_unwatch_name (watcher);
+    if (m_watcher_set)
+        g_bus_unwatch_name (m_watcher);
         
-    g_hash_table_destroy (commandsInfo);
+    g_hash_table_destroy (m_commandsInfo);
 }
 
 void
 FrameHelper::setRootItem (DbusmenuMenuitem *root)
 {
-    this->root = root;
+    this->m_root = root;
 }
 
 void
 FrameHelper::setRegistrarWatcher (guint watcher)
 {
-    watcher_set = TRUE;
-    this->watcher = watcher;
+    m_watcher_set = TRUE;
+    this->m_watcher = watcher;
 }
 
 void
 FrameHelper::setServer (DbusmenuServer *server)
 {
-    this->server = server;
+    this->m_server = server;
 }
 
 //Getters
 Reference < XFrame >
 FrameHelper::getFrame ()
 {
-    return xFrame;
+    return m_xFrame;
 }
 
 XStatusListener*
 FrameHelper::getStatusListener ()
 {
-    return xSL;
+    return m_xSL;
 }
 
 GHashTable*
 FrameHelper::getCommandsInfo ()
 {
-    return commandsInfo;
+    return m_commandsInfo;
 }
 
 unsigned long
 FrameHelper::getXID ()
 {
-    Reference< XSystemDependentWindowPeer > xWin( xFrame->getContainerWindow(), UNO_QUERY );
+    Reference< XSystemDependentWindowPeer > xWin( m_xFrame->getContainerWindow(), UNO_QUERY );
 
     if (!xWin.is())
         return 0;
@@ -326,9 +329,9 @@ FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException
 
     //This is a special case, .uno:printPreview detaches the component but we are
     //not actually switching to another document.
-    if (blockDetach)
+    if (m_blockDetach)
     {
-        blockDetach = TRUE;
+        m_blockDetach = TRUE;
         return;
     }
 
@@ -337,8 +340,8 @@ FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException
         GError *error = NULL;
         
         
-        xFrame->removeFrameActionListener (this);
-        Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
+        m_xFrame->removeFrameActionListener (this);
+        Reference< XPropertySet > frameProps (m_xFrame, UNO_QUERY);
         Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString::createFromAscii("LayoutManager")),
                                                     UNO_QUERY);
         xLayoutManager->showElement (OUString::createFromAscii("private:resource/menubar/menubar"));
@@ -375,17 +378,17 @@ FrameHelper::frameAction(const FrameActionEvent& action) throw (RuntimeException
             g_error_free (error);
         }
         
-        if (server)
+        if (m_server)
         {
-            g_object_unref (server);
-            server = NULL;
-            root = NULL;
+            g_object_unref (m_server);
+            m_server = NULL;
+            m_root = NULL;
         }
 
-        if (watcher_set)
+        if (m_watcher_set)
         {
-            g_bus_unwatch_name (watcher);
-            watcher_set = FALSE;
+            g_bus_unwatch_name (m_watcher);
+            m_watcher_set = FALSE;
         }
         
         return;
@@ -492,11 +495,11 @@ FrameHelper::rebuildMenu (Reference < XMenu >  xMenu,
 
         // Lookup for a MenuItemInfo object for this menuitem, create one if it doesn't exist
         // this object caches the values that change on status updates.
-        MenuItemInfo* commInfo = (MenuItemInfo*)g_hash_table_lookup (commandsInfo, (gconstpointer)command.getStr());
+        MenuItemInfo* commInfo = (MenuItemInfo*)g_hash_table_lookup (m_commandsInfo, (gconstpointer)command.getStr());
         if (!commInfo)
         {
             commInfo = new MenuItemInfo ();
-            g_hash_table_insert (commandsInfo, g_strdup (command.getStr()), commInfo);
+            g_hash_table_insert (m_commandsInfo, g_strdup (command.getStr()), commInfo);
 
             OUString oULabel = getLabelFromCommandURL(oUCommand);
             if (oULabel.getLength() == 0)
@@ -534,11 +537,11 @@ FrameHelper::rebuildMenu (Reference < XMenu >  xMenu,
         // Adding status listener
         URL commandURL;
         commandURL.Complete = oUCommand;
-        xTrans->parseStrict (commandURL);
+        m_xTrans->parseStrict (commandURL);
 
-        Reference < XDispatch > xDispatch  = xdp->queryDispatch (commandURL, OUString(), 0);
+        Reference < XDispatch > xDispatch  = m_xdp->queryDispatch (commandURL, OUString(), 0);
         if (xDispatch.is())
-            xDispatch->addStatusListener (xSL, commandURL);
+            xDispatch->addStatusListener (m_xSL, commandURL);
 
         Reference < XPopupMenu > subPopMenu (xMenu->getPopupMenu (id), UNO_QUERY);
         
@@ -546,16 +549,16 @@ FrameHelper::rebuildMenu (Reference < XMenu >  xMenu,
         //we need to access that info through a special XPopupMenuController
         if (isSpecialSubmenu (oUCommand))
         {
-            Reference < XPropertySet > xMSFProps (xMSF, UNO_QUERY);
+            Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY);
             Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString::createFromAscii ("DefaultContext")),
                                                     UNO_QUERY);
 
-            Reference < XPopupMenuController > xRFC (xPCF->createInstanceWithArgumentsAndContext(oUCommand,
-                                                                                                 args,
+            Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(oUCommand,
+                                                                                                 m_args,
                                                                                                  xContext),
                                                      UNO_QUERY);
 
-            Reference < XPopupMenu > xPO (xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")),
+            Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")),
                                           UNO_QUERY);
 
             if (xRFC.is () && xPO.is ())
@@ -601,12 +604,12 @@ FrameHelper::getLabelFromCommandURL (OUString commandURL)
     if (commandURL.getLength () < 1)
         return label;
     
-    if (!xUICommands.is())
+    if (!m_xUICommands.is())
         return label;
     
     try
     {
-        xUICommands->getByName (commandURL) >>= commandProps;
+        m_xUICommands->getByName (commandURL) >>= commandProps;
     }
     catch (com::sun::star::container::NoSuchElementException e)
     {
@@ -646,7 +649,7 @@ FrameHelper::rebuildMenuFromRoot ()
     if (!xMenu.is ())
         return;
 
-    rebuildMenu (xMenu, root);
+    rebuildMenu (xMenu, m_root);
 }
 
 //Some menus are special, this is the list of them
@@ -677,7 +680,7 @@ void
 FrameHelper::dispatchCommand (OUString command)
 {
     OUString target = OUString::createFromAscii ("");
-    Reference < XDispatchHelper > xdh (xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))),
+    Reference < XDispatchHelper > xdh (m_xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))),
                                        UNO_QUERY);
 
     //g_debug ("%s", OUStringToOString (command, RTL_TEXTENCODING_ASCII_US).getStr());
@@ -686,24 +689,24 @@ FrameHelper::dispatchCommand (OUString command)
     // when PrintPreview dettaches. See the frameAction method.
     if (command.equals (OUString::createFromAscii (".uno:PrintPreview")))
     {
-        blockDetach = TRUE;
+        m_blockDetach = TRUE;
     }
     
-    // This is a special case for the recentfilelist    
+    // This is a special case for the recentfilelist
     if (command.matchAsciiL ("vnd.sun.star.popup:RecentFileList", 33, 0))
     {
         target = OUString::createFromAscii ("_default");
         
-        Reference < XPropertySet > xMSFProps (xMSF, UNO_QUERY);             
+        Reference < XPropertySet > xMSFProps (m_xMSF, UNO_QUERY);
         Reference <XComponentContext> xContext (xMSFProps->getPropertyValue (OUString::createFromAscii ("DefaultContext")),
                                                 UNO_QUERY);
-        Reference < XPopupMenuController > xRFC (xPCF->createInstanceWithArgumentsAndContext(OUString::createFromAscii (".uno:RecentFileList"),
-                                                                                             args,
+        Reference < XPopupMenuController > xRFC (m_xPCF->createInstanceWithArgumentsAndContext(OUString::createFromAscii (".uno:RecentFileList"),
+                                                                                             m_args,
                                                                                              xContext),
                                                  UNO_QUERY);
         Reference < XMenuListener > xML (xRFC, UNO_QUERY);
         
-        Reference < XPopupMenu > xPO (xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")),
+        Reference < XPopupMenu > xPO (m_xMSF->createInstance(OUString::createFromAscii ("stardiv.Toolkit.VCLXPopupMenu")),
                                       UNO_QUERY);
         
         if (xRFC.is () && xPO.is ())
@@ -734,7 +737,7 @@ FrameHelper::dispatchCommand (OUString command)
     if (command.matchAsciiL ("private:factory/", 16, 0))
         target = OUString::createFromAscii ("_blank");
 
-    xdh->executeDispatch (Reference < XDispatchProvider > (xFrame, UNO_QUERY),
+    xdh->executeDispatch (Reference < XDispatchProvider > (m_xFrame, UNO_QUERY),
                           command,
                           target,
                           0,
@@ -750,19 +753,19 @@ FrameHelper::getAcceleratorConfigurations (Reference < XModel >        xModel,
     Reference< XUIConfigurationManagerSupplier > docUISupplier(xModel, UNO_QUERY);
     Reference< XUIConfigurationManager >         docUIManager = docUISupplier->getUIConfigurationManager();
     Reference< XAcceleratorConfiguration >       docAccelConf(docUIManager->getShortCutManager(), UNO_QUERY);
-    this->docAccelConf = docAccelConf;
+    this->m_docAccelConf = docAccelConf;
 
     //Get module shurtcut database
-    Reference< XModuleUIConfigurationManagerSupplier > modUISupplier(xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
+    Reference< XModuleUIConfigurationManagerSupplier > modUISupplier(m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")),
                                                                      UNO_QUERY);
-    Reference< XUIConfigurationManager >   modUIManager = modUISupplier->getUIConfigurationManager(xModuleManager->identify(xFrame));
+    Reference< XUIConfigurationManager >   modUIManager = modUISupplier->getUIConfigurationManager(xModuleManager->identify(m_xFrame));
     Reference< XAcceleratorConfiguration > modAccelConf(modUIManager->getShortCutManager(), UNO_QUERY);
-    this->modAccelConf = modAccelConf;
+    this->m_modAccelConf = modAccelConf;
     
     //Get global shortcut database
-    Reference< XAcceleratorConfiguration > globAccelConf(xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration")),
+    Reference< XAcceleratorConfiguration > globAccelConf(m_xMSF->createInstance(OUString::createFromAscii("com.sun.star.ui.GlobalAcceleratorConfiguration")),
                                                          UNO_QUERY);
-    this->globAccelConf = globAccelConf;
+    this->m_globAccelConf = globAccelConf;
 }
 
 
@@ -778,7 +781,7 @@ FrameHelper::findShortcutForCommand (OUString command)
 
     try 
     {
-        Sequence < Any > evs = docAccelConf->getPreferredKeyEventsForCommandList (commands);
+        Sequence < Any > evs = m_docAccelConf->getPreferredKeyEventsForCommandList (commands);
 
         for (int j = 0; j < evs.getLength (); j++)
         {
@@ -791,7 +794,7 @@ FrameHelper::findShortcutForCommand (OUString command)
     {}  
     try 
     {
-        Sequence < Any > evs = modAccelConf->getPreferredKeyEventsForCommandList (commands);
+        Sequence < Any > evs = m_modAccelConf->getPreferredKeyEventsForCommandList (commands);
 
         for (int j = 0; j < evs.getLength (); j++)
         {
@@ -804,7 +807,7 @@ FrameHelper::findShortcutForCommand (OUString command)
     {}
     try 
     {
-        Sequence < Any > evs = globAccelConf->getPreferredKeyEventsForCommandList (commands);
+        Sequence < Any > evs = m_globAccelConf->getPreferredKeyEventsForCommandList (commands);
 
         for (int j = 0; j < evs.getLength (); j++)
         {
diff --git a/framework/source/lomenubar/FrameHelper.hxx b/framework/source/lomenubar/FrameHelper.hxx
index a36a7de097..d34220f4b1 100644
--- a/framework/source/lomenubar/FrameHelper.hxx
+++ b/framework/source/lomenubar/FrameHelper.hxx
@@ -43,7 +43,10 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 
+//#pragma GCC diagnostic push
+//#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #include <libdbusmenu-glib/server.h>
+//#pragma GCC diagnostic pop
 #include <libdbusmenu-glib/menuitem.h>
 
 using com::sun::star::awt::KeyEvent;
@@ -76,30 +79,30 @@ using rtl::OUString;
 class FrameHelper : public cppu::WeakImplHelper1 < XFrameActionListener >
 {
   private:
-    Reference < XFrame >                xFrame;
-    Reference < XMultiServiceFactory >  xMSF;
-    Reference < XNameAccess >           xUICommands;
-    DbusmenuServer                     *server;
-    DbusmenuMenuitem                   *root;
-    gboolean                            watcher_set;
-    guint                               watcher;
-    XStatusListener                    *xSL;
-    Reference < XURLTransformer >       xTrans;
-    Reference < XDispatchProvider >     xdp;
-    GHashTable                         *commandsInfo;
-    gboolean                            blockDetach;
+    Reference < XFrame >                m_xFrame;
+    Reference < XMultiServiceFactory >  m_xMSF;
+    Reference < XNameAccess >           m_xUICommands;
+    DbusmenuServer                     *m_server;
+    DbusmenuMenuitem                   *m_root;
+    gboolean                            m_watcher_set;
+    guint                               m_watcher;
+    XStatusListener                    *m_xSL;
+    Reference < XURLTransformer >       m_xTrans;
+    Reference < XDispatchProvider >     m_xdp;
+    GHashTable                         *m_commandsInfo;
+    gboolean                            m_blockDetach;
 
     //These object/methods are used to recreate dynamic popupmenus
-    Reference < XMultiComponentFactory > xPCF;
-    Reference < XModuleManager>          xMM;
-    Sequence  < Any >                    args;
+    Reference < XMultiComponentFactory > m_xPCF;
+    Reference < XModuleManager>          m_xMM;
+    Sequence  < Any >                    m_args;
     
     gboolean                             isSpecialSubmenu (OUString command);
     
     //This is to build the shortcut database
-    Reference< XAcceleratorConfiguration > docAccelConf;
-    Reference< XAcceleratorConfiguration > modAccelConf;
-    Reference< XAcceleratorConfiguration > globAccelConf;
+    Reference< XAcceleratorConfiguration > m_docAccelConf;
+    Reference< XAcceleratorConfiguration > m_modAccelConf;
+    Reference< XAcceleratorConfiguration > m_globAccelConf;
 
     void getAcceleratorConfigurations (Reference < XModel >,
                                        Reference < XModuleManager>);
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index f5de3cd9f4..bbf53ce06a 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -140,9 +140,9 @@ xid_to_object_path (unsigned long xid)
 //-------------------------- GObject callbacks -------------------------------//
 //This is called when a registrar becomes available. It registers the hides the menubar.
 static void
-on_registrar_available (GDBusConnection *connection,
-                        const gchar     *name,
-                        const gchar     *name_owner,
+on_registrar_available (GDBusConnection * /*connection*/,
+                        const gchar     * /*name*/,
+                        const gchar     * /*name_owner*/,
                         gpointer         user_data)
 {
     GError     *error = NULL;
@@ -195,8 +195,8 @@ on_registrar_available (GDBusConnection *connection,
 
 //This is called when the registrar becomes unavailable. It shows the menubar.
 static void
-on_registrar_unavailable (GDBusConnection *connection,
-                          const gchar     *name,
+on_registrar_unavailable (GDBusConnection * /*connection*/,
+                          const gchar     * /*name*/,
                           gpointer         user_data)
 {
     //TODO: Unregister window?
@@ -245,11 +245,11 @@ Any SAL_CALL FrameJob::execute( const Sequence< NamedValue >& aArguments )
     if (!xController.is())
         return Any();
         
-    xFrame = Reference< XFrame > ( xController->getFrame(), UNO_QUERY);
-    if (!xFrame.is ())
+    m_xFrame = Reference< XFrame > ( xController->getFrame(), UNO_QUERY);
+    if (!m_xFrame.is ())
         return Any();
     
-    exportMenus (xFrame);
+    exportMenus (m_xFrame);
     return Any();
 }
 
@@ -259,7 +259,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame)
 {   
     //Set the xFrame for this object
 
-    this->xFrame = xFrame;
+    this->m_xFrame = xFrame;
 
     //Create dbusmenu server object path string
     DbusmenuServer *server = dbusmenu_server_new (xid_to_object_path(getXID (xFrame)).getStr());
@@ -294,7 +294,7 @@ FrameJob::exportMenus (Reference < XFrame > xFrame)
     }
 
     //Create a new frame helper to close the server when needed
-    FrameHelper *helper = new FrameHelper (mxMSF, xFrame, server);
+    FrameHelper *helper = new FrameHelper (m_xMSF, xFrame, server);
     xFrame->addFrameActionListener (Reference < XFrameActionListener > (helper));
 
     //Populate dbusmenu items and start the server
diff --git a/framework/source/lomenubar/FrameJob.hxx b/framework/source/lomenubar/FrameJob.hxx
index d209a0966f..ae5369fdd7 100644
--- a/framework/source/lomenubar/FrameJob.hxx
+++ b/framework/source/lomenubar/FrameJob.hxx
@@ -49,9 +49,9 @@ using css::uno::Reference;
 class FrameJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XServiceInfo >
 {
  private:
-    Reference < css::lang::XMultiServiceFactory > mxMSF;
-    Reference < css::container::XNameAccess >     xUICommands;
-    Reference < css::frame::XFrame >              xFrame;
+    Reference < css::lang::XMultiServiceFactory > m_xMSF;
+    Reference < css::container::XNameAccess >     m_xUICommands;
+    Reference < css::frame::XFrame >              m_xFrame;
     
     unsigned long xid;
     
@@ -62,7 +62,7 @@ class FrameJob : public cppu::WeakImplHelper2 < css::task::XJob, css::lang::XSer
     
  public:
     FrameJob( const css::uno::Reference< css::lang::XMultiServiceFactory > &rxMSF)
-          : mxMSF( rxMSF ) {};
+          : m_xMSF( rxMSF ) {};
 
     void exportMenus (Reference < css::frame::XFrame > xFrame);
 
diff --git a/framework/source/lomenubar/MenuItemInfo.cxx b/framework/source/lomenubar/MenuItemInfo.cxx
index 4fe6636a94..c5b22f68e0 100644
--- a/framework/source/lomenubar/MenuItemInfo.cxx
+++ b/framework/source/lomenubar/MenuItemInfo.cxx
@@ -26,78 +26,78 @@
 
 MenuItemInfo::MenuItemInfo ()
 {
-    label = NULL;
-    check_state = DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN;
-    check_type  = (gchar*)DBUSMENU_MENUITEM_TOGGLE_CHECK;
+    m_label = NULL;
+    m_check_state = DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN;
+    m_check_type  = (gchar*)DBUSMENU_MENUITEM_TOGGLE_CHECK;
 
-    is_visible = TRUE;      
-    is_enabled = TRUE;
+    m_is_visible = TRUE;
+    m_is_enabled = TRUE;
 }
 
 MenuItemInfo::~MenuItemInfo ()
 {
-    if (label)
-        g_free(label);
+    if (m_label)
+        g_free(m_label);
 }
 
 //Setters
 void
 MenuItemInfo::setLabel (gchar* label)
 {
-    this->label = g_strdup (label);
+    this->m_label = g_strdup (label);
 }
 
 void
 MenuItemInfo::setEnabled (gboolean is_enabled)
 {
-    this->is_enabled = is_enabled;
+    this->m_is_enabled = is_enabled;
 }
 
 void
 MenuItemInfo::setCheckState (gint check_state)
 {
-    this->check_state = check_state;
+    this->m_check_state = check_state;
 }
 
 void
 MenuItemInfo::setCheckType (const gchar* check_type)
 {
-    this->check_type = (gchar*)check_type;
+    this->m_check_type = (gchar*)check_type;
 }
 
 void
 MenuItemInfo::setVisible (gboolean is_visible)
 {
-    this->is_visible = is_visible;
+    this->m_is_visible = is_visible;
 }
 
 //Getters
 gchar*
 MenuItemInfo::getLabel ()
 {
-    return label;
+    return m_label;
 }
 
 gboolean
 MenuItemInfo::getEnabled ()
 {
-    return is_enabled;
+    return m_is_enabled;
 }
 
 gint
 MenuItemInfo::getCheckState ()
 {
-    return check_state;
+    return m_check_state;
 }
 
 const gchar*
 MenuItemInfo::getCheckType ()
 {
-    return check_type;
+    return m_check_type;
 }
 
 gboolean
 MenuItemInfo::getVisible ()
 {
-    return is_visible;
+    return m_is_visible;
 }
diff --git a/framework/source/lomenubar/MenuItemInfo.hxx b/framework/source/lomenubar/MenuItemInfo.hxx
index 1180688f02..b04b8fc807 100644
--- a/framework/source/lomenubar/MenuItemInfo.hxx
+++ b/framework/source/lomenubar/MenuItemInfo.hxx
@@ -27,11 +27,11 @@
 
 // This is used in a hash table with commandurls as keys
 class MenuItemInfo {
-    gchar*            label;         //Label text in UTF-8 with tildes subst by underscores
-    gint              check_state;
-    gchar*            check_type;
-    gboolean          is_enabled;
-    gboolean          is_visible;
+    gchar*            m_label;         //Label text in UTF-8 with tildes subst by underscores
+    gint              m_check_state;
+    gchar*            m_check_type;
+    gboolean          m_is_enabled;
+    gboolean          m_is_visible;
 
   public:
     MenuItemInfo ();
diff --git a/framework/source/lomenubar/MenuItemStatusListener.cxx b/framework/source/lomenubar/MenuItemStatusListener.cxx
index d51a7c536f..7989c9b111 100644
--- a/framework/source/lomenubar/MenuItemStatusListener.cxx
+++ b/framework/source/lomenubar/MenuItemStatusListener.cxx
@@ -8,7 +8,7 @@ using com::sun::star::frame::status::Visibility;
 MenuItemStatusListener::MenuItemStatusListener (FrameHelper *helper)
 {
     if (!helper) throw ("FrameHelper cannot be NULL");
-    this->helper = helper;
+    this->m_helper = helper;
 }
 
 void SAL_CALL
@@ -24,7 +24,7 @@ MenuItemStatusListener::statusChanged(const FeatureStateEvent& Event)
                                     url.getLength(),
                                     NULL, NULL, NULL);
 
-    GHashTable *commandsInfo = helper->getCommandsInfo ();
+    GHashTable *commandsInfo = m_helper->getCommandsInfo ();
     MenuItemInfo *info = (MenuItemInfo*)g_hash_table_lookup (commandsInfo, (gpointer)c_url);
     if (!info)
     {
@@ -32,7 +32,7 @@ MenuItemStatusListener::statusChanged(const FeatureStateEvent& Event)
         g_hash_table_insert (commandsInfo, c_url, info);
         
         //Set the default label
-        oULabel = helper->getLabelFromCommandURL(url);
+        oULabel = m_helper->getLabelFromCommandURL(url);
         // Replace tilde with underscore for Dbusmenu Alt accelerators
         oULabel = oULabel.replace ((sal_Unicode)0x007e, (sal_Unicode)0x005f);
 
diff --git a/framework/source/lomenubar/MenuItemStatusListener.hxx b/framework/source/lomenubar/MenuItemStatusListener.hxx
index 33997e95dd..df0353739c 100644
--- a/framework/source/lomenubar/MenuItemStatusListener.hxx
+++ b/framework/source/lomenubar/MenuItemStatusListener.hxx
@@ -18,8 +18,8 @@ using com::sun::star::lang::EventObject;
 class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener >
 {
   private:
-    guint16 id;
-    FrameHelper *helper;    
+    guint16 m_id;
+    FrameHelper *m_helper;
 
   public:
     MenuItemStatusListener (FrameHelper *helper);
@@ -29,7 +29,7 @@ class MenuItemStatusListener : public cppu::WeakImplHelper1 < XStatusListener >
     statusChanged(const FeatureStateEvent& Event)
       throw (RuntimeException);
 
-    virtual void SAL_CALL disposing(const EventObject& aEvent)
+    virtual void SAL_CALL disposing(const EventObject& /*aEvent*/)
       throw (RuntimeException) {}
 };
 #endif
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index f6f0892964..6782167054 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -55,14 +55,14 @@ extern "C"
 {
 //==================================================================================================
 SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
-                                                                                 uno_Environment** ppEnv        )
+                                                                                 uno_Environment** /*ppEnv*/        )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager,
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*pServiceManager*/,
                                                             void* pRegistryKey   )
 {
     if (!pRegistryKey)
@@ -86,7 +86,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* pServiceManager
 //==================================================================================================
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName      ,
                                                                 void*     pServiceManager,
-                                                                void*     pRegistryKey   )
+                                                                void*     /*pRegistryKey*/  )
 {
     if ( !pServiceManager || !pImplName )
         return 0;