summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorAugust Sodora <augsod@gmail.com>2011-11-21 19:56:51 -0500
committerAugust Sodora <augsod@gmail.com>2011-11-21 19:57:53 -0500
commit487968707f9ea36f3873a9349ebb87655f6abb3d (patch)
tree4bd2527a5d54a4a37922c0cda9ed28a6a4ff3402 /framework
parent7c3a322f1985abb7b87e6346a7d7b2c3b783a2d3 (diff)
cppcheck: C-style pointer casting
Diffstat (limited to 'framework')
-rw-r--r--framework/source/lomenubar/FrameJob.cxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/framework/source/lomenubar/FrameJob.cxx b/framework/source/lomenubar/FrameJob.cxx
index 06af9394222f..fd9d5dae9fa5 100644
--- a/framework/source/lomenubar/FrameJob.cxx
+++ b/framework/source/lomenubar/FrameJob.cxx
@@ -153,7 +153,7 @@ on_registrar_available (GDBusConnection * /*connection*/,
GError *error = NULL;
GDBusProxy *proxy;
- FrameHelper *helper = (FrameHelper*)user_data;
+ FrameHelper *helper = static_cast<FrameHelper*>(user_data);
unsigned long xid = helper->getXID();
proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
@@ -207,7 +207,7 @@ on_registrar_unavailable (GDBusConnection * /*connection*/,
//TODO: Unregister window?
// Show menubar
- FrameHelper *helper = (FrameHelper*)user_data;
+ FrameHelper *helper = static_cast<FrameHelper*>(user_data);
Reference < XFrame > xFrame = helper->getFrame ();
Reference< XPropertySet > frameProps (xFrame, UNO_QUERY);
Reference < XLayoutManager > xLayoutManager(frameProps->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
@@ -343,8 +343,9 @@ FrameJob::getRootMenuitem (Reference < XMenu > xMenu, gpointer helper)
{
DbusmenuMenuitem *root = dbusmenu_menuitem_new_with_id (0);
- ((FrameHelper*)helper)->setRootItem(root);
- ((FrameHelper*)helper)->rebuildMenu (xMenu, root);
+ FrameHelper* fHelper = static_cast<FrameHelper*>(helper);
+ fHelper->setRootItem(root);
+ fHelper->rebuildMenu (xMenu, root);
return root;
}