include/test/helper/form.hxx | 6 +++---
test/Library_subsequenttest.mk | 1 -
test/Library_test.mk | 1 -
test/source/helper/form.cxx | 2 +-
test/source/view/xcontrolaccess.cxx | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 413bfc34423b950fa5a9f9a6edc2f3d36b1e638b
Author: Jens Carl <j.car...@gmx.de>
AuthorDate: Fri Mar 29 18:54:53 2019 +0000
Commit: Jens Carl <j.car...@gmx.de>
CommitDate: Fri Mar 29 23:04:32 2019 +0100
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.car...@gmx.de>
diff --git a/test/inc/helper/form.hxx b/include/test/helper/form.hxx
similarity index 91%
rename from test/inc/helper/form.hxx
rename to include/test/helper/form.hxx
index 271f06be0b7e..f6e035d64fec 100644
--- a/test/inc/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -7,8 +7,8 @@
* 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
+#ifndef INCLUDED_TEST_HELPER_FORM_HXX
+#define INCLUDED_TEST_HELPER_FORM_HXX
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
@@ -44,6 +44,6 @@ css::uno::Reference<css::drawing::XControlShape>
OOO_DLLPUBLIC_TEST createContro
} // namespace helper
} // namespace apitest
-#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX
+#endif // INCLUDED_TEST_HELPER_FORM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
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/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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
