diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-31 14:30:02 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-31 14:58:05 +0100 |
| commit | 4139e6a208ea5040b169e9775828a5513c4f4ea9 (patch) | |
| tree | d7642f0228609014dd61b9459e8d8d00ab61096d | |
| parent | a49cd8632ea7e0fdfc3fbb2729ec4d15fbf25a18 (diff) | |
target cppcheck index incrementing revert
Change-Id: I890dfe9fbd7b5a850daaa0d2b4d5040a5ddbefd7
| -rw-r--r-- | chart2/source/tools/InternalDataProvider.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/minimizer/pagecollector.cxx | 2 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 2 |
4 files changed, 6 insertions, 10 deletions
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 48e7cb671f80..62de736f16ad 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -296,7 +296,7 @@ public: rVector.resize( m_nLevel ); vector< uno::Any >::iterator aIt( rVector.begin() ); - for( sal_Int32 nN=0; aIt<rVector.end(); ++aIt, ++nN) + for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++) { if( nN==m_nLevel ) break; @@ -318,7 +318,7 @@ public: void operator() ( vector< uno::Any >& rVector ) { vector< uno::Any >::iterator aIt( rVector.begin() ); - for( sal_Int32 nN=0; aIt<rVector.end(); ++aIt, ++nN) + for( sal_Int32 nN=0; aIt<rVector.end(); aIt++, nN++) { if( nN==m_nLevel ) { diff --git a/sdext/source/minimizer/pagecollector.cxx b/sdext/source/minimizer/pagecollector.cxx index 668ce5f68119..511299b068e6 100644 --- a/sdext/source/minimizer/pagecollector.cxx +++ b/sdext/source/minimizer/pagecollector.cxx @@ -94,7 +94,7 @@ void PageCollector::CollectNonCustomShowPages( const com::sun::star::uno::Refere { std::vector< Reference< XDrawPage > > vUsedPageList; PageCollector::CollectCustomShowPages( rxModel, rCustomShowName, vUsedPageList ); - if ( !vUsedPageList.empty() ) + if ( vUsedPageList.size() ) { Reference< XDrawPagesSupplier > xDrawPagesSupplier( rxModel, UNO_QUERY_THROW ); Reference< XDrawPages > xDrawPages( xDrawPagesSupplier->getDrawPages(), UNO_QUERY_THROW ); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 12d2ab49fd19..9d066b942808 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -219,7 +219,7 @@ sal_Int32 PDFIProcessor::getFontId( const FontAttributes& rAttr ) const // line diagnose block - start void PDFIProcessor::processGlyphLine() { - if( m_GlyphsList.empty() ) + if( m_GlyphsList.size()<1 ) return; double fPreAvarageSpaceValue= 0.0; @@ -315,21 +315,17 @@ void PDFIProcessor::processGlyphLine() ParagraphElement* pPara= NULL ; FrameElement* pFrame= NULL ; - if(!m_GlyphsList.empty()) + if(m_GlyphsList.size()>0) { pFrame = m_pElFactory->createFrameElement( m_GlyphsList[0].getCurElement(), getGCId( getTransformGlyphContext( m_GlyphsList[0])) ); pFrame->ZOrder = m_nNextZOrder++; pPara = m_pElFactory->createParagraphElement( pFrame ); - - processGlyph( 0, m_GlyphsList[0], pPara, pFrame, m_bIsWhiteSpaceInLine ); - - } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 302e9fa7ce2a..586c498a0005 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2378,7 +2378,7 @@ SwXDocumentIndexes::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { return ::sw::SupportsServiceImpl( - SAL_N_ELEMENTS(g_ServicesDocumentIndexes) + SAL_N_ELEMENTS(g_ServicesDocumentIndexes), g_ServicesDocumentIndexes, rServiceName); } |