[Libreoffice-commits] core.git: include/test test/Library_test.mk test/source
Jens Carl (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 27 18:36:16 UTC 2019
include/test/helper/shape.hxx | 91 ++++++++++++++++++++++++++++++++++++++++++
test/Library_test.mk | 1
test/source/helper/shape.cxx | 78 ++++++++++++++++++++++++++++++++++++
3 files changed, 170 insertions(+)
New commits:
commit 28eab5de358631758315a3581e860d6ef533259a
Author: Jens Carl <j.carl43 at gmx.de>
AuthorDate: Tue Mar 26 21:55:00 2019 +0000
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Wed Mar 27 19:35:51 2019 +0100
Helper to create various drawing::XShape
This ports SOfficeFactory::createShape() from file
qadevOOo/runner/util/SOfficeFactory.
Change-Id: I2c7eb0304ac1d439211d3851b2debdb4843130e3
Reviewed-on: https://gerrit.libreoffice.org/69772
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx
new file mode 100644
index 000000000000..9f8bd9e8b73b
--- /dev/null
+++ b/include/test/helper/shape.hxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX
+#define INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX
+
+#include <rtl/string.hxx>
+#include <sal/config.h>
+#include <sal/types.h>
+#include <test/testdllapi.hxx>
+
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace apitest
+{
+namespace helper
+{
+namespace shape
+{
+/** @brief Create a XShape of kind "Ellipse".
+ *
+ * @param r_xComponent The document
+ * @param nX The x-position of the shape.
+ * @param nY The y-position of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidth The width of the shape.
+ * @return The create XShape.
+ */
+css::uno::Reference<css::drawing::XShape>
+ OOO_DLLPUBLIC_TEST createEllipse(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
+ const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth,
+ const sal_Int32 nHeight);
+
+/** @brief Create a XShape of kind "Line".
+ *
+ * @param r_xComponent The document
+ * @param nX The x-position of the shape.
+ * @param nY The y-position of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidth The width of the shape.
+ * @return The create XShape.
+ */
+css::uno::Reference<css::drawing::XShape>
+ OOO_DLLPUBLIC_TEST createLine(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
+ const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth,
+ const sal_Int32 nHeight);
+
+/** @brief Create a XShape of kind "Rectangle".
+ *
+ * @param r_xComponent The document
+ * @param nX The x-position of the shape.
+ * @param nY The y-position of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidth The width of the shape.
+ * @return The create XShape.
+ */
+css::uno::Reference<css::drawing::XShape> OOO_DLLPUBLIC_TEST
+createRectangle(const css::uno::Reference<css::lang::XComponent>& r_xComponent, const sal_Int32 nX,
+ const sal_Int32 nY, const sal_Int32 nWidth, const sal_Int32 nHeight);
+
+/** @brief Create a XShape.
+ *
+ * @param r_xComponent The document
+ * @param r_aKind The kind of shape.
+ * @param nX The x-position of the shape.
+ * @param nY The y-position of the shape.
+ * @param nHeight The height of the shape.
+ * @param nWidth The width of the shape.
+ * @return The create XShape.
+ */
+css::uno::Reference<css::drawing::XShape>
+ OOO_DLLPUBLIC_TEST createShape(const css::uno::Reference<css::lang::XComponent>& r_xComponent,
+ const OUString& r_aKind, const sal_Int32 nX, const sal_Int32 nY,
+ const sal_Int32 nWidth, const sal_Int32 nHeight);
+
+} // namespace shape
+} // namespace helper
+} // namespace apitest
+
+#endif // INCLUDED_TEST_HELPER_SHAPEFACTORY_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 3d55e1116d71..f80cacf6ed9a 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_add_exception_objects,test,\
test/source/screenshot_test \
test/source/unoapi_property_testers \
test/source/helper/form \
+ test/source/helper/shape \
))
# vim: set noet sw=4 ts=4:
diff --git a/test/source/helper/shape.cxx b/test/source/helper/shape.cxx
new file mode 100644
index 000000000000..130951527706
--- /dev/null
+++ b/test/source/helper/shape.cxx
@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include <test/helper/shape.hxx>
+#include <sal/types.h>
+#include <rtl/string.hxx>
+
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/PropertyVetoException.hpp>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+using namespace css;
+
+namespace apitest
+{
+namespace helper
+{
+namespace shape
+{
+uno::Reference<drawing::XShape>
+ OOO_DLLPUBLIC_TEST createEllipse(const uno::Reference<lang::XComponent>& r_xComponent,
+ const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth,
+ const sal_Int32 nHeight)
+{
+ return createShape(r_xComponent, "Ellipse", nX, nY, nWidth, nHeight);
+}
+
+uno::Reference<drawing::XShape>
+ OOO_DLLPUBLIC_TEST createLine(const uno::Reference<lang::XComponent>& r_xComponent,
+ const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nWidth,
+ const sal_Int32 nHeight)
+{
+ return createShape(r_xComponent, "Line", nX, nY, nWidth, nHeight);
+}
+
+uno::Reference<drawing::XShape>
+ OOO_DLLPUBLIC_TEST createRectangle(const uno::Reference<lang::XComponent>& r_xComponent,
+ const sal_Int32 nX, const sal_Int32 nY,
+ const sal_Int32 nWidth, const sal_Int32 nHeight)
+{
+ return createShape(r_xComponent, "Rectangle", nX, nY, nWidth, nHeight);
+}
+
+uno::Reference<drawing::XShape>
+ OOO_DLLPUBLIC_TEST createShape(const uno::Reference<lang::XComponent>& r_xComponent,
+ const OUString& r_aKind, const sal_Int32 nX, const sal_Int32 nY,
+ const sal_Int32 nWidth, const sal_Int32 nHeight)
+{
+ uno::Reference<lang::XMultiServiceFactory> xMSF(r_xComponent, uno::UNO_QUERY_THROW);
+ uno::Reference<drawing::XShape> xShape(
+ xMSF->createInstance("com.sun.star.drawing." + r_aKind + "Shape"), uno::UNO_QUERY_THROW);
+
+ try
+ {
+ xShape->setPosition(awt::Point(nX, nY));
+ xShape->setSize(awt::Size(nWidth, nHeight));
+ }
+ catch (const beans::PropertyVetoException&)
+ {
+ }
+
+ return xShape;
+}
+
+} // namespace shape
+} // namespace helper
+} // namespace apitest
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
More information about the Libreoffice-commits
mailing list