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>

test/inc/helper/form.hxx → 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: */

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) \
 ))
 

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) \
 ))
 

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>
 

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>