diff options
author | Jens Carl <j.carl43@gmx.de> | 2019-03-29 18:54:53 +0000 |
---|---|---|
committer | Jens Carl <j.carl43@gmx.de> | 2019-03-29 23:04:32 +0100 |
commit | 413bfc34423b950fa5a9f9a6edc2f3d36b1e638b (patch) | |
tree | de037dde671f8bf805ef354f1015e8f416b9b296 /test | |
parent | 020a2eb507bb25bcc67dd1e601233aa7cd5d65d1 (diff) |
Move UNO Api helper form to include/
Move UNO Api helper form to include/, so it can be used outside of
directory test/.
Change-Id: I9392f44df8a93d2b5ee092b0458aeef12f99fc7a
Reviewed-on: https://gerrit.libreoffice.org/69936
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'test')
-rw-r--r-- | test/Library_subsequenttest.mk | 1 | ||||
-rw-r--r-- | test/Library_test.mk | 1 | ||||
-rw-r--r-- | test/inc/helper/form.hxx | 49 | ||||
-rw-r--r-- | test/source/helper/form.cxx | 2 | ||||
-rw-r--r-- | test/source/view/xcontrolaccess.cxx | 2 |
5 files changed, 2 insertions, 53 deletions
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index 65d9d1f7efd8..42cec9343c75 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Library_Library,subsequenttest)) $(eval $(call gb_Library_set_include,subsequenttest,\ - -I$(SRCDIR)/test/inc \ $$(INCLUDE) \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index f80cacf6ed9a..ce318d95471c 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -10,7 +10,6 @@ $(eval $(call gb_Library_Library,test)) $(eval $(call gb_Library_set_include,test,\ - -I$(SRCDIR)/test/inc \ $$(INCLUDE) \ )) diff --git a/test/inc/helper/form.hxx b/test/inc/helper/form.hxx deleted file mode 100644 index 271f06be0b7e..000000000000 --- a/test/inc/helper/form.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- 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_INC_HELPER_FORM_HXX -#define INCLUDED_TEST_INC_HELPER_FORM_HXX - -#include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/lang/XComponent.hpp> - -#include <com/sun/star/uno/Reference.hxx> - -#include <rtl/string.hxx> -#include <sal/config.h> -#include <sal/types.h> -#include <test/testdllapi.hxx> - -namespace apitest -{ -namespace helper -{ -namespace form -{ -/** @brief Create a XControlShape - * - * @param r_xComponent The document. - * @param r_aKind The kind of the 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 XControlShape. - */ -css::uno::Reference<css::drawing::XControlShape> OOO_DLLPUBLIC_TEST createControlShape( - const css::uno::Reference<css::lang::XComponent>& r_xComponent, const OUString& r_aKind, - const sal_Int32 nX, const sal_Int32 nY, const sal_Int32 nHeight, const sal_Int32 nWidth); - -} // namespace form -} // namespace helper -} // namespace apitest - -#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx index 610bd43f1a51..3dbf079af59d 100644 --- a/test/source/helper/form.cxx +++ b/test/source/helper/form.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <helper/form.hxx> +#include <test/helper/form.hxx> #include <rtl/string.hxx> #include <sal/types.h> diff --git a/test/source/view/xcontrolaccess.cxx b/test/source/view/xcontrolaccess.cxx index 5f00e88a5f63..2c24d85328c8 100644 --- a/test/source/view/xcontrolaccess.cxx +++ b/test/source/view/xcontrolaccess.cxx @@ -8,7 +8,7 @@ */ #include <test/view/xcontrolaccess.hxx> -#include <helper/form.hxx> +#include <test/helper/form.hxx> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/awt/XControlModel.hpp> |