summaryrefslogtreecommitdiff
path: root/include/vbahelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-02-28 09:46:27 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-02-28 10:53:39 +0000
commitd0b71f167cd4c03d574decb7b78ed1ecdab1c424 (patch)
tree78301958eeee4d6ef5e9ff0fd359e115175d82d9 /include/vbahelper
parent44e1f09f7e658b87c3e2eda9e4929cdf6967d2f3 (diff)
flatten some vba classes
no need to allocate ShapeHelper separately, it is only one pointer big Change-Id: Ie4981ca81ac1dd430f22ba32357fcabbbd47bd09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147944 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/vbahelper')
-rw-r--r--include/vbahelper/vbahelper.hxx2
-rw-r--r--include/vbahelper/vbashape.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 9be2b900a019..e9d8fa8bc01f 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -193,7 +193,7 @@ public:
class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes final : public AbstractGeometryAttributes
{
- std::unique_ptr< ShapeHelper > m_pShapeHelper;
+ ShapeHelper m_aShapeHelper;
public:
ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::drawing::XShape >& xShape );
virtual double getLeft() const override;
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 11ac68780193..0766b275b556 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -60,7 +60,7 @@ typedef InheritedHelperInterfaceImpl< ListeningShape > ScVbaShape_BASE;
class VBAHELPER_DLLPUBLIC ScVbaShape : public ScVbaShape_BASE
{
protected:
- std::unique_ptr< ov::ShapeHelper > m_pShapeHelper;
+ ov::ShapeHelper m_aShapeHelper;
css::uno::Reference< css::drawing::XShape > m_xShape;
css::uno::Reference< css::drawing::XShapes > m_xShapes;
css::uno::Reference< css::beans::XPropertySet > m_xPropertySet;