f325b2
From 7a2ed28a86aad93edca7fa6c2706a7ff78653b21 Mon Sep 17 00:00:00 2001
f325b2
From: Stephan Bergmann <sbergman@redhat.com>
f325b2
Date: Tue, 10 Nov 2015 10:18:58 +0100
f325b2
Subject: [PATCH 292/398] loplugin:nullptr (automatic rewrite)
f325b2
f325b2
Change-Id: Ibdb6409664cdf9499b6fec95c5de3549887b8106
f325b2
(cherry picked from commit 5678a4ce9eee64cafdbdb4fc1290535f9e03208f)
f325b2
---
f325b2
 .../qa/gtktiledviewer/gtktiledviewer.cxx           |  96 ++++++-------
f325b2
 libreofficekit/qa/tilebench/tilebench.cxx          |   6 +-
f325b2
 libreofficekit/source/gtk/lokdocview.cxx           | 160 ++++++++++-----------
f325b2
 libreofficekit/source/gtk/tilebuffer.cxx           |  12 +-
f325b2
 libreofficekit/source/gtk/tilebuffer.hxx           |  10 +-
f325b2
 5 files changed, 142 insertions(+), 142 deletions(-)
f325b2
f325b2
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
index 08e756fa3ef6..3f57b5c6c6b9 100644
f325b2
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
f325b2
@@ -119,31 +119,31 @@ public:
f325b2
     std::shared_ptr<TiledCornerButton> m_pCornerButton;
f325b2
 
f325b2
     TiledWindow()
f325b2
-        : m_pDocView(0),
f325b2
-        m_pStatusBar(0),
f325b2
-        m_pProgressBar(0),
f325b2
-        m_pStatusbarLabel(0),
f325b2
-        m_pZoomLabel(0),
f325b2
-        m_pEnableEditing(0),
f325b2
-        m_pBold(0),
f325b2
-        m_pItalic(0),
f325b2
-        m_pUnderline(0),
f325b2
-        m_pStrikethrough(0),
f325b2
-        m_pSuperscript(0),
f325b2
-        m_pSubscript(0),
f325b2
-        m_pLeftpara(0),
f325b2
-        m_pCenterpara(0),
f325b2
-        m_pRightpara(0),
f325b2
-        m_pJustifypara(0),
f325b2
-        m_pScrolledWindow(0),
f325b2
+        : m_pDocView(nullptr),
f325b2
+        m_pStatusBar(nullptr),
f325b2
+        m_pProgressBar(nullptr),
f325b2
+        m_pStatusbarLabel(nullptr),
f325b2
+        m_pZoomLabel(nullptr),
f325b2
+        m_pEnableEditing(nullptr),
f325b2
+        m_pBold(nullptr),
f325b2
+        m_pItalic(nullptr),
f325b2
+        m_pUnderline(nullptr),
f325b2
+        m_pStrikethrough(nullptr),
f325b2
+        m_pSuperscript(nullptr),
f325b2
+        m_pSubscript(nullptr),
f325b2
+        m_pLeftpara(nullptr),
f325b2
+        m_pCenterpara(nullptr),
f325b2
+        m_pRightpara(nullptr),
f325b2
+        m_pJustifypara(nullptr),
f325b2
+        m_pScrolledWindow(nullptr),
f325b2
         m_bToolItemBroadcast(true),
f325b2
-        m_pVBox(0),
f325b2
-        m_pPartSelector(0),
f325b2
-        m_pPartModeComboBox(0),
f325b2
+        m_pVBox(nullptr),
f325b2
+        m_pPartSelector(nullptr),
f325b2
+        m_pPartModeComboBox(nullptr),
f325b2
         m_bPartSelectorBroadcast(true),
f325b2
-        m_pFindbar(0),
f325b2
-        m_pFindbarEntry(0),
f325b2
-        m_pFindbarLabel(0),
f325b2
+        m_pFindbar(nullptr),
f325b2
+        m_pFindbarEntry(nullptr),
f325b2
+        m_pFindbarLabel(nullptr),
f325b2
         m_bFindAll(false)
f325b2
     {
f325b2
     }
f325b2
@@ -240,7 +240,7 @@ gboolean TiledRowColumnBar::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
f325b2
 void TiledRowColumnBar::docAdjustmentChanged(GtkAdjustment* /*pAdjustment*/, gpointer pData)
f325b2
 {
f325b2
     GtkWidget* pDocView = static_cast<GtkWidget*>(pData);
f325b2
-    docConfigureEvent(pDocView, 0, 0);
f325b2
+    docConfigureEvent(pDocView, nullptr, nullptr);
f325b2
 }
f325b2
 
f325b2
 gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfigure* /*pEvent*/, gpointer /*pData*/)
f325b2
@@ -470,11 +470,11 @@ static void createView(GtkWidget* pButton, gpointer /*pItem*/)
f325b2
 /// Creates a new model, i.e. LOK init and document load, one view implicitly.
f325b2
 static void createModelAndView(const char* pLOPath, const char* pDocPath)
f325b2
 {
f325b2
-    GtkWidget* pDocView = lok_doc_view_new(pLOPath, 0, 0);
f325b2
+    GtkWidget* pDocView = lok_doc_view_new(pLOPath, nullptr, nullptr);
f325b2
 
f325b2
     setupWidgetAndCreateWindow(pDocView);
f325b2
 
f325b2
-    lok_doc_view_open_document(LOK_DOC_VIEW(pDocView), pDocPath, 0, openDocumentCallback, pDocView);
f325b2
+    lok_doc_view_open_document(LOK_DOC_VIEW(pDocView), pDocPath, nullptr, openDocumentCallback, pDocView);
f325b2
 }
f325b2
 
f325b2
 /// Our GtkClipboardGetFunc implementation for HTML.
