|
 |
135360 |
From f14e917df2cd85f90337a2fe7cae085390e4aa34 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Mihai Varga <mihai.mv13@gmail.com>
|
|
|
135360 |
Date: Mon, 5 Oct 2015 18:07:28 +0300
|
|
|
135360 |
Subject: [PATCH 178/398] LOK: fixed duplicated switch case values
|
|
|
135360 |
|
|
|
135360 |
(cherry picked from commit a6ef5718475ba35b52d9de474741b640316502eb)
|
|
|
135360 |
---
|
|
|
135360 |
libreofficekit/source/gtk/lokdocview.cxx | 11 +----------
|
|
|
135360 |
1 file changed, 1 insertion(+), 10 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
index fa0386ba77f8..5d810d801106 100644
|
|
|
135360 |
--- a/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
+++ b/libreofficekit/source/gtk/lokdocview.cxx
|
|
|
135360 |
@@ -661,11 +661,7 @@ callback (gpointer pData)
|
|
|
135360 |
case LOK_CALLBACK_SEARCH_RESULT_COUNT:
|
|
|
135360 |
{
|
|
|
135360 |
size_t nPos = pCallback->m_aPayload.find_first_of(";");
|
|
|
135360 |
- int nSearchResultCount = std::stoi(pCallback->m_aPayload.substr(0, nPos));
|
|
|
135360 |
- if (nSearchResultCount == 0)
|
|
|
135360 |
- {
|
|
|
135360 |
- searchNotFound(pDocView, pCallback->m_aPayload.substr(nPos + 1));
|
|
|
135360 |
- }
|
|
|
135360 |
+ searchResultCount(pDocView, pCallback->m_aPayload.substr(0, nPos));
|
|
|
135360 |
}
|
|
|
135360 |
break;
|
|
|
135360 |
case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
|
|
|
135360 |
@@ -683,11 +679,6 @@ callback (gpointer pData)
|
|
|
135360 |
setPart(pDocView, pCallback->m_aPayload);
|
|
|
135360 |
}
|
|
|
135360 |
break;
|
|
|
135360 |
- case LOK_CALLBACK_SEARCH_RESULT_COUNT:
|
|
|
135360 |
- {
|
|
|
135360 |
- searchResultCount(pDocView, pCallback->m_aPayload);
|
|
|
135360 |
- }
|
|
|
135360 |
- break;
|
|
|
135360 |
default:
|
|
|
135360 |
g_assert(false);
|
|
|
135360 |
break;
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|