include/LibreOfficeKit/LibreOfficeKitEnums.h | 37 ++++++++++++++++++++++++---
svx/source/svdraw/svdmrkv.cxx | 3 +-
2 files changed, 35 insertions(+), 5 deletions(-)
New commits:
commit b359e4816a9d40beb79f1f87be1c0d12a59555f7
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu May 9 11:32:56 2019 +0200
Commit: Marco Cecchetti <mrcek...@gmail.com>
CommitDate: Mon May 20 10:36:30 2019 +0200
svx lok: fix crash on select all when there is no mpMarkedObj yet
Fixes the online.git HTTPWSTest::testRenderShapeSelectionImpress()
testcase by reverting one hunk of commit
3fb298f673db169a38c1258d66ec24821386eb40 (lok: writer: svg export
transformed images, 2019-03-26).
This was probably meant to be a cleanup, but getting the sdr mark,
followed by getting the sdr object of the mark always gives us a shape,
while directly accessing mpMarkedObj does not.
Change-Id: Id733ba5c6fdf6fc86a3e9f7de62b4bdcbf9b06db
Reviewed-on: https://gerrit.libreoffice.org/72039
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
Tested-by: Michael Meeks <michael.me...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/72566
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index e95195cbd6ea..8cf33dbb628f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -841,7 +841,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
{
if (GetMarkedObjectCount())
{
- SdrObject* pO = mpMarkedObj;
+ SdrMark* pM = GetSdrMarkByIndex(0);
+ SdrObject* pO = pM->GetMarkedSdrObj();
long nRotAngle = pO->GetRotateAngle();
// true if we are delaing with a RotGrfFlyFrame
// (SwVirtFlyDrawObj with a SwGrfNode)
commit 516c3385dece94247ebf3f3e50e6ca7ff1a82b08
Author: Marco Cecchetti <mrcek...@gmail.com>
AuthorDate: Tue Mar 26 15:11:33 2019 +0100
Commit: Marco Cecchetti <mrcek...@gmail.com>
CommitDate: Mon May 20 10:36:14 2019 +0200
lok: update graphic selection callback description
Change-Id: I1ae073cc8e307b5c42aed9b17d405ef36ce4dc43
Reviewed-on: https://gerrit.libreoffice.org/70569
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index af4952566dbd..f3fc91b2f71c 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -162,11 +162,40 @@ typedef enum
*/
LOK_CALLBACK_CURSOR_VISIBLE = 5,
/**
- * The size and/or the position of the graphic selection changed and
- * the rotation angle of the embedded graphic object
+ * The size and/or the position of the graphic selection changed,
+ * the rotation angle of the embedded graphic object, and a property list
+ * which can be used for informing the client about severl properties.
*
- * Format is "x, y, width, height, angle", where angle is in 100th
- * of degree.
+ * Format is "x, y, width, height, angle, { list of properties }",
+ * where angle is in 100th of degree, and the property list is optional.
+ *
+ * The "{ list of properties }" part is in JSON format.
+ * Follow some examples of the property list part:
+ *
+ * 1) when the selected object is an image inserted in Writer:
+ *
+ * { "isWriterGraphic": true }
+ *
+ * 2) when the selected object is a chart legend:
+ *
+ * { "isDraggable": true, "isResizable": true, "isRotatable": false }
+ *
+ * 3) when the selected object is a pie segment in a chart:
+ *
+ * {
+ * "isDraggable": true,
+ * "isResizable": false,
+ * "isRotatable": false,
+ * "dragInfo": {
+ * "dragMethod": "PieSegmentDragging",
+ * "initialOffset": 50,
+ * "dragDirection": [x, y],
+ * "svg": "<svg ..."
+ * }
+ * }
+ *
+ * where the "svg" property is a string containing an svg document
+ * which is a rapresentation of the pie segment.
*/
LOK_CALLBACK_GRAPHIC_SELECTION = 6,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
