[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_sw binfilter/bf_xmloff

[Caolán McNamara]

 binfilter/bf_sc/source/core/tool/sc_rangelst.cxx    |   14 ---------
 binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx    |    6 ---
 binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx |   31 ++++++++++----------
 3 files changed, 16 insertions(+), 35 deletions(-)

New commits:
commit bff44d03e7765c8839a9a224a7beaee002a87a4d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 16:49:49 2010 +0000

    silence some warnings

diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
index 7700323..a27518c 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::awt;
 using rtl::OUString;
 
 void XMLTextExportPropertySetMapper::handleElementItem(
-        SvXMLExport& rExport,
+        SvXMLExport& rExp,
         const XMLPropertyState& rProperty,
         sal_uInt16 nFlags,
         const ::std::vector< XMLPropertyState > *pProperties,
@@ -117,19 +117,19 @@ void XMLTextExportPropertySetMapper::handleElementItem(
         break;
 
     case CTF_SECTION_FOOTNOTE_END:
-        XMLSectionFootnoteConfigExport::exportXML(rExport, sal_False,
+        XMLSectionFootnoteConfigExport::exportXML(rExp, sal_False,
                                                   pProperties, nIdx,
                                                   getPropertySetMapper());
         break;
 
     case CTF_SECTION_ENDNOTE_END:
-        XMLSectionFootnoteConfigExport::exportXML(rExport, sal_True,
+        XMLSectionFootnoteConfigExport::exportXML(rExp, sal_True,
                                                   pProperties, nIdx,
                                                   getPropertySetMapper());
         break;
 
     default:
-        SvXMLExportPropertyMapper::handleElementItem( rExport, rProperty, nFlags, pProperties, nIdx );
+        SvXMLExportPropertyMapper::handleElementItem( rExp, rProperty, nFlags, pProperties, nIdx );
         break;
     }
 }
@@ -188,8 +188,8 @@ XMLTextExportPropertySetMapper::XMLTextExportPropertySetMapper(
     SvXMLExportPropertyMapper( rMapper ),
     rExport( rExp ),
     bDropWholeWord( sal_False ),
-    maTabStopExport( rExp ),
     maDropCapExport( rExp ),
+    maTabStopExport( rExp ),
     maTextColumnsExport( rExp ),
     maBackgroundImageExport( rExp )
 {
@@ -266,7 +266,7 @@ void XMLTextExportPropertySetMapper::ContextFontHeightFilter(
 {
     if( pCharPropHeightState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pCharPropHeightState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -281,7 +281,7 @@ void XMLTextExportPropertySetMapper::ContextFontHeightFilter(
     }
     if( pCharDiffHeightState )
     {
-        float nTemp;
+        float nTemp = 0;
         pCharDiffHeightState->maValue >>= nTemp;
         if( nTemp == 0. )
         {
@@ -531,7 +531,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
         sal_Bool bClear = !pUnderlineState;
         if( !bClear )
         {
-            sal_Int16 nUnderline;
+            sal_Int16 nUnderline = 0;
             pUnderlineState->maValue >>= nUnderline;
             bClear = FontUnderline::NONE == nUnderline;
         }
@@ -546,7 +546,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     if( pParaLeftMarginState && pParaLeftMarginRelState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pParaLeftMarginRelState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -563,7 +563,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     if( pParaRightMarginState && pParaRightMarginRelState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pParaRightMarginRelState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -579,7 +579,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     if( pParaFirstLineState && pParaFirstLineRelState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pParaFirstLineRelState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -595,7 +595,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     if( pParaTopMarginState && pParaTopMarginRelState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pParaTopMarginRelState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -612,7 +612,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
 
     if( pParaBottomMarginState && pParaBottomMarginRelState )
     {
-        sal_Int32 nTemp;
+        sal_Int32 nTemp = 0;
         pParaBottomMarginRelState->maValue >>= nTemp;
         if( nTemp == 100 )
         {
@@ -670,7 +670,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
     {
         if( pLeftBorderDistanceState && pRightBorderDistanceState && pTopBorderDistanceState && pBottomBorderDistanceState )
         {
-            sal_Int32 aLeft, aRight, aTop, aBottom;
+            sal_Int32 aLeft = 0, aRight = 0, aTop = 0, aBottom = 0;
 
             pLeftBorderDistanceState->maValue >>= aLeft;
             pRightBorderDistanceState->maValue >>= aRight;
@@ -781,7 +781,8 @@ void XMLTextExportPropertySetMapper::ContextFilter(
             if( pWrapContourState )
                 pWrapContourState->mnIndex = -1;
             break;
-        // <--
+        default:
+            break;
         }
         if( pWrapContourModeState  &&
             (!pWrapContourState ||
commit d16b1cb248aa2e34cb094a4e88f4c8e1b09bf6c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 16:41:31 2010 +0000

    cppcheck: remove unused ScRangePairNameSort

diff --git a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
index a0e670a..235614b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
@@ -536,20 +536,6 @@ namespace binfilter {
 /*N*/ 	return pNew;
 /*N*/ }
 
-
-struct ScRangePairNameSort
-{
-    ScRangePair*	pPair;
-    ScDocument*		pDoc;
-};
-
-
-
-
-
-
-
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 402944f2d5613f4b1fa886dce752710c0cc06c26
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 16:31:56 2010 +0000

    cppcheck: unused variables

diff --git a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
index 7ef51dc..ce962a4 100644
--- a/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
+++ b/binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx
@@ -3632,12 +3632,6 @@ void SwW4WParser::Read_HdFtDefinition( BOOL bHeader )
         && GetDecimal( nPos )       && !nError
         && GetDecimal( nLinePos )   && !nError )
     {
-        long nHdFtUl = nLinePos * 240;		// Grundlage: Zeilenabstand 6 LPI
-                                            // stimmt so zumindest fuer WW2
-        // was tun wir mit diesem Wert?
-        // vielleicht sollten wir nHdFtUl
-        // ggfs. in nNewValueHTM umwandeln ???
-
         // gibt es die optionale Angabe ?
         long nOptNew1, nOptNew2;
         if( W4WR_TXTERM == GetDecimal( nOptNew1 ) && !nError &&