[Libreoffice-commits] .: 2 commits - connectivity/source cui/source oox/source sd/source sot/source ucb/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 13 07:09:25 PDT 2012
connectivity/source/drivers/mork/MorkParser.cxx | 12 ++++++------
cui/source/tabpages/autocdlg.cxx | 2 +-
oox/source/vml/vmlshape.cxx | 4 ++--
sd/source/ui/remotecontrol/Server.cxx | 8 ++++----
sot/source/sdstor/stgcache.cxx | 10 +++++-----
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 2 +-
ucb/source/ucp/webdav/webdavcontentcaps.cxx | 2 +-
ucb/source/ucp/webdav/webdavdatasupplier.cxx | 4 ++--
8 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 72fe2e3003b89b4d6bc7a87e0dc5ce85dd043b45
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Oct 13 16:06:44 2012 +0200
Prefer prefix ++/-- operators for non-primitive types
+ replace "<" by "!=" for end iterator comparison with current it
Change-Id: I6e90caa8752c7057cca8c74fca12c0a050544dbb
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 7773d8a..fcc0da5 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -667,8 +667,8 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
// Parse VML path string and convert to absolute coordinates
ConversionHelper::decodeVmlPath( aCoordLists, aFlagLists, maShapeModel.maVmlPath );
- for ( SubPathList::iterator aListIt = aCoordLists.begin(); aListIt != aCoordLists.end(); aListIt++ )
- for ( ::std::vector< Point >::iterator aPointIt = (*aListIt).begin(); aPointIt != (*aListIt).end(); aPointIt++)
+ for ( SubPathList::iterator aListIt = aCoordLists.begin(); aListIt != aCoordLists.end(); ++aListIt )
+ for ( ::std::vector< Point >::iterator aPointIt = (*aListIt).begin(); aPointIt != (*aListIt).end(); ++aPointIt)
{
(*aPointIt) = lclGetAbsPoint( (*aPointIt), rShapeRect, aCoordSys );
}
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 8ec942d..deb8814 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -186,7 +186,7 @@ void RemoteServer::presentationStarted( const css::uno::Reference<
return;
MutexGuard aGuard( spServer->mDataMutex );
for ( vector<Communicator*>::const_iterator aIt = spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
{
(*aIt)->presentationStarted( rController );
}
@@ -197,7 +197,7 @@ void RemoteServer::presentationStopped()
return;
MutexGuard aGuard( spServer->mDataMutex );
for ( vector<Communicator*>::const_iterator aIt = spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
{
(*aIt)->disposeListener();
}
@@ -209,7 +209,7 @@ void RemoteServer::removeCommunicator( Communicator* mCommunicator )
return;
MutexGuard aGuard( spServer->mDataMutex );
for ( vector<Communicator*>::iterator aIt = spServer->mCommunicators.begin();
- aIt < spServer->mCommunicators.end(); aIt++ )
+ aIt != spServer->mCommunicators.end(); ++aIt )
{
if ( mCommunicator == *aIt )
{
@@ -275,7 +275,7 @@ sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
spServer->mCommunicators.push_back( pCommunicator );
for ( vector<ClientInfoInternal*>::iterator aIt = spServer->mAvailableClients.begin();
- aIt < spServer->mAvailableClients.end(); aIt++ )
+ aIt != spServer->mAvailableClients.end(); ++aIt )
{
if ( pClient == *aIt )
{
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 00c20d4..f2d22e5 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -135,7 +135,7 @@ void StgCache::Erase( const rtl::Reference< StgPage > &xElem )
{
OSL_ENSURE( xElem.is(), "The pointer should not be NULL!" );
if ( xElem.is() ) {
- for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); it++ ) {
+ for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); ++it ) {
if ( it->is() && (*it)->GetPage() == xElem->GetPage() ) {
it->clear();
break;
@@ -149,7 +149,7 @@ void StgCache::Erase( const rtl::Reference< StgPage > &xElem )
void StgCache::Clear()
{
maDirtyPages.clear();
- for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); it++ )
+ for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); ++it )
it->clear();
}
@@ -157,7 +157,7 @@ void StgCache::Clear()
rtl::Reference< StgPage > StgCache::Find( sal_Int32 nPage )
{
- for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); it++ )
+ for ( LRUList::iterator it = maLRUPages.begin(); it != maLRUPages.end(); ++it )
if ( it->is() && (*it)->GetPage() == nPage )
return *it;
IndexToStgPage::iterator it2 = maDirtyPages.find( nPage );
@@ -216,12 +216,12 @@ sal_Bool StgCache::Commit()
{
std::vector< StgPage * > aToWrite;
for ( IndexToStgPage::iterator aIt = maDirtyPages.begin();
- aIt != maDirtyPages.end(); aIt++ )
+ aIt != maDirtyPages.end(); ++aIt )
aToWrite.push_back( aIt->second.get() );
std::sort( aToWrite.begin(), aToWrite.end(), StgPage::IsPageGreater );
for ( std::vector< StgPage * >::iterator aWr = aToWrite.begin();
- aWr != aToWrite.end(); aWr++)
+ aWr != aToWrite.end(); ++aWr)
{
const rtl::Reference< StgPage > &pPage = *aWr;
if ( !Write( pPage->GetPage(), pPage->GetData(), 1 ) )
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 063ad21..4f1d515 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1116,7 +1116,7 @@ sal_Bool DAVResourceAccess::detectRedirectCycle(
if ( aUri == (*it) )
return sal_True;
- it++;
+ ++it;
}
return sal_False;
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 76da928..04b76c5 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -429,7 +429,7 @@ uno::Sequence< beans::Property > Content::getProperties(
{
bHasCreatableInfos = sal_True;
}
- it++;
+ ++it;
}
}
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index bb4c396..c082b83 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -105,7 +105,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
while ( it != end )
{
delete (*it);
- it++;
+ ++it;
}
}
@@ -370,7 +370,7 @@ sal_Bool DataSupplier::getData()
if ( (*it).equals( DAVProperties::RESOURCETYPE ) )
break;
- it++;
+ ++it;
}
if ( it == end )
commit 64ab96cd15e52da88781e720d6f031dbcd0ba902
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sat Oct 13 10:19:43 2012 +0200
Prefer prefix ++/-- operators for non-primitive types
Change-Id: I057c3ea14cd1f224b339f884ae86890d16471215
diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx
index b29486f..ba1e95b 100644
--- a/connectivity/source/drivers/mork/MorkParser.cxx
+++ b/connectivity/source/drivers/mork/MorkParser.cxx
@@ -604,7 +604,7 @@ void MorkParser::retrieveLists(std::set<std::string>& lists)
MorkTableMap* tables = getTables(defaultScope_);
if (!tables) return;
for (MorkTableMap::iterator TableIter = tables->begin();
- TableIter != tables->end(); TableIter++ )
+ TableIter != tables->end(); ++TableIter )
{
#ifdef VERBOSE
std::cout << "\t Table:"
@@ -614,7 +614,7 @@ void MorkParser::retrieveLists(std::set<std::string>& lists)
MorkRowMap* rows = getRows( defaultListScope_, &TableIter->second );
if (!rows) return;
for ( MorkRowMap::iterator RowIter = rows->begin();
- RowIter != rows->end(); RowIter++ )
+ RowIter != rows->end(); ++RowIter )
{
#ifdef VERBOSE
std::cout << "\t\t\t Row Id:"
@@ -624,7 +624,7 @@ void MorkParser::retrieveLists(std::set<std::string>& lists)
#endif
// Get cells
for ( MorkCells::iterator cellsIter = RowIter->second.begin();
- cellsIter != RowIter->second.end(); cellsIter++ )
+ cellsIter != RowIter->second.end(); ++cellsIter )
{
if (cellsIter->first == 0xC1)
{
@@ -641,7 +641,7 @@ void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>&
MorkTableMap* tables = getTables(defaultScope_);
if (!tables) return;
for (MorkTableMap::iterator TableIter = tables->begin();
- TableIter != tables->end(); TableIter++ )
+ TableIter != tables->end(); ++TableIter )
{
#ifdef VERBOSE
std::cout << "\t Table:"
@@ -651,7 +651,7 @@ void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>&
MorkRowMap* rows = getRows( 0x81, &TableIter->second );
if (!rows) return;
for ( MorkRowMap::iterator RowIter = rows->begin();
- RowIter != rows->end(); RowIter++ )
+ RowIter != rows->end(); ++RowIter )
{
#ifdef VERBOSE
std::cout << "\t\t\t Row Id:"
@@ -662,7 +662,7 @@ void MorkParser::getRecordKeysForListTable(std::string& listName, std::set<int>&
// Get cells
bool listFound = false;
for ( MorkCells::iterator cellsIter = RowIter->second.begin();
- cellsIter != RowIter->second.end(); cellsIter++ )
+ cellsIter != RowIter->second.end(); ++cellsIter )
{
if (listFound)
{
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1c6e725..a34bd71 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -936,7 +936,7 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet& )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- for (StringChangeTable::reverse_iterator it = aChangesTable.rbegin(); it != aChangesTable.rend(); it++)
+ for (StringChangeTable::reverse_iterator it = aChangesTable.rbegin(); it != aChangesTable.rend(); ++it)
{
LanguageType eCurrentLang = it->first;
StringChangeList& rStringChangeList = it->second;
More information about the Libreoffice-commits
mailing list