7 files changed, 26 insertions, 29 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 4cad926570de..2e335b4175c4 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -182,6 +182,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/forms/property_meta_data \
     xmloff/source/forms/strings \
     xmloff/source/forms/valueproperties \
+    xmloff/source/forms/handler/form_handler_factory \
+    xmloff/source/forms/handler/property_handler_base \
+    xmloff/source/forms/handler/vcl_date_handler \
+    xmloff/source/forms/handler/vcl_time_handler \
     xmloff/source/meta/MetaExportComponent \
     xmloff/source/meta/MetaImportComponent \
     xmloff/source/meta/xmlmetae \
diff --git a/xmloff/source/forms/form_handler_factory.hxx b/xmloff/inc/form_handler_factory.hxx
index 62bf94f74aa8..62bf94f74aa8 100755
--- a/xmloff/source/forms/form_handler_factory.hxx
+++ b/xmloff/inc/form_handler_factory.hxx
diff --git a/xmloff/source/forms/property_handler.hxx b/xmloff/inc/property_handler.hxx
index 247b4f17f798..247b4f17f798 100755
--- a/xmloff/source/forms/property_handler.hxx
+++ b/xmloff/inc/property_handler.hxx
diff --git a/xmloff/source/forms/property_ids.hxx b/xmloff/inc/property_ids.hxx
index 31004f2d9ff2..31004f2d9ff2 100755
--- a/xmloff/source/forms/property_ids.hxx
+++ b/xmloff/inc/property_ids.hxx
diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst
index 967214d6f0e9..6f677525dbbb 100644
--- a/xmloff/prj/build.lst
+++ b/xmloff/prj/build.lst
@@ -1,5 +1,5 @@
 xo	xmloff	:	offapi svl vos NULL
 zxo	xmloff\prj								nmake	-	all	xo_prj NULL
 
-xo xmloff\qa\unoapi nmake - all xo_qa_unoapi xo_prj NULL
+xo xmloff\qa\unoapi nmake - all xo_qa_unoapi NULL
 
diff --git a/xmloff/source/forms/handler/makefile.mk b/xmloff/qa/unoapi/makefile.mk
index 574537ffd474..3cbbc5f2a797 100755..100644
--- a/xmloff/source/forms/handler/makefile.mk
+++ b/xmloff/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -22,34 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../..
-
-PRJNAME=xmloff
-TARGET=form_handlers
-
-INCEXT=..
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
+#***********************************************************************/
 
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)/util/makefile.pmk
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-# --- Files --------------------------------------------------------
+PRJ = ../..
+PRJNAME = xmloff
+TARGET = qa_unoapi
 
-SLOFILES =	\
-    $(SLO)/form_handler_factory.obj \
-    $(SLO)/property_handler_base.obj \
-    $(SLO)/vcl_date_handler.obj \
-    $(SLO)/vcl_time_handler.obj
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/xmloff/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-# --- Tagets -------------------------------------------------------
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-.INCLUDE :  target.mk
+ALLTAR : javatest
 
-test:
-    echo $(INCLUDE)
-\ No newline at end of file
+.END
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 7f058d14b9b7..7dd5277cff28 100755
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -30,7 +30,7 @@
 #include "form_handler_factory.hxx"
 #include "strings.hxx"
 #include "xmloff/xmltoken.hxx"
-#include "xmlnmspe.hxx"
+#include "xmloff/xmlnmspe.hxx"
 
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>