diff options
-rw-r--r-- | comphelper/source/property/MasterPropertySet.cxx | 2 | ||||
-rw-r--r-- | comphelper/source/property/MasterPropertySetInfo.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 2 | ||||
-rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 38 | ||||
-rw-r--r-- | package/source/zippackage/ZipPackageFolder.cxx | 2 | ||||
-rw-r--r-- | sot/qa/cppunit/test_sot.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cntex.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/redlndlg.cxx | 2 |
10 files changed, 28 insertions, 28 deletions
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 68f135cf2d0e..c9517d5c3ef2 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -95,7 +95,7 @@ MasterPropertySet::~MasterPropertySet() while (aIter != aEnd ) { delete (*aIter).second; - aIter++; + ++aIter; } } diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index ec661d0ed505..df3e2995d02d 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -56,7 +56,7 @@ MasterPropertySetInfo::~MasterPropertySetInfo() while (aIter != aEnd ) { delete (*aIter).second; - aIter++; + ++aIter; } } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 83e568904bfa..3a5ac2b26115 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3147,7 +3147,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta } } ::std::vector< sal_Int32 >::iterator curIt = itSubLines; - itSubLines++; + ++itSubLines; if( itSubLines != pExtraInfo->lineBreaksList.end() ) { nTextStart = *curIt; diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 3f35aae4750c..212e7aecaaa5 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -288,7 +288,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea() aRowColumnSizes[nCurrDockingArea].clear(); aRowColumnSizes[nCurrDockingArea].push_back( 0 ); - for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); pConstIter++ ) + for ( pConstIter = aWindowVector.begin(); pConstIter != aWindowVector.end(); ++pConstIter ) { uno::Reference< ui::XUIElement > xUIElement( pConstIter->m_xUIElement, uno::UNO_QUERY ); if ( xUIElement.is() ) @@ -481,7 +481,7 @@ bool ToolbarLayoutManager::destroyToolbar( const ::rtl::OUString& rResourceURL ) bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 ); WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == rResourceURL ) { @@ -562,7 +562,7 @@ void ToolbarLayoutManager::destroyToolbars() aWriteLock.unlock(); UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { uno::Reference< lang::XComponent > xComponent( pIter->m_xUIElement, uno::UNO_QUERY ); if ( xComponent.is() ) @@ -630,7 +630,7 @@ void ToolbarLayoutManager::refreshToolbarsVisibility( bool bAutomaticToolbars ) UIElement aUIElement; SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { if ( implts_readWindowStateData( pIter->m_aName, aUIElement ) && ( pIter->m_bVisible != aUIElement.m_bVisible ) && !pIter->m_bMasterHide ) @@ -653,7 +653,7 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible ) SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement ); if ( pWindow && pIter->m_bFloating ) @@ -676,7 +676,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible ) SolarMutexGuard aGuard; UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { pIter->m_bMasterHide = !bVisible; Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement ); @@ -792,7 +792,7 @@ bool ToolbarLayoutManager::dockAllToolbars() ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aType == "toolbar" && pIter->m_xUIElement.is() && pIter->m_bFloating && pIter->m_bVisible ) aToolBarNameVector.push_back( pIter->m_aName ); @@ -838,7 +838,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) ::std::vector< uno::Reference< ui::XUIFunctionListener > > aListenerArray; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1246,7 +1246,7 @@ void ToolbarLayoutManager::implts_reparentToolbars() if ( pContainerWindow ) { UIElementVector::iterator pIter; - for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); pIter++ ) + for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter ) { uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -1794,7 +1794,7 @@ UIElement& ToolbarLayoutManager::impl_findToolbar( const rtl::OUString& aName ) UIElementVector::iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName ) return *pIter; @@ -1818,7 +1818,7 @@ UIElement ToolbarLayoutManager::implts_findToolbar( const uno::Reference< uno::X UIElementVector::const_iterator pIter; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1840,7 +1840,7 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const :: uno::Reference< awt::XWindow > xWindow; ReadGuard aReadLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aName == aName && pIter->m_xUIElement.is() ) { @@ -1930,7 +1930,7 @@ awt::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos() // Try to find a cascaded position for the new floating window UIElementVector::const_iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { @@ -1969,7 +1969,7 @@ void ToolbarLayoutManager::implts_sortUIElements() // We have to reset our temporary flags. UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) pIter->m_bUserActive = sal_False; aWriteLock.unlock(); } @@ -2013,7 +2013,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfos( ui::DockingArea eD aWindowVector.reserve(m_aUIElements.size()); xDockAreaWindow = m_xDockAreaWindows[eDockingArea]; UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea && pIter->m_bVisible && !pIter->m_bFloating ) { @@ -2197,7 +2197,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D ReadGuard aReadLock( m_aLock ); UIElementVector::iterator pIter; UIElementVector::iterator pEnd = m_aUIElements.end(); - for ( pIter = m_aUIElements.begin(); pIter != pEnd; pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != pEnd; ++pIter ) { if ( pIter->m_aDockedData.m_nDockedArea == eDockingArea ) { @@ -3271,7 +3271,7 @@ void ToolbarLayoutManager::implts_renumberRowColumnData( /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if (( pIter->m_aDockedData.m_nDockedArea == sal_Int16( eDockingArea )) && ( pIter->m_aName != rUIElement.m_aName )) { @@ -3926,7 +3926,7 @@ throw (uno::RuntimeException) UIElementVector::iterator pIter; WriteGuard aWriteLock( m_aLock ); - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { uno::Reference< ui::XUIElement > xUIElement( pIter->m_xUIElement ); if ( xUIElement.is() ) @@ -4134,7 +4134,7 @@ uno::Sequence< uno::Reference< ui::XUIElement > > ToolbarLayoutManager::getToolb { sal_uInt32 nCount(0); UIElementVector::iterator pIter; - for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); pIter++ ) + for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter ) { if ( pIter->m_xUIElement.is() ) { diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index f9c7deda771a..28ea85e3480f 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -717,7 +717,7 @@ void ZipPackageFolder::saveContents( ::rtl::OUString &rPath, std::vector < uno:: for ( ContentHash::const_iterator aCI = maContents.begin(), aEnd = maContents.end(); aCI != aEnd; - aCI++) + ++aCI) { const ::rtl::OUString &rShortName = (*aCI).first; const ContentInfo &rInfo = *(*aCI).second; diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx index c4fec43bd001..d0bda111cb61 100644 --- a/sot/qa/cppunit/test_sot.cxx +++ b/sot/qa/cppunit/test_sot.cxx @@ -105,7 +105,7 @@ namespace xObjStor->FillInfoList( &aInfoList ); for( SvStorageInfoList::iterator aIt = aInfoList.begin(); - aIt != aInfoList.end(); aIt++ ) + aIt != aInfoList.end(); ++aIt ) { // fprintf( stderr, "Stream '%s' size %ld\n", // rtl::OUStringToOString( aIt->GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 9b29a8274368..c2e26b900493 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -395,7 +395,7 @@ long BorderWidthImpl::GuessWidth( long nLine1, long nLine2, long nGap ) while ( pIt != aToCompare.end() && !bInvalid ) { bInvalid = ( nWidth != *pIt ); - pIt++; + ++pIt; } if ( bInvalid ) nWidth = 0.0; diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 4f6a30a95443..c647089ccd31 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -421,7 +421,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( pValues[nTokenIndex] = aPropVals; nTokenIndex++; - aIt++; // #i24377# + ++aIt; // #i24377# } aSequPropVals.realloc(nTokenIndex); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index ffacb5d0ef7e..47f75aeddec3 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2926,7 +2926,7 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL) bLastWasText = sal_False; } - aIt++; // #i21237# + ++aIt; // #i21237# } if(!bLastWasText) { diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 34bc2a1cdaaf..61618863517f 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -853,7 +853,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) ListBoxEntries_t::iterator aEnd = aRedlines.end(); for( ListBoxEntries_t::iterator aIter = aRedlines.begin(); aIter != aEnd; - aIter++ ) + ++aIter ) { sal_uInt16 nPosition = GetRedlinePos( **aIter ); if( nPosition != USHRT_MAX ) |