[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/factoryimpl_ns.py |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f0e7d9eb64f1586daf9b54ee533c5ba0841e031a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Oct 11 09:37:45 2014 +0200

    writerfilter: drop support for simple list types without constants
    
    In other words, from now it's a must to map ST_Foo simple types to
    NS_ooxml::LN_something constants, and raw integers (which are hard to
    grep and hard to track down where are they used) are no longer an
    option.
    
    Change-Id: I968b27bca3f64f6f4a382b87e2dbc499a3132ea2

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py
index 610fac0..407bb49 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -200,11 +200,8 @@ def factoryAttributeToResourceMap(nsNode):
 
 
 def idToLabel(idName):
-    if ":" in idName:
-        ns, ln = idName.split(':')
-        return "NS_%s::LN_%s" % (ns, ln)
-    else:
-        return idName
+    ns, ln = idName.split(':')
+    return "NS_%s::LN_%s" % (ns, ln)
 
 
 def appendValueData(values, name, value):