chart2/source/view/inc/ShapeFactory.hxx | 3 ++
chart2/source/view/main/ShapeFactory.cxx | 14 +++++++++
include/svx/unodraw/SvxTableShape.hxx | 44 +++++++++++++++++++++++++++++++
svx/source/unodraw/shapeimpl.hxx | 17 -----------
svx/source/unodraw/tableshape.cxx | 1
svx/source/unodraw/unopage.cxx | 1
6 files changed, 63 insertions(+), 17 deletions(-)
New commits:
commit 0eb7d3c8dfbfd7ddddd8ba8bd959743b68758049
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Thu May 5 21:10:25 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Aug 16 16:12:44 2022 +0200
chart2: add function to create a table shape to ShapeFactory
Change-Id: I18f76c3372504c1d660aa168ee0387f61817f30a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133921
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit ed883b92efa9ca8e3006290eb2c28485e9052575)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138306
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index f2699e5372f1..5b03509a3695 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <rtl/ustring.hxx>
+#include <svx/unodraw/SvxTableShape.hxx>
namespace chart { struct VLineProperties; }
namespace com::sun::star::beans { class XPropertySet; }
@@ -212,6 +213,8 @@ public:
const css::uno::Reference< css::beans::XPropertySet > &
xTextProperties,
double nRotation, const OUString& aName, sal_Int32
nTextMaxWidth );
+ static rtl::Reference<SvxTableShape> createTable(css::uno::Reference<
css::drawing::XShapes >& xTarget);
+
css::uno::Reference< css::drawing::XShape >
createInvisibleRectangle(
const css::uno::Reference< css::drawing::XShapes >& xTarget
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index a7011527dfc6..7c2574c5f407 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2656,6 +2656,20 @@ void ShapeFactory::removeSubShapes( const
uno::Reference< drawing::XShapes >& xS
}
}
+rtl::Reference<SvxTableShape>
ShapeFactory::createTable(uno::Reference<drawing::XShapes>& xTarget)
+{
+ if (!xTarget.is())
+ return nullptr;
+
+ //create table shape
+ rtl::Reference<SvxTableShape> xShape = new SvxTableShape(nullptr);
+ xShape->setShapeKind(OBJ_TABLE);
+ uno::Reference<drawing::XShape> xShapeUno(xShape);
+ xTarget->add(xShapeUno);
+
+ return xShape;
+}
+
} //namespace chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f67f444d966210ecc876acaa77f0fd75a2be9e38
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri Apr 22 16:53:32 2022 +0900
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Aug 16 16:12:35 2022 +0200
svx: move SvxTableShape into own file and externalize
Change-Id: I0c4b37ebafa56ed50286bdcec1f2a8d5e1362f8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133918
Tested-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
(cherry picked from commit cc1be7312d9f6bd4a4ea742c6d1e3cb9293631cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138305
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/include/svx/unodraw/SvxTableShape.hxx
b/include/svx/unodraw/SvxTableShape.hxx
new file mode 100644
index 000000000000..518d3ac2c06a
--- /dev/null
+++ b/include/svx/unodraw/SvxTableShape.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <svx/svxdllapi.h>
+#include <svx/unoshape.hxx>
+
+class SVXCORE_DLLPUBLIC SvxTableShape : public SvxShape
+{
+protected:
+ // override these for special property handling in subcasses. Return true
if property is handled
+ virtual bool setPropertyValueImpl(const OUString& rName,
+ const SfxItemPropertyMapEntry* pProperty,
+ const css::uno::Any& rValue) override;
+ virtual bool getPropertyValueImpl(const OUString& rName,
+ const SfxItemPropertyMapEntry* pProperty,
+ css::uno::Any& rValue) override;
+
+ virtual void lock() override;
+ virtual void unlock() override;
+
+public:
+ explicit SvxTableShape(SdrObject* pObj);
+ virtual ~SvxTableShape() noexcept override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 0ccf22071194..44b3bcdea0e2 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -84,23 +84,6 @@ public:
virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage ) override;
};
-
-class SvxTableShape : public SvxShape
-{
-protected:
- // override these for special property handling in subcasses. Return true
if property is handled
- virtual bool setPropertyValueImpl( const OUString& rName, const
SfxItemPropertyMapEntry* pProperty, const css::uno::Any& rValue ) override;
- virtual bool getPropertyValueImpl( const OUString& rName, const
SfxItemPropertyMapEntry* pProperty, css::uno::Any& rValue ) override;
-
- virtual void lock() override;
- virtual void unlock() override;
-
-public:
-
- explicit SvxTableShape(SdrObject* pObj);
- virtual ~SvxTableShape() noexcept override;
-};
-
SvxUnoPropertyMapProvider& getSvxMapProvider();
#endif
diff --git a/svx/source/unodraw/tableshape.cxx
b/svx/source/unodraw/tableshape.cxx
index 69823ea3043b..b9220516411a 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -21,6 +21,7 @@
#include "UnoGraphicExporter.hxx"
#include "shapeimpl.hxx"
+#include <svx/unodraw/SvxTableShape.hxx>
#include <svx/unoshprp.hxx>
#include <svx/svdotable.hxx>
#include <svx/svdpool.hxx>
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f7bc19864927..eda5a586079a 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -41,6 +41,7 @@
#include <svx/svdundo.hxx>
#include <svx/unopage.hxx>
#include "shapeimpl.hxx"
+#include <svx/unodraw/SvxTableShape.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdobjkind.hxx>
#include <svx/unoprov.hxx>
