diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-10-13 20:51:57 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-14 11:06:19 +0200 |
commit | 91a2dfe81dfecf09d9347a49a53e61d6bd2f82ce (patch) | |
tree | 2ee140e9eaff6dea6a0b553c5b8306d71e62583d /sd | |
parent | 2b7ccc1ee083abee812a4e9917c1324179ec97cb (diff) |
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@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/func/fusnapln.cxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drviews4.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsa.cxx | 1 |
5 files changed, 1 insertions, 9 deletions
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; |