[Libreoffice-commits] .: sw/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Mon May 16 10:46:15 PDT 2011
sw/source/filter/xml/xmlfmte.cxx | 2 +-
sw/source/ui/dbui/dbmgr.cxx | 2 +-
sw/source/ui/dbui/mmconfigitem.cxx | 6 +++---
sw/source/ui/docvw/PostItMgr.cxx | 4 ++--
sw/source/ui/frmdlg/frmpage.cxx | 14 +++++++-------
sw/source/ui/lingu/sdrhhcwrap.cxx | 2 +-
sw/source/ui/vba/vbarevisions.cxx | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit d3e911acbdf0fc2454747197a21abbd6afe28234
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon May 16 19:45:52 2011 +0200
Some cppcheck cleaning
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index e7333be..b21a705 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -306,7 +306,7 @@ void SwXMLAutoStylePoolP::exportStyleAttributes(
for( ::std::vector< XMLPropertyState >::const_iterator
aProperty = rProperties.begin();
aProperty != rProperties.end();
- aProperty++ )
+ ++aProperty )
{
if (aProperty->mnIndex != -1) // #i26762#
{
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 60b6661..88a5fa6 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1333,7 +1333,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
//remove the temporary files
::std::vector<String>::iterator aFileIter;
for(aFileIter = aFilesToRemove.begin();
- aFileIter != aFilesToRemove.end(); aFileIter++)
+ aFileIter != aFilesToRemove.end(); ++aFileIter)
SWUnoHelper::UCB_DeleteFile( *aFileIter );
// unlock all dispatchers
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/ui/dbui/mmconfigitem.cxx
index b2c93f6..13cba5f 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/ui/dbui/mmconfigitem.cxx
@@ -601,7 +601,7 @@ void SwMailMergeConfigItem_Impl::Commit()
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
for(aAssignIter = aAddressDataAssignments.begin();
- aAssignIter != aAddressDataAssignments.end(); aAssignIter++)
+ aAssignIter != aAddressDataAssignments.end(); ++aAssignIter)
{
if(aAssignIter->bColumnAssignmentsChanged)
{
@@ -1248,7 +1248,7 @@ Sequence< ::rtl::OUString> SwMailMergeConfigItem::GetColumnAssignment(
Sequence< ::rtl::OUString> aRet;
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
for(aAssignIter = m_pImpl->aAddressDataAssignments.begin();
- aAssignIter != m_pImpl->aAddressDataAssignments.end(); aAssignIter++)
+ aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter)
{
if(aAssignIter->aDBData == rDBData)
{
@@ -1278,7 +1278,7 @@ void SwMailMergeConfigItem::SetColumnAssignment( const SwDBData& rDBData,
::std::vector<DBAddressDataAssignment>::iterator aAssignIter;
sal_Bool bFound = sal_False;
for(aAssignIter = m_pImpl->aAddressDataAssignments.begin();
- aAssignIter != m_pImpl->aAddressDataAssignments.end(); aAssignIter++)
+ aAssignIter != m_pImpl->aAddressDataAssignments.end(); ++aAssignIter)
{
if(aAssignIter->aDBData == rDBData)
{
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/ui/docvw/PostItMgr.cxx
index 89f13a8..10ca2c7 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/ui/docvw/PostItMgr.cxx
@@ -443,7 +443,7 @@ bool SwPostItMgr::CalcRects()
SwPosition aPosition = pItem->GetAnchorPosition();
pItem->mLayoutStatus = SwPostItHelper::getLayoutInfos( aInfo, aPosition );
}
- if( aInfo.size() )
+ if( !aInfo.empty() )
{
pItem->maLayoutInfo = aInfo[0];
}
@@ -656,7 +656,7 @@ void SwPostItMgr::LayoutPostIts()
}
}
- if ((aVisiblePostItList.size()>0) && ShowNotes())
+ if ((!aVisiblePostItList.empty()) && ShowNotes())
{
bool bOldScrollbar = mPages[n]->bScrollbar;
if (ShowNotes())
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6f21bdd..793654a 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -456,23 +456,23 @@ void lcl_InsertVectors(ListBox& rBox,
{
::std::vector< String >::const_iterator aIt;
sal_uInt16 nEntry = 0;
- for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
+ for(aIt = rPrev.begin(); aIt != rPrev.end(); ++aIt)
nEntry = rBox.InsertEntry(*aIt);
- for(aIt = rThis.begin(); aIt != rThis.end(); aIt++)
+ for(aIt = rThis.begin(); aIt != rThis.end(); ++aIt)
nEntry = rBox.InsertEntry(*aIt);
- for(aIt = rNext.begin(); aIt != rNext.end(); aIt++)
+ for(aIt = rNext.begin(); aIt != rNext.end(); ++aIt)
nEntry = rBox.InsertEntry(*aIt);
rBox.SetSeparatorPos(nEntry);
//now insert all strings sorted
sal_uInt16 nStartPos = rBox.GetEntryCount();
- for(aIt = rPrev.begin(); aIt != rPrev.end(); aIt++)
+ for(aIt = rPrev.begin(); aIt != rPrev.end(); ++aIt)
::InsertStringSorted(*aIt, rBox, nStartPos );
- for(aIt = rThis.begin(); aIt != rThis.end(); aIt++)
+ for(aIt = rThis.begin(); aIt != rThis.end(); ++aIt)
::InsertStringSorted(*aIt, rBox, nStartPos );
- for(aIt = rNext.begin(); aIt != rNext.end(); aIt++)
+ for(aIt = rNext.begin(); aIt != rNext.end(); ++aIt)
::InsertStringSorted(*aIt, rBox, nStartPos );
- for(aIt = rRemain.begin(); aIt != rRemain.end(); aIt++)
+ for(aIt = rRemain.begin(); aIt != rRemain.end(); ++aIt)
::InsertStringSorted(*aIt, rBox, nStartPos );
}
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/ui/lingu/sdrhhcwrap.cxx
index a189055..52c451d 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/ui/lingu/sdrhhcwrap.cxx
@@ -141,7 +141,7 @@ sal_Bool SdrHHCWrapper::ConvertNextDocument()
std::list<SdrTextObj*> aTextObjs;
SwDrawContact::GetTextObjectsFromFmt( aTextObjs, pView->GetDocShell()->GetDoc() );
- for ( std::list<SdrTextObj*>::iterator aIt = aTextObjs.begin(); aIt != aTextObjs.end(); aIt++ )
+ for ( std::list<SdrTextObj*>::iterator aIt = aTextObjs.begin(); aIt != aTextObjs.end(); ++aIt )
{
pTextObj = (*aIt);
if ( pTextObj )
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 85f4d8b..e9ebc7e 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -65,7 +65,7 @@ RevisionCollectionHelper( const uno::Reference< frame::XModel >& xModel, const u
// XElementAccess
virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException) { return beans::XPropertySet::static_type(0); }
- virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( mRevisionMap.size() > 0 ); }
+ virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException) { return ( !mRevisionMap.empty() ); }
// XIndexAccess
virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException) { return mRevisionMap.size(); }
virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
More information about the Libreoffice-commits
mailing list