[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - writerfilter/source

[Michael Stahl]

 writerfilter/source/ooxml/factoryimpl.py |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 7b4e37468e8d9ed1b528886d579e0ffc5eeb093d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Feb 2 15:04:36 2017 +0100

    writerfilter: remove gperf related declarations
    
    Reportedly gperf 3.1 changes the signature of in_word_set(), where the
    len parameter changes from unsigned int to size_t.
    
    It turns out the only forward declaration for this function is currently
    unused, so just remove it.
    
    Change-Id: Ifbc582cd31ca37fff9ff95a3706ee902ecfe5223
    (cherry picked from commit 19c0eff34a5e1de4f3aff723b7750d4e01d4ba6d)
    Reviewed-on: https://gerrit.libreoffice.org/33969
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/ooxml/factoryimpl.py b/writerfilter/source/ooxml/factoryimpl.py
index 8584e19..dbb391c 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/writerfilter/source/ooxml/factoryimpl.py
@@ -105,17 +105,7 @@ def createFastChildContextFromStart(model):
 
 
 def fastTokenToId(model):
-    print("""namespace tokenmap {
-struct token { const char* name; Token_t nToken; };
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char* str, unsigned int len);
-public:
-  static struct token* in_word_set (const char* str, unsigned int len);
-};
-}
-
+    print("""
 std::string fastTokenToId(sal_uInt32 nToken)
 {