13 files changed, 66 insertions, 156 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index 45a26819ba99..09c2b320b1de 100755
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \
 
 $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index 9c799476d0df..8f09f3d799a9 100755
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_complex))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_complex,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\
     $$(DEFS) \
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 33602a0b720d..f7fdfae94e76 100755
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -25,7 +25,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sfx2_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sfx2_unoapi,\
     $$(DEFS) \
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 881e78df5c37..13842f774627 100755
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -42,26 +42,22 @@ $(eval $(call gb_Library_add_api,qstart_gtk,\
 	offapi \
 ))
 
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
     -DDLL_NAME=$(notdir $(call gb_Library_get_target,sfx2)) \
     -DENABLE_QUICKSTART_APPLET \
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,qstart_gtk,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,qstart_gtk,\
     -DENABLE_SYSTRAY_GTK \
 ))
 endif
 
-$(eval $(call gb_Library_set_cflags,qstart_gtk,\
-    $$(CFLAGS) \
+$(eval $(call gb_Library_add_cflags,qstart_gtk,\
     $(filter-out -I%,$(GTK_CFLAGS)) \
 ))
 
-$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
-    $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,qstart_gtk,\
     $(GTK_LIBS) \
 ))
 
@@ -82,10 +78,11 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\
     ucbhelper \
     utl \
     vcl \
-    xml2 \
     sfx \
 ))
 
+$(eval $(call gb_Library_use_external,qstart_gtk,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\
     sfx2/source/appl/shutdowniconunx \
 ))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index bd1125730c50..4af5501016ee 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -52,17 +52,14 @@ $(eval $(call gb_Library_set_include,sfx,\
     -I$(WORKDIR)/inc/ \
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    $(LIBXML_CFLAGS) \
 ))
 
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DSFX2_DLLIMPLEMENTATION \
 ))
 
 ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DENABLE_QUICKSTART_APPLET \
     -DENABLE_SYSTRAY_GTK \
     -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
@@ -86,10 +83,11 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\
     ucbhelper \
     utl \
     vcl \
-    xml2 \
     $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_use_external,sfx,libxml2))
+
 $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/appl/app \
     sfx2/source/appl/appbas \
@@ -258,8 +256,7 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
 ))
 
 ifeq ($(OS),$(filter WNT MACOSX,$(OS)))
-$(eval $(call gb_Library_set_defs,sfx,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sfx,\
     -DENABLE_QUICKSTART_APPLET \
 ))
 endif
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 577073df81b1..33fd675822a1 100755
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -52,7 +52,6 @@ endif
 endif
 
 #todo: source/dialog BUILD_VER_STRING
-#todo: source/doc SYSTEM_LIBXML2
 #todo: ENABLE_LAYOUT
 #todo: clean up quickstarter stuff in both libraries
 #todo: move standard pool to svl
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 53b7cf9c4297..c68cb9613d68 100755
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -136,3 +136,4 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sf
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))
diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 8615cc61d450..f5a7c5a4187e 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -482,7 +482,6 @@
 #include "rtl/ustring.hxx"
 #include "sal/config.h"
 #include "sal/types.h"
-#include "setup_native/qswin32.h"
 #include "sot/clsids.hxx"
 #include "sot/exchange.hxx"
 #include "sot/factory.hxx"
diff --git a/sfx2/inc/sfx2/qswin32.h b/sfx2/inc/sfx2/qswin32.h
new file mode 100644
index 000000000000..30045ddadcb0
--- /dev/null
+++ b/sfx2/inc/sfx2/qswin32.h
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _QSWIN32_H
+#define _QSWIN32_H
+
+#define QUICKSTART_CLASSNAMEA           "SO Listener Class"
+#define QUICKSTART_WINDOWNAMEA          "SO Listener Window"
+#define SHUTDOWN_QUICKSTART_MESSAGEA    "SO KillTray"
+
+#define QUICKSTART_CLASSNAMEW           L##QUICKSTART_CLASSNAMEA
+#define QUICKSTART_WINDOWNAMEW          L##QUICKSTART_WINDOWNAMEA
+#define SHUTDOWN_QUICKSTART_MESSAGEW    L##SHUTDOWN_QUICKSTART_MESSAGEA
+
+#ifdef UNICODE
+#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEW
+#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEW
+#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEW
+#else
+#   define QUICKSTART_CLASSNAME             QUICKSTART_CLASSNAMEA
+#   define QUICKSTART_WINDOWNAME            QUICKSTART_WINDOWNAMEA
+#   define SHUTDOWN_QUICKSTART_MESSAGE      SHUTDOWN_QUICKSTART_MESSAGEA
+
+#endif /* _QSWIN32_H */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 3126d35d058a..52f145af8701 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,3 +1,2 @@
 sf      sfx2    :    TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell DESKTOP:setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
-
diff --git a/sfx2/qa/complex/sfx2/makefile.mk b/sfx2/qa/complex/sfx2/makefile.mk
deleted file mode 100755
index 20b170fba3b4..000000000000
--- a/sfx2/qa/complex/sfx2/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.IF "$(OOO_JUNIT_JAR)" == ""
-nothing .PHONY:
-    @echo -----------------------------------------------------
-    @echo - JUnit not available, not building anything
-    @echo -----------------------------------------------------
-.ELSE   # IF "$(OOO_JUNIT_JAR)" != ""
-
-PRJ = ../../..
-PRJNAME = sfx2
-TARGET = qa_complex
-PACKAGE = complex/sfx2
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = OOoRunnerLight.jar ridl.jar test.jar test-tools.jar unoil.jar
-EXTRAJARFILES   = $(OOO_JUNIT_JAR)
-JAVAFILES       = $(shell @$(FIND) . -name "*.java") \
-
-#----- create a jar from compiled files ----------------------------
-
-JARTARGET       = $(TARGET).jar
-
-#----- JUnit tests class -------------------------------------------
-
-JAVATESTFILES = \
-    DocumentInfo.java \
-    DocumentProperties.java \
-    StandaloneDocumentInfo.java \
-    DocumentMetadataAccess.java \
-    UndoManager.java \
-
-# disabled: #i115674#
-#    GlobalEventBroadcaster.java \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE: target.mk
-
-ALL :   ALLTAR
-
-# --- subsequent tests ---------------------------------------------
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
-
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-    # Sample how to debug
-    # JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
-
-.END    # "$(OOO_SUBSEQUENT_TESTS)" == ""
-
-.END    # ELSE "$(OOO_JUNIT_JAR)" != ""
diff --git a/sfx2/qa/unoapi/makefile.mk b/sfx2/qa/unoapi/makefile.mk
deleted file mode 100755
index ea91ba4d1c44..000000000000
--- a/sfx2/qa/unoapi/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
-PRJ = ../..
-PRJNAME = sfx2
-TARGET = qa_unoapi
-
-.IF "$(OOO_JUNIT_JAR)" != ""
-PACKAGE = org/openoffice/sfx2/qa/unoapi
-JAVATESTFILES = Test.java
-JAVAFILES = $(JAVATESTFILES)
-JARFILES = OOoRunner.jar ridl.jar test.jar
-EXTRAJARFILES = $(OOO_JUNIT_JAR)
-.END
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-ALLTAR : javatest
-
-.END
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 4acf9c887c50..f3bc6f0b47ef 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -51,7 +51,7 @@
 #include <shlobj.h>
 #include <objidl.h>
 #include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
 #include <comphelper/sequenceashashmap.hxx>
 
 #include <set>