diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2011-06-12 23:01:56 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2011-06-12 23:01:56 +0200 |
commit | 5cfb91df40675d81131200d8cce918ae108efb31 (patch) | |
tree | 8d3a9b73fc71f5dbe84198cf4b003ffe48b5e002 /writerfilter/source/dmapper | |
parent | a6364087da316b5838924a037ed250dc0a44d52e (diff) |
Some cppcheck cleaning
Diffstat (limited to 'writerfilter/source/dmapper')
5 files changed, 10 insertions, 11 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index dfe345c531fc..4e3624405b9a 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1913,7 +1913,6 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType { //get value from style sheet and invert it sal_Int16 nStyleValue = 0; - double fDoubleValue; uno::Any aStyleVal = m_pImpl->GetPropertyFromStyleSheet(ePropertyId); if( !aStyleVal.hasValue() ) { @@ -1922,6 +1921,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType } else if(aStyleVal.getValueTypeClass() == uno::TypeClass_FLOAT ) { + double fDoubleValue = 0; //only in case of awt::FontWeight aStyleVal >>= fDoubleValue; nIntValue = fDoubleValue > 100. ? 0 : 1; diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index ebe7d41665f5..407b119e8a5f 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -715,13 +715,13 @@ void DomainMapperTableHandler::endTable() m_xTableRange = xTable->getAnchor( ); } - catch (lang::IllegalArgumentException e) + catch (lang::IllegalArgumentException) { #ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->chars("failed to import table!"); #endif } - catch ( uno::Exception e ) + catch ( uno::Exception &e ) { #ifdef DEBUG_DMAPPER_TABLE_HANDLER dmapper_logger->startElement("exception"); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index b4b8278987bc..3bfb4632e6a3 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -425,7 +425,7 @@ void DomainMapperTableManager::endOfRowAction() dmapper_logger->attribute("span", *aGridSpanIter); dmapper_logger->endElement(); - aGridSpanIter++; + ++aGridSpanIter; } } dmapper_logger->endElement(); @@ -464,7 +464,7 @@ void DomainMapperTableManager::endOfRowAction() pSeparators[nBorder].Position = nRelPos + nLastRelPos; pSeparators[nBorder].IsVisible = sal_True; nLastRelPos = nLastRelPos + nRelPos; - aSpansIter++; + ++aSpansIter; } TablePropertyMapPtr pPropMap( new TablePropertyMap ); pPropMap->Insert( PROP_TABLE_COLUMN_SEPARATORS, false, uno::makeAny( aSeparators ) ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 629db247819b..bdaf3eb2d1fc 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -309,9 +309,8 @@ void DomainMapper_Impl::SetIsLastParagraphInSection( bool bIsLast ) void DomainMapper_Impl::PushProperties(ContextType eId) { - SectionPropertyMap* pSectionContext = 0; PropertyMapPtr pInsert(eId == CONTEXT_SECTION ? - (pSectionContext = new SectionPropertyMap( m_bIsFirstSection )) : + (new SectionPropertyMap( m_bIsFirstSection )) : eId == CONTEXT_PARAGRAPH ? new ParagraphPropertyMap : new PropertyMap); if(eId == CONTEXT_SECTION) { @@ -2576,7 +2575,7 @@ void DomainMapper_Impl::CloseFieldCommand() { if (aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\l"))) { - aPartIt++; + ++aPartIt; if (aPartIt == aItEnd) break; @@ -2591,7 +2590,7 @@ void DomainMapper_Impl::CloseFieldCommand() else if (aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\o")) || aPartIt->equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("\\t"))) { - aPartIt++; + ++aPartIt; if (aPartIt == aItEnd) break; @@ -2601,7 +2600,7 @@ void DomainMapper_Impl::CloseFieldCommand() sURL = *aPartIt; } - aPartIt++; + ++aPartIt; } if (sURL.getLength() > 0) diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 690d621612f5..744361dfc494 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -909,7 +909,7 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) uno::makeAny( aSize.Width ) ); } } - catch( const beans::UnknownPropertyException e ) + catch( const beans::UnknownPropertyException ) { // It isn't a graphic image } |