f325b2
@@ -494,7 +494,7 @@ static void htmlClearFunc(GtkClipboard* /*pClipboard*/, gpointer pData)
f325b2
 /// Same as gtk_clipboard_set_text(), but sets HTML.
f325b2
 static void clipboardSetHtml(GtkClipboard* pClipboard, const char* pSelection)
f325b2
 {
f325b2
-    GtkTargetList* pList = gtk_target_list_new(0, 0);
f325b2
+    GtkTargetList* pList = gtk_target_list_new(nullptr, 0);
f325b2
     GdkAtom aAtom(gdk_atom_intern("text/html", false));
f325b2
     gtk_target_list_add(pList, aAtom, 0, 0);
f325b2
     gint nTargets = 0;
f325b2
@@ -512,7 +512,7 @@ static void doCopy(GtkWidget* pButton, gpointer /*pItem*/)
f325b2
     TiledWindow& rWindow = lcl_getTiledWindow(pButton);
f325b2
     LOKDocView* pLOKDocView = LOK_DOC_VIEW(rWindow.m_pDocView);
f325b2
     LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView);
f325b2
-    char* pUsedFormat = 0;
f325b2
+    char* pUsedFormat = nullptr;
f325b2
     char* pSelection = pDocument->pClass->getTextSelection(pDocument, "text/html", &pUsedFormat);
f325b2
 
f325b2
     GtkClipboard* pClipboard = gtk_clipboard_get_for_display(gtk_widget_get_display(rWindow.m_pDocView), GDK_SELECTION_CLIPBOARD);
f325b2
@@ -708,9 +708,9 @@ static void signalPart(LOKDocView* pLOKDocView, int nPart, gpointer /*pData*/)
f325b2
 /// User clicked on a command button -> inform LOKDocView.
f325b2
 static void signalHyperlink(LOKDocView* /*pLOKDocView*/, char* pPayload, gpointer /*pData*/)
f325b2
 {
f325b2
-    GError* pError = NULL;
f325b2
-    gtk_show_uri(NULL, pPayload, GDK_CURRENT_TIME, &pError);
f325b2
-    if (pError != NULL)
f325b2
+    GError* pError = nullptr;
f325b2
+    gtk_show_uri(nullptr, pPayload, GDK_CURRENT_TIME, &pError);
f325b2
+    if (pError != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to show URI %s : %s", pPayload, pError->message);
f325b2
         g_error_free(pError);
f325b2
@@ -781,7 +781,7 @@ static void toggleToolItem(GtkWidget* pWidget, gpointer /*pData*/)
f325b2
         // notify about the finished Save
f325b2
         gboolean bNotify = (rString == ".uno:Save");
f325b2
 
f325b2
-        lok_doc_view_post_command(pLOKDocView, rString.c_str(), 0, bNotify);
f325b2
+        lok_doc_view_post_command(pLOKDocView, rString.c_str(), nullptr, bNotify);
f325b2
     }
f325b2
 }
f325b2
 
f325b2
@@ -863,8 +863,8 @@ static void openDocumentCallback (GObject* source_object, GAsyncResult* res, gpo
f325b2
 {
f325b2
     LOKDocView* pDocView = LOK_DOC_VIEW (source_object);
f325b2
     TiledWindow& rWindow = lcl_getTiledWindow(GTK_WIDGET(pDocView));
f325b2
-    GError* error = NULL;
f325b2
-    GList *focusChain = NULL;
f325b2
+    GError* error = nullptr;
f325b2
+    GList *focusChain = nullptr;
f325b2
 
f325b2
     if (!lok_doc_view_open_document_finish(pDocView, res, &error))
f325b2
     {
f325b2
@@ -913,7 +913,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_toolbar_set_style(GTK_TOOLBAR(pUpperToolbar), GTK_TOOLBAR_ICONS);
f325b2
 
f325b2
     // Save.
f325b2
-    GtkToolItem* pSave = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pSave = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pSave), "document-save-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pSave, "Save");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pSave, -1);
f325b2
@@ -922,12 +922,12 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     lcl_registerToolItem(rWindow, pSave, ".uno:Save");
f325b2
 
f325b2
     // Copy and paste.
f325b2
-    GtkToolItem* pCopyButton = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pCopyButton = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pCopyButton), "edit-copy-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pCopyButton, "Copy");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pCopyButton, -1);
f325b2
     g_signal_connect(G_OBJECT(pCopyButton), "clicked", G_CALLBACK(doCopy), NULL);
f325b2
-    GtkToolItem* pPasteButton = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pPasteButton = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pPasteButton), "edit-paste-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pPasteButton, "Paste");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pPasteButton, -1);
f325b2
@@ -935,13 +935,13 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_toolbar_insert( GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1);
f325b2
 
f325b2
     // Undo and redo.
f325b2
-    GtkToolItem* pUndo = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pUndo = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pUndo), "edit-undo-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pUndo, "Undo");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pUndo, -1);
f325b2
     g_signal_connect(G_OBJECT(pUndo), "clicked", G_CALLBACK(toggleToolItem), NULL);
f325b2
     lcl_registerToolItem(rWindow, pUndo, ".uno:Undo");
f325b2
-    GtkToolItem* pRedo = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pRedo = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pRedo), "edit-redo-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pRedo, "Redo");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pRedo, -1);
f325b2
@@ -950,7 +950,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1);
f325b2
 
f325b2
     // Find.
f325b2
-    GtkToolItem* pFindButton = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pFindButton = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindButton), "edit-find-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pFindButton, "Find");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pFindButton, -1);
f325b2
@@ -958,19 +958,19 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), gtk_separator_tool_item_new(), -1);
f325b2
 
f325b2
     // Misc upper toolbar.
