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

[Jan Holesovsky]

 writerfilter/source/ooxml/OOXMLFactory.cxx   |    2 ++
 writerfilter/source/ooxml/OOXMLFactory.hxx   |    2 +-
 writerfilter/source/ooxml/factory_ns.xsl     |    2 ++
 writerfilter/source/ooxml/factoryimpl_ns.xsl |    2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7ec515a7162d886cba611067cc6b4577aaf270a4
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Apr 16 17:43:43 2014 +0200

    writerfilter: Hide more debug strings we don't need in production builds.
    
    Change-Id: If30d3a94cd3f18bd5c4856d8a88f6c78e0da3e76

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 8e2fa15..1f778c3 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -85,10 +85,12 @@ TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
     return m_TokenToIdsMap[nId];
 }
 
+#ifdef DEBUG_FACTORY
 string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
     return "";
 }
+#endif
 
 // class OOXMLFactory
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 346b023..7690976 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -102,8 +102,8 @@ public:
     virtual void charactersAction(OOXMLFastContextHandler * pHandler, const OUString & rString);
     virtual void endAction(OOXMLFastContextHandler * pHandler);
     virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
-    virtual string getDefineName(Id nId) const;
 #ifdef DEBUG_FACTORY
+    virtual string getDefineName(Id nId) const;
     virtual string getName() const;
 #endif
 
diff --git a/writerfilter/source/ooxml/factory_ns.xsl b/writerfilter/source/ooxml/factory_ns.xsl
index 2815078..a657215 100644
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ b/writerfilter/source/ooxml/factory_ns.xsl
@@ -86,7 +86,9 @@ public:
     virtual ListValueMapPointer createListValueMap(Id nId);
     virtual CreateElementMapPointer createCreateElementMap(Id nId);
     virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
+#ifdef DEBUG_FACTORY
     virtual string getDefineName(Id nId) const;</xsl:text>
+#endif
     <xsl:call-template name="factoryactiondecls"/>
     virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t nToken, OOXMLValue::Pointer_t pValue);
 
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.xsl b/writerfilter/source/ooxml/factoryimpl_ns.xsl
index 8d5f565..9cb8912 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.xsl
+++ b/writerfilter/source/ooxml/factoryimpl_ns.xsl
@@ -676,6 +676,7 @@ CreateElementMapPointer </xsl:text>
 
 <xsl:template name="factorygetdefinename">
     <xsl:text>
+#ifdef DEBUG_FACTORY
 string </xsl:text>
     <xsl:call-template name="factoryclassname"/>
     <xsl:text>::getDefineName(Id nId) const
@@ -699,6 +700,7 @@ string </xsl:text>
     
     return (*pMap)[nId];
 }
+#endif
     
 </xsl:template>