Kaydet (Commit) 7fbfd04c authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Miklos Vajna

sc tiled editing: Hide the cell selection when we select graphic.

Change-Id: I50f68cc292e971af8bb59782e0495d6142007d67
üst 9987747c
...@@ -5913,9 +5913,11 @@ void ScGridWindow::UpdateCursorOverlay() ...@@ -5913,9 +5913,11 @@ void ScGridWindow::UpdateCursorOverlay()
mpOOCursors->append(*pOverlay); mpOOCursors->append(*pOverlay);
// notify the LibreOfficeKit too, but only if there's no // notify the LibreOfficeKit too, but only if there's no
// selection yet, to avoid setting the LOK selection twice // selection yet (either cell selection, or graphic object),
// to avoid setting the LOK selection twice
// (once for the cell only, and then for the selection) // (once for the cell only, and then for the selection)
if (!pViewData->GetMarkData().IsMarked() && !pViewData->GetMarkData().IsMultiMarked()) if (!pViewData->GetMarkData().IsMarked() && !pViewData->GetMarkData().IsMultiMarked() &&
!pViewData->GetViewShell()->GetScDrawView()->IsMarking())
{ {
updateLibreOfficeKitSelection(pViewData, pDoc->GetDrawLayer(), aPixelRects); updateLibreOfficeKitSelection(pViewData, pDoc->GetDrawLayer(), aPixelRects);
} }
......
...@@ -737,6 +737,9 @@ void SdrMarkView::SetMarkHandles() ...@@ -737,6 +737,9 @@ void SdrMarkView::SetMarkHandles()
} }
sSelection = aSelection.toString(); sSelection = aSelection.toString();
// hide the text selection too
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, "");
} }
GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sSelection.getStr()); GetModel()->libreOfficeKitCallback(LOK_CALLBACK_GRAPHIC_SELECTION, sSelection.getStr());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment