commit 9e9e08dae1abe90d7c4d81d22065f31e5b948435
author Mike Kaganski <mike.kaganski@collabora.com> Sun Nov 04 22:38:44 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Mon Nov 05 07:19:52 2018 +0100
tree d0de18ec4361f635ed157a7da528aafa23536049
parent 655154e45abfe6c69b97ad5c615f231be4b3827a

tdf#120703 PVS: this fix was wrong

This partially reverts commit 2a3f5d11522cd69f0ce221cde3a63b7e85e94b53
to reimplement the proper index check. Thanks to Svyatoslav Razmyslov.

Change-Id: If0928eed8ff137efbb2d7605135375d147e9accf
Reviewed-on: https://gerrit.libreoffice.org/62862
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

basctl/source/basicide/baside2b.cxx

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index a1ec27c..4c40686 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -148,10 +148,13 @@
    if ( nIndexStart != -1 )
    {
        sal_Int32 nIndexEnd = rVar.indexOf( ')', nIndexStart );
        rIndex = rVar.copy(nIndexStart + 1, nIndexEnd - nIndexStart - 1);
        rVar = rVar.copy(0, nIndexStart);
        rVar = comphelper::string::stripEnd(rVar, ' ');
        rIndex = comphelper::string::strip(rIndex, ' ');
        if (nIndexEnd != -1)
        {
            rIndex = rVar.copy(nIndexStart + 1, nIndexEnd - nIndexStart - 1);
            rVar = rVar.copy(0, nIndexStart);
            rVar = comphelper::string::stripEnd(rVar, ' ');
            rIndex = comphelper::string::strip(rIndex, ' ');
        }
    }

    if ( !rVar.isEmpty() )