f325b2
-    GtkToolItem* pZoomIn = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pZoomIn = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomIn), "zoom-in-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pZoomIn, "Zoom In");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoomIn, -1);
f325b2
     g_signal_connect(G_OBJECT(pZoomIn), "clicked", G_CALLBACK(changeZoom), NULL);
f325b2
 
f325b2
-    GtkToolItem* pZoom1 = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pZoom1 = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pZoom1), "zoom-original-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pZoom1, "Normal Size");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoom1, -1);
f325b2
     g_signal_connect(G_OBJECT(pZoom1), "clicked", G_CALLBACK(changeZoom), NULL);
f325b2
 
f325b2
-    GtkToolItem* pZoomOut = gtk_tool_button_new(NULL, NULL);
f325b2
+    GtkToolItem* pZoomOut = gtk_tool_button_new(nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pZoomOut), "zoom-out-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pZoomOut, "Zoom Out");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pZoomOut, -1);
f325b2
@@ -995,7 +995,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pEnableEditing, -1);
f325b2
     g_signal_connect(G_OBJECT(pEnableEditing), "toggled", G_CALLBACK(toggleEditing), NULL);
f325b2
 
f325b2
-    GtkToolItem* pNewViewButton = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pNewViewButton = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pNewViewButton), "view-continuous-symbolic");
f325b2
     gtk_tool_item_set_tooltip_text(pNewViewButton, "New View");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(pUpperToolbar), pNewViewButton, -1);
f325b2
@@ -1079,7 +1079,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     rWindow.m_pFindbar = gtk_toolbar_new();
f325b2
     gtk_toolbar_set_style(GTK_TOOLBAR(rWindow.m_pFindbar), GTK_TOOLBAR_ICONS);
f325b2
 
f325b2
-    GtkToolItem* pFindbarClose = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pFindbarClose = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarClose), "window-close-symbolic");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarClose, -1);
f325b2
     g_signal_connect(G_OBJECT(pFindbarClose), "clicked", G_CALLBACK(toggleFindbar), NULL);
f325b2
@@ -1090,12 +1090,12 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     g_signal_connect(rWindow.m_pFindbarEntry, "key-press-event", G_CALLBACK(signalFindbar), 0);
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pEntryContainer, -1);
f325b2
 
f325b2
-    GtkToolItem* pFindbarNext = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pFindbarNext = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarNext), "go-down-symbolic");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarNext, -1);
f325b2
     g_signal_connect(G_OBJECT(pFindbarNext), "clicked", G_CALLBACK(signalSearchNext), NULL);
f325b2
 
f325b2
-    GtkToolItem* pFindbarPrev = gtk_tool_button_new( NULL, NULL);
f325b2
+    GtkToolItem* pFindbarPrev = gtk_tool_button_new( nullptr, nullptr);
f325b2
     gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pFindbarPrev), "go-up-symbolic");
f325b2
     gtk_toolbar_insert(GTK_TOOLBAR(rWindow.m_pFindbar), pFindbarPrev, -1);
f325b2
     g_signal_connect(G_OBJECT(pFindbarPrev), "clicked", G_CALLBACK(signalSearchPrev), NULL);
f325b2
@@ -1126,7 +1126,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
f325b2
     gtk_grid_attach(GTK_GRID(pGrid), rWindow.m_pColumnBar->m_pDrawingArea, 1, 0, 1, 1);
f325b2
 
f325b2
     // Scrolled window for DocView
f325b2
-    rWindow.m_pScrolledWindow = gtk_scrolled_window_new(0, 0);
f325b2
+    rWindow.m_pScrolledWindow = gtk_scrolled_window_new(nullptr, nullptr);
f325b2
     gtk_widget_set_hexpand(rWindow.m_pScrolledWindow, TRUE);
f325b2
     gtk_widget_set_vexpand(rWindow.m_pScrolledWindow, TRUE);
f325b2
     // "B2" cell of the grid
f325b2
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx
f325b2
index e72c730a6dfe..20777de49fe1 100644
f325b2
--- a/libreofficekit/qa/tilebench/tilebench.cxx
f325b2
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
f325b2
@@ -42,7 +42,7 @@ int main( int argc, char* argv[] )
f325b2
         const char *mpName;
f325b2
         double mfTime;
f325b2
 
f325b2
-        TimeRecord() : mpName(NULL), mfTime(getTimeNow()) { }
f325b2
+        TimeRecord() : mpName(nullptr), mfTime(getTimeNow()) { }
f325b2
         explicit TimeRecord(const char *pName) :
f325b2
                        mpName(pName ), mfTime(getTimeNow()) { }
f325b2
     };
f325b2
@@ -62,7 +62,7 @@ int main( int argc, char* argv[] )
f325b2
     Office *pOffice = lok_cpp_init(argv[1]);
f325b2
     aTimes.push_back(TimeRecord());
f325b2
 
