[Libreoffice-commits] core.git: include/svl svl/source

[Libreoffice Gerrit user]

 include/svl/nfkeytab.hxx        |   13 +++----------
 svl/source/numbers/zforscan.cxx |    2 --
 2 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit f827b5fd7f5add45868b2527006856d902a4e550
Author:     Eike Rathke <erack at redhat.com>
AuthorDate: Mon Sep 17 21:33:21 2018 +0200
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Tue Sep 18 17:23:43 2018 +0200

    Bin binfilter cruft
    
    The requirement for persistent keyword index values is gone since
    long. Remove the NF_KEY_UNUSEDn place holders.
    
    Change-Id: Idcc1b621d88884ebcefb3ba4e7865d4f2db4ce51
    Reviewed-on: https://gerrit.libreoffice.org/60643
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins

diff --git a/include/svl/nfkeytab.hxx b/include/svl/nfkeytab.hxx
index ddffc030d482..16dea80e99e2 100644
--- a/include/svl/nfkeytab.hxx
+++ b/include/svl/nfkeytab.hxx
@@ -25,15 +25,10 @@
 
 //! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
 //! e.g. first TT then TTTT
-//! The internal order is essentially for the format code string scanner!
-//! New keywords MUST NOT be inserted, only the NF_KEY_UNUSEDn may be used,
-//! NF_KEY_LASTKEYWORD must be adjusted accordingly. Otherwise old versions
-//! will fail upon reading these entries. Nevertheless, old versions are NOT
-//! able to display those new keywords => blank display.
+//! The internal order is essential for the format code string scanner.
+//! New keywords MUST NOT be inserted.
 //
-// Note: 2005-09-02: the above applies to the binary file format.
-//
-// ER 15.12.99: This table is externally only to be used with method
+// This table is externally only to be used with method
 // OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable&, const LocaleDataWrapper& );
 // and method
 // void SvNumberFormatter::FillKeywordTable( NfKeywordTable&, LanguageType );
@@ -70,8 +65,6 @@ enum NfKeywordIndex
     NF_KEY_WW,          // week of year, as of version 8, 19.06.98
     NF_KEY_MMMMM,       // first letter of month name
     NF_KEY_LASTKEYWORD = NF_KEY_MMMMM,
-    NF_KEY_UNUSED4,
-    NF_KEY_UNUSED5,     // was quarter word, not used anymore from SRC631 on (26.04.01)
     NF_KEY_TRUE,        // boolean true
     NF_KEY_FALSE,       // boolean false
     NF_KEY_BOOLEAN,     // boolean
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index bb54df73ef02..266937f8ec4c 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -73,8 +73,6 @@ const NfKeywordTable ImpSvNumberformatScan::sEnglishKeyword =
     "NNN",     // NF_KEY_NNN Day of week long
     "WW",      // NF_KEY_WW Week of year
     "MMMMM",   // NF_KEY_MMMMM first letter of month name
-    "",        // NF_KEY_UNUSED4,
-    "",        // NF_KEY_UNUSED5,     // was quarter word, not used anymore from SRC631 on (26.04.01)
     "TRUE",    // NF_KEY_TRUE boolean true
     "FALSE",   // NF_KEY_FALSE boolean false
     "BOOLEAN", // NF_KEY_BOOLEAN boolean