[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff
Julien Nabet
serval2412 at kemper.freedesktop.org
Mon May 7 14:14:12 PDT 2012
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx | 2 -
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 1
binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx | 2 -
binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx | 4 +-
binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 20 +++++-----
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 6 +--
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 2 -
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx | 2 -
binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx | 2 -
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx | 2 -
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx | 4 +-
15 files changed, 27 insertions(+), 28 deletions(-)
New commits:
commit 0b54eb6b70f1102a84ee9da01b2c6aea1aa50904
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon May 7 23:13:07 2012 +0200
Some cppcheck cleaning
Change-Id: Ib0dee8fed7c3ac54870024853d0bcdfcb964039d
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
index 1310b8c..e13b783 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
@@ -2126,7 +2126,7 @@ void WinMtfOutput::Push() // !! to be able to access the o
void WinMtfOutput::Pop()
{
// Die aktuellen Daten vom Stack holen
- if( vSaveStack.size() )
+ if( !vSaveStack.empty() )
{
// Die aktuelle Daten auf dem Stack sichern
SaveStructPtr pSave( vSaveStack.back() );
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
index de2dc23..51814e8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
@@ -383,7 +383,6 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet& rSet, sal_Bool bIsValueSea
}
}
delete pBoxItem;
- delete pBreakItem;
delete pBreakItem ;
delete pAutoKernItem ;
delete pWLineItem;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
index d816c6c..e9b20a1 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
@@ -445,7 +445,7 @@ void SchXMLTableHelper::applyTableSimple(
double fVal;
const sal_Bool bConstConvertNan = bConvertNaN;
- for( ++iRow, nRow = 0; iRow != rTable.aData.end(); iRow++, nRow++ )
+ for( ++iRow, nRow = 0; iRow != rTable.aData.end(); ++iRow, nRow++ )
{
aCategories[ nRow ] = (*iRow)[ 0 ].aString;
for( nCol = 1; nCol < nColumnCount; nCol++ )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
index 71f2587..12fdc17 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
@@ -125,7 +125,7 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const OUString& sName) thro
{
::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
- for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
+ for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
return (*ii).sValue;
}
@@ -172,7 +172,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString sName )
{
::std::vector<struct SvXMLTagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
- for( ; ii != m_pImpl->vecAttribute.end() ; ii ++ ) {
+ for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
m_pImpl->vecAttribute.erase( ii );
break;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
index 866686f..7d6238c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
@@ -130,7 +130,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
// first, look for the old format, where we had a text:list-style-name
// attribute in the style:properties element
- for( property = rProperties.begin(); property != end; property++ )
+ for( property = rProperties.begin(); property != end; ++property )
{
// find properties with context
if( rMapper->GetEntryContextId( property->mnIndex ) == CTF_SD_NUMBERINGRULES_NAME )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
index 9c92760..d60903c 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx
@@ -321,7 +321,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
UniReference < XMLPropertySetMapper > aPropMapper(getPropertySetMapper());
- for( ::std::vector< XMLPropertyState >::iterator pProp = rPropState.begin(); pProp != rPropState.end(); pProp++ )
+ for( ::std::vector< XMLPropertyState >::iterator pProp = rPropState.begin(); pProp != rPropState.end(); ++pProp )
{
sal_Int16 nContextId = aPropMapper->GetEntryContextId( pProp->mnIndex );
sal_Int16 nFlag = nContextId & CTF_PM_FLAGMASK;
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
index 7ab447d..7f8878d 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx
@@ -124,7 +124,7 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
XMLPropertyState* pFooterHeight = NULL;
XMLPropertyState* pFooterMinHeight = NULL;
XMLPropertyState* pFooterDynamic = NULL;
- for (::std::vector< XMLPropertyState >::iterator property = rProperties.begin(); property != rProperties.end(); property++)
+ for (::std::vector< XMLPropertyState >::iterator property = rProperties.begin(); property != rProperties.end(); ++property)
{
sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex);
if (property->mnIndex >= nStartIndex && property->mnIndex < nEndIndex)
diff --git a/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx b/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
index 1392757..3760e5b 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx
@@ -59,7 +59,7 @@ using rtl::OUString;
sal_Bool XMLPageExport::findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const
{
for( ::std::vector< XMLPageExportNameEntry >::const_iterator pEntry = aNameVector.begin();
- pEntry != aNameVector.end(); pEntry++ )
+ pEntry != aNameVector.end(); ++pEntry )
{
if( pEntry->sStyleName == rStyleName )
{
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
index 7554326..81e0e42 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx
@@ -138,7 +138,7 @@ void XMLPropertyStates_Impl::FillPropertyStateVector(
while (aItr != aPropStates.end())
{
rVector[i] = *aItr;
- aItr++;
+ ++aItr;
i++;
}
}
@@ -283,7 +283,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
FilterPropertyInfoList_Impl::iterator aOld = aPropInfos.begin();
FilterPropertyInfoList_Impl::iterator aEnd = aPropInfos.end();
FilterPropertyInfoList_Impl::iterator aCurrent = aOld;
- aCurrent++;
+ ++aCurrent;
while ( aCurrent != aEnd )
{
@@ -300,7 +300,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
{
// remember old element and continue with next
aOld = aCurrent;
- aCurrent++;
+ ++aCurrent;
}
}
}
@@ -310,7 +310,7 @@ const uno::Sequence<OUString>& FilterPropertiesInfo_Impl::GetApiNames()
OUString *pNames = pApiNames->getArray();
FilterPropertyInfoList_Impl::iterator aItr = aPropInfos.begin();
FilterPropertyInfoList_Impl::iterator aEnd = aPropInfos.end();
- for ( ; aItr != aEnd; aItr++, pNames++)
+ for ( ; aItr != aEnd; ++aItr, pNames++)
*pNames = aItr->GetApiName();
}
@@ -374,7 +374,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
*pPropIter++ = aItr;
i++;
}
- aItr++;
+ ++aItr;
pStates++;
}
@@ -390,7 +390,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for( ::std::list<sal_uInt32>::iterator aIndexItr =
(*pPropIter)->GetIndexes().begin();
aIndexItr != (*pPropIter)->GetIndexes().end();
- aIndexItr++ )
+ ++aIndexItr )
{
aNewProperty.mnIndex = *aIndexItr;
aPropStates.AddPropertyState( aNewProperty );
@@ -416,12 +416,12 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for( ::std::list<sal_uInt32>::iterator aIndexItr =
aItr->GetIndexes().begin();
aIndexItr != aItr->GetIndexes().end();
- aIndexItr++ )
+ ++aIndexItr )
{
aNewProperty.mnIndex = *aIndexItr;
aPropStates.AddPropertyState( aNewProperty );
}
- aItr++;
+ ++aItr;
}
}
}
@@ -440,7 +440,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
for( ::std::list<sal_uInt32>::iterator aIndexItr =
aItr->GetIndexes().begin();
aIndexItr != aItr->GetIndexes().end();
- aIndexItr++ )
+ ++aIndexItr )
{
if( bDirectValue ||
(rPropMapper->GetEntryFlags( *aIndexItr ) &
@@ -467,7 +467,7 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
}
}
- aItr++;
+ ++aItr;
if( pStates )
pStates++;
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index 471e896..483255d 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -160,7 +160,7 @@ void SvXMLNumUsedList_Impl::Export()
std::pair<SvXMLuInt32Set::iterator, bool> aPair = aWasUsed.insert( *aItr );
if (aPair.second)
nWasUsedCount++;
- aItr++;
+ ++aItr;
}
aUsed.clear();
nUsedCount = 0;
@@ -184,7 +184,7 @@ sal_Bool SvXMLNumUsedList_Impl::GetNextUsed(sal_uInt32& nKey)
sal_Bool bRet(sal_False);
if (aCurrentUsedPos != aUsed.end())
{
- aCurrentUsedPos++;
+ ++aCurrentUsedPos;
if (aCurrentUsedPos != aUsed.end())
{
nKey = *aCurrentUsedPos;
@@ -204,7 +204,7 @@ void SvXMLNumUsedList_Impl::GetWasUsed(uno::Sequence<sal_Int32>& rWasUsed)
while (aItr != aWasUsed.end())
{
*pWasUsed = *aItr;
- aItr++;
+ ++aItr;
pWasUsed++;
}
}
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
index cb16566..aefeaf3 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
@@ -737,7 +737,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl(
OUString sTmp;
sal_Int16 nTmp(0);
::std::vector< XMLPropertyState >::iterator i;
- for( i = aProps.begin(); i != aProps.end(); i++ )
+ for( i = aProps.begin(); i != aProps.end(); ++i )
{
switch( i->mnIndex )
{
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
index bea3f18..1c252f2 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
@@ -340,7 +340,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext(
{
const SvXMLStyleContext *pStyle = 0;
- if( !pIndices && bCreateIndex && aStyles.size() > 0 )
+ if( !pIndices && bCreateIndex && !aStyles.empty() )
{
#ifdef DBG_UTIL
DBG_ASSERT( 0==nIndexCreated,
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
index 9c8133f..d8ce68b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx
@@ -413,7 +413,7 @@ void XMLTextExportPropertySetMapper::ContextFilter(
for( ::std::vector< XMLPropertyState >::iterator propertie = rProperties.begin();
propertie != rProperties.end();
- propertie++ )
+ ++propertie )
{
switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) )
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
index bc27fd5..63270be 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx
@@ -307,7 +307,7 @@ void XMLTextImportPropertyMapper::finished(
for( ::std::vector< XMLPropertyState >::iterator property = rProperties.begin();
property != rProperties.end();
- property++ )
+ ++property )
{
switch( getPropertySetMapper()->GetEntryContextId( property->mnIndex ) )
{
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
index 02717df..654b2be 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx
@@ -261,7 +261,7 @@ void XMLTextParagraphExport::Add( sal_uInt16 nFamily,
for( ::std::vector< XMLPropertyState >::iterator i
= xPropStates.begin();
nIgnoreProps < 2 && i != xPropStates.end();
- i++ )
+ ++i )
{
switch( xPM->GetEntryContextId(i->mnIndex) )
{
@@ -451,7 +451,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
for( ::std::vector< XMLPropertyState >::iterator
i = xPropStates.begin();
nIgnoreProps < 2 && i != xPropStates.end();
- i++ )
+ ++i )
{
switch( xPM->GetEntryContextId(i->mnIndex) )
{
More information about the Libreoffice-commits
mailing list