f325b2
-    if (argv[2] != NULL)
f325b2
+    if (argv[2] != nullptr)
f325b2
     {
f325b2
         aTimes.push_back(TimeRecord("load document"));
f325b2
         Document *pDocument(pOffice->documentLoad(argv[2]));
f325b2
@@ -157,7 +157,7 @@ int main( int argc, char* argv[] )
f325b2
     {
f325b2
         double nDelta = aTimes[i+1].mfTime - aTimes[i].mfTime;
f325b2
         fprintf (stderr, "  %s - %2.4f(ms)\n", aTimes[i].mpName, nDelta * 1000.0);
f325b2
-        if (aTimes[i+1].mpName == NULL)
f325b2
+        if (aTimes[i+1].mpName == nullptr)
f325b2
             i++; // skip it.
f325b2
         nTotal += nDelta;
f325b2
     }
f325b2
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
index 9dfa2f3b44a6..0d1dec1ddb05 100644
f325b2
--- a/libreofficekit/source/gtk/lokdocview.cxx
f325b2
+++ b/libreofficekit/source/gtk/lokdocview.cxx
f325b2
@@ -119,15 +119,15 @@ struct LOKDocViewPrivateImpl
f325b2
     int m_nViewId;
f325b2
 
f325b2
     LOKDocViewPrivateImpl()
f325b2
-        : m_aLOPath(0),
f325b2
-        m_aDocPath(0),
f325b2
+        : m_aLOPath(nullptr),
f325b2
+        m_aDocPath(nullptr),
f325b2
         m_nLoadProgress(0),
f325b2
         m_bIsLoading(false),
f325b2
         m_bCanZoomIn(false),
f325b2
         m_bCanZoomOut(false),
f325b2
-        m_pOffice(0),
f325b2
-        m_pDocument(0),
f325b2
-        lokThreadPool(0),
f325b2
+        m_pOffice(nullptr),
f325b2
+        m_pDocument(nullptr),
f325b2
+        lokThreadPool(nullptr),
f325b2
         m_fZoom(0),
f325b2
         m_nDocumentWidthTwips(0),
f325b2
         m_nDocumentHeightTwips(0),
f325b2
@@ -144,16 +144,16 @@ struct LOKDocViewPrivateImpl
f325b2
         m_aGraphicSelection({0, 0, 0, 0}),
f325b2
         m_aCellCursor({0, 0, 0, 0}),
f325b2
         m_bInDragGraphicSelection(false),
f325b2
-        m_pHandleStart(0),
f325b2
+        m_pHandleStart(nullptr),
f325b2
         m_aHandleStartRect({0, 0, 0, 0}),
f325b2
         m_bInDragStartHandle(0),
f325b2
-        m_pHandleMiddle(0),
f325b2
+        m_pHandleMiddle(nullptr),
f325b2
         m_aHandleMiddleRect({0, 0, 0, 0}),
f325b2
         m_bInDragMiddleHandle(false),
f325b2
-        m_pHandleEnd(0),
f325b2
+        m_pHandleEnd(nullptr),
f325b2
         m_aHandleEndRect({0, 0, 0, 0}),
f325b2
         m_bInDragEndHandle(false),
f325b2
-        m_pGraphicHandle(0),
f325b2
+        m_pGraphicHandle(nullptr),
f325b2
         m_nViewId(0)
f325b2
     {
f325b2
         memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
f325b2
@@ -299,7 +299,7 @@ callbackTypeToString (int nType)
f325b2
     case LOK_CALLBACK_SEARCH_RESULT_SELECTION:
f325b2
         return "LOK_CALLBACK_SEARCH_RESULT_SELECTION";
f325b2
     }
f325b2
-    return 0;
f325b2
+    return nullptr;
f325b2
 }
f325b2
 
f325b2
 static bool
f325b2
@@ -330,7 +330,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
     int nCharCode = 0;
f325b2
     int nKeyCode = 0;
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     if (!priv->m_bEdit)
f325b2
     {
f325b2
@@ -419,14 +419,14 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
f325b2
 
f325b2
     if (pEvent->type == GDK_KEY_RELEASE)
f325b2
     {
f325b2
-        GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+        GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
         LOEvent* pLOEvent = new LOEvent(LOK_POST_KEY);
f325b2
         pLOEvent->m_nKeyEvent = LOK_KEYEVENT_KEYUP;
f325b2
         pLOEvent->m_nCharCode = nCharCode;
f325b2
         pLOEvent->m_nKeyCode  = nKeyCode;
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_POST_KEY: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -435,14 +435,14 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)
f325b2
     }
f325b2
     else
f325b2
     {
f325b2
-        GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+        GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
         LOEvent* pLOEvent = new LOEvent(LOK_POST_KEY);
f325b2
         pLOEvent->m_nKeyEvent = LOK_KEYEVENT_KEYINPUT;
f325b2
         pLOEvent->m_nCharCode = nCharCode;
f325b2
         pLOEvent->m_nKeyCode  = nKeyCode;
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_POST_KEY: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -664,7 +664,7 @@ setTilesInvalid (LOKDocView* pDocView, const GdkRectangle& rRectangle)
f325b2
     {
f325b2
         for (int j = aStart.y; j < aEnd.y; j++)
f325b2
         {
f325b2
-            GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+            GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
             priv->m_pTileBuffer->setInvalid(i, j, priv->m_fZoom, task, priv->lokThreadPool);
f325b2
             g_object_unref(task);
f325b2
         }
f325b2
@@ -927,7 +927,7 @@ paintTileFinish(LOKDocView* pDocView, GAsyncResult* res, GError **error)
f325b2
 
f325b2
     g_return_val_if_fail(LOK_IS_DOC_VIEW(pDocView), NULL);
f325b2
     g_return_val_if_fail(g_task_is_valid(res, pDocView), NULL);
f325b2
-    g_return_val_if_fail(error == NULL || *error == NULL, NULL);
f325b2
+    g_return_val_if_fail(error == nullptr || *error == nullptr, NULL);
f325b2
 
f325b2
     return g_task_propagate_pointer(task, error);
f325b2
 }
f325b2
@@ -943,9 +943,9 @@ paintTileCallback(GObject* sourceObject, GAsyncResult* res, gpointer userData)
f325b2
     int index = pLOEvent->m_nPaintTileX * buffer->m_nWidth + pLOEvent->m_nPaintTileY;
f325b2
     GError* error;
f325b2
 
f325b2
-    error = NULL;
f325b2
+    error = nullptr;
f325b2
     GdkPixbuf* pPixBuf = static_cast<GdkPixbuf*>(paintTileFinish(pDocView, res, &error));
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         if (error->domain == LOK_TILEBUFFER_ERROR &&
f325b2
             error->code == LOK_TILEBUFFER_CHANGED)
f325b2
@@ -1008,7 +1008,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
f325b2
             aTileRectangleTwips.width = pixelToTwip(aTileRectanglePixels.width, priv->m_fZoom);
f325b2
             aTileRectangleTwips.height = pixelToTwip(aTileRectanglePixels.height, priv->m_fZoom);
f325b2
 
f325b2
-            if (!gdk_rectangle_intersect(&aVisibleArea, &aTileRectangleTwips, 0))
f325b2
+            if (!gdk_rectangle_intersect(&aVisibleArea, &aTileRectangleTwips, nullptr))
f325b2
                 bPaint = false;
f325b2
 
f325b2
             if (bPaint)
f325b2
@@ -1018,7 +1018,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo)
f325b2
                 pLOEvent->m_nPaintTileY = nColumn;
