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

[Libreoffice Gerrit user]

 sd/source/ui/framework/configuration/ConfigurationClassifier.cxx |    5 ----
 sd/source/ui/framework/configuration/ConfigurationClassifier.hxx |    5 ----
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx             |   11 ----------
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx         |    6 -----
 4 files changed, 1 insertion(+), 26 deletions(-)

New commits:
commit 899e4a88b112a318fe712847c8b854a47ead4296
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Dec 12 13:17:43 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Dec 13 07:27:13 2018 +0100

    loplugin:unusedfields in sd
    
    Change-Id: Ifbcaeb1fae1c181861ceceed79dc0c9fd6545751
    Reviewed-on: https://gerrit.libreoffice.org/65052
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
index 5ec81853e9ce..2bc51836e78a 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
@@ -34,8 +34,7 @@ ConfigurationClassifier::ConfigurationClassifier (
     : mxConfiguration1(rxConfiguration1),
       mxConfiguration2(rxConfiguration2),
       maC1minusC2(),
-      maC2minusC1(),
-      maC1andC2()
+      maC2minusC1()
 {
 }
 
@@ -43,7 +42,6 @@ bool ConfigurationClassifier::Partition()
 {
     maC1minusC2.clear();
     maC2minusC1.clear();
-    maC1andC2.clear();
 
     PartitionResources(
         mxConfiguration1->getResources(nullptr, OUString(), AnchorBindingMode_DIRECT),
@@ -78,7 +76,6 @@ void ConfigurationClassifier::PartitionResources (
     ResourceIdVector::const_iterator iResource;
     for (iResource=aC1andC2.begin(); iResource!=aC1andC2.end(); ++iResource)
     {
-        maC1andC2.push_back(*iResource);
         PartitionResources(
             mxConfiguration1->getResources(*iResource, OUString(), AnchorBindingMode_DIRECT),
             mxConfiguration2->getResources(*iResource, OUString(), AnchorBindingMode_DIRECT));
diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
index c26263330413..82f32c6f6abd 100644
--- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx
@@ -106,11 +106,6 @@ private:
     */
     ResourceIdVector maC2minusC1;
 
-    /** After the call to Classify() this vector holds all elements that are
-        member both of mxConfiguration1 and mxConfiguration2.
-    */
-    ResourceIdVector maC1andC2;
-
     /** Put all the elements in the two given sequences of resource ids and
         copy them into one of the resource id result vectors maC1minusC2,
         maC2minusC1, and maC1andC2.  This is done by using only the resource
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index ab02f7e4ae5d..18d2608841f0 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -141,7 +141,6 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter)
       mrSlideSorter(rSlideSorter),
       mrController(mrSlideSorter.GetController()),
       maPagesToRemove(),
-      maPagesToSelect(),
       mxUndoContext(),
       mxSelectionObserverContext(),
       mnDragFinishedUserEventId(nullptr)
@@ -573,7 +572,6 @@ void Clipboard::StartDrag (
     vcl::Window* pWindow)
 {
     maPagesToRemove.clear();
-    maPagesToSelect.clear();
     CreateSlideTransferable(pWindow, true);
 
     mrController.GetInsertionIndicatorHandler()->UpdatePosition(
@@ -835,15 +833,6 @@ sal_uInt16 Clipboard::InsertSlides (
         rTransferable,
         nInsertPosition);
 
-    // Remember the inserted pages so that they can be selected when the
-    // operation is finished.
-    maPagesToSelect.clear();
-    SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
-    if (pDocument != nullptr)
-        for (sal_Int32 i=0; i<=nInsertedPageCount; i+=2)
-            maPagesToSelect.push_back(
-                dynamic_cast<SdPage*>(pDocument->GetPage(nInsertPosition+i)));
-
     return nInsertedPageCount;
 }
 
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index dbb233d8ccbb..f86c129b77a7 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -116,12 +116,6 @@ private:
     */
     PageList maPagesToRemove;
 
-    /** Remember the pages inserted from another document or another place
-        in the same document so that they can be selected after the
-        drag-and-drop operation is completed.
-    */
-    PageList maPagesToSelect;
-
     /** Used when a drop is executed to combine all undo actions into one.
         Typically created in ExecuteDrop() and released in DragFinish().
     */