svx/source/svdraw/svdmrkv.cxx | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 2a0aba855b09b45297091098bfa9e1d1bcdb055c
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 20:30:26 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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87285
Tested-by: Jenkins
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 56cc4db99e0f..bcc048b8a788 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -844,9 +844,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)
{
@@ -860,7 +865,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)
{
@@ -972,10 +976,11 @@ void SdrMarkView::SetMarkHandles(SfxViewShell*
pOtherShell)
aExtraInfo.append("}"); // dragInfo
}
}
- aExtraInfo.append(" }");
}
}
}
+ aExtraInfo.append(" }");
+
sSelectionText = aSelection.toString() +
", " + OString::number(nRotAngle);
if (!aExtraInfo.isEmpty())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