f325b2
                 pLOEvent->m_fPaintTileZoom = priv->m_fZoom;
f325b2
                 pLOEvent->m_pTileBuffer = &*priv->m_pTileBuffer;
f325b2
-                GTask* task = g_task_new(pDocView, NULL, paintTileCallback, pLOEvent);
f325b2
+                GTask* task = g_task_new(pDocView, nullptr, paintTileCallback, pLOEvent);
f325b2
                 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
                 Tile& currentTile = priv->m_pTileBuffer->getTile(nRow, nColumn, task, priv->lokThreadPool);
f325b2
@@ -1145,7 +1145,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
 {
f325b2
     LOKDocView* pDocView = LOK_DOC_VIEW (pWidget);
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     g_info("LOKDocView_Impl::signalButton: %d, %d (in twips: %d, %d)",
f325b2
            (int)pEvent->x, (int)pEvent->y,
f325b2
@@ -1181,7 +1181,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
                 g_info("LOKDocView_Impl::signalButton: end of drag graphic handle #%d", i);
f325b2
                 priv->m_bInDragGraphicHandles[i] = false;
f325b2
 
f325b2
-                GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+                GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
                 LOEvent* pLOEvent = new LOEvent(LOK_SET_GRAPHIC_SELECTION);
f325b2
                 pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_END;
f325b2
                 pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1189,7 +1189,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
                 g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
                 g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-                if (error != NULL)
f325b2
+                if (error != nullptr)
f325b2
                 {
f325b2
                     g_warning("Unable to call LOK_SET_GRAPHIC_SELECTION: %s", error->message);
f325b2
                     g_clear_error(&error);
f325b2
@@ -1205,7 +1205,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
             g_info("LOKDocView_Impl::signalButton: end of drag graphic selection");
f325b2
             priv->m_bInDragGraphicSelection = false;
f325b2
 
f325b2
-            GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+            GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
             LOEvent* pLOEvent = new LOEvent(LOK_SET_GRAPHIC_SELECTION);
f325b2
             pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_END;
f325b2
             pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1213,7 +1213,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
             g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
             g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-            if (error != NULL)
f325b2
+            if (error != nullptr)
f325b2
             {
f325b2
                 g_warning("Unable to call LOK_SET_GRAPHIC_SELECTION: %s", error->message);
f325b2
                 g_clear_error(&error);
f325b2
@@ -1233,19 +1233,19 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
         aClick.height = 1;
f325b2
         if (pEvent->type == GDK_BUTTON_PRESS)
f325b2
         {
f325b2
-            if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleStartRect, NULL))
f325b2
+            if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleStartRect, nullptr))
f325b2
             {
f325b2
                 g_info("LOKDocView_Impl::signalButton: start of drag start handle");
f325b2
                 priv->m_bInDragStartHandle = true;
f325b2
                 return FALSE;
f325b2
             }
f325b2
-            else if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleMiddleRect, NULL))
f325b2
+            else if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleMiddleRect, nullptr))
f325b2
             {
f325b2
                 g_info("LOKDocView_Impl::signalButton: start of drag middle handle");
f325b2
                 priv->m_bInDragMiddleHandle = true;
f325b2
                 return FALSE;
f325b2
             }
