You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/05/27 13:29:06 UTC
svn commit: r1486583 -
/openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
Author: hdu
Date: Mon May 27 11:29:06 2013
New Revision: 1486583
URL: http://svn.apache.org/r1486583
Log:
#i122208# const SD containers cannot provide non-const iterators
Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
Modified: openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx?rev=1486583&r1=1486582&r2=1486583&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx Mon May 27 11:29:06 2013
@@ -154,7 +154,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;
};
@@ -247,7 +247,7 @@ SharedPageObjectRun InsertAnimator::Impl
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.
@@ -288,7 +288,7 @@ SharedPageObjectRun InsertAnimator::Impl
-InsertAnimator::Implementation::RunContainer::iterator
+InsertAnimator::Implementation::RunContainer::const_iterator
InsertAnimator::Implementation::FindRun (const sal_Int32 nRunIndex) const
{
return std::find_if(
@@ -326,7 +326,7 @@ void InsertAnimator::Implementation::Rem
// 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);