[Libreoffice-commits] .: Branch 'integration/dev300_m101' - sd/source

[Tor Lillqvist]

 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fffea7806ac41f327ebbb09e7f36fde1c20b08dc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 18 16:54:53 2011 +0200

    const_iterator pedantry for MSVC

diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index 4a8f7b4..6cd4557 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -158,7 +158,7 @@ private:
         view::Layouter& rLayouter,
         const InsertPosition& rInsertPosition,
         const bool bCreate = true);
-    RunContainer::iterator FindRun (const sal_Int32 nRunIndex) const;
+    RunContainer::const_iterator FindRun (const sal_Int32 nRunIndex) const;
 };
 
 
@@ -251,7 +251,7 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun (
     if (nRow < 0)
         return SharedPageObjectRun();
 
-    RunContainer::iterator iRun (maRuns.end());
+    RunContainer::const_iterator iRun (maRuns.end());
     if (rLayouter.GetColumnCount() == 1)
     {
         // There is only one run that contains all slides.
@@ -292,7 +292,7 @@ SharedPageObjectRun InsertAnimator::Implementation::GetRun (
 
 
 
-InsertAnimator::Implementation::RunContainer::iterator
+InsertAnimator::Implementation::RunContainer::const_iterator
     InsertAnimator::Implementation::FindRun (const sal_Int32 nRunIndex) const
 {
     return std::find_if(
@@ -330,7 +330,7 @@ void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageOb
         // Do not remove runs that show the space for the insertion indicator.
         if (pRun->mnLocalInsertIndex == -1)
         {
-            InsertAnimator::Implementation::RunContainer::iterator iRun (FindRun(pRun->mnRunIndex));
+            InsertAnimator::Implementation::RunContainer::const_iterator iRun (FindRun(pRun->mnRunIndex));
             if (iRun != maRuns.end())
             {
                 OSL_ASSERT(*iRun == pRun);