[Libreoffice-commits] core.git: 2 commits - sfx2/source xmloff/source

[Julien Nabet]

 sfx2/source/doc/templatedlg.cxx             |    2 ++
 xmloff/source/draw/XMLShapeStyleContext.cxx |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 8 16:15:14 2014 +0200

    cppcheck: Prefer prefix ++/-- operators for non-primitive types
    
    Change-Id: Ieb7933207ed921353a9681ce850d0f4a38d69759

diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index d366b96..4dbafca 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -195,7 +195,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
         static ::rtl::OUString s_FillStyle(RTL_CONSTASCII_USTRINGPARAM("FillStyle"));
 
         // try to find a FillStyle entry and a value from it
-        for(a = rProperties.begin(); a != rProperties.end(); a++)
+        for(a = rProperties.begin(); a != rProperties.end(); ++a)
         {
             if(a->mnIndex != -1)
             {
@@ -238,7 +238,7 @@ void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet
             static ::rtl::OUString s_BackGraphicLocation(RTL_CONSTASCII_USTRINGPARAM("BackGraphicLocation"));
             static ::rtl::OUString s_BackGraphicTransparency(RTL_CONSTASCII_USTRINGPARAM("BackGraphicTransparency"));
 
-            for(a = rProperties.begin(); a != rProperties.end(); a++)
+            for(a = rProperties.begin(); a != rProperties.end(); ++a)
             {
                 if(a->mnIndex != -1)
                 {
commit 24cb5b3cf8ea893acd4d8a43e5405459d765b314
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu May 8 16:15:03 2014 +0200

    cppcheck: Missing bounds check for extra iterator increment in loop
    
    Change-Id: Ia6f7d35acacc99b4cfe4f8b8d5a7c81e97558205

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 7551c95..2f91796 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -1263,6 +1263,8 @@ void SfxTemplateManagerDlg::OnFolderDelete()
                 aFolderList = aFolderList + "\n" + (*pIter)->maTitle;
 
             ++pIter;
+            if (pIter == aSelFolders.end())
+                break;
         }
     }