[Libreoffice-commits] core.git: filter/source

[Libreoffice Gerrit user]

 filter/source/config/cache/querytokenizer.cxx |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 1d86bad16d8d517845828932115f75dd13c24940
Author:     Matteo Casalin <matteo.casa...@yahoo.com>
AuthorDate: Wed Mar 13 23:52:32 2019 +0100
Commit:     Matteo Casalin <matteo.casa...@yahoo.com>
CommitDate: Wed Mar 20 07:48:21 2019 +0100

    Simplify by using indexed getToken()
    
    Change-Id: Ie3c890be9ec3ec01bb72977ab2934bda62b2edea
    Reviewed-on: https://gerrit.libreoffice.org/69248
    Tested-by: Jenkins
    Reviewed-by: Matteo Casalin <matteo.casa...@yahoo.com>

diff --git a/filter/source/config/cache/querytokenizer.cxx 
b/filter/source/config/cache/querytokenizer.cxx
index a7f5b3e8be1d..6d6e9d5e504a 100644
--- a/filter/source/config/cache/querytokenizer.cxx
+++ b/filter/source/config/cache/querytokenizer.cxx
@@ -35,22 +35,14 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery)
         OUString sToken = sQuery.getToken(0, ':', token);
         if (!sToken.isEmpty())
         {
-            sal_Int32 equal = sToken.indexOf('=');
+            sal_Int32 nIdx{ 0 };
+            const OUString sKey{ sToken.getToken(0, '=', nIdx) };
+            const OUString sVal{ sToken.getToken(0, ':', nIdx) };
 
-            if (equal == 0)
+            if (sKey.isEmpty())
                 m_bValid = false;
             OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer() Found non 
boolean query parameter ... but its key is empty. Will be ignored!");
 
-            OUString sKey;
-            OUString sVal;
-
-            sKey = sToken;
-            if (equal > 0)
-            {
-                sKey = sToken.copy(0      , equal                       );
-                sVal = sToken.copy(equal+1);
-            }
-
             if (find(sKey) != end())
                 m_bValid = false;
             OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer() Query 
contains same param more than once. Last one wins :-)");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits