From d926f623382b53c351c2a890352d5e16525df2f3 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 2 Oct 2026 14:55:35 +0200 Subject: [PATCH] lokdocview: Use m_pTileBuffer.get instead of &*m_pTileBuffer on unique_ptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using &* can be problematic if the pointer is null. In this case it probably doesn’t matter, but using unique_ptr::get() is probably easier to understand anyway. This also paves the way for a later compiler plugin to check for this. Change-Id: If0ece4548b44080acf6db7f8c0ac37922d1a197c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211749 Tested-by: Jenkins Reviewed-by: Neil Roberts --- libreofficekit/source/gtk/lokdocview.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index b9c8e3cf7704..24b6826495e0 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -1720,7 +1720,7 @@ renderDocument(LOKDocView* pDocView, cairo_t* pCairo) pLOEvent->m_nPaintTileX = nRow; pLOEvent->m_nPaintTileY = nColumn; pLOEvent->m_fPaintTileZoom = priv->m_fZoom; - pLOEvent->m_pTileBuffer = &*priv->m_pTileBuffer; + pLOEvent->m_pTileBuffer = priv->m_pTileBuffer.get(); GTask* task = g_task_new(pDocView, nullptr, paintTileCallback, pLOEvent); g_task_set_task_data(task, pLOEvent, LOEvent::destroy); @@ -2482,7 +2482,7 @@ paintTileInThread (gpointer data) gint nTileSizePixelsScaled = nTileSizePixels * nScaleFactor; // check if "source" tile buffer is different from "current" tile buffer - if (pLOEvent->m_pTileBuffer != &*priv->m_pTileBuffer) + if (pLOEvent->m_pTileBuffer != priv->m_pTileBuffer.get()) { pLOEvent->m_pTileBuffer = nullptr; g_task_return_new_error(task, @@ -2533,7 +2533,7 @@ paintTileInThread (gpointer data) // requests has passed the previous check at start of this function, and has // rendered the tile already. We want to stop such rendered tiles from being // stored in new tile buffer. - if (pLOEvent->m_pTileBuffer != &*priv->m_pTileBuffer) + if (pLOEvent->m_pTileBuffer != priv->m_pTileBuffer.get()) { pLOEvent->m_pTileBuffer = nullptr; g_task_return_new_error(task,