[Libreoffice-commits] .: 6 commits - desktop/source editeng/source framework/source svx/source ucb/source vbahelper/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Dec 24 06:27:52 PST 2010


 desktop/source/app/dispatchwatcher.cxx             |    2 -
 editeng/source/uno/unotext2.cxx                    |    4 +--
 framework/source/uielement/menubarmanager.cxx      |   22 ++++++++++-----------
 svx/source/unodraw/unomtabl.cxx                    |    4 +--
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx |    2 -
 vbahelper/source/vbahelper/vbacommandbarhelper.cxx |    2 -
 6 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 60feb1135c5e7268b388d3fc24b8f36ccd982aac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:37:16 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index ced1142..5f4a19a 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -93,7 +93,7 @@ uno::Any SvxUnoTextContentEnumeration::nextElement(void) throw( container::NoSuc
 
     const SvxUnoTextRangeBaseList& rRanges( mpEditSource->getRanges() );
     SvxUnoTextRangeBaseList::const_iterator aIter;
-    for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pContent == 0); aIter++ )
+    for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pContent == 0); ++aIter )
     {
         SvxUnoTextContent* pIterContent = dynamic_cast< SvxUnoTextContent* >( (*aIter ) );
         if( pIterContent && (pIterContent->mnParagraph == mnNextParagraph) )
@@ -463,7 +463,7 @@ uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement()
     SvxUnoTextRange* pRange = 0;
 
     SvxUnoTextRangeBaseList::const_iterator aIter;
-    for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pRange == 0); aIter++ )
+    for( aIter = rRanges.begin(); (aIter != rRanges.end()) && (pRange == 0); ++aIter )
     {
         SvxUnoTextRange* pIterRange = dynamic_cast< SvxUnoTextRange* >( (*aIter ) );
         if( pIterRange && pIterRange->mbPortion && (aSel.IsEqual( pIterRange->maSelection ) ) )
commit 55533b5025fbfa9fbf0916dcb05d99c0c28fdb45
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:35:54 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 77cc1c3..75bf44b 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -176,7 +176,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
     sal_Bool                        bSetInputFilter = sal_False;
     ::rtl::OUString                 aForcedInputFilter;
 
-    for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); p++ )
+    for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); ++p )
     {
         const DispatchRequest&	aDispatchRequest = *p;
 
commit 27176ed24dce53d584ecefe2c90a38f1a4719434
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:35:38 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 4f161ec..c675dd5 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -229,7 +229,7 @@ void SAL_CALL SvxUnoMarkerTable::removeByName( const OUString& aApiName )
             maItemSetVector.erase( aIter );
             return;
         }
-        aIter++;
+        ++aIter;
     }
 
     if( !hasByName( Name ) )
@@ -270,7 +270,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
             (*aIter)->Put( aStartMarker, XATTR_LINESTART );
             return;
         }
-        aIter++;
+        ++aIter;
     }
 
     // if it is not in our own sets, modify the pool!
commit 183acf8d3a70a7d57cd1f1a6ee021b3933be537c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:34:15 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 98db065..a78ed0c 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -81,7 +81,7 @@ public:
     rtl::OUString findBuildinToolbar( const rtl::OUString& sToolbarName )
     {
         MSO2OOCommandbarMap::iterator it = maBuildinToolbarMap.begin();
-        for(; it != maBuildinToolbarMap.end(); it++ )
+        for(; it != maBuildinToolbarMap.end(); ++it )
         {
             rtl::OUString sName = it->first;
             if( sName.equalsIgnoreAsciiCase( sToolbarName ) )
commit 056bd47cdc19b9c55b1a9790b6c24648e9546e94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:31:33 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 4c7f4e6..07896af 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -357,7 +357,7 @@ void MenuBarManager::Destroy()
         RemoveListener();
 
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             pItemHandler->xMenuItemDispatch.clear();
@@ -489,7 +489,7 @@ throw ( RuntimeException )
     if ( Action.Action == FrameAction_CONTEXT_CHANGED )
     {
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             // Clear dispatch reference as we will requery it later o
             MenuItemHandler* pItemHandler = *p;
@@ -514,7 +514,7 @@ throw ( RuntimeException )
 
         // We have to check all menu entries as there can be identical entries in a popup menu.
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
             if ( pMenuItemHandler->aMenuItemURL == aFeatureURL )
@@ -605,7 +605,7 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( USHORT nIte
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->nItemId == nItemId )
@@ -648,7 +648,7 @@ void MenuBarManager::RemoveListener()
     if ( xServiceManager.is() )
     {
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             if ( pItemHandler->xMenuItemDispatch.is() )
@@ -727,7 +727,7 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
     ResetableGuard aGuard( m_aLock );
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pMenuItemHandler = *p;
         if ( pMenuItemHandler->xMenuItemDispatch.is() &&
@@ -896,7 +896,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         {
             RetrieveShortcuts( m_aMenuItemHandlerVector );
             std::vector< MenuItemHandler* >::iterator p;
-            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
             {
                 MenuItemHandler* pMenuItemHandler = *p;
 
@@ -926,7 +926,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
             KeyCode             aEmptyKeyCode;
             SvtCommandOptions   aCmdOptions;
             std::vector< MenuItemHandler* >::iterator p;
-            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+            for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
             {
                 MenuItemHandler* pMenuItemHandler = *p;
                 if ( pMenuItemHandler )
@@ -1502,7 +1502,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF
     {
         RetrieveShortcuts( m_aMenuItemHandlerVector );
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pMenuItemHandler = *p;
 
@@ -1931,7 +1931,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
 
         RemoveListener();
         std::vector< MenuItemHandler* >::iterator p;
-        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+        for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
         {
             MenuItemHandler* pItemHandler = *p;
             pItemHandler->xMenuItemDispatch.clear();
@@ -1965,7 +1965,7 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
     SolarMutexGuard aSolarMutexGuard;
 
     std::vector< MenuItemHandler* >::iterator p;
-    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); p++ )
+    for ( p = m_aMenuItemHandlerVector.begin(); p != m_aMenuItemHandlerVector.end(); ++p )
     {
         MenuItemHandler* pItemHandler = *p;
         if ( pItemHandler->xPopupMenuController.is() )
commit a1a63fde53a3b645da3eb779ad376988e980a7f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 24 13:29:38 2010 +0000

    cppcheck: prefer prefix variant

diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index a2dd284..456b59a 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -111,7 +111,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
     while ( it != end )
     {
         delete (*it);
-        it++;
+        ++it;
     }
 }
 


More information about the Libreoffice-commits mailing list