diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2019-12-09 10:48:15 +0100 |
|---|---|---|
| committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2019-12-09 10:53:45 +0100 |
| commit | cb33666811db8b3aa34f6587c50367117b8bbe30 (patch) | |
| tree | 053394af7ef165e4f34ccab39345800fa6c0f1e6 /sc | |
| parent | 09ddec08eaa0af1ca6a5f8a376abae9e62fe2607 (diff) | |
lok: calc: zoom: object selection - is unreliable
Change-Id: Ic8e61c56bdf38bbb74f179fa36075bdd3a601249
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/view/gridwin3.cxx | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index c2ea2346cb86..299ddeca376b 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -50,6 +50,11 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr(); if (pDraw && !pViewData->IsRefMode()) { + MapMode aDrawMode = GetDrawMapMode(); + MapMode aOldMode = GetMapMode(); + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aDrawMode ); + pDraw->SetWindow( this ); Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel()); if ( pDraw->IsDetectiveHit( aLogicPos ) ) @@ -63,6 +68,9 @@ bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) if ( bRet ) UpdateStatusPosSize(); } + + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aOldMode ); } // cancel draw with right key @@ -82,6 +90,11 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt) FuPoor* pDraw = pView->GetDrawFuncPtr(); if (pDraw && !pViewData->IsRefMode()) { + MapMode aDrawMode = GetDrawMapMode(); + MapMode aOldMode = GetMapMode(); + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aDrawMode ); + pDraw->SetWindow( this ); bRet = pDraw->MouseButtonUp( rMEvt ); @@ -98,6 +111,9 @@ bool ScGridWindow::DrawMouseButtonUp(const MouseEvent& rMEvt) if ( !pView->IsPaintBrushLocked() ) pView->ResetBrushDocument(); // end paint brush mode if not locked } + + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aOldMode ); } return bRet; @@ -108,10 +124,19 @@ bool ScGridWindow::DrawMouseMove(const MouseEvent& rMEvt) FuPoor* pDraw = pViewData->GetView()->GetDrawFuncPtr(); if (pDraw && !pViewData->IsRefMode()) { + MapMode aDrawMode = GetDrawMapMode(); + MapMode aOldMode = GetMapMode(); + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aDrawMode ); + pDraw->SetWindow( this ); bool bRet = pDraw->MouseMove( rMEvt ); if ( bRet ) UpdateStatusPosSize(); + + if ( comphelper::LibreOfficeKit::isActive() && aOldMode != aDrawMode ) + SetMapMode( aOldMode ); + return bRet; } else |