f325b2
-            else if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleEndRect, NULL))
f325b2
+            else if (gdk_rectangle_intersect(&aClick, &priv->m_aHandleEndRect, nullptr))
f325b2
             {
f325b2
                 g_info("LOKDocView_Impl::signalButton: start of drag end handle");
f325b2
                 priv->m_bInDragEndHandle = true;
f325b2
@@ -1254,12 +1254,12 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
 
f325b2
             for (int i = 0; i < GRAPHIC_HANDLE_COUNT; ++i)
f325b2
             {
f325b2
-                if (gdk_rectangle_intersect(&aClick, &priv->m_aGraphicHandleRects[i], NULL))
f325b2
+                if (gdk_rectangle_intersect(&aClick, &priv->m_aGraphicHandleRects[i], nullptr))
f325b2
                 {
f325b2
                     g_info("LOKDocView_Impl::signalButton: start of drag graphic handle #%d", i);
f325b2
                     priv->m_bInDragGraphicHandles[i] = true;
f325b2
 
f325b2
-                    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+                    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
                     LOEvent* pLOEvent = new LOEvent(LOK_SET_GRAPHIC_SELECTION);
f325b2
                     pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_START;
f325b2
                     pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(priv->m_aGraphicHandleRects[i].x + priv->m_aGraphicHandleRects[i].width / 2, priv->m_fZoom);
f325b2
@@ -1267,7 +1267,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
                     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
                     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-                    if (error != NULL)
f325b2
+                    if (error != nullptr)
f325b2
                     {
f325b2
                         g_warning("Unable to call LOK_SET_GRAPHIC_SELECTION: %s", error->message);
f325b2
                         g_clear_error(&error);
f325b2
@@ -1291,7 +1291,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
         if ((pEvent->time - priv->m_nLastButtonPressTime) < 250)
f325b2
             nCount++;
f325b2
         priv->m_nLastButtonPressTime = pEvent->time;
f325b2
-        GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+        GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
         LOEvent* pLOEvent = new LOEvent(LOK_POST_MOUSE_EVENT);
f325b2
         pLOEvent->m_nPostMouseEventType = LOK_MOUSEEVENT_MOUSEBUTTONDOWN;
f325b2
         pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1314,7 +1314,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_POST_MOUSE_EVENT: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -1328,7 +1328,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
         if ((pEvent->time - priv->m_nLastButtonReleaseTime) < 250)
f325b2
             nCount++;
f325b2
         priv->m_nLastButtonReleaseTime = pEvent->time;
f325b2
-        GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+        GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
         LOEvent* pLOEvent = new LOEvent(LOK_POST_MOUSE_EVENT);
f325b2
         pLOEvent->m_nPostMouseEventType = LOK_MOUSEEVENT_MOUSEBUTTONUP;
f325b2
         pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1351,7 +1351,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_POST_MOUSE_EVENT: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -1389,7 +1389,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
f325b2
     LOKDocView* pDocView = LOK_DOC_VIEW (pWidget);
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
     GdkPoint aPoint;
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
f325b2
     if (priv->m_bInDragMiddleHandle)
f325b2
@@ -1432,12 +1432,12 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
f325b2
     aMotionInTwipsInTwips.y = pixelToTwip(pEvent->y, priv->m_fZoom);
f325b2
     aMotionInTwipsInTwips.width = 1;
f325b2
     aMotionInTwipsInTwips.height = 1;
f325b2
-    if (gdk_rectangle_intersect(&aMotionInTwipsInTwips, &priv->m_aGraphicSelection, 0))
f325b2
+    if (gdk_rectangle_intersect(&aMotionInTwipsInTwips, &priv->m_aGraphicSelection, nullptr))
f325b2
     {
f325b2
         g_info("lcl_signalMotion: start of drag graphic selection");
f325b2
         priv->m_bInDragGraphicSelection = true;
f325b2
 
f325b2
-        GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+        GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
         LOEvent* pLOEvent = new LOEvent(LOK_SET_GRAPHIC_SELECTION);
f325b2
         pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_START;
f325b2
         pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1445,7 +1445,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_SET_GRAPHIC_SELECTION: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -1457,7 +1457,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
f325b2
 
f325b2
     // Otherwise a mouse move, as on the desktop.
f325b2
 
f325b2
-    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_POST_MOUSE_EVENT);
f325b2
     pLOEvent->m_nPostMouseEventType = LOK_MOUSEEVENT_MOUSEMOVE;
f325b2
     pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);
f325b2
@@ -1469,7 +1469,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_MOUSEEVENT_MOUSEMOVE: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
@@ -1522,7 +1522,7 @@ openDocumentInThread (gpointer data)
f325b2
     if ( priv->m_pDocument )
f325b2
     {
f325b2
         priv->m_pDocument->pClass->destroy( priv->m_pDocument );
f325b2
-        priv->m_pDocument = 0;
f325b2
+        priv->m_pDocument = nullptr;
f325b2
     }
f325b2
 
f325b2
     priv->m_pOffice->pClass->registerCallback(priv->m_pOffice, globalCallbackWorker, pDocView);
f325b2
@@ -1728,10 +1728,10 @@ static void lok_doc_view_init (LOKDocView* pDocView)
f325b2
                           |GDK_KEY_RELEASE_MASK);
f325b2
 
f325b2
     priv->lokThreadPool = g_thread_pool_new(lokThreadFunc,
f325b2
-                                            NULL,
f325b2
+                                            nullptr,
f325b2
                                             1,
f325b2
                                             FALSE,
f325b2
-                                            NULL);
f325b2
+                                            nullptr);
f325b2
 }
f325b2
 
f325b2
 static void lok_doc_view_set_property (GObject* object, guint propId, const GValue *value, GParamSpec *pspec)
f325b2
@@ -1838,7 +1838,7 @@ static void lok_doc_view_finalize (GObject* object)
f325b2
     if (priv->m_pOffice)
f325b2
         priv->m_pOffice->pClass->destroy (priv->m_pOffice);
f325b2
     delete priv.m_pImpl;
f325b2
-    priv.m_pImpl = 0;
f325b2
+    priv.m_pImpl = nullptr;
f325b2
 
f325b2
     G_OBJECT_CLASS (lok_doc_view_parent_class)->finalize (object);
f325b2
 }
f325b2
@@ -1848,12 +1848,12 @@ static gboolean lok_doc_view_initable_init (GInitable *initable, GCancellable* /
f325b2
     LOKDocView *pDocView = LOK_DOC_VIEW (initable);
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
 
f325b2
-    if (priv->m_pOffice != NULL)
f325b2
+    if (priv->m_pOffice != nullptr)
f325b2
         return TRUE;
f325b2
 
f325b2
     priv->m_pOffice = lok_init (priv->m_aLOPath);
f325b2
 
f325b2
-    if (priv->m_pOffice == NULL)
f325b2
+    if (priv->m_pOffice == nullptr)
f325b2
     {
f325b2
         g_set_error (error,
f325b2
                      g_quark_from_static_string ("LOK initialization error"), 0,
f325b2
@@ -1896,7 +1896,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
           g_param_spec_string("lopath",
f325b2
                               "LO Path",
f325b2
                               "LibreOffice Install Path",
f325b2
-                              0,
f325b2
+                              nullptr,
f325b2
                               static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
                                                        G_PARAM_CONSTRUCT_ONLY |
f325b2
                                                        G_PARAM_STATIC_STRINGS)));
f325b2
@@ -1926,7 +1926,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
           g_param_spec_string("docpath",
f325b2
                               "Document Path",
f325b2
                               "The URI of the document to open",
f325b2
-                              0,
f325b2
+                              nullptr,
f325b2
                               static_cast<GParamFlags>(G_PARAM_READWRITE |
f325b2
                                                        G_PARAM_STATIC_STRINGS)));
