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

[Miklos Vajna]

 writerfilter/source/ooxml/OOXMLFactory.cxx   |    7 -------
 writerfilter/source/ooxml/OOXMLFactory.hxx   |    1 -
 writerfilter/source/ooxml/factory_ns.py      |    5 -----
 writerfilter/source/ooxml/factoryimpl_ns.py  |   14 --------------
 writerfilter/source/ooxml/modelpreprocess.py |    5 -----
 5 files changed, 32 deletions(-)

New commits:
commit 14a5f2f6fa3feabc8ef71843063b52364cbc4560
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jul 29 19:04:19 2014 +0200

    writerfilter: nobody reads enumname
    
    Change-Id: I4a5eb77ff14bb033061ce8214ef7f65d587b159a

diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py
index 82e5e3f..cdb1382 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -136,11 +136,6 @@ def preprocess(model):
                 localname = j.getAttribute("name")
 
             # set the attributes
-            enumname = ""
-            if len(prefix):
-                enumname += prefix + ":"
-            j.setAttribute("enumname", enumname + localname)
-
             qname = ""
             if len(ns):
                 qname += ns + ":"
commit 423020de5d2533533aa0d19249079e1dcee632d2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Jul 29 19:02:28 2014 +0200

    writerfilter: unused OOXMLFactory_*::getName()
    
    Change-Id: I9cf482b10b719d40ab553616099d04c7b1572986

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 2e73930..afdadf1 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -279,13 +279,6 @@ void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, OOXMLV
 {
 }
 
-#ifdef DEBUG_DOMAINMAPPER
-string OOXMLFactory_ns::getName() const
-{
-    return "noname";
-}
-#endif
-
 }
 }
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 0150acb..76676ac 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -103,7 +103,6 @@ public:
     virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
 #ifdef DEBUG_DOMAINMAPPER
     virtual string getDefineName(Id nId) const;
-    virtual string getName() const;
 #endif
 
     AttributeToResourceMapPointer getAttributeToResourceMap(Id nId);
diff --git a/writerfilter/source/ooxml/factory_ns.py b/writerfilter/source/ooxml/factory_ns.py
index edd0718..991d23a 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -56,11 +56,6 @@ public:
     print("""virtual void charactersAction(OOXMLFastContextHandler* pHandler, const OUString & sText);
     virtual void attributeAction(OOXMLFastContextHandler* pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
 
-#ifdef DEBUG_DOMAINMAPPER
-    virtual string getName() const;
-#endif
-
-
     virtual ~OOXMLFactory_%s();
 
 protected:
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py
index 38ffa51..fc28dc2 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -636,19 +636,6 @@ def factoryAttributeAction(nsNode):
         print()
 
 
-# factoryGetName
-
-
-def factoryGetName(nsNode):
-    print("""#ifdef DEBUG_DOMAINMAPPER
-string OOXMLFactory_%s::getName() const
-{
-    return "%s";
-}
-#endif
-""" % (nsToLabel(nsNode), nsNode.getAttribute("name")))
-
-
 # createImpl
 
 
@@ -692,7 +679,6 @@ namespace ooxml {
         factoryGetDefineName(nsNode)
         factoryTokenToIdMap(nsNode)
         factoryAttributeAction(nsNode)
-        factoryGetName(nsNode)
 
     print("""/// @endcond
 }}""")