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