f325b2
 
f325b2
@@ -2072,7 +2072,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS (pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__DOUBLE,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_DOUBLE);
f325b2
@@ -2087,7 +2087,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS (pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__BOOLEAN,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_BOOLEAN);
f325b2
@@ -2102,7 +2102,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__STRING,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_STRING);
f325b2
@@ -2117,7 +2117,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__STRING,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_STRING);
f325b2
@@ -2132,7 +2132,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__INT,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_INT);
f325b2
@@ -2147,7 +2147,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__VOID,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_INT);
f325b2
@@ -2162,7 +2162,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__STRING,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_STRING);
f325b2
@@ -2180,7 +2180,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_generic,
f325b2
                      G_TYPE_NONE, 4,
f325b2
                      G_TYPE_INT, G_TYPE_INT,
f325b2
@@ -2196,7 +2196,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__STRING,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_STRING);
f325b2
@@ -2212,7 +2212,7 @@ static void lok_doc_view_class_init (LOKDocViewClass* pClass)
f325b2
                      G_TYPE_FROM_CLASS(pGObjectClass),
f325b2
                      G_SIGNAL_RUN_FIRST,
f325b2
                      0,
f325b2
-                     NULL, NULL,
f325b2
+                     nullptr, nullptr,
f325b2
                      g_cclosure_marshal_VOID__STRING,
f325b2
                      G_TYPE_NONE, 1,
f325b2
                      G_TYPE_STRING);
f325b2
@@ -2228,7 +2228,7 @@ lok_doc_view_new (const gchar* pPath, GCancellable *cancellable, GError **error)
f325b2
 SAL_DLLPUBLIC_EXPORT GtkWidget* lok_doc_view_new_from_widget(LOKDocView* pOldLOKDocView)
f325b2
 {
f325b2
     LOKDocViewPrivate& pOldPriv = getPrivate(pOldLOKDocView);
f325b2
-    GtkWidget* pNewDocView = GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/0, /*error=*/0,
f325b2
+    GtkWidget* pNewDocView = GTK_WIDGET(g_initable_new(LOK_TYPE_DOC_VIEW, /*cancellable=*/nullptr, /*error=*/nullptr,
f325b2
                                                        "lopath", pOldPriv->m_aLOPath, "lopointer", pOldPriv->m_pOffice, "docpointer", pOldPriv->m_pDocument, NULL));
f325b2
 
f325b2
     // No documentLoad(), just a createView().
f325b2
@@ -2248,7 +2248,7 @@ lok_doc_view_open_document_finish (LOKDocView* pDocView, GAsyncResult* res, GErr
f325b2
     g_return_val_if_fail(g_task_is_valid(res, pDocView), false);
f325b2
     //FIXME: make source_tag work
f325b2
     //g_return_val_if_fail(g_task_get_source_tag(task) == lok_doc_view_open_document, NULL);
f325b2
-    g_return_val_if_fail(error == NULL || *error == NULL, false);
f325b2
+    g_return_val_if_fail(error == nullptr || *error == nullptr, false);
f325b2
 
f325b2
     return g_task_propagate_boolean(task, error);
f325b2
 }
f325b2
@@ -2262,7 +2262,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,
f325b2
 {
f325b2
     GTask* task = g_task_new(pDocView, cancellable, callback, userdata);
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_LOAD_DOC);
f325b2
     pLOEvent->m_pPath = pPath;
f325b2
@@ -2271,7 +2271,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_LOAD_DOC: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
@@ -2331,15 +2331,15 @@ SAL_DLLPUBLIC_EXPORT void
f325b2
 lok_doc_view_set_part (LOKDocView* pDocView, int nPart)
f325b2
 {
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_SET_PART);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     pLOEvent->m_nPart = nPart;
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_SET_PART: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
@@ -2360,14 +2360,14 @@ lok_doc_view_set_partmode(LOKDocView* pDocView,
f325b2
                           int nPartMode)
f325b2
 {
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_SET_PARTMODE);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
     pLOEvent->m_nPartMode = nPartMode;
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_SET_PARTMODE: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
@@ -2397,22 +2397,22 @@ lok_doc_view_reset_view(LOKDocView* pDocView)
f325b2
     memset(&priv->m_aCellCursor, 0, sizeof(priv->m_aCellCursor));
f325b2
 
f325b2
     cairo_surface_destroy(priv->m_pHandleStart);
f325b2
-    priv->m_pHandleStart = 0;
f325b2
+    priv->m_pHandleStart = nullptr;
f325b2
     memset(&priv->m_aHandleStartRect, 0, sizeof(priv->m_aHandleStartRect));
f325b2
     priv->m_bInDragStartHandle = false;
f325b2
 
f325b2
     cairo_surface_destroy(priv->m_pHandleMiddle);
f325b2
-    priv->m_pHandleMiddle = 0;
f325b2
+    priv->m_pHandleMiddle = nullptr;
f325b2
     memset(&priv->m_aHandleMiddleRect, 0, sizeof(priv->m_aHandleMiddleRect));
f325b2
     priv->m_bInDragMiddleHandle = false;
f325b2
 
f325b2
     cairo_surface_destroy(priv->m_pHandleEnd);
f325b2
-    priv->m_pHandleEnd = 0;
f325b2
+    priv->m_pHandleEnd = nullptr;
f325b2
     memset(&priv->m_aHandleEndRect, 0, sizeof(priv->m_aHandleEndRect));
f325b2
     priv->m_bInDragEndHandle = false;
f325b2
 
f325b2
     cairo_surface_destroy(priv->m_pGraphicHandle);
f325b2
-    priv->m_pGraphicHandle = 0;
f325b2
+    priv->m_pGraphicHandle = nullptr;
f325b2
     memset(&priv->m_aGraphicHandleRects, 0, sizeof(priv->m_aGraphicHandleRects));
f325b2
     memset(&priv->m_bInDragGraphicHandles, 0, sizeof(priv->m_bInDragGraphicHandles));
f325b2
 
f325b2
@@ -2426,14 +2426,14 @@ lok_doc_view_set_edit(LOKDocView* pDocView,
f325b2
                       gboolean bEdit)
f325b2
 {
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_SET_EDIT);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
     pLOEvent->m_bEdit = bEdit;
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
 
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_SET_EDIT: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
@@ -2456,16 +2456,16 @@ lok_doc_view_post_command (LOKDocView* pDocView,
f325b2
                            gboolean bNotifyWhenFinished)
f325b2
 {
f325b2
     LOKDocViewPrivate& priv = getPrivate(pDocView);
f325b2
-    GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
f325b2
+    GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr);
f325b2
     LOEvent* pLOEvent = new LOEvent(LOK_POST_COMMAND);
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
     pLOEvent->m_pCommand = pCommand;
f325b2
     pLOEvent->m_pArguments  = g_strdup(pArguments);
f325b2
     pLOEvent->m_bNotifyWhenFinished = bNotifyWhenFinished;
f325b2
 
f325b2
     g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), &error);
