From 9b6a3417e3a6190f356e9f608346d5ee07bbd19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 19 Dec 2015 15:11:03 +0000 Subject: [PATCH 380/398] coverity#1343633 Resource leak Change-Id: I2384091557c2a3b061e2c60118309f35b65b45d6 (cherry picked from commit 746da6b7fb3829e1ca23a4b8dfec6c502bac681c) Reviewed-on: https://gerrit.libreoffice.org/21270 Reviewed-by: David Tardon Tested-by: Jenkins (cherry picked from commit af32996eb55008b9787516a280a237b61a05ca05) --- libreofficekit/source/gtk/lokdocview.cxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index ec3eb4b9e3ba..4d2842005f37 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -335,6 +335,9 @@ static void doSearch(LOKDocView* pDocView, const char* pText, bool bBackwards, bool highlightAll) { LOKDocViewPrivate& priv = getPrivate(pDocView); + if (!priv->m_pDocument) + return; + boost::property_tree::ptree aTree; GtkWidget* drawingWidget = GTK_WIDGET(pDocView); GdkWindow* drawingWindow = gtk_widget_get_window(drawingWidget); @@ -342,9 +345,6 @@ doSearch(LOKDocView* pDocView, const char* pText, bool bBackwards, bool highligh cairo_rectangle_int_t cairoVisRect; int x, y; - if (!priv->m_pDocument) - return; - cairo_region_get_rectangle(cairoVisRegion, 0, &cairoVisRect); x = pixelToTwip (cairoVisRect.x, priv->m_fZoom); y = pixelToTwip (cairoVisRect.y, priv->m_fZoom); @@ -2541,13 +2541,13 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_set_part (LOKDocView* pDocView, int nPart) { LOKDocViewPrivate& priv = getPrivate(pDocView); + if (!priv->m_pDocument) + return; + GTask* task = g_task_new(pDocView, nullptr, nullptr, nullptr); LOEvent* pLOEvent = new LOEvent(LOK_SET_PART); GError* error = nullptr; - if (!priv->m_pDocument) - return; - pLOEvent->m_nPart = nPart; g_task_set_task_data(task, pLOEvent, LOEvent::destroy); @@ -2564,7 +2564,6 @@ SAL_DLLPUBLIC_EXPORT gchar* lok_doc_view_get_part_name (LOKDocView* pDocView, int nPart) { LOKDocViewPrivate& priv = getPrivate(pDocView); - if (!priv->m_pDocument) return nullptr; @@ -2680,7 +2679,6 @@ lok_doc_view_post_command (LOKDocView* pDocView, gboolean bNotifyWhenFinished) { LOKDocViewPrivate& priv = getPrivate(pDocView); - if (!priv->m_pDocument) return; -- 2.12.0