diff options
-rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index b74a9b1a0a0d..cb707d7961af 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -265,7 +265,7 @@ namespace rptui */ OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt); - void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet); + void MovAction(const Point& rPnt,const OSectionView* _pSection, bool _bControlKeySet); sal_uInt32 getMarkedObjectCount() const; diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 4547ce83814e..44459a0d60ea 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1342,10 +1342,8 @@ void OViewsWindow::EndAction() ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eEndAction) ); } -void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bool _bMove, bool _bControlKeySet) +void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection, bool _bControlKeySet) { - (void)_bMove; - Point aRealMousePos = _aPnt; Point aCurrentSectionPos; SAL_INFO( diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 98f4ae2857da..2511747f11d6 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -764,7 +764,7 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) } bIsSetPoint = setMovementPointer(rMEvt); ForceScroll(aPos); - m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == nullptr, false); + m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, false); } if ( !bIsSetPoint ) @@ -868,7 +868,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) if (m_rView.GetDragMethod()==nullptr) { // create a selection - m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, true, false); + m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false); } else { @@ -882,7 +882,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) } // drag or resize an object bool bControlKey = rMEvt.IsMod1(); - m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey); + m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, bControlKey); } } |