diff options
| author | Noel Grandin <noel@peralex.com> | 2016-10-24 11:30:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-10-24 11:30:14 +0200 |
| commit | 6320a0f2108e5c4b7f397005a5b5bf6ae93812bd (patch) | |
| tree | 8e5cfde5ac11e73e2a3163df178b6ce7580dbec9 | |
| parent | Simplify code further (diff) | |
| download | core-6320a0f2108e5c4b7f397005a5b5bf6ae93812bd.tar.gz core-6320a0f2108e5c4b7f397005a5b5bf6ae93812bd.zip | |
revert string::find changes
this reverts
commit 610f59651563205564a0f4818b5c1d347ca02132
fix "cppcheck:stlIfStrFind"
and
commit 5c1bb338ef0d781648d5b33ffc9d64c2be6d9926
cppcheck:stlIfStrFind
which are deficient in one way or another, the original logic, while
inefficient, is still most accurate
Change-Id: I4907d2569c9c2976533f8ac9f4b8b45eb1807b72
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 | ||||
| -rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 29a9bfe61345..f3592c8c66ac 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -356,7 +356,7 @@ struct RectangleAndPart static RectangleAndPart Create(const std::string& rPayload) { RectangleAndPart aRet; - if (rPayload.rfind("EMPTY") == 0) // payload starts with "EMPTY" + if (rPayload.find("EMPTY") == 0) // payload starts with "EMPTY" { if (comphelper::LibreOfficeKit::isPartInInvalidation()) aRet.m_nPart = std::stol(rPayload.substr(6)); diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 8f23995dbfcf..a08d93e8e3fa 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -1136,7 +1136,7 @@ callback (gpointer pData) { case LOK_CALLBACK_INVALIDATE_TILES: { - if (pCallback->m_aPayload.rfind("EMPTY") != 0) // payload doesn't start with "EMPTY" + if (pCallback->m_aPayload.find("EMPTY") != 0) // payload doesn't start with "EMPTY" { GdkRectangle aRectangle = payloadToRectangle(pDocView, pCallback->m_aPayload.c_str()); setTilesInvalid(pDocView, aRectangle); |