[Libreoffice-commits] core.git: cui/uiconfig i18npool/source offapi/com

[Yossi Zahn]

 cui/uiconfig/ui/numberingoptionspage.ui                               |    8 ++++++++
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   10 ++++++++++
 offapi/com/sun/star/style/NumberingType.idl                           |    6 ++++++
 3 files changed, 24 insertions(+)

New commits:
commit 08fb6d73f8c22d98ab806dd93f4afe3f78b4ff83
Author: Yossi Zahn <yossizahn at gmail.com>
Date:   Mon Dec 12 11:42:31 2016 +0000

    tdf#66212 - Add Hebrew NATNUM1 to numbering-format menus.
    
    Previously it was only accessible as "Native Numbering" and Locale option had to be set to Hebrew.
    
    Still to implement: rtf/ooxml/.doc export/import
                        NATNUM2?
    
    Change-Id: Ife9943a7d21e8f69c2761007dcefdf3e223fc261
    Reviewed-on: https://gerrit.libreoffice.org/31901
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index b103567..6ad166f 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -160,6 +160,14 @@
         <col id="0" translatable="yes">α, β, γ, ... (Greek Lower Letter)</col>
         <col id="1">53</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">א...י, יא...כ, ...</col>
+        <col id="1">56</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">א...ת, אא...תת, ...</col>
+        <col id="1">33</col>
+      </row>
     </data>
   </object>
   <object class="GtkBox" id="NumberingOptionsPage">
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index a8ec5b2..0990651 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -44,6 +44,11 @@
 #define S_GR_A "\xCE\xB1"
 #define S_GR_B "\xCE\xB2"
 
+//Hebrew
+#define S_HE_ALEPH "\xD7\x90"
+#define S_HE_YOD "\xD7\x99"
+#define S_HE_QOF "\xD7\xA7"
+
 #include <math.h>
 #include <sal/macros.h>
 #include <rtl/ustring.hxx>
@@ -750,6 +755,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
           case CHARS_HEBREW:
               lcl_formatChars(table_Alphabet_he, SAL_N_ELEMENTS(table_Alphabet_he), number - 1, result);
               break;
+          case NUMBER_HEBREW:
+              natNum = NativeNumberMode::NATNUM1;
+              locale.Language = "he";
+              break;
           case CHARS_NEPALI:
               lcl_formatChars(table_Alphabet_ne, SAL_N_ELEMENTS(table_Alphabet_ne), number - 1, result);
               break;
@@ -915,6 +924,7 @@ static const Supported_NumberingType aSupportedTypes[] =
         {style::NumberingType::CHARS_ARABIC_ABJAD,   nullptr, LANG_CTL},
         {style::NumberingType::CHARS_THAI,      nullptr, LANG_CTL},
         {style::NumberingType::CHARS_HEBREW,    nullptr, LANG_CTL},
+        {style::NumberingType::NUMBER_HEBREW,    S_HE_ALEPH ", " S_HE_YOD ", " S_HE_QOF ", ...", LANG_CTL},
         {style::NumberingType::CHARS_NEPALI,    nullptr, LANG_CTL},
         {style::NumberingType::CHARS_KHMER,     nullptr, LANG_CTL},
         {style::NumberingType::CHARS_LAO,       nullptr, LANG_CTL},
diff --git a/offapi/com/sun/star/style/NumberingType.idl b/offapi/com/sun/star/style/NumberingType.idl
index c5f7516..77b1a10 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -434,6 +434,12 @@ published constants NumberingType
      */
     const short CHARS_PERSIAN_WORD = 55;
 
+    /** Numbering in Hebrew numerals
+
+        @since LibreOffice 5.4
+     */
+    const short NUMBER_HEBREW = 56;
+
 };