diff options
author | Armin Le Grand <alg@apache.org> | 2012-11-12 16:29:06 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2012-11-12 16:29:06 +0000 |
commit | f6bff98d6f13bf71fc4bce53c189598c002343c2 (patch) | |
tree | 09b919db5bff046b5917c32f8fea58bf26fc266a | |
parent | 612cefdcf6176b6bb847ce899d89af40ef313a90 (diff) |
Secured SlideSorterModel::DeleteSlide for negative page indices
Notes
Notes:
merged as: 5481d32d285178dbf1a974389da1ee7c8ae19939
-rw-r--r-- | sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 7d8fc3a8a439..6a335e68d9f8 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -675,13 +675,36 @@ void SlideSorterModel::InsertSlide (SdPage* pPage) void SlideSorterModel::DeleteSlide (const SdPage* pPage) { - const sal_Int32 nIndex (GetIndex(pPage)); - if (maPageDescriptors[nIndex]) - if (maPageDescriptors[nIndex]->GetPage() != pPage) - return; + sal_Int32 nIndex(0); - maPageDescriptors.erase(maPageDescriptors.begin()+nIndex); - UpdateIndices(nIndex); + // Caution, GetIndex() may be negative since it uses GetPageNumber()-1 + // for calculation, so do this only when page is inserted, else the + // GetPageNumber() will be zero and thus GetIndex() == -1 + if(pPage->IsInserted()) + { + nIndex = GetIndex(pPage); + } + else + { + // if not inserted, search for page + for(; nIndex < maPageDescriptors.size(); nIndex++) + { + if(maPageDescriptors[nIndex]->GetPage() == pPage) + { + break; + } + } + } + + if(nIndex >= 0 && nIndex < maPageDescriptors.size()) + { + if (maPageDescriptors[nIndex]) + if (maPageDescriptors[nIndex]->GetPage() != pPage) + return; + + maPageDescriptors.erase(maPageDescriptors.begin()+nIndex); + UpdateIndices(nIndex); + } OSL_TRACE("page removed"); } |