[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx     |    8 
+-------
 sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx |    1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 9288886b01907545e22b98dca1dc666a11d71e55
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue May 17 10:20:46 2016 +0100

    maDeletedPages member of slidesorter is only written to, never read
    
    Change-Id: I5eb58462306f3d8cab54eb00f4ff492c80585dbb

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx
index c90b104..18b77b6 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 4bdfc15..c88b032 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

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits