sc/source/ui/view/gridwin.cxx | 2 --
sc/source/ui/view/viewdata.cxx | 26 --------------------------
2 files changed, 28 deletions(-)
New commits:
commit 8f695dd653031863673b099c14fa20841df2cd88
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Mon Mar 25 14:55:29 2024 +1030
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Mon Mar 25 08:20:41 2024 +0100
Revert "lok calc: show cell cursor on in place editing"
Causes calc/focus_spec.js to fail in COOL.
Or when clicking into formula bar, cell takes back focus.
This reverts commit cc88ad715f80b13efb29744673d044df9c16550c.
Change-Id: I9b43c5893a721fc4c42bf1e5f2ef0f514c127ee5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165263
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fbb6bceb0e5c..3cf47209647c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6107,8 +6107,6 @@ void ScGridWindow::UpdateAllOverlays()
void ScGridWindow::DeleteCursorOverlay()
{
- if (comphelper::LibreOfficeKit::isActive() &&
mrViewData.HasEditView(eWhich))
- return;
ScTabViewShell* pViewShell = mrViewData.GetViewShell();
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR, "EMPTY");
SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_CELL_VIEW_CURSOR,
"rectangle", "EMPTY");
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index c7bd25aabb51..c2ec647d203b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -71,7 +71,6 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
using namespace com::sun::star;
@@ -1519,22 +1518,6 @@ tools::Rectangle ScViewData::GetEditArea( ScSplitPos
eWhich, SCCOL nPosX, SCROW
GetEditArea( pPattern, bForceToTop );
}
-namespace {
-
-void notifyCellCursorAt(const ScTabViewShell* pViewShell, SCCOL nCol, SCROW
nRow,
- const tools::Rectangle& rCursor)
-{
- std::stringstream ss;
- ss << rCursor.getX() << ", " << rCursor.getY() << ", " <<
rCursor.GetWidth() << ", "
- << rCursor.GetHeight() << ", " << nCol << ", " << nRow;
-
- pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_CURSOR,
ss.str().c_str());
- SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_CELL_VIEW_CURSOR,
"rectangle",
- ss.str().c_str());
-}
-
-}
-
void ScViewData::SetEditEngine( ScSplitPos eWhich,
ScEditEngineDefaulter* pNewEngine,
vcl::Window* pWin, SCCOL nNewX, SCROW nNewY )
@@ -1650,9 +1633,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
tools::Rectangle aOutputArea = pWin->PixelToLogic( aPixRect,
GetLogicMode() );
pEditView[eWhich]->SetOutputArea( aOutputArea );
- if (bLOKPrintTwips)
- notifyCellCursorAt(GetViewShell(), nNewX, nNewY, aPTwipsRect);
-
if ( bActive && eWhich == GetActivePart() )
{
// keep the part that has the active edit view available after
@@ -2141,9 +2121,6 @@ void ScViewData::EditGrowX()
pCurView->SetOutputArea(aArea);
- if (bLOKPrintTwips)
- notifyCellCursorAt(GetViewShell(), nEditCol, nEditRow, aAreaPTwips);
-
// In vertical mode, the whole text is moved to the next cell
(right-aligned),
// so everything must be repainted. Otherwise, paint only the new area.
// If growing in centered alignment, if the cells left and right have
different sizes,
@@ -2257,9 +2234,6 @@ void ScViewData::EditGrowY( bool bInitial )
pCurView->SetOutputArea(aArea);
- if (bLOKPrintTwips)
- notifyCellCursorAt(GetViewShell(), nEditCol, nEditRow, aAreaPTwips);
-
if (nEditEndRow >= nBottom || bMaxReached)
{
if (!(nControl & EVControlBits::AUTOSCROLL))
