|
 |
f325b2 |
From 19770dc907fb14c29c954aba399f906ee0c44914 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Stephan Bergmann <sbergman@redhat.com>
|
|
|
f325b2 |
Date: Fri, 13 Nov 2015 10:41:32 +0100
|
|
|
f325b2 |
Subject: [PATCH 320/398] loplugin:nullptr
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Iaf779157b97e4d3a3a449cc7f17e4d5c533955f0
|
|
|
f325b2 |
(cherry picked from commit c6c8af5ef46e2178e4b9abcd95f76c8df2db2732)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
libreofficekit/source/gtk/lokdocview.cxx | 8 ++++----
|
|
|
f325b2 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
index 9d852351262e..47ada280dde3 100644
|
|
|
f325b2 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
f325b2 |
@@ -2269,7 +2269,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 |
@@ -2346,7 +2346,7 @@ SAL_DLLPUBLIC_EXPORT void
|
|
|
f325b2 |
lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
LOKDocViewPrivate& priv = getPrivate(pDocView);
|
|
|
f325b2 |
- GError* error = NULL;
|
|
|
f325b2 |
+ GError* error = nullptr;
|
|
|
f325b2 |
|
|
|
f325b2 |
priv->m_fZoom = fZoom;
|
|
|
f325b2 |
long nDocumentWidthPixels = twipToPixel(priv->m_nDocumentWidthTwips, fZoom);
|
|
|
f325b2 |
@@ -2361,7 +2361,7 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
|
|
|
f325b2 |
nDocumentHeightPixels);
|
|
|
f325b2 |
|
|
|
f325b2 |
// Update the client's view size
|
|
|
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_CLIENT_ZOOM);
|
|
|
f325b2 |
pLOEvent->m_nTilePixelWidth = nTileSizePixels;
|
|
|
f325b2 |
pLOEvent->m_nTilePixelHeight = nTileSizePixels;
|
|
|
f325b2 |
@@ -2370,7 +2370,7 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
|
|
|
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_CLIENT_ZOOM: %s", error->message);
|
|
|
f325b2 |
g_clear_error(&error);
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|