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

[Caolán McNamara (via logerrit)]

 sd/source/ui/func/fusnapln.cxx     |    1 -
 sd/source/ui/inc/DrawViewShell.hxx |    2 --
 sd/source/ui/view/drviews2.cxx     |    2 --
 sd/source/ui/view/drviews4.cxx     |    4 +---
 sd/source/ui/view/drviewsa.cxx     |    1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 91a2dfe81dfecf09d9347a49a53e61d6bd2f82ce
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 13 20:51:57 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 14 11:06:19 2020 +0200

    mbMousePosFreezed is always false
    
    Change-Id: I664b8e8c02b3af6af96300e3b2aa40a1cff91946
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104259
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index b94e5ecb7f06..ff9840e82424 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -80,7 +80,6 @@ void FuSnapLine::DoExecute( SfxRequest& rReq )
             // request.  Determine it from the mouse position.
 
             aLinePos = static_cast<DrawViewShell*>(mpViewShell)->GetMousePos();
-            static_cast<DrawViewShell*>(mpViewShell)->SetMousePosFreezed();
 
             if ( aLinePos.X() >= 0 )
             {
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index ec259808c273..608819c63541 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -234,7 +234,6 @@ public:
     PageKind        GetPageKind() const { return mePageKind; }
     void            SetPageKind( PageKind ePageKind ) { mePageKind = ePageKind; }
     const Point&    GetMousePos() const { return maMousePos; }
-    void            SetMousePosFreezed() { mbMousePosFreezed = false; }
 
     EditMode        GetEditMode() const { return meEditMode; }
     virtual SdPage* GetActualPage() override { return mpActualPage; }
@@ -382,7 +381,6 @@ protected:
     SdPage*             mpActualPage;
     ::tools::Rectangle           maMarkRect;
     Point               maMousePos;
-    bool                mbMousePosFreezed;
     VclPtr<TabControl>  maTabControl;
     EditMode            meEditMode;
     PageKind            mePageKind;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index f32acb5d3182..a76151901147 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1336,8 +1336,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                 FuPoor::HITPIX, 0 ) ).Width());
             sal_uInt16  nHelpLine;
 
-            mbMousePosFreezed = false;
-
             if( mpDrawView->PickHelpLine( aMPos, nHitLog, *GetActiveWindow(), nHelpLine, pPV) )
             {
                 pPV->DeleteHelpLine( nHelpLine );
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 5cd99a497143..ce34072644e0 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -364,8 +364,7 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
 
     ViewShell::MouseMove(rMEvt, pWin);
 
-    if( !mbMousePosFreezed )
-        maMousePos = rMEvt.GetPosPixel();
+    maMousePos = rMEvt.GetPosPixel();
 
     ::tools::Rectangle aRect;
 
@@ -788,7 +787,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
                 //open context menu at that point
                 GetViewFrame()->GetDispatcher()->ExecutePopup( aPopupId, GetActiveWindow(), &aMenuPos );
             }
-            mbMousePosFreezed = false;
         }
     }
     else
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 789d46eafce3..74a68af15e15 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -201,7 +201,6 @@ DrawViewShell::~DrawViewShell()
 void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
 {
     mpActualPage = nullptr;
-    mbMousePosFreezed = false;
     mbReadOnly = GetDocSh()->IsReadOnly();
     mxClipEvtLstnr.clear();
     mbPastePossible = false;