f325b2
-    if (error != NULL)
f325b2
+    if (error != nullptr)
f325b2
     {
f325b2
         g_warning("Unable to call LOK_POST_COMMAND: %s", error->message);
f325b2
         g_clear_error(&error);
f325b2
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
f325b2
index 32a9534e884c..f804a1f42140 100644
f325b2
--- a/libreofficekit/source/gtk/tilebuffer.cxx
f325b2
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
f325b2
@@ -44,7 +44,7 @@ void Tile::setPixbuf(GdkPixbuf *buffer)
f325b2
     if (m_pBuffer == buffer)
f325b2
         return;
f325b2
     g_clear_object(&m_pBuffer);
f325b2
-    if (buffer != NULL)
f325b2
+    if (buffer != nullptr)
f325b2
         g_object_ref(buffer);
f325b2
     m_pBuffer = buffer;
f325b2
 }
f325b2
@@ -66,7 +66,7 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,
f325b2
                             GThreadPool* lokThreadPool)
f325b2
 {
f325b2
     int index = x * m_nWidth + y;
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
     if (m_mTiles.find(index) != m_mTiles.end())
f325b2
     {
f325b2
         m_mTiles[index].valid = false;
f325b2
@@ -77,7 +77,7 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,
f325b2
         pLOEvent->m_fPaintTileZoom = fZoom;
f325b2
         g_task_set_task_data(task, pLOEvent, LOEvent::destroy);
f325b2
         g_thread_pool_push(lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_PAINT_TILE: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -89,12 +89,12 @@ Tile& TileBuffer::getTile(int x, int y, GTask* task,
f325b2
                           GThreadPool* lokThreadPool)
f325b2
 {
f325b2
     int index = x * m_nWidth + y;
f325b2
-    GError* error = NULL;
f325b2
+    GError* error = nullptr;
f325b2
 
f325b2
     if (m_mTiles.find(index) != m_mTiles.end() && !m_mTiles[index].valid)
f325b2
     {
f325b2
         g_thread_pool_push(lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_PAINT_TILE: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
@@ -104,7 +104,7 @@ Tile& TileBuffer::getTile(int x, int y, GTask* task,
f325b2
     else if(m_mTiles.find(index) == m_mTiles.end())
f325b2
     {
f325b2
         g_thread_pool_push(lokThreadPool, g_object_ref(task), &error);
f325b2
-        if (error != NULL)
f325b2
+        if (error != nullptr)
f325b2
         {
f325b2
             g_warning("Unable to call LOK_PAINT_TILE: %s", error->message);
f325b2
             g_clear_error(&error);
f325b2
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx
f325b2
index 9407257e5fec..5482ea2b2825 100644
f325b2
--- a/libreofficekit/source/gtk/tilebuffer.hxx
f325b2
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
f325b2
@@ -58,7 +58,7 @@ GQuark LOKTileBufferErrorQuark(void);
f325b2
 class Tile
f325b2
 {
f325b2
  public:
f325b2
-    Tile() : valid(false), m_pBuffer(0) {}
f325b2
+    Tile() : valid(false), m_pBuffer(nullptr) {}
f325b2
     ~Tile()
f325b2
     {
f325b2
         g_clear_object(&m_pBuffer);
f325b2
@@ -92,7 +92,7 @@ private:
f325b2
 class TileBuffer
f325b2
 {
f325b2
  public:
f325b2
- TileBuffer(LibreOfficeKitDocument *document = 0,
f325b2
+ TileBuffer(LibreOfficeKitDocument *document = nullptr,
f325b2
             int columns = 0)
f325b2
      : m_pLOKDocument(document)
f325b2
      , m_nWidth(columns)
f325b2
@@ -236,10 +236,10 @@ struct LOEvent
f325b2
     /// Constructor to instantiate an object of type `type`.
f325b2
     LOEvent(int type)
f325b2
         : m_nType(type)
f325b2
-        , m_pCommand(0)
f325b2
-        , m_pArguments(0)
f325b2
+        , m_pCommand(nullptr)
f325b2
+        , m_pArguments(nullptr)
f325b2
         , m_bNotifyWhenFinished(false)
f325b2
-        , m_pPath(0)
f325b2
+        , m_pPath(nullptr)
f325b2
         , m_bEdit(false)
f325b2
         , m_nPartMode(0)
f325b2
         , m_nPart(0)
f325b2
-- 
f325b2
2.12.0
f325b2