mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I50f68cc292e971af8bb59782e0495d6142007d67
This commit is contained in:
Jan Holesovsky
2015-03-27 22:25:28 +01:00
committed by Miklos Vajna
parent 9987747c47
commit 7fbfd04c2e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sc/source/ui/view/gridwin.cxx
View File

@@ -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);
} }

3
svx/source/svdraw/svdmrkv.cxx
View File

@@ -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());
} }