commit 21795eb3d3eca8e3c2eadc1e80dfc2d032a3c861
author Mike Kaganski <mike.kaganski@collabora.com> Wed Nov 07 09:05:07 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Sat Nov 10 14:09:17 2018 +0100
tree 5b47d41fd09c08ef9f9f18930047347205010c39
parent 0408b72ae93d7cce9f64c4779f19d645d694df95

tdf#120703 PVS: drop dead code.

V547 Expression 'mpTargetSlideSorter != nullptr' is always false.

The code wasn't used since commit 4b83a7fe5714eb9a1d208502a18e33da35772ece
(initially, mpTargetSlideSorter pointer was compared to a pSlideSorter
parameter, which was always nullptr since commit above; then commit
f946e905c6c6bb041ae580b14b711c6964af97bd removed the const parameter).

Change-Id: I70047ae3e7ef39419be0012e375856d8a50d5793
Reviewed-on: https://gerrit.libreoffice.org/63229
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx

diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 9990d91..770fb1b 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -66,7 +66,7 @@

DragAndDropContext::~DragAndDropContext() COVERITY_NOEXCEPT_FALSE
{
    SetTargetSlideSorter (Point(0,0));
    SetTargetSlideSorter();
}

void DragAndDropContext::Dispose()
@@ -111,8 +111,7 @@
    }
}

void DragAndDropContext::SetTargetSlideSorter(
    const Point& rMousePosition)
void DragAndDropContext::SetTargetSlideSorter()
{
    if (mpTargetSlideSorter != nullptr)
    {
@@ -122,16 +121,6 @@
    }

    mpTargetSlideSorter = nullptr;

    if (mpTargetSlideSorter != nullptr)
    {
        mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->Start(
            false/*bIsOverSourceView*/);
        mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->UpdatePosition(
            rMousePosition,
            InsertionIndicatorHandler::UnknownMode);

    }
}

} } } // end of namespace ::sd::slidesorter::controller

sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx

diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 1b36791..3a2ed06 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -60,7 +60,7 @@
        const InsertionIndicatorHandler::Mode eMode,
        const bool bAllowAutoScroll);

    void SetTargetSlideSorter(const Point& rMousePosition);
    void SetTargetSlideSorter();

private:
    SlideSorter* mpTargetSlideSorter;

sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 002c924..4a3b066 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -1162,11 +1162,9 @@
        {
            if (maButtonDownLocation)
            {
                const sal_Int32 nDistance (maButtonDownLocation
                    ? ::std::max (
                        std::abs(maButtonDownLocation->X() - rDescriptor.maMousePosition.X()),
                        std::abs(maButtonDownLocation->Y() - rDescriptor.maMousePosition.Y()))
                    : 0);
                const sal_Int32 nDistance(std::max(
                    std::abs(maButtonDownLocation->X() - rDescriptor.maMousePosition.X()),
                    std::abs(maButtonDownLocation->Y() - rDescriptor.maMousePosition.Y())));
                if (nDistance > 3)
                    StartDrag(rDescriptor.maMousePosition);
            }
@@ -1499,7 +1497,7 @@
    if (mpDragAndDropContext)
    {
        // Disconnect the substitution handler from this selection function.
        mpDragAndDropContext->SetTargetSlideSorter(Point(0,0));
        mpDragAndDropContext->SetTargetSlideSorter();
        mpDragAndDropContext.reset();
    }
    mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated);