diff options
| author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2016-08-12 11:59:56 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-08-16 10:23:57 +0000 |
| commit | 3deb5fed775290540611cde158051a647bb5e317 (patch) | |
| tree | 3d4d949cad196b2194f0a84be8fc2b3f1040ae6a /svl | |
| parent | 553f61ccf4cd9ea062c40ccd6de86b76b5497aeb (diff) | |
tdf#101462 tdf#79399 lcl_matchKeywordAndGetNumber returns integer
This prevent [DBNumX] format codes to be recognized
Fix in the same time tdf#79399 (import of [DBNumX] from XL)
Do NOT fix yet tdf#79398 (export of [DBNumX] to XL)
Change-Id: I08817818bf0ff30b4704bb69b2ac9aa3890c7aa6
Reviewed-on: https://gerrit.libreoffice.org/28071
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit b1ce5db192750210b1546417494664f91759719d)
Reviewed-on: https://gerrit.libreoffice.org/28141
Tested-by: Laurent BP <laurent.balland-poirier@laposte.net>
Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 7f0df633da7a..222d731fea82 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -1457,13 +1457,13 @@ short SvNumberformat::ImpNextSymbol(OUStringBuffer& rString, eState = SsGetPrefix; } else if ( lcl_matchKeywordAndGetNumber( aBufStr, nPos-1, aDBNum, nDBNum) && - '1' <= nDBNum && nDBNum <= '9' ) + 1 <= nDBNum && nDBNum <= 9 ) { sBuffSymbol.stripStart('['); sBuffSymbol.append( aBufStr.copy( --nPos, aDBNum.getLength()+1 )); nPos += aDBNum.getLength()+1; //! SymbolType is negative - eSymbolType = sal::static_int_cast< short >( BRACKET_SYMBOLTYPE_DBNUM1 - (nDBNum - '1')); + eSymbolType = sal::static_int_cast< short >( BRACKET_SYMBOLTYPE_DBNUM1 - (nDBNum - 1) ); eState = SsGetPrefix; } else |