1 files changed, 83 insertions, 16 deletions

diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx
index 996ceff2c288..a8854ac4a951 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -18,6 +18,10 @@
 
 #include <memory>
 
+#include "CommonConverters.hxx"
+#include <editeng/unoprnms.hxx>
+#include "macros.hxx"
+
 namespace chart
 {
 
@@ -27,6 +31,8 @@ VButton::VButton()
     : m_xShapeFactory(nullptr)
     , m_xTarget(nullptr)
     , m_xShape(nullptr)
+    , m_bShowArrow(true)
+    , m_nArrowColor(0x00000000)
 {
 }
 
@@ -37,9 +43,54 @@ void VButton::init(const uno::Reference<drawing::XShapes>& xTargetPage,
     m_xShapeFactory = xFactory;
 }
 
-void VButton::createShapes(const awt::Point& rPosition,
-                           const awt::Size& rReferenceSize,
-                           const uno::Reference<beans::XPropertySet>& xTextProp)
+uno::Reference<drawing::XShape> VButton::createTriangle(awt::Size aSize)
+{
+    uno::Reference<drawing::XShape> xShape;
+    xShape.set(m_xShapeFactory->createInstance("com.sun.star.drawing.PolyPolygonShape"), uno::UNO_QUERY);
+
+    if (!xShape.is())
+        return xShape;
+
+    uno::Reference<beans::XPropertySet> xProperies(xShape, uno::UNO_QUERY);
+
+    drawing::PolyPolygonShape3D aPolyPolygon;
+    aPolyPolygon.SequenceX.realloc(1);
+    aPolyPolygon.SequenceY.realloc(1);
+    aPolyPolygon.SequenceZ.realloc(1);
+
+    drawing::DoubleSequence* pOuterSequenceX = aPolyPolygon.SequenceX.getArray();
+    drawing::DoubleSequence* pOuterSequenceY = aPolyPolygon.SequenceY.getArray();
+    drawing::DoubleSequence* pOuterSequenceZ = aPolyPolygon.SequenceZ.getArray();
+
+    pOuterSequenceX->realloc(3);
+    pOuterSequenceY->realloc(3);
+    pOuterSequenceZ->realloc(3);
+
+    double* pInnerSequenceX = pOuterSequenceX->getArray();
+    double* pInnerSequenceY = pOuterSequenceY->getArray();
+    double* pInnerSequenceZ = pOuterSequenceZ->getArray();
+
+    pInnerSequenceX[0] = 0.0;
+    pInnerSequenceY[0] = 0.0;
+    pInnerSequenceZ[0] = 0.0;
+
+    pInnerSequenceX[1] = aSize.Width / 2.0;
+    pInnerSequenceY[1] = aSize.Height;
+    pInnerSequenceZ[1] = 0.0;
+
+    pInnerSequenceX[2] = aSize.Width;
+    pInnerSequenceY[2] = 0.0;
+    pInnerSequenceZ[2] = 0.0;
+
+    xProperies->setPropertyValue("Name", uno::makeAny(m_sCID));
+    xProperies->setPropertyValue(UNO_NAME_POLYPOLYGON, uno::Any(PolyToPointSequence(aPolyPolygon)));
+    xProperies->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE));
+    xProperies->setPropertyValue("FillColor", uno::Any(m_nArrowColor));
+
+    return xShape;
+}
+
+void VButton::createShapes(const uno::Reference<beans::XPropertySet>& xTextProp)
 {
     AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
 
@@ -48,36 +99,52 @@ void VButton::createShapes(const awt::Point& rPosition,
 
     PropertyMapper::getTextLabelMultiPropertyLists(xTextProp, *pPropNames, *pPropValues);
 
+    m_xShape.set(pShapeFactory->createGroup2D(m_xTarget, m_sCID), uno::UNO_QUERY);
+    m_xShape->setPosition(m_aPosition);
+    m_xShape->setSize(m_aSize);
+
+    uno::Reference<drawing::XShapes> xContainer(m_xShape, uno::UNO_QUERY);
+    if (!xContainer.is())
+        return;
+
     tPropertyNameValueMap aTextValueMap;
     aTextValueMap["CharHeight"] <<= 10.0f;
-    aTextValueMap["FillColor"] <<= (sal_Int32)0xe6e6e6;
+    aTextValueMap["FillColor"] <<= sal_Int32(0xe6e6e6);
     aTextValueMap["FillStyle"] <<= drawing::FillStyle_SOLID;
-    aTextValueMap["LineColor"] <<= (sal_Int32)0xcccccc;
+    aTextValueMap["LineColor"] <<= sal_Int32(0xcccccc);
     aTextValueMap["LineStyle"] <<= drawing::LineStyle_SOLID;
     aTextValueMap["ParaAdjust"] <<= style::ParagraphAdjust_CENTER;
-    aTextValueMap["TextHorizontalAdjust"] <<= drawing::TextHorizontalAdjust_CENTER;
+    aTextValueMap["TextHorizontalAdjust"] <<= drawing::TextHorizontalAdjust_LEFT;
     aTextValueMap["TextVerticalAdjust"] <<= drawing::TextVerticalAdjust_CENTER;
+    aTextValueMap["ParaLeftMargin"] <<= sal_Int32(100);
+    aTextValueMap["ParaRightMargin"] <<= sal_Int32(600);
 
     aTextValueMap["Name"] <<= m_sCID; //CID OUString
 
     PropertyMapper::getMultiPropertyListsFromValueMap(*pPropNames, *pPropValues, aTextValueMap);
 
     uno::Reference<drawing::XShape> xEntry = pShapeFactory->createText(
-        m_xTarget, m_sLabel, *pPropNames, *pPropValues, uno::Any());
+        xContainer, m_sLabel, *pPropNames, *pPropValues, uno::Any());
 
     if (xEntry.is())
     {
-        m_xShape = xEntry;
-        m_xShape->setPosition(rPosition);
-        m_xShape->setSize(rReferenceSize);
+        xEntry->setPosition(m_aPosition);
+        xEntry->setSize(m_aSize);
     }
-}
 
-void VButton::setWidth(sal_Int32 nWidth)
-{
-    awt::Size aSize = m_xShape->getSize();
-    aSize.Width = nWidth;
-    m_xShape->setSize(aSize);
+    if (m_bShowArrow)
+    {
+        awt::Size aPolySize {280, 180};
+
+        uno::Reference<drawing::XShape> xPoly = createTriangle(aPolySize);
+        if (xPoly.is())
+        {
+            xPoly->setSize(aPolySize);
+            xPoly->setPosition({ sal_Int32(m_aPosition.X + m_aSize.Width - aPolySize.Width - 100),
+                                 sal_Int32(m_aPosition.Y + (m_aSize.Height / 2.0) - (aPolySize.Height / 2.0)) });
+            xContainer->add(xPoly);
+        }
+    }
 }
 
 } //namespace chart