summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-05-31 14:34:59 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-05-31 14:58:05 +0100
commitdc0d009f10dee5d379b41abcd51d181dda38f1dd (patch)
treee7e14449e6c13fb155d96e6be9e77940119d3314 /framework
parent4139e6a208ea5040b169e9775828a5513c4f4ea9 (diff)
targetted misc. minor cppcheck cleanups reversion
Change-Id: Ic7f91c035d3e7f0e792d2e9ab217e1fc4ebcf697
Diffstat (limited to 'framework')
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx38
1 files changed, 19 insertions, 19 deletions
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 1bcf3c3a1a55..2fe830694e92 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() )
@@ -4126,7 +4126,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() )
{