Use const_iterator when possible (svx/gallery2,items,sdr,stbctrls)

Change-Id: Idd8992fcb76c25120202b24a23820d85ca09e434
Reviewed-on: https://gerrit.libreoffice.org/24174
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

4 files changed, 10 insertions, 7 deletions

diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx
index 6b0e4d1ec32c..84e1ce3511b0 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -190,8 +190,9 @@ namespace sdr
                 }
 
                 // execute events from the vector
+                ::std::vector< Event* >::const_iterator aEnd = EventPointerVector.end();
                 for(::std::vector< Event* >::iterator aCandidate = EventPointerVector.begin();
-                    aCandidate != EventPointerVector.end(); ++aCandidate)
+                    aCandidate != aEnd; ++aCandidate)
                 {
                     // trigger event. This may re-insert the event to the scheduler again
                     (*aCandidate)->Trigger(mnTime);
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 479310f83226..747a727f9cbe 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -94,7 +94,8 @@ namespace sdr
 
             if(nSize)
             {
-                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
+                OverlayObjectVector::const_iterator aEnd(maOverlayObjects.end());
+                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != aEnd; ++aIter)
                 {
                     OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                     OverlayObject& rCandidate = **aIter;
@@ -223,7 +224,8 @@ namespace sdr
 
             if(nSize)
             {
-                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != maOverlayObjects.end(); ++aIter)
+                OverlayObjectVector::const_iterator aEnd = maOverlayObjects.end();
+                for(OverlayObjectVector::iterator aIter(maOverlayObjects.begin()); aIter != aEnd; ++aIter)
                 {
                     OSL_ENSURE(*aIter, "Corrupted OverlayObject List (!)");
                     OverlayObject& rCandidate = **aIter;
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index a9955c21df14..701895228ab0 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -362,8 +362,8 @@ namespace sdr
                             SfxStyleSheetBase* pLastSheet = nullptr;
                             SfxStyleSheetBase* pForThisObject = nullptr;
 
-                            std::vector<SfxStyleSheetBase*>::iterator iter;
-                            for (iter = aStyleList.begin(); iter != aStyleList.end(); ++iter)
+                            for (std::vector<SfxStyleSheetBase*>::const_iterator iter = aStyleList.begin(), aEnd = aStyleList.end()
+                                ; iter != aEnd; ++iter)
                             {
                                 pNewSheet = &pNewPool->Make((*iter)->GetName(), (*iter)->GetFamily(), (*iter)->GetMask());
                                 pNewSheet->GetItemSet().Put((*iter)->GetItemSet(), false);
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 794c2ec6f284..180b907eba94 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -461,7 +461,7 @@ namespace sdr
                                     std::vector<EECharAttrib> aAttribs;
                                     pEditEngine->GetCharAttribs(nPara, aAttribs);
 
-                                    for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i)
+                                    for(std::vector<EECharAttrib>::const_iterator i = aAttribs.begin(), aEnd = aAttribs.end(); i != aEnd; ++i)
                                     {
                                         if(EE_FEATURE_FIELD == i->pAttr->Which())
                                         {
@@ -490,7 +490,7 @@ namespace sdr
 
                                         ESelection aSel(nPara, 0);
 
-                                        for(std::vector<EECharAttrib>::iterator i = aAttribs.begin(); i < aAttribs.end(); ++i)
+                                        for(std::vector<EECharAttrib>::const_iterator i = aAttribs.begin(), aEnd = aAttribs.end(); i != aEnd; ++i)
                                         {
                                             if(EE_FEATURE_FIELD == i->pAttr->Which())
                                             {