summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-17 10:20:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-17 10:22:16 +0100
commit9288886b01907545e22b98dca1dc666a11d71e55 (patch)
treecf72efb68495762d21d0a899e556c161e1c569bc
parentodk: add missing modelines (diff)
downloadcore-9288886b01907545e22b98dca1dc666a11d71e55.tar.gz
core-9288886b01907545e22b98dca1dc666a11d71e55.zip
maDeletedPages member of slidesorter is only written to, never read
Change-Id: I5eb58462306f3d8cab54eb00f4ff492c80585dbb
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx1
2 files changed, 1 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index c90b10458ea7..18b77b620994 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
@@ -58,8 +58,7 @@ void SelectionObserver::Context::Abort()
SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
mbIsOvservationActive(false),
- maInsertedPages(),
- maDeletedPages()
+ maInsertedPages()
{
}
@@ -84,8 +83,6 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage)
::std::find(maInsertedPages.begin(), maInsertedPages.end(), pPage));
if (iPage != maInsertedPages.end())
maInsertedPages.erase(iPage);
-
- maDeletedPages.push_back(pPage->GetPageNum());
}
}
@@ -93,7 +90,6 @@ void SelectionObserver::StartObservation()
{
OSL_ASSERT(!mbIsOvservationActive);
maInsertedPages.clear();
- maDeletedPages.clear();
mbIsOvservationActive = true;
}
@@ -102,7 +98,6 @@ void SelectionObserver::AbortObservation()
OSL_ASSERT(mbIsOvservationActive);
mbIsOvservationActive = false;
maInsertedPages.clear();
- maDeletedPages.clear();
}
void SelectionObserver::EndObservation()
@@ -126,7 +121,6 @@ void SelectionObserver::EndObservation()
}
maInsertedPages.clear();
}
- maDeletedPages.clear();
aUpdateLock.Release();
mrSlideSorter.GetController().GetFocusManager().SetFocusedPageToCurrentPage();
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
index 4bdfc158db89..c88b032acfe5 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx
@@ -68,7 +68,6 @@ private:
bool mbIsOvservationActive;
::std::vector<const SdPage*> maInsertedPages;
- ::std::vector<sal_Int32> maDeletedPages;
};
} } } // end of namespace ::sd::slidesorter::controller