summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-24 14:50:41 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-24 14:50:41 +0000
commitb93aee14736e65b13887ad0d1ebb32f214d3cb05 (patch)
tree2e3b53637706414c3c8fc7962028a145f7da5fae
parent8b3801e24fb3ba3d8bc5283ffff83d19bd0d369f (diff)
WaE: gcc 4.6.0 various warnings
-rw-r--r--basic/source/classes/sbxmod.cxx3
-rw-r--r--idl/source/cmptools/lex.cxx3
-rw-r--r--svx/source/svdraw/svdundo.cxx1
-rw-r--r--ucb/source/sorter/sortresult.cxx2
-rw-r--r--xmloff/source/core/xmluconv.cxx2
-rw-r--r--xmloff/source/draw/animationimport.cxx4
-rw-r--r--xmloff/source/draw/xexptran.cxx1
-rw-r--r--xmloff/source/table/XMLTableImport.cxx14
8 files changed, 13 insertions, 17 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 286b70c874..c5849d755c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -300,9 +300,8 @@ DocObjectWrapper::invoke( const ::rtl::OUString& aFunctionName, const Sequence<
// call method
SbxVariableRef xReturn = new SbxVariable;
- ErrCode nErr = SbxERR_OK;
- nErr = pMethod->Call( xReturn );
+ pMethod->Call( xReturn );
Any aReturn;
// get output parameters
if ( xSbxParams.Is() )
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index fa0c47756f..8b98334033 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -338,8 +338,6 @@ ULONG SvTokenStream::GetNumber()
*************************************************************************/
BOOL SvTokenStream::MakeToken( SvToken & rToken )
{
- USHORT i;
-
do
{
if( 0 == c )
@@ -412,7 +410,6 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
else if( c == '"' )
{
ByteString aStr;
- i = 0;
BOOL bDone = FALSE;
while( !bDone && !IsEof() && c )
{
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 56e9dd98b8..abc6558020 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1454,6 +1454,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum)
pChkPg=rMod.RemovePage(nNum);
}
DBG_ASSERT(pChkPg==&mrPage,"SdrUndoPage::ImpRemovePage(): RemovePage!=&mrPage");
+ (void)pChkPg;
}
}
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index c18535d395..02f2d05be8 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1469,7 +1469,7 @@ void SortedResultSet::Initialize(
// insert some dummy entries first and replace then
// the entries with the right ones
- sal_uInt32 i;
+ size_t i;
for ( i=1; i<maS2O.Count(); i++ )
maO2S.Insert( (void*) 0, i ); // Insert( data, pos )
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) )