mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#103550 fix issue with HYPHEN-MINUS in Calc function JIS.

Browse Source 
Change-Id: Ie1e25ea7a0d6f23dfe21f53ed47430be6b357984
Reviewed-on: https://gerrit.libreoffice.org/48523
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Winfried Donkers
2018-01-24 17:21:19 +01:00
committed by Eike Rathke
parent 1a8aac875f
commit 484d0ea842
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
i18nutil/source/utility/widthfolding_data.h
View File

@@ -718,6 +718,7 @@ UnicodePairWithFlag half2full[] = {
{ 0x002A, 0xFF0A, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // ASTERISK --> FULLWIDTH ASTERISK
{ 0x002B, 0xFF0B, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // PLUS SIGN --> FULLWIDTH PLUS SIGN
{ 0x002C, 0xFF0C, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // COMMA --> FULLWIDTH COMMA
{ 0x002D, 0xFF0D, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // MINUS HYPHEN --> FULLWIDTH MINUS HYPHEN
{ 0x002E, 0xFF0E, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // FULL STOP --> FULLWIDTH FULL STOP
{ 0x002F, 0xFF0F, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // SOLIDUS --> FULLWIDTH SOLIDUS
{ 0x0030, 0xFF10, HALF2FULL_NORMAL | HALF2FULL_JIS_FUNCTION }, // DIGIT ZERO --> FULLWIDTH DIGIT ZERO

15
sc/qa/unit/data/functions/text/fods/jis.fods
View File

@@ -1057,19 +1057,22 @@
<table:table-cell table:style-name="ce13" table:number-columns-repeated="2"/>
</table:table-row>
<table:table-row table:style-name="ro5">
<table:table-cell table:formula="of:=JIS([.I3])" office:value-type="string" office:string-value="０１２３４５６７８９" calcext:value-type="string">
<text:p>０１２３４５６７８９</text:p>
<table:table-cell table:style-name="ce14" table:formula="of:=JIS([.I2])" office:value-type="string" office:string-value="！”＃＄％＆’（）＊＋，－．／" calcext:value-type="string">
<text:p>！”＃＄％＆’（）＊＋，－．／</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>０１２３４５６７８９</text:p>
<text:p>！”＃＄％＆’（）＊＋，－．／</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce29" table:formula="of:=[.A2]=[.B2]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A42])" office:value-type="string" office:string-value="=JIS(I2)" calcext:value-type="string">
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=JIS(I2)" calcext:value-type="string">
<text:p>=JIS(I2)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="4"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Tdf103550, AOO#78727</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="3"/>
<table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
<text:p>!&quot;#$%&amp;&apos;()*+,-./</text:p>
</table:table-cell>
@@ -1802,4 +1805,4 @@
</table:named-expressions>
</office:spreadsheet>
</office:body>
</office:document>
</office:document>