[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - svl/source

[Eike Rathke]

 svl/source/numbers/zforscan.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit abea6ac4580a0d8ce48527d7cec4b4df087a541a
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Aug 18 16:28:32 2014 +0200

    detect * with no character following as invalid format code
    
    ... so adding it to the list in Format Numbers using the checkmark
    button is not possible.
    
    Change-Id: I57ca6a7a3617583a82a99c87291373b1fe4e246d
    (cherry picked from commit bf674ab0f3097ad122c727b4d86f004f8cce1f61)
    Reviewed-on: https://gerrit.libreoffice.org/10998
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 68959bc..813dede 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -933,6 +933,11 @@ sal_Int32 ImpSvNumberformatScan::Symbol_Division(const OUString& rString)
             }
             else
             {
+                // Valid only if there is a character following, else we are
+                // at the end of a code that does not have a fill character
+                // (yet?).
+                if (sStrArray[nAnzStrings].getLength() < 2)
+                    return nPos;
                 bStar = true;
             }
         }