summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2013-05-27 11:29:06 +0000
committerHerbert Dürr <hdu@apache.org>2013-05-27 11:29:06 +0000
commit7bae0d96274fa1c57834281495f5710ef3343dc1 (patch)
treea739b95216757b4f14c63d12da211d59aa711ff0 /sd
parentc6f4bbfa54bd0fbef6bbc048cbd930c2781b2137 (diff)
#i122208# const SD containers cannot provide non-const iterators
Notes
Notes: prefer: 49d1c0bd993579f0874fd8373a7e0dd7932a56f9
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index bec36e28d905..0e6e7de11e94 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -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::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.
@@ -288,7 +288,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(
@@ -326,7 +326,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);