diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-12-10 08:06:06 +0100 |
| commit | fb8a3fac5d448451794804a7470be45fa14da453 (patch) | |
| tree | 110395d7cf3b7ad304e34a007ea597263adcfad8 /sfx2 | |
| parent | b8ecfd83bac98ea58a435c59856da8fd94f5c6d9 (diff) | |
loplugin:nullptr: More NULL -> nullptr automatic rewrite
Change-Id: Ie83819e2bcdc5fa160b39296b005ca9a5ff74b1d
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 986326f83e93..ceaacfb06f81 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -198,7 +198,7 @@ add_image_menu_item( GtkMenuShell *pMenuShell, gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage ); gtk_menu_shell_append( pMenuShell, pMenuItem ); - g_signal_connect( pMenuItem, "activate", activate_cb, NULL); + g_signal_connect( pMenuItem, "activate", activate_cb, nullptr); return pMenuItem; } @@ -341,13 +341,13 @@ void plugin_init_sys_tray() pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-main"); g_object_set (pTrayIcon, "title", aLabel.getStr(), - "tooltip_text", aLabel.getStr(), NULL); + "tooltip_text", aLabel.getStr(), nullptr); GtkWidget *pMenu = gtk_menu_new(); g_signal_connect(pTrayIcon, "button-press-event", G_CALLBACK(display_menu_cb), pMenu); g_signal_connect (pMenu, "deactivate", - G_CALLBACK (menu_deactivate_cb), NULL); + G_CALLBACK (menu_deactivate_cb), nullptr); // disable shutdown pShutdownIcon->SetVeto( true ); @@ -362,7 +362,7 @@ void plugin_init_sys_tray() if (pFile) { if ((pMonitor = g_file_monitor_file(pFile, G_FILE_MONITOR_NONE, nullptr, nullptr))) - g_signal_connect(pMonitor, "changed", reinterpret_cast<GCallback>(notify_file_changed), NULL); + g_signal_connect(pMonitor, "changed", reinterpret_cast<GCallback>(notify_file_changed), nullptr); g_object_unref(pFile); } #endif diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 89d69a926ab6..22af458a4d8e 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -267,7 +267,7 @@ namespace sfx2 nChildWindowId, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aVisibility, - NULL + nullptr ); } } |