diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 14:50:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-01-24 14:50:41 +0000 |
| commit | b93aee14736e65b13887ad0d1ebb32f214d3cb05 (patch) | |
| tree | 2e3b53637706414c3c8fc7962028a145f7da5fae /xmloff | |
| parent | 8b3801e24fb3ba3d8bc5283ffff83d19bd0d369f (diff) | |
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmluconv.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/animationimport.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/draw/xexptran.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/table/XMLTableImport.cxx | 14 |
4 files changed, 10 insertions, 11 deletions
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 3d209a328b..fc40061e96 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -1734,7 +1734,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer, sal_Int16 nType ) const { enum XMLTokenEnum eFormat = XML_TOKEN_INVALID; - sal_Bool bExt = sal_False; switch( nType ) { case NumberingType::CHARS_UPPER_LETTER: eFormat = XML_A_UPCASE; break; @@ -1752,7 +1751,6 @@ void SvXMLUnitConverter::convertNumFormat( OUStringBuffer& rBuffer, DBG_ASSERT( eFormat != XML_TOKEN_INVALID, "invalid number format" ); break; default: - bExt = sal_True; break; } diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index ef83d16748..ed298e57bd 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -530,8 +530,8 @@ Sequence< Any > AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e // fill the sequence Any* pValues = aValues.getArray(); - sal_Int32 nIndex, nElement; - for( nIndex = 0, nElement = 0; nElements && (nIndex >= 0); nElements-- ) + sal_Int32 nIndex; + for( nIndex = 0; nElements && (nIndex >= 0); nElements-- ) { *pValues++ = convertValue( eAttributeName, rValue.getToken( 0, ';', nIndex ) ); } diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index b8eb90fc9e..833b957006 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -2359,6 +2359,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew, } DBG_ASSERT(!bEllipticalArc, "XMLIMP: non-interpreted tags in svg:d element!"); + (void)bEllipticalArc; if(nNumPolys) { diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 4d591f1aa3..38e2953839 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -454,9 +454,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUS Reference< XPropertySet > xRowSet( mxRows->getByIndex(mnCurrentRow), UNO_QUERY ); - sal_Int32 nRepeated = 1; OUString sStyleName; - sal_Bool bVisibility = sal_True; // read attributes for the table-row sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; @@ -469,11 +467,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUS sal_uInt16 nPrefix2 = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if( nPrefix2 == XML_NAMESPACE_TABLE ) { - if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) - { - nRepeated = sValue.toInt32(); - } - else if( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) + if( IsXMLToken( aLocalName, XML_STYLE_NAME ) ) { sStyleName = sValue; } @@ -481,10 +475,16 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( USHORT nPrefix, const OUS { msDefaultCellStyleName = sValue; } +#if 0 else if( IsXMLToken( aLocalName, XML_VISIBILITY ) ) { bVisibility = IsXMLToken( sValue, XML_VISIBLE ); } + else if( IsXMLToken( aLocalName, XML_NUMBER_ROWS_REPEATED ) ) + { + nRepeated = sValue.toInt32(); + } +#endif } else if ( (XML_NAMESPACE_XML == nPrefix2) && IsXMLToken(aLocalName, XML_ID) ) |