svx/source/svdraw/svdmrkv.cxx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
New commits: commit 3b55464eeab68f6dd37b3e85e04924815001a18d Author: Henry Castro <hcas...@collabora.com> AuthorDate: Tue Jan 21 17:00:13 2020 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Thu Jan 23 17:07:57 2020 +0100 lok: add id information to the selected graphic When the graphic is selected it is necessary to send the id so the SVG background can be cached. Change-Id: I13afcad61c2f059f409484ea4af089dd199d1242 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87165 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Henry Castro <hcas...@collabora.com> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index a48642e40013..90dc167c64f9 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -851,9 +851,14 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) } OStringBuffer aExtraInfo; + + aExtraInfo.append("{ \"id\": \""); + aExtraInfo.append(OString::number(reinterpret_cast<sal_IntPtr>(pO))); + aExtraInfo.append("\""); + if (bWriterGraphic) { - aExtraInfo.append("{ \"isWriterGraphic\": true }"); + aExtraInfo.append(", \"isWriterGraphic\": true"); } else if (bIsChart) { @@ -867,7 +872,6 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) if (aSel >>= aValue) { OString aObjectCID(aValue.getStr(), aValue.getLength(), osl_getThreadTextEncoding()); - aExtraInfo.append("{ "); const std::vector<OString> aProps{"Draggable", "Resizable", "Rotatable"}; for (const auto& rProp: aProps) { @@ -979,10 +983,11 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell) aExtraInfo.append("}"); // dragInfo } } - aExtraInfo.append(" }"); } } } + aExtraInfo.append(" }"); + sSelectionText = aSelection.toString(); sSelectionText += OString(", ") + OString::number(nRotAngle); if (!aExtraInfo.isEmpty()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits