Commits

Anonymous committed 8e9e669

resolved warnings on unxlngi6.pro

Comments (0)

Files changed (3)

writerfilter/source/dmapper/WrapPolygonHandler.cxx

 #include <ooxml/resourceids.hxx>
 #include <resourcemodel/ResourceModelHelper.hxx>
 
-#include "ConversionHelper.hxx"ConversionHelper::convertTwipToMM100(
+#include "ConversionHelper.hxx"
 #include "WrapPolygonHandler.hxx"
 #include "dmapperLoggers.hxx"
 
     }
 }
 
-void WrapPolygonHandler::lcl_sprm(Sprm & sprm)
+void WrapPolygonHandler::lcl_sprm(Sprm & _sprm)
 {
-    switch (sprm.getId())
+    switch (_sprm.getId())
     {
     case NS_ooxml::LN_CT_WrapPath_lineTo:
     case NS_ooxml::LN_CT_WrapPath_start:
         /* WRITERFILTERSTATUS: done: 100, planned: 0.5, spent: 0 */
         {
-            resolveSprmProps(*this, sprm);
+            resolveSprmProps(*this, _sprm);
             
             awt::Point aPoint(mnX, mnY);
             mpPolygon->addPoint(aPoint);

writerfilter/source/ooxml/factoryimpl_ns.xsl

 <!-- factoryaction -->
 <xsl:template name="factoryaction">
   <xsl:param name="action"/>
-  <xsl:text>&#xa;&#xa;</xsl:text>
-  <xsl:text>void </xsl:text>
-  <xsl:call-template name="factoryclassname"/>
-  <xsl:text>::</xsl:text>
-  <xsl:value-of select="$action"/>
-  <xsl:text>Action(OOXMLFastContextHandler * pHandler</xsl:text>
-  <xsl:if test="$action='characters'">
-    <xsl:text>, const ::rtl::OUString &amp; sText</xsl:text>
-  </xsl:if>
-  <xsl:text>)&#xa;</xsl:text>
-  <xsl:text>{&#xa;</xsl:text>
-  <xsl:variable name="switch1block">
+  <xsl:variable name="switchblock1">
     <xsl:for-each select="resource[action/@name=$action]">
       <xsl:text>
       </xsl:text>
       </xsl:for-each>
     </xsl:if>
   </xsl:variable>
-  <xsl:if test="string-length($switch1block) > 0 or string-length($switchblock2) > 0">
+  <xsl:text>&#xa;&#xa;</xsl:text>
+  <xsl:text>void </xsl:text>
+  <xsl:call-template name="factoryclassname"/>
+  <xsl:text>::</xsl:text>
+  <xsl:value-of select="$action"/>
+  <xsl:text>Action(OOXMLFastContextHandler*</xsl:text>
+  <xsl:if test="string-length($switchblock1) &gt; 0 or string-length($switchblock2) &gt; 0">
+    <xsl:text> pHandler</xsl:text>
+  </xsl:if>
+  <xsl:if test="$action='characters'">
+    <xsl:text>, const ::rtl::OUString &amp;</xsl:text>
+    <xsl:if test="contains($switchblock1, 'sText') or contains($switchblock2, 'sText')">
+      <xsl:text> sText</xsl:text>
+    </xsl:if>
+  </xsl:if>
+  <xsl:text>)&#xa;</xsl:text>
+  <xsl:text>{&#xa;</xsl:text>
+  <xsl:if test="string-length($switchblock1) > 0 or string-length($switchblock2) > 0">
     <xsl:text>    sal_uInt32 nDefine = pHandler->getDefine();&#xa;</xsl:text>
   </xsl:if>
-  <xsl:if test="string-length($switch1block) > 0">
+  <xsl:if test="string-length($switchblock1) > 0">
     <xsl:text>    switch (nDefine)&#xa;</xsl:text>
     <xsl:text>    {&#xa;</xsl:text>
-    <xsl:value-of select="$switch1block"/>
+    <xsl:value-of select="$switchblock1"/>
     <xsl:text>    default:&#xa;</xsl:text>
     <xsl:text>        break;&#xa;</xsl:text>
     <xsl:text>    }&#xa;</xsl:text>

writerfilter/source/resourcemodel/LoggedResources.cxx

 #endif    
 }
 
-void LoggedStream::info(const string & info)
+void LoggedStream::info(const string & _info)
 {
 #ifdef DEBUG_LOGGING
     mHelper.startElement("info");
-    mHelper.attribute("text", info);
+    mHelper.attribute("text", _info);
 #endif
     
-    lcl_info(info);
+    lcl_info(_info);
 
 #ifdef DEBUG_LOGGING
     mHelper.endElement("info");
     lcl_attribute(name, val);
 }
 
-void LoggedProperties::sprm(Sprm & sprm)
+void LoggedProperties::sprm(Sprm & _sprm)
 {
 #ifdef DEBUG_LOGGING
     mHelper.startElement("sprm");
-    mHelper.attribute("name", (*QNameToString::Instance())(sprm.getId()));
+    mHelper.attribute("name", (*QNameToString::Instance())(_sprm.getId()));
     mHelper.chars(sprm.toString());
 #endif
 
-    lcl_sprm(sprm);
+    lcl_sprm(_sprm);
 
 #ifdef DEBUG_LOGGING
     mHelper.endElement("sprm");