[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - i18nutil/source sc/qa

[Winfried Donkers]

 i18nutil/source/utility/widthfolding_data.h  |    1 +
 sc/qa/unit/data/functions/text/fods/jis.fods |   15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 8c01c25ac4f85266719dc04e9809da2f3eb5b10e
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Wed Jan 24 17:21:19 2018 +0100

    tdf#103550 fix issue with HYPHEN-MINUS in Calc function JIS.
    
    Change-Id: Ie1e25ea7a0d6f23dfe21f53ed47430be6b357984
    Reviewed-on: https://gerrit.libreoffice.org/48523
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 484d0ea842da586a4cf51b6d11683b04f234474c)
    Reviewed-on: https://gerrit.libreoffice.org/48664

diff --git a/i18nutil/source/utility/widthfolding_data.h b/i18nutil/source/utility/widthfolding_data.h
index b2bdd369c6cf..999ca82734b1 100644
--- a/i18nutil/source/utility/widthfolding_data.h
+++ b/i18nutil/source/utility/widthfolding_data.h
@@ -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
diff --git a/sc/qa/unit/data/functions/text/fods/jis.fods b/sc/qa/unit/data/functions/text/fods/jis.fods
index 50584f6b8820..2c55690735fb 100644
--- a/sc/qa/unit/data/functions/text/fods/jis.fods
+++ b/sc/qa/unit/data/functions/text/fods/jis.fods
@@ -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>!"#$%&'()*+,-./</text:p>
      </table:table-cell>
@@ -1802,4 +1805,4 @@
    </table:named-expressions>
   </office:spreadsheet>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>