Merge branch 'feature/gbuild_extensions'

Conflicts: extensions/source/ole/servreg.cxx extensions/source/plugin/util/makefile.mk postprocess/packcomponents/makefile.mk postprocess/prj/build.lst tail_build/prj/build.lst
author: Michael Stahl <mstahl@redhat.com> 2012-01-06 21:09:13 +0100
committer: Michael Stahl <mstahl@redhat.com> 2012-01-06 21:09:13 +0100
commit: 23dd856d3c70a63dd47ae2a09a75833267296432 (patch)
tree: 3ed426d983d5a46cc48dc1ee873ac5627b867f05
parent: 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff)
parent: 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff)
152 files changed, 2590 insertions, 3805 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 3dce18d6175a..4902f75e4ee0 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -27,19 +27,28 @@ $(eval $(call gb_Module_Module,tail_end))
 $(eval $(call gb_Module_add_moduledirs,tail_end,\
     accessibility \
     animations \
+    avmedia \
     basctl \
+    basic \
     bean \
+    canvas \
     chart2 \
+    cppcanvas \
     cui \
     dbaccess \
     desktop \
     dtrans \
+    drawinglayer \
+    editeng \
     eventattacher \
+    extensions \
     fileaccess \
     filter \
     forms \
     formula \
+    framework \
     hwpfilter \
+    idl \
     lingucomponent \
     linguistic \
     lotuswordpro \
@@ -55,8 +64,10 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     sccomp \
     scripting \
     sd \
+    sfx2 \
     slideshow \
     starmath \
+    svx \
     sw \
     swext \
     UnoControls \
@@ -67,6 +78,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     writerfilter \
     writerperfect \
     xmerge \
+    xmloff \
     xmlsecurity \
 ))
 
diff --git a/Repository.mk b/Repository.mk
index e94a23ba9cd6..bd7a13e73d4f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -97,8 +97,28 @@ endif
 
 endif
 
+ifneq ($(WITH_MOZILLA),NO)
+$(eval $(call gb_Helper_register_executables,OOO,\
+	nspugin \
+	pluginapp.bin \
+))
+$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+	pl \
+))
+endif # WITH_MOZILLA
+
+
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+    OOoSpotlightImporter \
+))
+
+endif
+
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	PptImporter \
+	abp \
 	adabas \
 	adabasui \
 	acc \
@@ -107,6 +127,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	animcore \
 	basctl \
 	basebmp \
+	bib \
 	canvastools \
 	communi \
 	date \
@@ -132,6 +153,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     dba \
     dbaxml \
     dbmm \
+	dbp \
     dbtools \
     dbu \
     deploymentmisc \
@@ -179,6 +201,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	iti \
     lng \
 	lnth \
+	log \
     lwpft \
 	MacOSXSpell \
     merged \
@@ -187,10 +210,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 	msworks \
 	odfflatxml \
     offacc \
+	pcr \
 	pdffilter \
 	placeware \
 	protocolhandler \
     qstart_gtk \
+	res \
     resourcemodel \
     rpt \
     rptui \
@@ -201,6 +226,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sc \
     scd \
     scfilt \
+    scn \
     scui \
     sd \
     sdbt \
@@ -231,6 +257,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     tl \
     unordf \
     unoxml \
+    updatecheckui \
     utl \
 	uui \
     vbahelper \
@@ -249,6 +276,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     xcr \
 	xmlfa \
 	xmlfd \
+	xmx \
     xo \
     xof \
 	xsltdlg \
@@ -287,6 +315,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	log_uno \
 	mcnttype \
 	neon \
+	npsoplugin \
 	package2 \
     reg \
 	scriptframe \
@@ -298,6 +327,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     ucb \
     ucpfile \
     unopkgapp \
+	updchk \
 	unsafe_uno \
 	xmlsecurity \
 	xsec_fw \
@@ -318,6 +348,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	fop \
 	fps \
 	ftransl \
+	so_activex \
+	so_activex_x64 \
 	sysdtrans \
 ))
 endif
@@ -373,6 +405,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     slideshow \
     stocservices \
 	stringresource \
+	updatefeed \
 	vbaevents \
     vbaobj \
     vbaswobj \
@@ -393,6 +426,19 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 	) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	oleautobridge \
+	oleautobridge2 \
+))
+endif
+
+ifeq ($(WITH_LDAP),YES)
+$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+	ldapbe2 \
+))
+endif
+
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 	binaryurp \
 ))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ac2a95bd298d..e986ac3528b8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -905,6 +905,28 @@ endef
 endif # SYSTEM_CURL
 
 
+ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
+
+define gb_LinkTarget__use_mozilla_headers
+$(eval $(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(MOZILLA_HEADERS_CFLAGS)
+))
+endef
+
+else #!SYSTEM_MOZILLA_HEADERS
+
+define gb_LinkTarget__use_mozilla_headers
+$(eval $(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/npsdk \
+))
+endef
+
+endif #SYSTEM_MOZILLA_HEADERS
+#TODO np_sdk $(eval $(call gb_LinkTarget_add_external_headers,$(1),np_sdk))
+
+
 # MacOSX-only frameworks ############################################
 # (in alphabetical order)
 
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index cb80f454f036..bcbbdc31b12f 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -61,6 +61,8 @@ gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst curl:icurl%,curl:libcurl%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst npsoplugin:inpsoplugin%,npsoplugin:npsoplugin%,$(gb_Library_FILENAMES))
 
 gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
 
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index d44e041e1a62..f89b39321d89 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     dtrans \
     editeng \
     eventattacher \
+	extensions \
     fileaccess \
     filter \
     forms \
diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile
index ee5ad1950d3a..a98250ba1b47 100644
--- a/android/qa/simple/Makefile
+++ b/android/qa/simple/Makefile
@@ -123,7 +123,7 @@ run:
 	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libqa_sal_types.so"
 #
 	sleep 10
-	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector libunoexceptionprotector.so unoexceptionprotector '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  file:///assets/ComponentTarget/i18npool/util/i18npool.component' -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib" 
+	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libcppunittester -e lo-main-cmdline "$(APP_DATA_PATH)/lib/libtest_i18npool_test_breakiterator.so --protector libunoexceptionprotector.so unoexceptionprotector '-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'  '-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb  file:///assets/ComponentTarget/i18npool/util/i18npool.component' -env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib"
 #
 #	adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libunoexe -e lo-main-cmdline "-ro /assets/lib/uno_services.rdb -ro /assets/lib/uno_types.rdb -s com.sun.star.test.bridge.BridgeTest -- com.sun.star.test.bridge.CppTestObject" -e lo-main-delay 2
 
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index 1611f9a506e2..fee9fc007f03 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
 	basctl/source/dlged/managelang.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,basctl/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 15b6806005c6..177bfa307a01 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -90,6 +90,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
     dbaccess/source/ui/inc/toolbox_tmpl.hrc \
 ))
 
-$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbu) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index 7478fc2c4474..f17c96c506d6 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -92,6 +92,6 @@ $(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\
     dbaccess/source/ui/inc/toolbox_tmpl.hrc \
 ))
 
-$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc
+$(call gb_SrsTemplateTarget_get_target,dbaccess/dbui) : $(call gb_Package_get_target,svx_globlmn_hrc)
 
 # vim: set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
new file mode 100644
index 000000000000..7da6d415e6e3
--- /dev/null
+++ b/extensions/AllLangResTarget_abp.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,abp))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,abp,extensions/res))
+
+$(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,abp/res))
+
+$(eval $(call gb_SrsTarget_set_include,abp/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,abp/res,\
+	extensions/source/abpilot/abspilot.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
new file mode 100644
index 000000000000..78b06773f8dc
--- /dev/null
+++ b/extensions/AllLangResTarget_bib.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,bib))
+
+$(eval $(call gb_AllLangResTarget_add_srs,bib,bib/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,bib/res))
+
+$(eval $(call gb_SrsTarget_set_include,bib/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,bib/res,\
+	extensions/source/bibliography/bib.src \
+	extensions/source/bibliography/datman.src \
+	extensions/source/bibliography/sections.src \
+	extensions/source/bibliography/toolbar.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
new file mode 100644
index 000000000000..d4d4e3053736
--- /dev/null
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbp))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbp/res))
+
+$(eval $(call gb_SrsTarget_set_include,dbp/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbp/res,\
+	extensions/source/dbpilots/commonpagesdbp.src \
+	extensions/source/dbpilots/dbpilots.src \
+	extensions/source/dbpilots/gridpages.src \
+	extensions/source/dbpilots/groupboxpages.src \
+	extensions/source/dbpilots/listcombopages.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
new file mode 100644
index 000000000000..87ce2c6eaefe
--- /dev/null
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,pcr))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,pcr,extensions))
+
+$(eval $(call gb_AllLangResTarget_add_srs,pcr,\
+	pcr/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,pcr/res))
+
+$(eval $(call gb_SrsTarget_set_include,pcr/res,\
+	-I$(SRCDIR)/extensions/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,pcr/res,\
+	extensions/source/propctrlr/propres.src \
+	extensions/source/propctrlr/formres.src \
+	extensions/source/propctrlr/pcrmiscres.src \
+	extensions/source/propctrlr/taborder.src \
+	extensions/source/propctrlr/fontdialog.src \
+	extensions/source/propctrlr/selectlabeldialog.src \
+	extensions/source/propctrlr/formlinkdialog.src \
+	extensions/source/propctrlr/listselectiondlg.src \
+	extensions/source/propctrlr/newdatatype.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk
new file mode 100644
index 000000000000..8b8dde4fdb03
--- /dev/null
+++ b/extensions/AllLangResTarget_scn.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,scn))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner))
+
+$(eval $(call gb_AllLangResTarget_add_srs,scn,\
+	scn/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scn/res))
+
+$(eval $(call gb_SrsTarget_set_include,scn/res,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/source/scanner \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scn/res,\
+	extensions/source/scanner/grid.src \
+	extensions/source/scanner/sanedlg.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangResTarget_upd.mk
new file mode 100644
index 000000000000..7c1190fd7f5b
--- /dev/null
+++ b/extensions/AllLangResTarget_upd.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,upd))
+
+$(eval $(call gb_AllLangResTarget_add_srs,upd,\
+	upd/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,upd/res))
+
+$(eval $(call gb_SrsTarget_add_files,upd/res,\
+	extensions/source/update/check/updatehdl.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
new file mode 100644
index 000000000000..8f956a2a47dd
--- /dev/null
+++ b/extensions/AllLangResTarget_updchk.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,updchk))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,updchk,extensions/source/update/ui))
+
+$(eval $(call gb_AllLangResTarget_add_srs,updchk,\
+	updchk/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,updchk/res))
+
+$(eval $(call gb_SrsTarget_add_files,updchk/res,\
+	extensions/source/update/ui/updatecheckui.src \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk
new file mode 100644
index 000000000000..1b3cbd350022
--- /dev/null
+++ b/extensions/Configuration_updchk.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+# TODO is this really supposed to be delivered to the officecfg registry?
+$(eval $(call gb_Configuration_Configuration,updchk))
+
+$(eval $(call gb_Configuration_add_spool_modules,updchk,extensions/source/update/check,\
+	org/openoffice/Office/Jobs-onlineupdate.xcu \
+	org/openoffice/Office/Addons-onlineupdate.xcu \
+))
+
+$(eval $(call gb_Configuration_add_localized_datas,updchk,extensions/source/update/check,\
+	org/openoffice/Office/Jobs.xcu \
+	org/openoffice/Office/Addons.xcu \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index 3db886b0a524..a81b5856735e 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
 #
 # Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -28,16 +29,11 @@
 $(eval $(call gb_CppunitTest_CppunitTest,extensions_test_update))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \
-	extensions/source/update/check/download \
-	extensions/source/update/check/updatecheck \
-	extensions/source/update/check/updatecheckconfig \
-	extensions/source/update/check/updatehdl \
-	extensions/source/update/check/updateprotocol \
-	\
 	extensions/qa/update/test_update \
 ))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \
+	updchk \
 	cppu \
 	cppuhelper \
 	sal \
@@ -46,11 +42,18 @@ $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \
 	$(gb_STDLIBS) \
 ))
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update,\
+	shell32 \
+	ole32 \
+))
+endif
+
 $(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl))
 
 $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
 	$$(INCLUDE) \
-	-I$(realpath $(SRCDIR)/extensions/inc) \
+	-I$(SRCDIR)/extensions/inc \
 	-I$(OUTDIR)/inc \
 ))
 
@@ -67,13 +70,13 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\
 
 $(eval $(call gb_CppunitTest_add_components,extensions_test_update,\
     configmgr/source/configmgr \
+    extensions/source/update/feed/updatefeed \
     unoxml/source/service/unoxml \
 ))
 
 $(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\
     ucb1 \
     ucpfile1 \
-    updatefeed \
 ))
 
 $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
new file mode 100644
index 000000000000..e328a5ca8bf0
--- /dev/null
+++ b/extensions/Executable_nsplugin.mk
@@ -0,0 +1,82 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Executable_Executable,nsplugin))
+
+$(eval $(call gb_Executable_add_api,nsplugin,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
+	extensions/source/nsplugin/source/so_closelistener \
+	extensions/source/nsplugin/source/so_instance \
+	extensions/source/nsplugin/source/so_env \
+	extensions/source/nsplugin/source/so_main \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,nsplugin,\
+	cppu \
+	cppuhelper \
+	sal \
+	$(if $(filter $(GUI),UNX), \
+		dl \
+	) \
+	$(if $(filter $(OS),SOLARIS), \
+		nsl \
+		socket \
+	) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Executable_add_ldflags,nsplugin,\
+	$(OUTDIR)/lib/pathutils-obj.obj \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,nsplugin,\
+	extensions/source/nsplugin/source/nsp_windows \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,nsplugin,\
+	ws2_32 \
+	shell32 \
+	ole32 \
+	kernel32 \
+	user32 \
+	gdi32 \
+	winspool \
+	comdlg32 \
+	advapi32 \
+	oleaut32 \
+	uuid \
+))
+endif # WNT
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
new file mode 100644
index 000000000000..1c3b4fc2d6dc
--- /dev/null
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -0,0 +1,99 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Executable_Executable,pluginapp.bin))
+
+$(eval $(call gb_Executable_set_include,pluginapp.bin,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/source/plugin/inc \
+))
+
+$(eval $(call gb_Executable_add_api,pluginapp.bin,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\
+	extensions/source/plugin/unx/npwrap \
+	extensions/source/plugin/unx/npnapi \
+	extensions/source/plugin/unx/mediator \
+	extensions/source/plugin/unx/plugcon \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,pluginapp.bin,\
+	sal \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
+	-lXm \
+	-lXt \
+	-lXext \
+	-lX11 \
+	-ldl \
+))
+else ifeq ($(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
+$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
+	-lXt \
+	-lXext \
+	-lX11 \
+))
+else ifeq ($(OS),AIX)
+$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
+	-lXpm \
+	-lXmu \
+	-lXt \
+	-lXext \
+	-lX11 \
+	-ldl \
+))
+else
+$(eval $(call gb_Executable_add_libs,pluginapp.bin,\
+	-lXt \
+	-lXext \
+	-lX11 \
+	-ldl \
+))
+endif
+
+
+ifeq ($(ENABLE_GTK),TRUE)
+$(eval $(call gb_Executable_use_external,pluginapp.bin,gtk))
+
+# the orignal dmakefile said: don't ask, it's ugly
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Executable_set_ldflags,pluginapp.bin,\
+	-z nodefs \
+))
+endif
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
new file mode 100644
index 000000000000..336cf4d93624
--- /dev/null
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Bundle,OOoSpotlightImporter))
+
+$(eval $(call gb_Library_add_objcobjects,OOoSpotlightImporter,\
+	extensions/source/macosx/spotlight/GetMetadataForFile \
+	extensions/source/macosx/spotlight/OOoContentDataParser \
+	extensions/source/macosx/spotlight/OOoMetaDataParser \
+	extensions/source/macosx/spotlight/OOoSpotlightImporter \
+	extensions/source/macosx/spotlight/ioapi \
+	extensions/source/macosx/spotlight/main \
+	extensions/source/macosx/spotlight/unzip \
+))
+
+$(eval $(call gb_Library_add_ldflags,OOoSpotlightImporter,\
+	-framework CoreFoundation \
+	-framework Foundation \
+	-framework CoreServices \
+))
+
+$(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
new file mode 100644
index 000000000000..8e69ebecb3dc
--- /dev/null
+++ b/extensions/Library_abp.mk
@@ -0,0 +1,91 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,abp))
+
+$(eval $(call gb_Library_set_componentfile,abp,extensions/source/abpilot/abp))
+
+$(eval $(call gb_Library_set_include,abp,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+	-I$(SRCDIR)/extensions/source/inc \
+))
+
+ifneq ($(WITH_MOZILLA),NO)
+ifneq ($(SYSTEM_MOZILLA),YES)
+$(eval $(call gb_Library_add_defs,abp,\
+	-DWITH_MOZILLA \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_defs,abp,\
+	-DCOMPMOD_NAMESPACE=abp \
+	-DCOMPMOD_RESPREFIX=abp \
+))
+
+$(eval $(call gb_Library_add_api,abp,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,abp,\
+	extensions/source/abpilot/abpfinalpage \
+	extensions/source/abpilot/abpservices \
+	extensions/source/abpilot/abspage \
+	extensions/source/abpilot/abspilot \
+	extensions/source/abpilot/admininvokationimpl \
+	extensions/source/abpilot/admininvokationpage \
+	extensions/source/abpilot/datasourcehandling \
+	extensions/source/abpilot/fieldmappingimpl \
+	extensions/source/abpilot/fieldmappingpage \
+	extensions/source/abpilot/moduleabp \
+	extensions/source/abpilot/tableselectionpage \
+	extensions/source/abpilot/typeselectionpage \
+	extensions/source/abpilot/unodialogabp \
+))
+
+$(eval $(call gb_Library_add_linked_libs,abp,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	sfx \
+	svl \
+	svt \
+	svxcore \
+	svx \
+	tk \
+	tl \
+	utl \
+	vcl \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
new file mode 100644
index 000000000000..dd09e0b1f87d
--- /dev/null
+++ b/extensions/Library_bib.mk
@@ -0,0 +1,75 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,bib))
+
+$(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib))
+
+$(eval $(call gb_Library_set_include,bib,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+))
+
+$(eval $(call gb_Library_add_api,bib,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,bib,\
+	extensions/source/bibliography/bibbeam \
+	extensions/source/bibliography/bibconfig \
+	extensions/source/bibliography/bibcont \
+	extensions/source/bibliography/bibload \
+	extensions/source/bibliography/bibmod \
+	extensions/source/bibliography/bibview \
+	extensions/source/bibliography/datman \
+	extensions/source/bibliography/formcontrolcontainer \
+	extensions/source/bibliography/framectr \
+	extensions/source/bibliography/general \
+	extensions/source/bibliography/loadlisteneradapter \
+	extensions/source/bibliography/toolbar \
+))
+
+$(eval $(call gb_Library_add_linked_libs,bib,\
+	dbtools \
+	sot \
+	svt \
+	svl \
+	tk \
+	vcl \
+	utl \
+	tl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
new file mode 100644
index 000000000000..0bbe08635585
--- /dev/null
+++ b/extensions/Library_dbp.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,dbp))
+
+$(eval $(call gb_Library_set_componentfile,dbp,extensions/source/dbpilots/dbp))
+
+$(eval $(call gb_Library_set_include,dbp,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+	-I$(SRCDIR)/extensions/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,dbp,\
+	-DCOMPMOD_NAMESPACE=dbp \
+))
+
+$(eval $(call gb_Library_add_api,dbp,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dbp,\
+	extensions/source/dbpilots/commonpagesdbp \
+	extensions/source/dbpilots/controlwizard \
+	extensions/source/dbpilots/dbpservices \
+	extensions/source/dbpilots/dbptools \
+	extensions/source/dbpilots/gridwizard \
+	extensions/source/dbpilots/groupboxwiz \
+	extensions/source/dbpilots/listcombowizard \
+	extensions/source/dbpilots/moduledbp \
+	extensions/source/dbpilots/optiongrouplayouter \
+	extensions/source/dbpilots/wizardservices \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbp,\
+	svt \
+	vcl \
+	tl \
+	svl \
+	sfx \
+	dbtools \
+	utl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
new file mode 100644
index 000000000000..6f676196452c
--- /dev/null
+++ b/extensions/Library_ldapbe2.mk
@@ -0,0 +1,86 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,ldapbe2))
+
+$(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2))
+
+$(eval $(call gb_Library_add_api,ldapbe2,\
+	offapi \
+	udkapi \
+))
+
+ifeq ($(LDAPSDKINCLUDES),)
+ifneq ($(WITH_OPENLDAP),YES)
+ifeq ($(SYSTEM_MOZILLA),YES)
+$(eval $(call gb_Library_set_include,ldapbe2,\
+	$$(INCLUDE) \
+	$(MOZ_LDAP_CFLAGS) \
+))
+else # SYSTEM_MOZILLA=NO
+$(eval $(call gb_Library_set_include,ldapbe2,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/mozilla \
+))
+endif # SYSTEM_MOZILLA=YES
+else # WITH_OPENLDAP=YES
+$(eval $(call gb_Library_add_defs,ldapbe2,\
+	-DWITH_OPENLDAP \
+	-DLDAP_DEPRECATED \
+))
+endif # WITH_OPENLDAP=NO
+endif # LDAPSDKINCLUDES=
+
+$(eval $(call gb_Library_add_exception_objects,ldapbe2,\
+	extensions/source/config/ldap/componentdef \
+	extensions/source/config/ldap/ldapaccess \
+	extensions/source/config/ldap/ldapuserprofilebe \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ldapbe2,\
+	cppuhelper \
+	cppu \
+	salhelper \
+	sal \
+))
+
+ifeq ($(OS),FREEBSD)
+$(eval $(call gb_Library_add_libs,ldapbe2,\
+	-lcompat \
+))
+ifneq ($(WITH_OPENLDAP),YES)
+$(eval $(call gb_Library_add_libs,ldapbe2,\
+	-Wl,-Bstatic
+	-llber50 \
+))
+endif # WITH_OPENLDAP=NO
+endif # OS=FREEBSD
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
new file mode 100644
index 000000000000..d12296e806e3
--- /dev/null
+++ b/extensions/Library_log.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,log))
+
+$(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log))
+
+$(eval $(call gb_Library_add_api,log,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,log,\
+	extensions/source/logging/log_module \
+	extensions/source/logging/logrecord \
+))
+
+$(eval $(call gb_Library_add_exception_objects,log,\
+	extensions/source/logging/consolehandler \
+	extensions/source/logging/csvformatter \
+	extensions/source/logging/filehandler \
+	extensions/source/logging/log_services \
+	extensions/source/logging/logger \
+	extensions/source/logging/loggerconfig \
+	extensions/source/logging/loghandler \
+	extensions/source/logging/plaintextformatter \
+))
+
+$(eval $(call gb_Library_add_linked_libs,log,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
new file mode 100644
index 000000000000..f542f59445fd
--- /dev/null
+++ b/extensions/Library_npsoplugin.mk
@@ -0,0 +1,93 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,npsoplugin))
+
+$(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers))
+
+ifeq ($(GUI),UNX)
+
+$(eval $(call gb_Library_add_ldflags,npsoplugin,\
+	$(OUTDIR)/lib/npunix.o \
+))
+
+$(eval $(call gb_Library_add_libs,npsoplugin,\
+	-ldl \
+))
+
+$(eval $(call gb_Library_use_external,npsoplugin,gtk))
+
+$(eval $(call gb_Library_add_defs,npsoplugin,\
+	-DMOZ_X11 \
+))
+
+ifeq ($(filter-out LINUX FREEBSD NETBSD OPENBSD DRAGONFLY,$(OS)),)
+$(eval $(call gb_Library_add_defs,npsoplugin,\
+	-DNP_LINUX \
+))
+endif
+
+endif # GUI=UNX
+
+ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Library_add_ldflags,npsoplugin,\
+	$(OUTDIR)/lib/pathutils-obj.obj \
+	$(OUTDIR)/lib/npwin.obj \
+))
+
+$(eval $(call gb_Library_add_linked_libs,npsoplugin,\
+	ws2_32 \
+	shell32 \
+	ole32 \
+	kernel32 \
+	user32 \
+	gdi32 \
+	winspool \
+	comdlg32 \
+	advapi32 \
+	oleaut32 \
+	uuid \
+))
+
+$(eval $(call gb_Library_add_defs,npsoplugin,\
+	-DENGLISH \
+))
+
+$(eval $(call gb_Library_add_nativeres,npsoplugin,npsoplugin_res))
+
+endif # GUI=WNT
+
+$(eval $(call gb_Library_add_exception_objects,npsoplugin,\
+	extensions/source/nsplugin/source/so_env \
+	extensions/source/nsplugin/source/npshell \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
new file mode 100644
index 000000000000..106daf838c59
--- /dev/null
+++ b/extensions/Library_oleautobridge.mk
@@ -0,0 +1,79 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+# [ Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,oleautobridge))
+
+$(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge))
+
+$(eval $(call gb_Library_add_api,oleautobridge,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,oleautobridge,\
+	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,oleautobridge,\
+	cppuhelper \
+	cppu \
+	sal \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+
+ifeq ($(COM),MSC)
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,oleautobridge,\
+	$(ATL_LIB)/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,oleautobridge,\
+	$(ATL_LIB)/atls.lib \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_exception_objects,oleautobridge,\
+	extensions/source/ole/jscriptclasses \
+	extensions/source/ole/ole2uno \
+	extensions/source/ole/oledll \
+	extensions/source/ole/oleobjw \
+	extensions/source/ole/olethread \
+	extensions/source/ole/servprov \
+	extensions/source/ole/servreg \
+	extensions/source/ole/unoobjw \
+	extensions/source/ole/unotypewrapper \
+	extensions/source/ole/windata \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
new file mode 100644
index 000000000000..012b99a22251
--- /dev/null
+++ b/extensions/Library_oleautobridge2.mk
@@ -0,0 +1,87 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+# [ Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+# TODO: do we really need 2 of these?
+$(eval $(call gb_Library_Library,oleautobridge2))
+
+$(eval $(call gb_Library_add_defs,oleautobridge2,\
+	 -DOWNGUID \
+))
+
+$(eval $(call gb_Library_add_api,oleautobridge2,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,oleautobridge2,\
+	-I$(SRCDIR)/extensions/source/ole \
+	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,oleautobridge2,\
+	cppuhelper \
+	cppu \
+	sal \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+
+ifeq ($(COM),MSC)
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,oleautobridge2,\
+	$(ATL_LIB)/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,oleautobridge2,\
+	$(ATL_LIB)/atls.lib \
+))
+endif
+endif
+
+$(WORKDIR)/CustomTarget/extensions/source/ole/%.cxx: $(SRCDIR)/extensions/source/ole/%.cxx
+	mkdir -p $(dir $@)
+	cp $< $@
+
+$(eval $(call gb_Library_add_generated_exception_objects,oleautobridge2,\
+	CustomTarget/extensions/source/ole/jscriptclasses \
+	CustomTarget/extensions/source/ole/ole2uno \
+	CustomTarget/extensions/source/ole/oledll \
+	CustomTarget/extensions/source/ole/oleobjw \
+	CustomTarget/extensions/source/ole/olethread \
+	CustomTarget/extensions/source/ole/servprov \
+	CustomTarget/extensions/source/ole/servreg \
+	CustomTarget/extensions/source/ole/unoobjw \
+	CustomTarget/extensions/source/ole/unotypewrapper \
+	CustomTarget/extensions/source/ole/windata \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
new file mode 100644
index 000000000000..9b4837ac0819
--- /dev/null
+++ b/extensions/Library_pcr.mk
@@ -0,0 +1,121 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,pcr))
+
+$(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr))
+
+$(eval $(call gb_Library_add_api,pcr,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,pcr,\
+	-I$(SRCDIR)/extensions/inc \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,pcr,\
+	svx \
+	svxcore \
+	editeng \
+	sfx \
+	svt \
+	tk \
+	vcl \
+	svl \
+	utl \
+	tl \
+	dbtools \
+	i18nisolang1 \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,pcr,\
+	extensions/source/propctrlr/MasterDetailLinkDialog \
+	extensions/source/propctrlr/browserline \
+	extensions/source/propctrlr/browserlistbox \
+	extensions/source/propctrlr/browserpage \
+	extensions/source/propctrlr/browserview \
+	extensions/source/propctrlr/buttonnavigationhandler \
+	extensions/source/propctrlr/cellbindinghandler \
+	extensions/source/propctrlr/cellbindinghelper \
+	extensions/source/propctrlr/commoncontrol \
+	extensions/source/propctrlr/composeduiupdate \
+	extensions/source/propctrlr/controlfontdialog \
+	extensions/source/propctrlr/defaultforminspection \
+	extensions/source/propctrlr/defaulthelpprovider \
+	extensions/source/propctrlr/editpropertyhandler \
+	extensions/source/propctrlr/eformshelper \
+	extensions/source/propctrlr/eformspropertyhandler \
+	extensions/source/propctrlr/eventhandler \
+	extensions/source/propctrlr/fontdialog \
+	extensions/source/propctrlr/formbrowsertools \
+	extensions/source/propctrlr/formcomponenthandler \
+	extensions/source/propctrlr/formcontroller \
+	extensions/source/propctrlr/formgeometryhandler \
+	extensions/source/propctrlr/formlinkdialog \
+	extensions/source/propctrlr/formmetadata \
+	extensions/source/propctrlr/formstrings \
+	extensions/source/propctrlr/genericpropertyhandler \
+	extensions/source/propctrlr/handlerhelper \
+	extensions/source/propctrlr/inspectorhelpwindow \
+	extensions/source/propctrlr/inspectormodelbase \
+	extensions/source/propctrlr/listselectiondlg \
+	extensions/source/propctrlr/modulepcr \
+	extensions/source/propctrlr/newdatatype \
+	extensions/source/propctrlr/objectinspectormodel \
+	extensions/source/propctrlr/pcrcommon \
+	extensions/source/propctrlr/pcrcomponentcontext \
+	extensions/source/propctrlr/pcrservices \
+	extensions/source/propctrlr/pcrstrings \
+	extensions/source/propctrlr/pcrunodialogs \
+	extensions/source/propctrlr/propcontroller \
+	extensions/source/propctrlr/propertycomposer \
+	extensions/source/propctrlr/propertycontrolextender \
+	extensions/source/propctrlr/propertyeditor \
+	extensions/source/propctrlr/propertyhandler \
+	extensions/source/propctrlr/propeventtranslation \
+	extensions/source/propctrlr/pushbuttonnavigation \
+	extensions/source/propctrlr/selectlabeldialog \
+	extensions/source/propctrlr/sqlcommanddesign \
+	extensions/source/propctrlr/standardcontrol \
+	extensions/source/propctrlr/stringrepresentation \
+	extensions/source/propctrlr/submissionhandler \
+	extensions/source/propctrlr/taborder \
+	extensions/source/propctrlr/unourl \
+	extensions/source/propctrlr/usercontrol \
+	extensions/source/propctrlr/xsddatatypes \
+	extensions/source/propctrlr/xsdvalidationhelper \
+	extensions/source/propctrlr/xsdvalidationpropertyhandler \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
new file mode 100644
index 000000000000..6c07b0f1f7fd
--- /dev/null
+++ b/extensions/Library_pl.mk
@@ -0,0 +1,160 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,pl))
+
+$(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
+
+$(eval $(call gb_Library_set_include,pl,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/source/plugin/inc \
+	-I$(OUTDIR)/inc/mozilla/plugin \
+))
+
+$(eval $(call gb_Library_add_api,pl,\
+	offapi \
+	udkapi \
+))
+
+ifneq ($(SOLAR_JAVA),)
+
+$(eval $(call gb_Library_set_include,pl,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/mozilla/java \
+	-I$(OUTDIR)/mozilla/nspr \
+))
+
+$(eval $(call gb_Library_add_defs,pl,\
+	-DOJI \
+))
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_set_include,pl,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/npsdk \
+))
+endif # GUIBASE=aqua
+
+endif # SOLAR_JAVA=YES
+
+ifeq ($(SYSTEM_MOZILLA),YES)
+$(eval $(call gb_Library_add_defs,pl,\
+	-DSYSTEM_MOZILLA \
+))
+endif # SYSTEM_MOZILLA=YES
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_libs,pl,\
+	-lsocket \
+))
+endif # OS=SOLARIS
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,pl,\
+	version \
+	ole32 \
+	advapi32 \
+))
+
+$(eval $(call gb_Library_add_exception_objects,pl,\
+	extensions/source/plugin/win/winmgr \
+	extensions/source/plugin/win/sysplug \
+))
+endif # GUI=WNT
+
+ifeq ($(GUI),UNX)
+
+ifeq ($(GUIBASE),aqua)
+
+$(eval $(call gb_Library_add_exception_objects,pl,\
+	extensions/source/plugin/aqua/macmgr \
+))
+$(eval $(call gb_Library_add_objcxxobjects,pl,\
+	extensions/source/plugin/aqua/sysplug \
+))
+
+$(eval $(call gb_Library_set_include,pl,\
+	$$(INCLUDE) \
+	-I$(FRAMEWORKSHOME)/ApplicationServices.framework/Version/Current/Frameworks/QD.framework/Headers \
+	-I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers \
+))
+
+endif # GUIBASE=aqua
+
+ifeq ($(ENABLE_GTK),TRUE)
+$(eval $(call gb_Library_add_defs,pl,\
+	-DENABLE_GTK \
+))
+
+$(eval $(call gb_Library_use_external,pl,gtk))
+endif # ENABLE_GTK=TRUE
+
+$(eval $(call gb_Library_add_exception_objects,pl,\
+	extensions/source/plugin/unx/mediator \
+	extensions/source/plugin/unx/nppapi \
+	extensions/source/plugin/unx/plugcon \
+	extensions/source/plugin/unx/sysplug \
+	extensions/source/plugin/unx/unxmgr \
+))
+
+$(eval $(call gb_Library_add_libs,pl,\
+	-lX11 \
+))
+
+endif # GUI=UNX
+
+$(eval $(call gb_Library_add_linked_libs,pl,\
+	tk \
+	vcl \
+	svl \
+	utl \
+	tl \
+	ucbhelper \
+	cppuhelper \
+	cppu \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,pl,\
+	extensions/source/plugin/base/context \
+	extensions/source/plugin/base/evtlstnr \
+	extensions/source/plugin/base/manager \
+	extensions/source/plugin/base/multiplx \
+	extensions/source/plugin/base/nfuncs \
+	extensions/source/plugin/base/plcom \
+	extensions/source/plugin/base/plctrl \
+	extensions/source/plugin/base/plmodel \
+	extensions/source/plugin/base/service \
+	extensions/source/plugin/base/xplugin \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
new file mode 100644
index 000000000000..1fc857aa798f
--- /dev/null
+++ b/extensions/Library_res.mk
@@ -0,0 +1,56 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,res))
+
+$(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res))
+
+$(eval $(call gb_Library_add_api,res,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,res,\
+	vcl \
+	tl \
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,res,\
+	extensions/source/resource/ResourceIndexAccess \
+	extensions/source/resource/oooresourceloader \
+	extensions/source/resource/resourceservices \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
new file mode 100644
index 000000000000..37184d420f61
--- /dev/null
+++ b/extensions/Library_scn.mk
@@ -0,0 +1,73 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,scn))
+
+$(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn))
+
+$(eval $(call gb_Library_add_api,scn,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,scn,\
+	svt \
+	vcl \
+	tl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,scn,\
+	extensions/source/scanner/scnserv \
+	extensions/source/scanner/scanner \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_exception_objects,scn,\
+	extensions/source/scanner/scanwin \
+))
+else
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Library_add_exception_objects,scn,\
+	extensions/source/scanner/grid \
+	extensions/source/scanner/sane \
+	extensions/source/scanner/sanedlg \
+	extensions/source/scanner/scanunx \
+))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,scn,\
+	dl \
+))
+endif
+endif
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
new file mode 100644
index 000000000000..292b7e130a90
--- /dev/null
+++ b/extensions/Library_so_activex.mk
@@ -0,0 +1,92 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,so_activex))
+
+$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: $(SRCDIR)/extensions/source/activex/so_activex.idl
+	mkdir -p $(WORKDIR)/CustomTarget/so_activex
+	midl.exe -out $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) -Oicf $(call gb_Helper_convert_native,$<) \
+	$(foreach i,$(SOLARINC_FOR_BUILD), $(patsubst -I,/I,$(i)))
+
+$(call gb_Library_get_clean_target,so_activex) : extensions_activex_idlclean
+
+.PHONY: extensions_activex_idlclean
+extensions_activex_idlclean:
+	rm -rf $(WORKDIR)/CustomTarget/so_activex
+
+$(eval $(call gb_Library_set_include,so_activex,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/CustomTarget/so_activex \
+	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_add_api,so_activex,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
+
+$(eval $(call gb_Library_add_exception_objects,so_activex,\
+	extensions/source/activex/so_activex \
+	extensions/source/activex/SOActiveX \
+	extensions/source/activex/SOComWindowPeer \
+	extensions/source/activex/SODispatchInterceptor \
+	extensions/source/activex/SOActionsApproval \
+	extensions/source/activex/StdAfx2 \
+))
+
+$(eval $(call gb_Library_add_ldflags,so_activex,\
+	/DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,so_activex,\
+	uuid \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	gdi32 \
+	urlmon \
+	shlwapi \
+))
+
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,so_activex,\
+	$(ATL_LIB)/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,so_activex,\
+	$(ATL_LIB)/atls.lib \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
new file mode 100644
index 000000000000..dfee1b85f833
--- /dev/null
+++ b/extensions/Library_so_activex_x64.mk
@@ -0,0 +1,89 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,so_activex_x64))
+
+$(eval $(call gb_Library_set_x64,so_activex_x64,YES))
+
+$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(eval $(call gb_Library_set_include,so_activex_x64,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/source/activex \
+	-I$(WORKDIR)/CustomTarget/so_activex \
+	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_add_api,so_activex_x64,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
+
+$(WORKDIR)/CustomTarget/extensions/source/activex/%.cxx : \
+		$(SRCDIR)/extensions/source/activex/%.cxx
+	mkdir -p $(dir $@)
+	cp $< $@
+
+$(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
+	CustomTarget/extensions/source/activex/so_activex \
+	CustomTarget/extensions/source/activex/SOActiveX \
+	CustomTarget/extensions/source/activex/SOComWindowPeer \
+	CustomTarget/extensions/source/activex/SODispatchInterceptor \
+	CustomTarget/extensions/source/activex/SOActionsApproval \
+	CustomTarget/extensions/source/activex/StdAfx2 \
+))
+
+$(eval $(call gb_Library_add_ldflags,so_activex_x64,\
+	/DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,so_activex_x64,\
+	uuid \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	gdi32 \
+	urlmon \
+	shlwapi \
+))
+
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,so_activex_x64,\
+	$(ATL_LIB)/amd64/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,so_activex_x64,\
+	$(ATL_LIB)/amd64/atls.lib \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
new file mode 100644
index 000000000000..c336738bce42
--- /dev/null
+++ b/extensions/Library_updatecheckui.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,updatecheckui))
+
+$(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk))
+
+$(eval $(call gb_Library_add_api,updatecheckui,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,updatecheckui,\
+	vcl \
+	tl \
+	comphelper \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updatecheckui,\
+	extensions/source/update/ui/updatecheckui \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
new file mode 100644
index 000000000000..00a42c49b723
--- /dev/null
+++ b/extensions/Library_updatefeed.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,updatefeed))
+
+$(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed))
+
+$(eval $(call gb_Library_add_api,updatefeed,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,updatefeed,\
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updatefeed,\
+	extensions/source/update/feed/updatefeed \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
new file mode 100644
index 000000000000..c5286de8e08d
--- /dev/null
+++ b/extensions/Library_updchk.mk
@@ -0,0 +1,73 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+# [ Copyright (C) 2011 Peter Foley <pefoley2@verizon.net> ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,updchk))
+
+$(eval $(call gb_Library_set_componentfile,updchk,extensions/source/update/check/updchk.uno))
+
+$(eval $(call gb_Library_set_include,updchk,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/extensions/inc \
+))
+
+$(eval $(call gb_Library_add_api,updchk,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,updchk,\
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,updchk,\
+	ole32 \
+	shell32 \
+	wininet \
+))
+
+$(eval $(call gb_Library_add_exception_objects,updchk,\
+	extensions/source/update/check/onlinecheck \
+))
+endif # OS WNT
+
+$(eval $(call gb_Library_use_external,updchk,curl))
+
+$(eval $(call gb_Library_add_exception_objects,updchk,\
+	extensions/source/update/check/download \
+	extensions/source/update/check/updatecheck \
+	extensions/source/update/check/updatecheckconfig \
+	extensions/source/update/check/updatecheckjob \
+	extensions/source/update/check/updatehdl \
+	extensions/source/update/check/updateprotocol \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_xmx.mk b/extensions/Library_xmx.mk
new file mode 100644
index 000000000000..dfef71dd21dd
--- /dev/null
+++ b/extensions/Library_xmx.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,xmx))
+
+$(eval $(call gb_Library_set_componentfile,xmx,extensions/source/xmlextract/xmx))
+
+$(eval $(call gb_Library_add_api,xmx,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,xmx,\
+	extensions/source/xmlextract/xmxtrct \
+	extensions/source/xmlextract/xmxuno \
+))
+
+$(eval $(call gb_Library_add_linked_libs,xmx,\
+	sot \
+	utl \
+	tl \
+	cppuhelper \
+	cppu \
+	sal \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index cf44b2d8a7db..62caaf6dafe5 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -13,6 +13,7 @@
 #
 # Major Contributor(s):
 # Copyright (C) 2011 Jan Holesovsky <kendy@suse.cz> (initial developer)
+# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net>
 #
 # All Rights Reserved.
 #
@@ -26,6 +27,99 @@
 
 $(eval $(call gb_Module_Module,extensions))
 
+$(eval $(call gb_Module_add_targets,extensions,\
+	AllLangResTarget_abp \
+	AllLangResTarget_bib \
+	AllLangResTarget_dbp \
+	AllLangResTarget_pcr \
+	AllLangResTarget_scn \
+	AllLangResTarget_upd \
+	AllLangResTarget_updchk \
+	Configuration_updchk \
+	Library_abp \
+	Library_bib \
+	Library_dbp \
+	Library_log \
+	Library_pcr \
+	Library_res \
+	Library_scn \
+	Library_updatecheckui \
+	Library_updatefeed \
+	Library_updchk \
+	Library_xmx \
+	Package_bib \
+	Package_pcr \
+))
+
+ifeq ($(OS),WNT)
+
+ifeq ($(COM),MSC)
+ifneq ($(DISABLE_ACTIVEX),TRUE)
+$(eval $(call gb_Module_add_targets,extensions,\
+	WinResTarget_activex \
+	Library_so_activex \
+))
+
+ifeq ($(BUILD_X64),TRUE)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_so_activex_x64 \
+))
+endif # BUILD_X64
+endif # DISABLE_ACTIVEX
+endif # COM=MSC
+
+ifeq ($(DISABLE_ATL),)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_oleautobridge \
+	Library_oleautobridge2 \
+))
+endif # DISABLE_ATL
+
+endif # WNT
+
+ifneq ($(WITH_MOZILLA),NO)
+
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_pl \
+	Executable_nsplugin \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_npsoplugin \
+	WinResTarget_npsoplugin \
+))
+endif # GUI=WNT
+
+ifeq ($(GUI),UNX)
+
+$(eval $(call gb_Module_add_targets,extensions,\
+	Executable_pluginapp.bin \
+))
+
+ifneq ($(ENABLE_GTK),)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_npsoplugin \
+))
+endif # ENABLE_GTK
+
+endif # GUI=UNX
+
+endif # WITH_MOZILLA=YES
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_OOoSpotlightImporter \
+	Zip_mdibundle \
+))
+endif # OS=MACOSX
+
+ifeq ($(WITH_LDAP),YES)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_ldapbe2 \
+))
+endif # WITH_LDAP=YES
+
 $(eval $(call gb_Module_add_check_targets,extensions,\
     CppunitTest_extensions_test_update \
 ))
diff --git a/extensions/Package_bib.mk b/extensions/Package_bib.mk
new file mode 100644
index 000000000000..5b7eb7769a7b
--- /dev/null
+++ b/extensions/Package_bib.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Package_Package,bib,$(SRCDIR)/extensions/source/bibliography/uiconfig/sbibliography/menubar))
+
+$(eval $(call gb_Package_add_file,bib,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Package_pcr.mk b/extensions/Package_pcr.mk
new file mode 100644
index 000000000000..48f46302e904
--- /dev/null
+++ b/extensions/Package_pcr.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Package_Package,pcr,$(SRCDIR)/extensions/source/propctrlr))
+
+$(eval $(call gb_Package_add_file,pcr,xml/pcr.xml,pcr.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
new file mode 100644
index 000000000000..fd7879cb6652
--- /dev/null
+++ b/extensions/WinResTarget_activex.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_WinResTarget_WinResTarget,activex_res))
+
+ifneq ($(PRODUCT),)
+$(eval $(call gb_WinResTarget_set_defs,activex_res,\
+	$$(DEFS) \
+	-DPRODUCT \
+))
+endif
+
+$(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_activex))
+
+$(SRCDIR)/extensions/source/activex/so_activex.rc: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(eval $(call gb_WinResTarget_set_defs,activex_res,\
+	$$(DEFS) \
+	-DMISC=$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
new file mode 100644
index 000000000000..33926b34d64f
--- /dev/null
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res))
+
+$(eval $(call gb_WinResTarget_add_file,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
new file mode 100644
index 000000000000..0d1619fb791a
--- /dev/null
+++ b/extensions/Zip_mdibundle.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Zip_Zip,mdibundle,$(WORKDIR)/Zip/mdibundle))
+
+$(eval $(call gb_Zip_add_file,mdibundle,schema.xml,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/schema.xml))
+$(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/Info.plist))
+$(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
+$(eval $(call gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/inc/appsettings.hxx b/extensions/inc/appsettings.hxx
deleted file mode 100644
index 8622db0bd77e..000000000000
--- a/extensions/inc/appsettings.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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 _APPSETTINGS_HXX
-#define _APPSETTINGS_HXX
-
-#include <stardiv/uno/util/containr.hxx>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-XNameContainer* getApplicationSettings();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/inc/makefile.mk b/extensions/inc/makefile.mk
deleted file mode 100644
index 82d75bea7f8b..000000000000
--- a/extensions/inc/makefile.mk
+++ /dev/null
@@ -1,39 +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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=extensions
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index f29d117d3dc8..06f2e2de9a66 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,35 +1,5 @@
 ex  extensions :  officecfg  TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt CPPUNIT:cppunit NULL
-
-ex  extensions                                  usr1    -   all ex_mkout NULL
-ex  extensions\inc                              nmake   -   all ex_inc NULL
-ex  extensions\inc\ucbhelper                    get     -   all ex_incucbh ex_inc NULL
-ex  extensions\source\plugin\workben            get     -   all ex_plwkb ex_inc NULL
-ex  extensions\source\plugin\inc\plugin\win     get     -   all ex_piwi ex_inc NULL
-ex  extensions\source\plugin\inc\plugin\unx     get     -   all ex_piux ex_inc NULL
-ex  extensions\source\activex\msidl             nmake   -   w   ex_axmsidl ex_inc NULL
-ex  extensions\source\activex\main              nmake   -   w   ex_axmain ex_axmsidl.w ex_inc NULL
-ex  extensions\source\ole                       nmake   -   w   ex_ole ex_xmlextr ex_inc NULL
-ex  extensions\source\resource                  nmake   -   all ex_resrc ex_inc NULL
-ex  extensions\source\plugin\aqua               nmake   -   u   ex_plaqua ex_plbase NULL
-ex  extensions\source\plugin\base               nmake   -   all ex_plbase ex_inc NULL
-ex  extensions\source\plugin\win                nmake   -   w   ex_plwin ex_plbase ex_inc NULL
-ex  extensions\source\plugin\unx                nmake   -   u   ex_plunx ex_inc NULL
-ex  extensions\source\plugin\util               nmake   -   all ex_plutil ex_plbase ex_plunx.u ex_plwin.w ex_plaqua.u ex_inc NULL
-ex  extensions\source\macosx\spotlight          nmake   -   u   ex_mxspotlight NULL
-ex  extensions\source\scanner                   nmake   -   all ex_scan ex_resrc ex_inc NULL
-ex  extensions\source\bibliography              nmake   -   all ex_bib ex_inc NULL
-ex  extensions\source\xmlextract                nmake   -   all ex_xmlextr ex_inc NULL
-ex  extensions\source\propctrlr                 nmake   -   all ex_propctrlr ex_bib ex_inc NULL
-ex  extensions\source\dbpilots                  nmake   -   all ex_dbpilots ex_inc NULL
-ex  extensions\source\abpilot                   nmake   -   all ex_abpilot ex_inc NULL
-ex  extensions\source\logging                   nmake   -   all ex_logging ex_inc NULL
-ex  extensions\source\config\ldap               nmake   -   all ex_ldap ex_inc NULL
-ex	extensions\source\nsplugin\source			nmake	-	u	ex_nsplugin ex_inc NULL
-ex	extensions\source\nsplugin\source			nmake	-	w	ex_nsplugin ex_inc NULL
-ex  extensions\source\update\feed               nmake   -   all ex_updchkfeed ex_inc NULL
-ex  extensions\source\update\check              nmake   -   all ex_updchk ex_inc NULL
-ex  extensions\source\update\ui                 nmake   -   all ex_updchkui ex_inc NULL
-ex  extensions\util                             nmake   -   all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil NULL
+ex  extensions\prj                              nmake   -   all ex_prj NULL
 
 # Fails at the moment
 # ex  extensions\qa\complex\extensions            nmake   -   all ex_complex ex_util NULL
diff --git a/extensions/prj/d.lst b/extensions/prj/d.lst
index 01025ae00c68..e69de29bb2d1 100644
--- a/extensions/prj/d.lst
+++ b/extensions/prj/d.lst
@@ -1,55 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\xml\uiconfig
-mkdir: %_DEST%\xml\uiconfig\modules
-mkdir: %_DEST%\xml\uiconfig\modules\sbibliography
-mkdir: %_DEST%\xml\uiconfig\modules\sbibliography\menubar
-mkdir: %_DEST%\bin\odf4ms
-mkdir: %_DEST%\bin\so
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\ldapbe2.uno.so %_DEST%\lib\ldapbe2.uno.so
-..\%__SRC%\lib\updchk.uno.so %_DEST%\lib\updchk.uno.so
-..\%__SRC%\lib\updatefeed.uno.so %_DEST%\lib\updatefeed.uno.so
-..\%__SRC%\bin\oleautobridge2.uno.dll %_DEST%\bin\odf4ms\oleautobridge.uno.dll
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\bin\pluginapp.bin %_DEST%\bin\pluginapp.bin
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\bin\nsplugin.exe %_DEST%\bin\nsplugin.exe
-..\%__SRC%\bin\nsplugin %_DEST%\bin\nsplugin
-..\%__SRC%\bin\npsoplugin.dll %_DEST%\bin\npsoplugin.dll
-..\%__SRC%\bin\npsoplugin_so.dll %_DEST%\bin\so\npsoplugin.dll
-..\%__SRC%\bin\x64\so_activex.dll %_DEST%\bin\so_activex_x64.dll
-..\%__SRC%\bin\mdibundle.zip %_DEST%\bin\mdibundle.zip
-..\%__SRC%\misc\oleautobridge.component %_DEST%\xml\oleautobridge.component
-
-..\source\bibliography\uiconfig\sbibliography\menubar\*.xml %_DEST%\xml\uiconfig\modules\sbibliography\menubar\*.xml
-
-..\source\propctrlr\pcr.xml %_DEST%\xml\pcr.xml
-
-mkdir: %_DEST%\xml\registry\spool
-mkdir: %_DEST%\xml\registry\spool\org
-mkdir: %_DEST%\xml\registry\spool\org\openoffice
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Addons
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-mkdir: %_DEST%\xml\registry\spool\org\openoffice\Office\Logging
-
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Addons\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Addons
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Jobs
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Logging\*.xcu %_DEST%\xml\registry\spool\org\openoffice\Office\Logging
-
-..\%__SRC%\bin\*.oxt %_DEST%\pck\*
-..\%__SRC%\misc\abp.component %_DEST%\xml\abp.component
-..\%__SRC%\misc\bib.component %_DEST%\xml\bib.component
-..\%__SRC%\misc\dbp.component %_DEST%\xml\dbp.component
-..\%__SRC%\misc\ldapbe2.component %_DEST%\xml\ldapbe2.component
-..\%__SRC%\misc\log.component %_DEST%\xml\log.component
-..\%__SRC%\misc\pcr.component %_DEST%\xml\pcr.component
-..\%__SRC%\misc\pl.component %_DEST%\xml\pl.component
-..\%__SRC%\misc\res.component %_DEST%\xml\res.component
-..\%__SRC%\misc\scn.component %_DEST%\xml\scn.component
-..\%__SRC%\misc\updatefeed.component %_DEST%\xml\updatefeed.component
-..\%__SRC%\misc\updchk.component %_DEST%\xml\updchk.component
-..\%__SRC%\misc\updchk.uno.component %_DEST%\xml\updchk.uno.component
-..\%__SRC%\misc\xmx.component %_DEST%\xml\xmx.component
diff --git a/extensions/prj/makefile.mk b/extensions/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/extensions/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/abpilot/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
deleted file mode 100644
index 7f84828247bb..000000000000
--- a/extensions/source/abpilot/makefile.mk
+++ /dev/null
@@ -1,115 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=abp
-USE_DEFFILE=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=abp
-CDEFS+=-DCOMPMOD_RESPREFIX=abp
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/abpfinalpage.obj	\
-        $(SLO)$/abpservices.obj		\
-        $(SLO)$/abspage.obj		\
-        $(SLO)$/abspilot.obj		\
-        $(SLO)$/admininvokationimpl.obj	\
-        $(SLO)$/admininvokationpage.obj	\
-        $(SLO)$/datasourcehandling.obj	\
-        $(SLO)$/fieldmappingimpl.obj	\
-        $(SLO)$/fieldmappingpage.obj	\
-        $(SLO)$/moduleabp.obj		\
-        $(SLO)$/tableselectionpage.obj	\
-        $(SLO)$/typeselectionpage.obj	\
-        $(SLO)$/unodialogabp.obj	\
-
-SLOFILES=	\
-        $(EXCEPTIONSFILES)
-
-
-.IF "$(WITH_MOZILLA)" != "NO"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
-CDEFS+=-DWITH_MOZILLA
-.ENDIF
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			abspilot.src
-
-RESLIB1NAME=abp
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/abp.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB) \
-        $(SFXLIB) \
-        $(SVLLIB) \
-        $(SVTLIB) \
-        $(SVTOOLLIB) \
-        $(SVXCORELIB) \
-        $(SVXLIB) \
-        $(TKLIB) \
-        $(TOOLSLIB) \
-        $(UNOTOOLSLIB) \
-        $(VCLLIB) \
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/abp.component
-
-$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        abp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt abp.component
diff --git a/extensions/source/activex/main/README.txt b/extensions/source/activex/README.txt
index 9d647987aaa7..9d647987aaa7 100644
--- a/extensions/source/activex/main/README.txt
+++ b/extensions/source/activex/README.txt
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/SOActionsApproval.cxx
index e0ce5c5da58e..e0ce5c5da58e 100644
--- a/extensions/source/activex/main/SOActionsApproval.cpp
+++ b/extensions/source/activex/SOActionsApproval.cxx
diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index a5570312864d..a5570312864d 100644
--- a/extensions/source/activex/main/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
diff --git a/extensions/source/activex/main/SOActionsApproval.rgs b/extensions/source/activex/SOActionsApproval.rgs
index 543320813948..543320813948 100644
--- a/extensions/source/activex/main/SOActionsApproval.rgs
+++ b/extensions/source/activex/SOActionsApproval.rgs
diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/SOActiveX.cxx
index f95e42772185..f95e42772185 100644
--- a/extensions/source/activex/main/SOActiveX.cpp
+++ b/extensions/source/activex/SOActiveX.cxx
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index fea95d09c9b9..fea95d09c9b9 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
diff --git a/extensions/source/activex/main/SOActiveX.rgs b/extensions/source/activex/SOActiveX.rgs
index d3814df3b241..d3814df3b241 100644
--- a/extensions/source/activex/main/SOActiveX.rgs
+++ b/extensions/source/activex/SOActiveX.rgs
diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/SOComWindowPeer.cxx
index 7fb56dbdfd32..7fb56dbdfd32 100644
--- a/extensions/source/activex/main/SOComWindowPeer.cpp
+++ b/extensions/source/activex/SOComWindowPeer.cxx
diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index c819e17a81ea..c819e17a81ea 100644
--- a/extensions/source/activex/main/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
diff --git a/extensions/source/activex/main/SOComWindowPeer.rgs b/extensions/source/activex/SOComWindowPeer.rgs
index 42e985a31a1b..42e985a31a1b 100644
--- a/extensions/source/activex/main/SOComWindowPeer.rgs
+++ b/extensions/source/activex/SOComWindowPeer.rgs
diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/SODispatchInterceptor.cxx
index dcddf0d86b0c..dcddf0d86b0c 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.cpp
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index 538b12f24d2e..538b12f24d2e 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
diff --git a/extensions/source/activex/main/SODispatchInterceptor.rgs b/extensions/source/activex/SODispatchInterceptor.rgs
index 19fe0b5f0e4c..19fe0b5f0e4c 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.rgs
+++ b/extensions/source/activex/SODispatchInterceptor.rgs
diff --git a/extensions/source/activex/main/StdAfx2.cpp b/extensions/source/activex/StdAfx2.cxx
index f1cf88d10d14..f1cf88d10d14 100644
--- a/extensions/source/activex/main/StdAfx2.cpp
+++ b/extensions/source/activex/StdAfx2.cxx
diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/StdAfx2.h
index 5c540b0ba329..5c540b0ba329 100644
--- a/extensions/source/activex/main/StdAfx2.h
+++ b/extensions/source/activex/StdAfx2.h
diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/com_uno_helper.h
index 230fc63a6e77..230fc63a6e77 100644
--- a/extensions/source/activex/main/com_uno_helper.h
+++ b/extensions/source/activex/com_uno_helper.h
diff --git a/extensions/source/activex/main/example.html b/extensions/source/activex/example.html
index 3efee1f75a03..3efee1f75a03 100644
--- a/extensions/source/activex/main/example.html
+++ b/extensions/source/activex/example.html
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
deleted file mode 100644
index ea70b66d0f0f..000000000000
--- a/extensions/source/activex/main/makefile.mk
+++ /dev/null
@@ -1,157 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=extensions
-TARGET=so_activex
-
-use_shl_versions=
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
-
-VERSIONOBJ=
-LIBTARGET=NO
-USE_DEFFILE=YES
-UWINAPILIB=
-
-.IF "$(BUILD_X64)"!=""
-USE_DEFFILE_X64=TRUE
-.ENDIF
-
-INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \
-    -I$(MISC) \
-
-# --- Files -------------------------------------
-
-
-.IF "$(PRODUCT)"!=""
-RC+=-DPRODUCT
-.ENDIF
-
-RCFILES=\
-        $(TARGET).rc
-RCDEPN=$(MISC)$/envsettings.h
-
-SLOFILES=\
-    $(SLO)$/so_activex.obj \
-    $(SLO)$/SOActiveX.obj \
-    $(SLO)$/SOComWindowPeer.obj \
-    $(SLO)$/SODispatchInterceptor.obj \
-    $(SLO)$/SOActionsApproval.obj \
-    $(SLO)$/StdAfx2.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-    $(UUIDLIB) \
-    $(ADVAPI32LIB) \
-    $(OLE32LIB) \
-    $(OLEAUT32LIB) \
-    $(GDI32LIB) \
-    $(URLMONLIB) \
-    $(SHLWAPILIB)
-
-.IF "$(COM)" == "MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF
-
-
-#    $(KERNEL32LIB) \
-#    rpcndr.lib \
-#    rpcns4.lib \
-#    rpcrt4.lib
-
-#$(KERNEL32LIB) rpcndr.lib rpcns4.lib rpcrt4.lib
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1LIBS=
-SHL1DEF=$(TARGET).def
-SHL1RES=$(RES)$/$(TARGET).res
-
-.ENDIF
-
-.IF "$(BUILD_X64)"!=""
-# -------------------- x64 -----------------------
-
-CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1,  $i))
-LIBTARGET_X64=NO
-USE_DEFFILE_X64=YES
-UWINAPILIB_X64=
-
-SLOFILES_X64= \
-    $(SLO_X64)$/so_activex.obj \
-    $(SLO_X64)$/SOActiveX.obj \
-    $(SLO_X64)$/SOComWindowPeer.obj \
-    $(SLO_X64)$/SODispatchInterceptor.obj \
-    $(SLO_X64)$/SOActionsApproval.obj \
-    $(SLO_X64)$/StdAfx2.obj
-
-SHL1TARGET_X64=$(TARGET)
-
-SHL1STDLIBS_X64+=\
-    $(UUIDLIB_X64) \
-    $(ADVAPI32LIB_X64) \
-    $(OLE32LIB_X64) \
-    $(OLEAUT32LIB_X64) \
-    $(GDI32LIB_X64) \
-    $(URLMONLIB_X64) \
-    $(SHLWAPILIB_X64) \
-    $(KERNEL32LIB_X64) \
-    $(USER32LIB_X64) \
-    $(MSVCRT_X64) \
-    $(MSVCPRT_X64) \
-    $(OLDNAMESLIB_X64)
-
-SHL1OBJS_X64=$(SLOFILES_X64)
-SHL1DEF_X64=$(TARGET).def
-
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib
-.ELSE
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
-.ENDIF
-
-.ENDIF # "$(BUILD_X64)"!=""
-
-# --- Targets ----------------------------------
-
-.INCLUDE : set_wntx64.mk
-VERSIONOBJ_X64=
-.INCLUDE : target.mk
-.INCLUDE : tg_wntx64.mk
-
-$(MISC)$/envsettings.h : makefile.mk
-    -$(RM) $@
-# it looks wrong; but rc likes it that way...
-    echo "#define MISC .\..\$(INPATH)\misc" > $@
diff --git a/extensions/source/activex/msidl/makefile.mk b/extensions/source/activex/msidl/makefile.mk
deleted file mode 100644
index be9103ead216..000000000000
--- a/extensions/source/activex/msidl/makefile.mk
+++ /dev/null
@@ -1,62 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=extensions
-TARGET=msidl
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
-
-# --- Targets ----------------------------------
-
-ALL : $(MISC)$/activex_component
-
-MTL=midl.exe
-MTL_PROJ=
-
-SOURCE=so_activex.idl
-
-MTL_SWITCHES=-tlb $(MISC)$/so_activex.tlb -h $(MISC)$/so_activex.h -iid $(MISC)$/so_activex_i.c -dlldata $(MISC)$/so_activex_dll.c -proxy $(MISC)$/so_activex_p.c -Oicf
-
-.IF "$(COM)"=="GCC"
-MTL_SWITCHES+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)"
-
-$(MISC)$/activex_component : $(SOURCE) 
-    $(MTL) $(MTL_SWITCHES) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE) 
-.ELSE
-$(MISC)$/activex_component : $(SOURCE) 
-    $(WRAPCMD) $(MTL) $(MTL_SWITCHES) $(INCLUDE) $(SOURCE) && $(TOUCH) $@
-.ENDIF
-
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/resource.h
index fe74853c6d15..fe74853c6d15 100644
--- a/extensions/source/activex/main/resource.h
+++ b/extensions/source/activex/resource.h
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/so_activex.cxx
index 94dd0ccdcf1c..94dd0ccdcf1c 100644
--- a/extensions/source/activex/main/so_activex.cpp
+++ b/extensions/source/activex/so_activex.cxx
diff --git a/extensions/source/activex/main/so_activex.def b/extensions/source/activex/so_activex.def
index e3d56b070dad..e3d56b070dad 100644
--- a/extensions/source/activex/main/so_activex.def
+++ b/extensions/source/activex/so_activex.def
diff --git a/extensions/source/activex/msidl/so_activex.idl b/extensions/source/activex/so_activex.idl
index d1a7d9936eed..d1a7d9936eed 100644
--- a/extensions/source/activex/msidl/so_activex.idl
+++ b/extensions/source/activex/so_activex.idl
diff --git a/extensions/source/activex/main/so_activex.rc b/extensions/source/activex/so_activex.rc
index 2370a5162187..adba0ee79f8c 100644
--- a/extensions/source/activex/main/so_activex.rc
+++ b/extensions/source/activex/so_activex.rc
@@ -104,8 +104,6 @@ END
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
-#include "envsettings.h"
-
 1 TYPELIB MISC\so_activex.tlb
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
deleted file mode 100644
index b681c6c90b19..000000000000
--- a/extensions/source/bibliography/makefile.mk
+++ /dev/null
@@ -1,98 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=bib
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=			$(SLO)$/formcontrolcontainer.obj \
-                    $(SLO)$/loadlisteneradapter.obj \
-                    $(SLO)$/bibconfig.obj \
-                    $(SLO)$/bibcont.obj \
-                    $(SLO)$/bibload.obj \
-                    $(SLO)$/bibmod.obj \
-                    $(SLO)$/general.obj \
-                    $(SLO)$/framectr.obj \
-                    $(SLO)$/bibview.obj \
-                    $(SLO)$/bibbeam.obj  \
-                    $(SLO)$/toolbar.obj  \
-                    $(SLO)$/datman.obj	\
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			bib.src	 \
-                    datman.src \
-                    sections.src \
-                    toolbar.src
-
-RESLIB1NAME=bib
-RESLIB1SRSFILES= $(SRS)$/bib.srs
-RESLIB1DEPN= bib.src bib.hrc
-
-
-SHL1STDLIBS= \
-        $(SOTLIB)           \
-        $(SVTOOLLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVLLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(DBTOOLSLIB) \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1LIBS=       $(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/bib.component
-
-$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        bib.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt bib.component
diff --git a/extensions/source/config/ldap/exports.dxp b/extensions/source/config/ldap/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/config/ldap/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
deleted file mode 100644
index d35e2428ca31..000000000000
--- a/extensions/source/config/ldap/makefile.mk
+++ /dev/null
@@ -1,105 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=ldapbe
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-LDAP_MAJOR=2
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-.IF "$(WITH_LDAP)" != "YES"
-@all:
-    @echo "LDAP disabled."
-.ENDIF
-
-.IF "$(LDAPSDKINCLUDES)" == ""
-
-.IF "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_OPENLDAP)" != "YES"
-LDAPSDKINCLUDES = $(MOZ_LDAP_CFLAGS)
-.ELSE
-LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozilla
-.ENDIF
-.ENDIF
-
-.IF "$(WITH_OPENLDAP)" == "YES"
-CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED
-.ENDIF
-
-SOLARINC+= $(LDAPSDKINCLUDES)
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/ldapuserprofilebe.obj \
-    $(SLO)$/ldapaccess.obj	\
-    $(SLO)$/componentdef.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib        
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(LDAP_MAJOR).uno   
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALHELPERLIB) \
-        $(SALLIB)
-.IF "$(OS)"=="FREEBSD"
-SHL1STDLIBS+=-lcompat
-# workaround for FreeBSD, which needs -llber50, too
-.IF "$(WITH_OPENLDAP)" != "YES"
-SHL1STDLIBS+=-Wl,-Bstatic -llber50
-.ENDIF
-.ENDIF
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp    
-DEF1DES=Configuration: LDAP User Profile Backend
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-ALLTAR : $(MISC)/ldapbe2.component
-
-$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        ldapbe2.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt ldapbe2.component
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
deleted file mode 100644
index e37ab0a546ac..000000000000
--- a/extensions/source/dbpilots/makefile.mk
+++ /dev/null
@@ -1,111 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=dbp
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=dbp
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=			dbptools.cxx	\
-                    gridwizard.cxx	\
-                    listcombowizard.cxx	\
-                    optiongrouplayouter.cxx	\
-                    commonpagesdbp.cxx	\
-                    groupboxwiz.cxx	\
-                    wizardservices.cxx	\
-                    controlwizard.cxx	\
-                    moduledbp.cxx	\
-                    dbpservices.cxx
-
-SLOFILES=			$(SLO)$/dbptools.obj	\
-                    $(SLO)$/gridwizard.obj	\
-                    $(SLO)$/listcombowizard.obj	\
-                    $(SLO)$/optiongrouplayouter.obj	\
-                    $(SLO)$/commonpagesdbp.obj	\
-                    $(SLO)$/groupboxwiz.obj	\
-                    $(SLO)$/wizardservices.obj	\
-                    $(SLO)$/controlwizard.obj	\
-                    $(SLO)$/moduledbp.obj	\
-                    $(SLO)$/dbpservices.obj
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			gridpages.src	\
-                    commonpagesdbp.src	\
-                    dbpilots.src	\
-                    groupboxpages.src	\
-                    listcombopages.src
-
-RESLIB1NAME=dbp
-RESLIB1SRSFILES= $(SRS)$/dbp.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(SVTOOLLIB) \
-        $(VCLLIB) \
-        $(TOOLSLIB) \
-        $(SVLLIB) \
-        $(SFXLIB)		\
-        $(DBTOOLSLIB) \
-                $(UNOTOOLSLIB) \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/dbp.component
-
-$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        dbp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt dbp.component
diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk
deleted file mode 100644
index 1436576e89ba..000000000000
--- a/extensions/source/logging/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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=extensions
-TARGET=log
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-# ... object files ............................
-EXCEPTIONSFILES= \
-        $(SLO)$/consolehandler.obj      \
-        $(SLO)$/csvformatter.obj        \
-        $(SLO)$/filehandler.obj         \
-        $(SLO)$/log_services.obj        \
-        $(SLO)$/logger.obj              \
-        $(SLO)$/loggerconfig.obj        \
-        $(SLO)$/loghandler.obj          \
-        $(SLO)$/plaintextformatter.obj  \
-
-SLOFILES= \
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/log_module.obj          \
-        $(SLO)$/logrecord.obj           \
-
-# --- library -----------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET)_t.lib
-LIB1FILES=\
-        $(SLB)$/$(TARGET).lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/log.component
-
-$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        log.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt log.component
diff --git a/extensions/source/macosx/spotlight/delzip b/extensions/source/macosx/spotlight/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/extensions/source/macosx/spotlight/delzip
+++ /dev/null
diff --git a/extensions/source/macosx/spotlight/makefile.mk b/extensions/source/macosx/spotlight/makefile.mk
deleted file mode 100644
index e7b15150bd03..000000000000
--- a/extensions/source/macosx/spotlight/makefile.mk
+++ /dev/null
@@ -1,99 +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.
-#
-#*************************************************************************
-
-PRJ=../../..
-PRJNAME=extensions
-TARGET=spotlightplugin
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(OS)"!="MACOSX"
-dummy:
-    @echo Not using Mac OS X - nothing to build
-.ENDIF
-
-# --- Files -------------------------------------
-
-# ... object files ............................
-SLOFILES= \
-        $(SLO)$/ioapi.obj                \
-        $(SLO)$/unzip.obj                \
-        $(SLO)$/main.obj                 \
-        $(SLO)$/GetMetadataForFile.obj   \
-        $(SLO)$/OOoContentDataParser.obj \
-        $(SLO)$/OOoMetaDataParser.obj    \
-        $(SLO)$/OOoSpotlightImporter.obj \
-        
-BUNDLE =    $(MISC)$/OOoSpotlightImporter.mdimporter
-CONTENTS =  $(BUNDLE)$/Contents
-RESOURCES = $(CONTENTS)$/Resources
-MACOS =     $(CONTENTS)$/MacOS
-
-BUNDLELIBS= -framework CoreFoundation \
-            -framework Foundation     \
-            -framework CoreServices   \
-            $(ZLIB3RDLIB)
-
-plistfiles  = $(CONTENTS)$/Info.plist 
-binaries =    $(MACOS)$/OOoSpotlightImporter
-resources =   $(RESOURCES)/en.lproj/schema.strings \
-              $(RESOURCES)/schema.xml
-
-ZIPFLAGS = -r
-ZIP1TARGET = mdibundle
-ZIP1DIR = $(CONTENTS)
-ZIP1LIST = *
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN) : $(plistfiles) $(binaries) $(resources)
-
-.ENDIF          # "$(ZIP1TARGETN)"!=""
-
-# Info.plist is just versioned and copied into the bundle   
-$(CONTENTS)$/%.plist : mdimporter/%.plist
-    $(MKDIRHIER) $(@:d)
-    $(COPY) "$<" "$@"
-    
-$(MACOS)$/OOoSpotlightImporter: $(SLOFILES)
-    $(MKDIRHIER) $(@:d)
-    $(CC) -o $(MACOS)$/OOoSpotlightImporter $(SLOFILES:s/.obj/.o/) $(EXTRA_LINKFLAGS) $(BUNDLELIBS) -bundle
-# we have to change the zlib install name, otherwise the plugin will not work
-    .IF "$(SYSTEM_ZLIB)"=="NO"
-    install_name_tool -change @executable_path/libz.1.dylib @executable_path/../../../../MacOS/libz.1.dylib $(MACOS)$/OOoSpotlightImporter
-    .ENDIF
-
-#the resources are just copied
-$(RESOURCES)$/% : mdimporter/%
-    $(MKDIRHIER) $(@:d)
-    $(COPY) "$<" "$@"
-
diff --git a/extensions/source/nsplugin/source/exports.dxp b/extensions/source/nsplugin/source/exports.dxp
deleted file mode 100644
index e8b697289c20..000000000000
--- a/extensions/source/nsplugin/source/exports.dxp
+++ /dev/null
@@ -1,16 +0,0 @@
-NPP_GetMIMEDescription
-NPP_GetValue
-NPP_Initialize
-NPP_GetJavaClass
-NPP_Shutdown
-NPP_New
-NPP_Destroy
-NPP_SetWindow
-NPP_NewStream
-NPP_WriteReady
-NPP_Write
-NPP_DestroyStream
-NPP_StreamAsFile
-NPP_URLNotify
-NPP_Print
-NPP_Shutdown
diff --git a/extensions/source/nsplugin/source/exports_wnt.dxp b/extensions/source/nsplugin/source/exports_wnt.dxp
deleted file mode 100644
index a27be8c38300..000000000000
--- a/extensions/source/nsplugin/source/exports_wnt.dxp
+++ /dev/null
@@ -1,18 +0,0 @@
-NPP_GetMIMEDescription
-NPP_Initialize
-NPP_Shutdown
-NPP_New
-NPP_Destroy
-NPP_SetWindow
-NPP_NewStream
-NPP_WriteReady
-NPP_Write
-NPP_DestroyStream
-NPP_StreamAsFile
-NPP_URLNotify
-NPP_Print
-NPP_Shutdown
-NP_GetEntryPoints
-NP_Initialize
-NP_Shutdown
-NP_GetMIMEDescription
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
deleted file mode 100644
index 5b7476408a31..000000000000
--- a/extensions/source/nsplugin/source/makefile.mk
+++ /dev/null
@@ -1,164 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=extensions
-TARGET=npsoplugin
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
-INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
-.ELSE
-INCPRE=$(SOLARINCDIR)$/npsdk
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-
-# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
-CFLAGS+=-DMOZ_X11
-
-.IF "$(ENABLE_NSPLUGIN)"=="NO"
-
-dummy:
-    @echo Nsplugin disabled, nothing to build
-
-.ELSE           # ENABLE_NSPLUGIN
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
-    "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
-INC+= -DNP_LINUX
-.ENDIF
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-.ENDIF          # ENABLE_NSPLUGIN
-.ENDIF          # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT" 
-INC+= -DENGLISH
-.ENDIF
-
-
-# --- Files -------------------------------------
-
-SLOFILES=       $(SLO)$/npshell.obj \
-            $(SLO)$/so_env.obj
-
-SHL1OBJS=	$(SLO)$/npshell.obj \
-            $(SLO)$/so_env.obj
-
-.IF "$(GUI)"=="UNX"
-STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-.ENDIF #UNX
-.IF "$(GUI)"=="WNT"
-SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIBS+=$(SOLARLIBDIR)$/npwin.obj
-SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj
-
-.ENDIF
-
-OBJFILES=\
-        $(OBJ)$/so_closelistener.obj\
-        $(OBJ)$/so_instance.obj\
-        $(OBJ)$/so_env.obj\
-        $(OBJ)$/so_main.obj
-
-# --- Plugin executable -------------------------
-APP1TARGET=nsplugin$(EXEPOSTFIX)
-APP1OBJS=$(OBJFILES)
-
-APP1STDLIBS=\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(SALLIB)
-
-.IF "$(OS)"=="SOLARIS"
-APP1STDLIBS+= -lsocket -lnsl
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-DEPOBJFILES=$(OBJ)$/nsp_windows.obj
-APP1OBJS+=$(OBJ)$/nsp_windows.obj $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLEAAUT32LIB) $(UUIDLIB)
-.ENDIF
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)_so
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLE32LIB) $(OLEAAUT32LIB) $(UUIDLIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB)
-.ENDIF
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=OOO
-
-# ----- get some additional keys in versioninfo ------------
-SHL1ADD_VERINFO=nsplugin.rc
-SHL1DEPN+=$(SHL1ADD_VERINFO)
-
-DEF1NAME=$(SHL1TARGET)
-.IF "$(GUI)"=="UNX"
-DEF1EXPORTFILE=exports.dxp
-.ENDIF
-.IF "$(GUI)"=="WNT"
-DEF1EXPORTFILE=exports_wnt.dxp
-.ENDIF
-
-SHL2OBJS=$(SHL1OBJS)
-SHL2STDLIBS=$(SHL1STDLIBS)
-SHL2TARGET=$(TARGET)
-.IF "$(GUI)"=="WNT"
-SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLE32LIB) $(OLEAAUT32LIB) $(UUIDLIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB)
-.ENDIF
-
-SHL2DEPN=
-SHL2IMPLIB=	i$(SHL2TARGET)
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-SHL2RPATH=OOO
-
-# ----- get some additional keys in versioninfo ------------
-SHL2ADD_VERINFO=nsplugin_oo.rc
-SHL2DEPN+=$(SHL2ADD_VERINFO)
-
-DEF2NAME=$(SHL2TARGET)
-.IF "$(GUI)"=="UNX"
-DEF2EXPORTFILE=exports.dxp
-.ENDIF
-.IF "$(GUI)"=="WNT"
-DEF2EXPORTFILE=exports_wnt.dxp
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 134ee3677e30..76dd7a86ac5b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
 MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
 
-char*
+SAL_DLLPUBLIC_EXPORT char*
 NPP_GetMIMEDescription(void)
 {
     debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin,  NPP_GetMIMEDescription:%s.\n", pMimeTypes);
@@ -369,7 +369,7 @@ NPP_GetMIMEDescription(void)
 }
 
 #ifdef UNIX
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 // I am not actually sure wrt this, it ast least compiles with external
 // npapi.h now...
 NPP_GetValue(NPP /*instance*/, NPPVariable variable, void *value)
@@ -404,7 +404,7 @@ dupMimeType(NPMIMEType type)
 }
 #endif // end of UNIX
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_Initialize(void)
 {
     debug_fprintf(NSP_LOG_NEW, "NS Plugin begin initialize.\n");
@@ -419,7 +419,7 @@ NPP_GetJavaClass()
 }
 #endif
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_Shutdown(void)
 {
     PLUGIN_MSG msg;
@@ -435,7 +435,7 @@ NPP_Shutdown(void)
 #endif
 }
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_New(NPMIMEType pluginType,
     NPP instance,
     uint16_t mode,
@@ -487,7 +487,7 @@ NPP_New(NPMIMEType pluginType,
     return NPERR_NO_ERROR;
 }
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_Destroy(NPP instance, NPSavedData** /*save*/)
 {
     debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin, enter NPP_Destroy.\n");
@@ -532,7 +532,7 @@ NPP_Destroy(NPP instance, NPSavedData** /*save*/)
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_SetWindow(NPP instance, NPWindow* window)
 {
     PluginInstance* This;
@@ -626,7 +626,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_NewStream(NPP instance,
           NPMIMEType /*type*/,
           NPStream* /*stream*/,
@@ -648,21 +648,21 @@ int32_t STREAMBUFSIZE = 0X0FFFFFFF;
  * mode so we can take any size stream in our
  * write call (since we ignore it) */
 
-int32_t
+SAL_DLLPUBLIC_EXPORT int32_t
 NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/)
 {
     return STREAMBUFSIZE;
 }
 
 
-int32_t
+SAL_DLLPUBLIC_EXPORT int32_t
 NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t len, void* /*buffer*/)
 {
     return len;     /* The number of bytes accepted */
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
 {
     if (instance == NULL)
@@ -671,7 +671,7 @@ NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
 }
 
 // save fname to another file with the original file name
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
 {
     debug_fprintf(NSP_LOG_APPEND, "Into Stream\n");
@@ -812,14 +812,14 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
         debug_fprintf(NSP_LOG_APPEND, "NPP_StreamAsFile send SO_SET_WINDOW return failure \n");
 }
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_URLNotify(NPP /*instance*/, const char* /*url*/,
                 NPReason /*reason*/, void* /*notifyData*/)
 {
 }
 
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_Print(NPP instance, NPPrint* printInfo)
 {
     if(printInfo == NULL)
diff --git a/extensions/source/nsplugin/source/nsplugin.rc b/extensions/source/nsplugin/source/nsplugin.rc
deleted file mode 100644
index 34639157d7a4..000000000000
--- a/extensions/source/nsplugin/source/nsplugin.rc
+++ /dev/null
@@ -1,30 +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.
- *
- ************************************************************************/
-#define ADDITIONAL_VERINFO1     VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-    VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2    VALUE "FileDescription", "Oracle Open Office Plug-in handles all its documents" VALUE "ProductName", "Oracle Open Office Plug-in"  VALUE "MIMEType",   "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-#define ADDITIONAL_VERINFO3     "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
deleted file mode 100644
index a9ff68118c58..000000000000
--- a/extensions/source/ole/makefile.mk
+++ /dev/null
@@ -1,132 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-# -----------------------------------------------------------------
-
-PRJNAME=extensions
-TARGET=oleautobridge.uno
-TARGET2=oleautobridge2.uno
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-LIBTARGET=NO
-USE_DEFFILE=YES
-
-USE_DEFFILE=TRUE
-
-INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-.IF "$(USE_DEBUG_RUNTIME)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
-
-SLOFILES= \
-            $(SLO)$/servreg.obj		\
-            $(SLO)$/servprov.obj	\
-            $(SLO)$/unoobjw.obj		\
-            $(SLO)$/oleobjw.obj		\
-            $(SLO)$/olethread.obj	\
-            $(SLO)$/oledll.obj		\
-        $(SLO)$/jscriptclasses.obj	\
-        $(SLO)$/ole2uno.obj		\
-        $(SLO)$/windata.obj		\
-        $(SLO)$/unotypewrapper.obj
-
-SECOND_BUILD=OWNGUID
-OWNGUID_SLOFILES=$(SLOFILES)
-OWNGUIDCDEFS+= -DOWNGUID
-
-# the original library
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL1LIBS=
-SHL1OBJS=$(SLOFILES)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-# the second library
-SHL2TARGET=$(TARGET2)
-SHL2STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL2LIBS=
-SHL2OBJS=$(REAL_OWNGUID_SLOFILES)
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE=$(TARGET).dxp
-
-.ENDIF # "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-#----------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/oleautobridge.component
-
-$(MISC)/oleautobridge.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp
deleted file mode 100644
index 843ff2fc389f..000000000000
--- a/extensions/source/ole/oleautobridge.uno.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory @101
-component_canUnload @103
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index c7ebaa8c7569..b6471e47e6c4 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -118,7 +118,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     return pRet;
 }
 
-extern "C"  SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue* libUnused)
+extern "C"  SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
deleted file mode 100644
index 8d1aaa484d28..000000000000
--- a/extensions/source/plugin/aqua/makefile.mk
+++ /dev/null
@@ -1,63 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=plaqua
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-.IF "$(GUIBASE)"!="aqua" || "$(WITH_MOZILLA)"=="NO"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)."
-
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-INCPRE+=-I$(SOLARINCDIR)$/npsdk
-CDEFS+=-DOJI
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=\
-    $(SLO)$/macmgr.obj      \
-    $(SLO)$/sysplug.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.ENDIF # $(GUIBASE)==aqua
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.mm
index 415ca936c46f..415ca936c46f 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.mm
diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk
deleted file mode 100644
index a7e28f8deae5..000000000000
--- a/extensions/source/plugin/base/makefile.mk
+++ /dev/null
@@ -1,65 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=plbase
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=		\
-                $(SLO)$/plctrl.obj		\
-                $(SLO)$/service.obj		\
-                $(SLO)$/xplugin.obj		\
-                $(SLO)$/nfuncs.obj		\
-                $(SLO)$/manager.obj		\
-                $(SLO)$/context.obj		\
-                $(SLO)$/evtlstnr.obj	\
-                $(SLO)$/plcom.obj		\
-                $(SLO)$/multiplx.obj    \
-                $(SLO)$/plmodel.obj
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/pl.component
index 4a9d98f7dc7b..4a9d98f7dc7b 100644
--- a/extensions/source/plugin/util/pl.component
+++ b/extensions/source/plugin/pl.component
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
deleted file mode 100644
index 9dcdf1ace314..000000000000
--- a/extensions/source/plugin/unx/makefile.mk
+++ /dev/null
@@ -1,104 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=plunx
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-.IF "$(GUIBASE)"=="aqua"
-dummy:
-    @echo "Nothing to build for GUIBASE aqua."
-    
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-SLOFILES=\
-    $(SLO)$/nppapi.obj		\
-    $(SLO)$/sysplug.obj		\
-    $(SLO)$/mediator.obj	\
-    $(SLO)$/plugcon.obj		\
-    $(SLO)$/unxmgr.obj
-
-OBJFILES=\
-    $(OBJ)$/npwrap.obj		\
-    $(OBJ)$/npnapi.obj		\
-    $(OBJ)$/mediator.obj	\
-    $(OBJ)$/plugcon.obj
-
-APP1TARGET=pluginapp.bin
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS= $(SALLIB)
-
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO"
-APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
-.ELSE
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
-APP1STDLIBS+= -lXt -lXext -lX11
-.ELIF "$(OS)"=="AIX"
-APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
-.ELSE
-APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_GTK)" == "TRUE"
-# libs for gtk plugin
-APP1STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-.IF "$(OS)" == "SOLARIS"
-# don't ask, it's ugly
-DIRECT :=-z nodefs $(DIRECT)
-.ENDIF
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-.ENDIF
-
-
-APP1DEF=	$(MISC)$/$(TARGET).def
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-.ENDIF # $(GUIBASE)==aqua
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
deleted file mode 100644
index 1e6dda1e5ca0..000000000000
--- a/extensions/source/plugin/util/makefile.mk
+++ /dev/null
@@ -1,110 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=pl
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-LIB1TARGET = $(SLB)$/plall.lib
-LIB1FILES  = \
-    $(SLB)$/plbase.lib	\
-    $(SHL1LINKLIB)
-
-.IF "$(GUI)" == "UNX"
-.IF "$(GUIBASE)"=="aqua"
-.IF "$(WITH_MOZILLA)"=="YES"
-SHL1LINKLIB = $(SLB)$/plaqua.lib
-.ENDIF
-.ELSE
-SHL1LINKLIB = $(SLB)$/plunx.lib
-.ENDIF # $(GUIBASE)==aqua
-.IF "$(OS)" == "SOLARIS"
-SHL1OWNLIBS = -lsocket
-.ENDIF # SOLARIS
-.ENDIF # UNX
-
-.IF "$(GUI)" == "WNT"
-SHL1LINKLIB = $(SLB)$/plwin.lib
-SHL1OWNLIBS = \
-    $(VERSIONLIB)	\
-    $(OLE32LIB)	\
-    $(ADVAPI32LIB)
-.ENDIF # WNT
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1LIBS=$(LIB1TARGET)
-
-SHL1STDLIBS+= \
-    $(TKLIB)            \
-    $(VCLLIB)			\
-    $(SVLLIB)			\
-    $(UNOTOOLSLIB)      \
-    $(TOOLSLIB)			\
-    $(UCBHELPERLIB)		\
-    $(COMPHELPERLIB)	\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)           \
-    $(SALHELPERLIB)
-
-.IF "$(GUIBASE)"=="unx"
-SHL1STDLIBS+=$(X11LINK_DYNAMIC)
-.ENDIF
-
-SHL1STDLIBS+=$(SHL1OWNLIBS)
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
-
-ALLTAR : $(MISC)/pl.component
-
-$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        pl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pl.component
diff --git a/extensions/source/plugin/util/makefile.pmk b/extensions/source/plugin/util/makefile.pmk
deleted file mode 100644
index 0f06ea2a50ce..000000000000
--- a/extensions/source/plugin/util/makefile.pmk
+++ /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.
-#
-#*************************************************************************
-NOUNODOC=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-CFLAGS+=-DSYSTEM_MOZILLA
-PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
-.ENDIF
-
-.IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
-CDEFS+=-DENABLE_GTK
-PKGCONFIG_MODULES+=gtk+-2.0 gthread-2.0
-.ENDIF
-
-.IF "$(GUIBASE)" == "aqua"
-CFLAGS += -I$(FRAMEWORKSHOME)/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers\
-          -I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers
-.ENDIF
-
-.IF "$(PKGCONFIG_MODULES)" != ""
-.INCLUDE : pkg_config.mk
-.ENDIF
diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk
deleted file mode 100644
index 7f676ac16748..000000000000
--- a/extensions/source/plugin/win/makefile.mk
+++ /dev/null
@@ -1,58 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=plwin
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.IF "$(GUI)" == "WNT"
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
-.ENDIF
-
-# --- Types -------------------------------------
-
-.IF "$(WITH_MOZILLA)" != "NO"
-SLOFILES =	$(SLO)$/winmgr.obj	\
-            $(SLO)$/sysplug.obj
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-.ENDIF
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
deleted file mode 100644
index ebb629ae39c9..000000000000
--- a/extensions/source/propctrlr/makefile.mk
+++ /dev/null
@@ -1,154 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=pcr
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=           $(SLO)$/controlfontdialog.obj \
-                    $(SLO)$/fontdialog.obj	\
-                    $(SLO)$/pcrservices.obj	\
-                    $(SLO)$/selectlabeldialog.obj	\
-                    $(SLO)$/propcontroller.obj	\
-                    $(SLO)$/formcontroller.obj	\
-                    $(SLO)$/modulepcr.obj  \
-                    $(SLO)$/cellbindinghelper.obj   \
-                    $(SLO)$/taborder.obj   \
-                    $(SLO)$/pcrunodialogs.obj   \
-                    $(SLO)$/unourl.obj   \
-                    $(SLO)$/formlinkdialog.obj   \
-                    $(SLO)$/listselectiondlg.obj   \
-                    $(SLO)$/browserlistbox.obj	\
-                    $(SLO)$/stringrepresentation.obj   \
-                    $(SLO)$/eformshelper.obj   \
-                    $(SLO)$/xsddatatypes.obj   \
-                    $(SLO)$/xsdvalidationhelper.obj \
-                    $(SLO)$/pushbuttonnavigation.obj \
-                    $(SLO)$/sqlcommanddesign.obj \
-                    $(SLO)$/composeduiupdate.obj \
-                    $(SLO)$/propertycomposer.obj \
-                    $(SLO)$/pcrcomponentcontext.obj \
-                    $(SLO)$/commoncontrol.obj \
-                    $(SLO)$/standardcontrol.obj \
-                    $(SLO)$/usercontrol.obj \
-                    $(SLO)$/browserline.obj \
-                    $(SLO)$/genericpropertyhandler.obj \
-                    $(SLO)$/buttonnavigationhandler.obj \
-                    $(SLO)$/handlerhelper.obj \
-                    $(SLO)$/propertyhandler.obj \
-                    $(SLO)$/eventhandler.obj \
-                    $(SLO)$/editpropertyhandler.obj \
-                    $(SLO)$/eformspropertyhandler.obj \
-                    $(SLO)$/cellbindinghandler.obj \
-                    $(SLO)$/submissionhandler.obj \
-                    $(SLO)$/xsdvalidationpropertyhandler.obj \
-                    $(SLO)$/formcomponenthandler.obj \
-                    $(SLO)$/formmetadata.obj \
-                    $(SLO)$/defaultforminspection.obj \
-                    $(SLO)$/formbrowsertools.obj \
-                    $(SLO)$/browserpage.obj	\
-                    $(SLO)$/propertyeditor.obj	\
-                    $(SLO)$/formstrings.obj	\
-                    $(SLO)$/pcrstrings.obj	\
-                    $(SLO)$/browserview.obj	\
-                    $(SLO)$/pcrcommon.obj	\
-                    $(SLO)$/newdatatype.obj \
-                    $(SLO)$/propeventtranslation.obj \
-                    $(SLO)$/objectinspectormodel.obj \
-                    $(SLO)$/inspectorhelpwindow.obj \
-                    $(SLO)$/defaulthelpprovider.obj \
-                    $(SLO)$/MasterDetailLinkDialog.obj \
-                    $(SLO)$/inspectormodelbase.obj \
-                    $(SLO)$/propertycontrolextender.obj \
-                    $(SLO)$/formgeometryhandler.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			propres.src	 \
-                    formres.src \
-                    pcrmiscres.src \
-                    taborder.src \
-                    fontdialog.src \
-                    selectlabeldialog.src \
-                    formlinkdialog.src \
-                    listselectiondlg.src \
-                    newdatatype.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(EDITENGLIB)	\
-        $(SVXCORELIB)	\
-        $(SVXLIB)	\
-        $(SFXLIB)	\
-        $(SVTOOLLIB)\
-        $(TKLIB)	\
-        $(VCLLIB)	\
-        $(SVLLIB)	\
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB)   \
-        $(DBTOOLSLIB)	\
-        $(COMPHELPERLIB) 	 \
-        $(CPPUHELPERLIB) 	 \
-        $(CPPULIB) 	\
-        $(UNOTOOLSLIB) 	\
-        $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/pcr.component
-
-$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        pcr.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pcr.component
diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/resource/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
deleted file mode 100644
index 4839ec0b7ca2..000000000000
--- a/extensions/source/resource/makefile.mk
+++ /dev/null
@@ -1,86 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=res
-LIBTARGET=NO
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/ResourceIndexAccess.obj \
-    $(SLO)$/oooresourceloader.obj \
-    $(SLO)$/resourceservices.obj
-
-LIB1TARGET= 	$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=	$(SLOFILES)
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) 	 \
-        $(CPPULIB) 	 \
-        $(CPPUHELPERLIB) 	 \
-        $(SALLIB) 	 \
-        $(VCLLIB)	\
-        $(TOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=		ires
-SHL1LIBS=		$(LIB1TARGET)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
-
-ALLTAR : $(MISC)/res.component
-
-$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        res.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt res.component
diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/scanner/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
deleted file mode 100644
index 60d1900f0b6b..000000000000
--- a/extensions/source/scanner/makefile.mk
+++ /dev/null
@@ -1,104 +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.
-#
-#*************************************************************************
-PRJ=..$/..
-PRJNAME=extensions
-TARGET=scn
-ENABLE_EXCEPTIONS=TRUE
-PACKAGE=com$/sun$/star$/scanner
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-                $(SLO)$/scnserv.obj		\
-                $(SLO)$/scanner.obj
-
-.IF "$(GUI)"=="WNT"
-SLOFILES+=\
-                $(SLO)$/scanwin.obj		
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-SLOFILES+=\
-                $(SLO)$/sane.obj		\
-                $(SLO)$/sanedlg.obj		\
-                $(SLO)$/scanunx.obj		\
-                $(SLO)$/grid.obj
-
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    sanedlg.src		\
-    grid.src
-
-RESLIB1NAME=san
-RESLIB1IMAGES=$(PRJ)$/source$/scanner
-RESLIB1SRSFILES= $(SRS)$/scn.srs
-RESLIB1DEPN= sanedlg.src sanedlg.hrc grid.src grid.hrc
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1STDLIBS=\
-    $(CPPULIB)			\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)	\
-    $(SALLIB)			\
-    $(ONELIB)			\
-    $(TOOLSLIB)			\
-    $(VCLLIB)			\
-    $(SVTOOLLIB)
-
-.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \
-    "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-SHL1STDLIBS+=$(SVTOOLLIB) -ldl
-.ENDIF
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/scn.component
-
-$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        scn.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt scn.component
diff --git a/extensions/source/unoactivex/main/initwindowpeer.cxx b/extensions/source/unoactivex/main/initwindowpeer.cxx
deleted file mode 100644
index f2ae4cc713a2..000000000000
--- a/extensions/source/unoactivex/main/initwindowpeer.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-
-
-#include "initwindowpeer.hxx"
-
-using namespace ::com::sun::star;
-
-
-uno::Any SAL_CALL InitWindowPeer::getWindowHandle( const uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType )
-    throw ( uno::RuntimeException )
-{
-    uno::Any aRes;
-    sal_Int32 nHwnd = (sal_Int32)m_hwnd;
-    aRes <<= nHwnd;
-    return aRes;
-}
-
-
-uno::Reference< awt::XToolkit > SAL_CALL InitWindowPeer::getToolkit()
-    throw ( uno::RuntimeException )
-{
-    return uno::Reference< awt::XToolkit >();
-}
-
-void SAL_CALL InitWindowPeer::setPointer( const uno::Reference< awt::XPointer >& Pointer )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::setBackground( sal_Int32 Color )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidate( sal_Int16 Flags )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidateRect( const awt::Rectangle& Rect, sal_Int16 Flags )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::dispose()
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-    throw ( uno::RuntimeException )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
deleted file mode 100644
index 47da869ea11e..000000000000
--- a/extensions/source/update/check/makefile.mk
+++ /dev/null
@@ -1,142 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=updchk
-PACKAGE=org.openoffice.Office
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-ABSXCSROOT=$(SOLARXMLDIR)
-XCSROOT=..
-DTDDIR=$(ABSXCSROOT)
-XSLDIR=$(ABSXCSROOT)$/processing
-PROCESSOUT=$(MISC)$/$(TARGET)
-PROCESSORDIR=$(SOLARBINDIR)
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# no "lib" prefix
-DLLPRE =
-
-# --- Files ---
-
-SRS2NAME=$(TARGET)
-SRC2FILES=\
-    updatehdl.src
-
-RESLIB2NAME=upd
-RESLIB2SRSFILES= $(SRS)$/updchk.srs
-RESLIB2DEPN= updatehdl.src updatehdl.hrc
-
-SLOFILES=\
-    $(SLO)$/download.obj \
-    $(SLO)$/updatecheck.obj \
-    $(SLO)$/updatecheckjob.obj \
-    $(SLO)$/updatecheckconfig.obj \
-    $(SLO)$/updateprotocol.obj \
-    $(SLO)$/updatehdl.obj
-        
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno   
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(CURLLIB) \
-        $(SALLIB) \
-        $(SHELL32LIB) \
-        $(OLE32LIB)
-        
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
-SPOOLDIR=$(MISC)$/registry$/spool
-
-XCUFILES= \
-    Addons.xcu \
-    Jobs.xcu
-
-MYXCUFILES= \
-    $(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu \
-    $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu
-
-LOCALIZEDFILES= \
-    Addons.xcu \
-    Jobs.xcu
-
-.IF "$(test)" != ""
-APP1TARGET=updateprotocoltest
-APP1STDLIBS= $(SHL1STDLIBS)
-APP1OBJS= \
-    $(SLO)$/updateprotocol.obj \
-    $(SLO)$/updateprotocoltest.obj
-
-
-.ENDIF # "$(test)" != ""
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MYXCUFILES)
-
-.IF "$(WITH_LANG)"!=""
-XCU_SOURCEDIR:=$(PROCESSOUT)$/merge$/$(PACKAGEDIR)
-.ELSE			# "$(WITH_LANG)"!=""
-XCU_SOURCEDIR:=.
-.ENDIF			# "$(WITH_LANG)"!=""
-
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Addons.xcu
-    @-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu
-    @-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-#	@$(PERL) transform.pl < $< > $@
-
-
-ALLTAR : $(MISC)/updchk.uno.component
-
-$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updchk.uno.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx
index d3bbdc3f7b19..0a765399cce3 100644
--- a/sal/systools/win32/onlineupdate/onlinecheck.cxx
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -43,7 +43,7 @@
 #include <tchar.h>
 
 // #i71984
-extern "C" sal_Bool SAL_CALL hasInternetConnection()
+extern "C" bool SAL_CALL WNT_hasInternetConnection()
 {
     DWORD   dwFlags;
     TCHAR   szConnectionName[1024];
@@ -57,11 +57,11 @@ extern "C" sal_Bool SAL_CALL hasInternetConnection()
         SAL_N_ELEMENTS(szConnectionName),
         0 );
 
-    return fIsConnected ? sal_True : sal_False;
+    return fIsConnected ? true : false;
 
 #ifndef __MINGW32__
     } __except( EXCEPTION_EXECUTE_HANDLER ) {
-        return sal_False;
+        return false;
     }
 #endif
 }
diff --git a/extensions/source/update/check/Addons.xcu b/extensions/source/update/check/org/openoffice/Office/Addons.xcu
index 8794ce858073..8794ce858073 100644
--- a/extensions/source/update/check/Addons.xcu
+++ b/extensions/source/update/check/org/openoffice/Office/Addons.xcu
diff --git a/extensions/source/update/check/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
index 840d630698cb..840d630698cb 100644
--- a/extensions/source/update/check/Jobs.xcu
+++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
diff --git a/extensions/source/update/check/transform.pl b/extensions/source/update/check/transform.pl
deleted file mode 100644
index fb452ae0482c..000000000000
--- a/extensions/source/update/check/transform.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-        if 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.
-#
-#*************************************************************************
-
-while (<>) {
-
-  if( /<prop/ ) {
-    $prop = $_;
-    next if( /Text/ || /Bubble/ );
-  }
-
-  if( /<\/prop>/ ) {
-    next if( $prop =~ /Text/ || $prop =~ /Bubble/ );
-  }
-
-  if( /xml:lang/ ) {
-    $lang = $_;
-    $lang =~ s/.*xml:lang=\"//;
-    $lang =~ s/\".*//;
-    chomp $lang;
-    $line = $prop;
-    $line =~ s/\" oor:type/_$lang\" oor:type/;
-    print $line;
-    $line = $_;
-    $line =~ s/ xml:lang=\".*\"//;
-    print $line;
-    $line = $prop;
-    $line =~ s/<prop.*/<\/prop>/;
-    print $line;
-    next;
-  }
-
-  print;
-}
-\ No newline at end of file
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index ee04697d3296..9d8c7b92a286 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -85,6 +85,7 @@ namespace uno = com::sun::star::uno ;
 #define PROPERTY_DEFAULT_TEXT   UNISTRING("DefaultText")
 #define PROPERTY_SHOW_MENUICON  UNISTRING("MenuIconVisible")
 
+extern "C" bool SAL_CALL WNT_hasInternetConnection();
 //------------------------------------------------------------------------------
 
 // Returns the URL of the release note for the given position
@@ -267,9 +268,11 @@ private:
     /* Used to avoid dialup login windows (on platforms we know how to double this) */
     inline bool hasInternetConnection() const
     {
-        if(m_pHasInternetConnection != NULL )
-            return (sal_True == m_pHasInternetConnection());
+#ifdef WNT
+        return WNT_hasInternetConnection();
+#else
         return true;
+#endif
     }
 
     /* Creates a new instance of UpdateInformationProvider and returns this instance */
@@ -295,10 +298,6 @@ protected:
     osl::Condition& m_aCondition;
 
 private:
-
-//    const
-    OnlineCheckFunc m_pHasInternetConnection;
-
     const uno::Reference<uno::XComponentContext> m_xContext;
     uno::Reference<deployment::XUpdateInformationProvider> m_xProvider;
 };
@@ -373,30 +372,8 @@ private:
 UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
                                       const uno::Reference<uno::XComponentContext>& xContext ) :
     m_aCondition(rCondition),
-    m_pHasInternetConnection(NULL),
     m_xContext(xContext)
 {
-
-#ifdef WNT
-    rtl::OUString aPath;
-    if( osl_getExecutableFile(&aPath.pData) == osl_Process_E_None )
-    {
-        sal_uInt32 lastIndex = aPath.lastIndexOf('/');
-        if ( lastIndex > 0 )
-        {
-            aPath = aPath.copy( 0, lastIndex+1 );
-            aPath  += UNISTRING( "onlinecheck" );
-        }
-
-        if ( m_aModule.load(aPath) )
-        {
-            m_pHasInternetConnection =
-                reinterpret_cast < OnlineCheckFunc > (
-                    m_aModule.getFunctionSymbol( UNISTRING("hasInternetConnection")));
-        }
-    }
-#endif
-
     createSuspended();
 
     // actually run the thread
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index 0f0768919877..d6db5e8e8978 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -58,7 +58,7 @@ public:
     virtual void SAL_CALL cancel() = 0;
 };
 
-class UpdateCheck :
+class SAL_DLLPUBLIC_EXPORT UpdateCheck :
     public UpdateCheckConfigListener,
     public IActionListener,
     public DownloadInteractionHandler,
@@ -107,35 +107,35 @@ public:
     bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 0); }
 
     // DownloadInteractionHandler
-    virtual bool downloadTargetExists(const rtl::OUString& rFileName);
-    virtual void downloadStalled(const rtl::OUString& rErrorMessage);
-    virtual void downloadProgressAt(sal_Int8 nProcent);
-    virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize);
-    virtual void downloadFinished(const rtl::OUString& rLocalFileName);
+    SAL_DLLPUBLIC_EXPORT virtual bool downloadTargetExists(const rtl::OUString& rFileName);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadStalled(const rtl::OUString& rErrorMessage);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadProgressAt(sal_Int8 nProcent);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadFinished(const rtl::OUString& rLocalFileName);
     // checks if the download target already exists and asks user what to do next
-    virtual bool checkDownloadDestination( const rtl::OUString& rFile );
+    SAL_DLLPUBLIC_EXPORT virtual bool checkDownloadDestination( const rtl::OUString& rFile );
 
     // Cancels the download action (and resumes checking if enabled)
     void cancelDownload();
 
     // Returns the XInteractionHandler of the UpdateHandler instance if present (and visible)
-    com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
+    SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
 
     // UpdateCheckConfigListener
-    virtual void autoCheckStatusChanged(bool enabled);
-    virtual void autoCheckIntervalChanged();
+    SAL_DLLPUBLIC_EXPORT virtual void autoCheckStatusChanged(bool enabled);
+    SAL_DLLPUBLIC_EXPORT virtual void autoCheckIntervalChanged();
 
     // IActionListener
-    void cancel();
-    void download();
-    void install();
-    void pause();
-    void resume();
-    void closeAfterFailure();
+    SAL_DLLPUBLIC_EXPORT void cancel();
+    SAL_DLLPUBLIC_EXPORT void download();
+    SAL_DLLPUBLIC_EXPORT void install();
+    SAL_DLLPUBLIC_EXPORT void pause();
+    SAL_DLLPUBLIC_EXPORT void resume();
+    SAL_DLLPUBLIC_EXPORT void closeAfterFailure();
 
     // rtl::IReference
-    virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
-    virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
+    SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
+    SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
 
 private:
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index 510f8f968fd6..605ab84c130a 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -42,7 +42,7 @@ bool checkForUpdates(
 );
 
 // The same as above, that does not read the info from bootstrap
-bool
+SAL_DLLPUBLIC_EXPORT bool
 checkForUpdates(
     UpdateInfo& o_rUpdateInfo,
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
deleted file mode 100644
index 6361f20bdd73..000000000000
--- a/extensions/source/update/feed/makefile.mk
+++ /dev/null
@@ -1,72 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=updatefeed
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# no "lib" prefix
-DLLPRE =
-
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/updatefeed.obj \
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno
-SHL1OBJS=$(SLOFILES)
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/updatefeed.component
-
-$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updatefeed.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updatefeed.component
diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk
deleted file mode 100644
index 5ea6994d3d22..000000000000
--- a/extensions/source/update/ui/makefile.mk
+++ /dev/null
@@ -1,82 +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.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-PRJNAME=extensions
-TARGET=updchkui
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/updatecheckui.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    updatecheckui.src
-
-RESLIB1NAME=updchk
-RESLIB1IMAGES=$(PRJ)$/source$/update$/ui
-RESLIB1SRSFILES= $(SRS)$/updchkui.srs
-RESLIB1DEPN= updatecheckui.src updatecheckui.hrc
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=updchk$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB) \
-        $(VCLLIB) \
-        $(TOOLSLIB)
-        
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/updchk.component
-
-$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updchk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updchk.component
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
deleted file mode 100644
index fa54df738b58..000000000000
--- a/extensions/source/xmlextract/makefile.mk
+++ /dev/null
@@ -1,73 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=extensions
-TARGET=xmx
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/xmxuno.obj									\
-            $(SLO)$/xmxtrct.obj
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=	i$(SHL1TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS=\
-        $(SOTLIB)                       \
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/xmx.component
-
-$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xmx.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xmx.component
diff --git a/extensions/stardiv/fontest/fontest.idl b/extensions/stardiv/fontest/fontest.idl
deleted file mode 100644
index c000a5f0470b..000000000000
--- a/extensions/stardiv/fontest/fontest.idl
+++ /dev/null
@@ -1,111 +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.
- *
- ************************************************************************/
-#ifndef _EXTENSIONS_FONTEST_IDL
-#define _EXTENSIONS_FONTEST_IDL
-
-
-#include <uno/intrface.idl>
-#include <stardiv/uno/beans/propset.idl>
-#include <stardiv/uno/lang/ulexcp.idl>
-
-module stardiv
-{
-
-    module extensions
-    {
-
-        module fontest
-        {
-
-/** a flag called "surpressed" changes the action of check and checkWithDialog
- @author      Berndt Reinhold
- @see         stardiv::uno::XInterface
- */
-            [ uik(BF6D5A72-B53B-11d2-A17B00A0-243D2A0B), ident("FonTest", 1.0) ]
-            interface XFonTest: stardiv::uno::XInterface
-            {
-                /** Checks if "StarMath" and "StarBats" fonts are installed.
-                 <P>
-                 @param bForce: If TRUE check the fonts even if surpressed.
-                 Otherwise check the fonts only if not surpressed.
-                 @see resetSurpressed
-                 @returns TRUE if the fonts are available. Also TRUE if surpressed
-                 is TRUE and bForce is FALSE. Otherwise return FALSE.
-                 </P>
-                 */
-                boolean check([in] boolean bForce);
-
-                /** Same as check but additional shows a dialog if result is FALSE.
-                 <P>
-                 @param bForce: same as in check
-                 @see check
-                 @see resetSurpressed
-                 </P>
-                 */
-                boolean checkWithDialog([in] boolean bForce);
-
-                /** Shows a dialog if the font "StarBats" or "StarMath" is missing.
-                 <P>
-                 The dialog shows which font(s) is/are missing and have a checkbox,
-                 that represents the state of the flag surpressed. This dialog is
-                 the only way to set the flag surpressed to TRUE. This method is
-                 not affected by the value of the flag surpressed.
-                 @see resetSurpressed
-                 </P>
-                 */
-                boolean executeDialog();
-
-                /** Set flag surpressed to FALSE
-                 <P>
-                 The flag surpressed is stored in the registry. If surpressed is
-                 FALSE the methods check and checkWithDialog ignores the parameter
-                 bForce. if surpressed is TRUE check and checkWithDialog only
-                 perform any action if their parameter bForce is TRUE. otherwise
-                 they simply return TRUE.
-                 </P>
-                 */
-                void resetSurpressed();
-            };
-
-/*-------------- services -------------------------------------------
- This service is the implementation of the interface XFonTest.
- @version 1.0
- @author Berndt Reinhold
- */
-
-          service FonTestService
-          {
-              interface XFonTest;
-          };
-
-//-------------------------------------------------------------------
-
-        }; // fontest
-    }; // extensions
-}; // stardiv
-
-#endif
diff --git a/extensions/stardiv/fontest/makefile.mk b/extensions/stardiv/fontest/makefile.mk
deleted file mode 100644
index 3ea8d98cfc87..000000000000
--- a/extensions/stardiv/fontest/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.
-#
-#*************************************************************************
-
-prjpch=
-
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=fontestidl
-IDLMAP=stardiv$/usrmap.idl
-PACKAGE=stardiv$/fontest
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-IDLFILES=       fontest.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/extensions/stardiv/oinstchk/makefile.mk b/extensions/stardiv/oinstchk/makefile.mk
deleted file mode 100644
index ea496166956c..000000000000
--- a/extensions/stardiv/oinstchk/makefile.mk
+++ /dev/null
@@ -1,47 +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.
-#
-#*************************************************************************
-
-prjpch=
-
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=oinstchkidl
-IDLMAP=stardiv$/usrmap.idl
-PACKAGE=stardiv$/oinstchk
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# ------------------------------------------------------------------
-IDLFILES=       oinstchk.idl
-
-# ------------------------------------------------------------------
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/extensions/stardiv/oinstchk/oinstchk.idl b/extensions/stardiv/oinstchk/oinstchk.idl
deleted file mode 100644
index 04b3fbcd8a67..000000000000
--- a/extensions/stardiv/oinstchk/oinstchk.idl
+++ /dev/null
@@ -1,108 +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.
- *
- ************************************************************************/
-#ifndef _INSTALLATION_OINSTCHK_IDL
-#define _INSTALLATION_OINSTCHK_IDL
-
-
-#include <uno/intrface.idl>
-#include <stardiv/uno/beans/propset.idl>
-#include <stardiv/uno/lang/ulexcp.idl>
-
-module stardiv
-{
-
-    module installation
-    {
-
-/** a flag called "surpressed" changes the action of check and checkWithDialog
- @author      Berndt Reinhold
- @see         stardiv::uno::XInterface
- */
-
-        [ uik(BF6D5A72-B53B-11d2-A17B00A0-243D2A0B), ident("OInstChk", 1.0) ]
-        interface XOInstChk: stardiv::uno::XInterface
-        {
-            /** Checks if "StarMath" and "StarBats" fonts are installed.
-             <P>
-             @param bForce: If TRUE check the fonts even if surpressed.
-             Otherwise check the fonts only if not surpressed.
-             @see resetSurpressed
-             @returns TRUE if the fonts are available. Also TRUE if surpressed
-             is TRUE and bForce is FALSE. Otherwise return FALSE.
-             </P>
-             */
-            boolean check([in] boolean bForce);
-
-            /** Same as check but additional shows a dialog if result is FALSE.
-             <P>
-             @param bForce: same as in check
-             @see check
-             @see resetSurpressed
-             </P>
-             */
-            boolean checkWithDialog([in] boolean bForce);
-
-            /** Shows a dialog if the font "StarBats" or "StarMath" is missing.
-             <P>
-             The dialog shows which font(s) is/are missing and have a checkbox,
-             that represents the state of the flag surpressed. This dialog is
-             the only way to set the flag surpressed to TRUE. This method is
-             not affected by the value of the flag surpressed.
-             @see resetSurpressed
-             </P>
-             */
-            boolean executeDialog();
-
-            /** Set flag surpressed to FALSE
-             <P>
-             The flag surpressed is stored in the registry. If surpressed is
-             FALSE the methods check and checkWithDialog ignores the parameter
-             bForce. if surpressed is TRUE check and checkWithDialog only
-             perform any action if their parameter bForce is TRUE. otherwise
-             they simply return TRUE.
-             </P>
-             */
-            void resetSurpressed();
-        };
-
-/*-------------- services -------------------------------------------
- This service is the implementation of the interface XOInstChk.
- @version 1.0
- @author Berndt Reinhold
- */
-
-        service OInstChkService
-        {
-            interface XOInstChk;
-        };
-
-//-------------------------------------------------------------------
-
-    }; // installation
-}; // stardiv
-
-#endif
diff --git a/extensions/stardiv/pgp/makefile.mk b/extensions/stardiv/pgp/makefile.mk
deleted file mode 100644
index dbce7d52b388..000000000000
--- a/extensions/stardiv/pgp/makefile.mk
+++ /dev/null
@@ -1,53 +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.
-#
-#*************************************************************************
-
-prjpch=
-
-PRJ=..$/..
-
-PRJNAME=extensions
-TARGET=pgpidl
-IDLMAP=stardiv$/usrmap.idl
-PACKAGE=stardiv$/extensions$/pgp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-#javauno=
-
-# --- Files --------------------------------------------------------
-
-JARFILES+=  usr.jar
-IDLFILES= 	pgp.idl		
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
deleted file mode 100644
index cfe1db5de2a0..000000000000
--- a/extensions/util/hidother.src
+++ /dev/null
@@ -1,428 +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.
- *
- ************************************************************************/
-
-#include "../inc/abpilot.hrc"
-#include "../inc/bibliography.hrc"
-#include "../inc/dbpilots.hrc"
-#include "../inc/propctrlr.hrc"
-#include "../inc/update.hrc"
-
-hidspecial HID_ABSPILOT                         { HelpId = HID_ABSPILOT; }
-hidspecial HID_ABSPILOT_CANCEL                  { HelpId = HID_ABSPILOT_CANCEL; }
-hidspecial HID_ABSPILOT_FINISH                  { HelpId = HID_ABSPILOT_FINISH; }
-hidspecial HID_ABSPILOT_NEXT                    { HelpId = HID_ABSPILOT_NEXT; }
-hidspecial HID_ABSPILOT_PREVIOUS                { HelpId = HID_ABSPILOT_PREVIOUS; }
-
-hidspecial HID_BIB_ADDRESS_POS                  { HelpId = HID_BIB_ADDRESS_POS; }
-hidspecial HID_BIB_ANNOTE_POS                   { HelpId = HID_BIB_ANNOTE_POS; }
-hidspecial HID_BIB_AUTHORITYTYPE_POS            { HelpId = HID_BIB_AUTHORITYTYPE_POS; }
-hidspecial HID_BIB_AUTHOR_POS                   { HelpId = HID_BIB_AUTHOR_POS; }
-hidspecial HID_BIB_BOOKTITLE_POS                { HelpId = HID_BIB_BOOKTITLE_POS; }
-hidspecial HID_BIB_CHANGESOURCE                 { HelpId = HID_BIB_CHANGESOURCE; }
-hidspecial HID_BIB_CHAPTER_POS                  { HelpId = HID_BIB_CHAPTER_POS; }
-hidspecial HID_BIB_CONTROL_PAGE                 { HelpId = HID_BIB_CONTROL_PAGE; }
-hidspecial HID_BIB_CONTROL_PARENT               { HelpId = HID_BIB_CONTROL_PARENT; }
-hidspecial HID_BIB_CUSTOM1_POS                  { HelpId = HID_BIB_CUSTOM1_POS; }
-hidspecial HID_BIB_CUSTOM2_POS                  { HelpId = HID_BIB_CUSTOM2_POS; }
-hidspecial HID_BIB_CUSTOM3_POS                  { HelpId = HID_BIB_CUSTOM3_POS; }
-hidspecial HID_BIB_CUSTOM4_POS                  { HelpId = HID_BIB_CUSTOM4_POS; }
-hidspecial HID_BIB_CUSTOM5_POS                  { HelpId = HID_BIB_CUSTOM5_POS; }
-hidspecial HID_BIB_DB_GRIDCTRL                  { HelpId = HID_BIB_DB_GRIDCTRL; }
-hidspecial HID_BIB_DB_TBX                       { HelpId = HID_BIB_DB_TBX; }
-hidspecial HID_BIB_DELETE_RECORD                { HelpId = HID_BIB_DELETE_RECORD; }
-hidspecial HID_BIB_EDITION_POS                  { HelpId = HID_BIB_EDITION_POS; }
-hidspecial HID_BIB_EDITOR_POS                   { HelpId = HID_BIB_EDITOR_POS; }
-hidspecial HID_BIB_HOWPUBLISHED_POS             { HelpId = HID_BIB_HOWPUBLISHED_POS; }
-hidspecial HID_BIB_IDENTIFIER_POS               { HelpId = HID_BIB_IDENTIFIER_POS; }
-hidspecial HID_BIB_INSERT_RECORD                { HelpId = HID_BIB_INSERT_RECORD; }
-hidspecial HID_BIB_INSTITUTION_POS              { HelpId = HID_BIB_INSTITUTION_POS; }
-hidspecial HID_BIB_ISBN_POS                     { HelpId = HID_BIB_ISBN_POS; }
-hidspecial HID_BIB_JOURNAL_POS                  { HelpId = HID_BIB_JOURNAL_POS; }
-hidspecial HID_BIB_MAPPINGDLG                   { HelpId = HID_BIB_MAPPINGDLG; }
-hidspecial HID_BIB_MONTH_POS                    { HelpId = HID_BIB_MONTH_POS; }
-hidspecial HID_BIB_NOTE_POS                     { HelpId = HID_BIB_NOTE_POS; }
-hidspecial HID_BIB_NUMBER_POS                   { HelpId = HID_BIB_NUMBER_POS; }
-hidspecial HID_BIB_ORGANIZATIONS_POS            { HelpId = HID_BIB_ORGANIZATIONS_POS; }
-hidspecial HID_BIB_PAGES_POS                    { HelpId = HID_BIB_PAGES_POS; }
-hidspecial HID_BIB_PUBLISHER_POS                { HelpId = HID_BIB_PUBLISHER_POS; }
-hidspecial HID_BIB_REPORTTYPE_POS               { HelpId = HID_BIB_REPORTTYPE_POS; }
-hidspecial HID_BIB_SCHOOL_POS                   { HelpId = HID_BIB_SCHOOL_POS; }
-hidspecial HID_BIB_SERIES_POS                   { HelpId = HID_BIB_SERIES_POS; }
-hidspecial HID_BIB_TBX_AUTOFILTER               { HelpId = HID_BIB_TBX_AUTOFILTER; }
-hidspecial HID_BIB_TBX_SEARCH                   { HelpId = HID_BIB_TBX_SEARCH; }
-hidspecial HID_BIB_TBX_TABLE                    { HelpId = HID_BIB_TBX_TABLE; }
-hidspecial HID_BIB_TITLE_POS                    { HelpId = HID_BIB_TITLE_POS; }
-hidspecial HID_BIB_URL_POS                      { HelpId = HID_BIB_URL_POS; }
-hidspecial HID_BIB_VOLUME_POS                   { HelpId = HID_BIB_VOLUME_POS; }
-hidspecial HID_BIB_YEAR_POS                     { HelpId = HID_BIB_YEAR_POS; }
-
-hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
-hidspecial HID_CHECK_FOR_UPD_CLOSE              { HelpId = HID_CHECK_FOR_UPD_CLOSE; }
-hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
-hidspecial HID_CHECK_FOR_UPD_DLG                { HelpId = HID_CHECK_FOR_UPD_DLG; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD           { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD2          { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD2; }
-hidspecial HID_CHECK_FOR_UPD_INSTALL            { HelpId = HID_CHECK_FOR_UPD_INSTALL; }
-hidspecial HID_CHECK_FOR_UPD_PAUSE              { HelpId = HID_CHECK_FOR_UPD_PAUSE; }
-hidspecial HID_CHECK_FOR_UPD_RESUME             { HelpId = HID_CHECK_FOR_UPD_RESUME; }
-hidspecial HID_CHECK_FOR_UPD_STATUS             { HelpId = HID_CHECK_FOR_UPD_STATUS; }
-
-hidspecial HID_DLG_DBCHANGE                     { HelpId = HID_DLG_DBCHANGE; }
-hidspecial HID_DLG_MAPPING                      { HelpId = HID_DLG_MAPPING; }
-
-hidspecial HID_EVT_ACTIONPERFORMED              { HelpId = HID_EVT_ACTIONPERFORMED; }
-hidspecial HID_EVT_ADJUSTMENTVALUECHANGED       { HelpId = HID_EVT_ADJUSTMENTVALUECHANGED; }
-hidspecial HID_EVT_AFTERUPDATE                  { HelpId = HID_EVT_AFTERUPDATE; }
-hidspecial HID_EVT_APPROVEACTIONPERFORMED       { HelpId = HID_EVT_APPROVEACTIONPERFORMED; }
-hidspecial HID_EVT_APPROVEPARAMETER             { HelpId = HID_EVT_APPROVEPARAMETER; }
-hidspecial HID_EVT_APPROVERESETTED              { HelpId = HID_EVT_APPROVERESETTED; }
-hidspecial HID_EVT_APPROVEROWCHANGE             { HelpId = HID_EVT_APPROVEROWCHANGE; }
-hidspecial HID_EVT_BEFOREUPDATE                 { HelpId = HID_EVT_BEFOREUPDATE; }
-hidspecial HID_EVT_CHANGED                      { HelpId = HID_EVT_CHANGED; }
-hidspecial HID_EVT_CONFIRMDELETE                { HelpId = HID_EVT_CONFIRMDELETE; }
-hidspecial HID_EVT_ERROROCCURRED                 { HelpId = HID_EVT_ERROROCCURRED; }
-hidspecial HID_EVT_FOCUSGAINED                  { HelpId = HID_EVT_FOCUSGAINED; }
-hidspecial HID_EVT_FOCUSLOST                    { HelpId = HID_EVT_FOCUSLOST; }
-hidspecial HID_EVT_ITEMSTATECHANGED             { HelpId = HID_EVT_ITEMSTATECHANGED; }
-hidspecial HID_EVT_KEYTYPED                     { HelpId = HID_EVT_KEYTYPED; }
-hidspecial HID_EVT_KEYUP                        { HelpId = HID_EVT_KEYUP; }
-hidspecial HID_EVT_LOADED                       { HelpId = HID_EVT_LOADED; }
-hidspecial HID_EVT_MOUSEDRAGGED                 { HelpId = HID_EVT_MOUSEDRAGGED; }
-hidspecial HID_EVT_MOUSEENTERED                 { HelpId = HID_EVT_MOUSEENTERED; }
-hidspecial HID_EVT_MOUSEEXITED                  { HelpId = HID_EVT_MOUSEEXITED; }
-hidspecial HID_EVT_MOUSEMOVED                   { HelpId = HID_EVT_MOUSEMOVED; }
-hidspecial HID_EVT_MOUSEPRESSED                 { HelpId = HID_EVT_MOUSEPRESSED; }
-hidspecial HID_EVT_MOUSERELEASED                { HelpId = HID_EVT_MOUSERELEASED; }
-hidspecial HID_EVT_POSITIONED                   { HelpId = HID_EVT_POSITIONED; }
-hidspecial HID_EVT_POSITIONING                  { HelpId = HID_EVT_POSITIONING; }
-hidspecial HID_EVT_RELOADED                     { HelpId = HID_EVT_RELOADED; }
-hidspecial HID_EVT_RELOADING                    { HelpId = HID_EVT_RELOADING; }
-hidspecial HID_EVT_RESETTED                     { HelpId = HID_EVT_RESETTED; }
-hidspecial HID_EVT_ROWCHANGE                    { HelpId = HID_EVT_ROWCHANGE; }
-hidspecial HID_EVT_SUBMITTED                    { HelpId = HID_EVT_SUBMITTED; }
-hidspecial HID_EVT_TEXTCHANGED                  { HelpId = HID_EVT_TEXTCHANGED; }
-hidspecial HID_EVT_UNLOADED                     { HelpId = HID_EVT_UNLOADED; }
-hidspecial HID_EVT_UNLOADING                    { HelpId = HID_EVT_UNLOADING; }
-
-hidspecial HID_FIELDLINK_DETAIL_COLUMN          { HelpId = HID_FIELDLINK_DETAIL_COLUMN; }
-hidspecial HID_FIELDLINK_MASTER_COLUMN          { HelpId = HID_FIELDLINK_MASTER_COLUMN; }
-
-hidspecial HID_GRIDWIZARD_CANCEL                { HelpId = HID_GRIDWIZARD_CANCEL; }
-hidspecial HID_GRIDWIZARD_FINISH                { HelpId = HID_GRIDWIZARD_FINISH; }
-hidspecial HID_GRIDWIZARD_NEXT                  { HelpId = HID_GRIDWIZARD_NEXT; }
-hidspecial HID_GRIDWIZARD_PREVIOUS              { HelpId = HID_GRIDWIZARD_PREVIOUS; };
-hidspecial HID_GROUPWIZARD_CANCEL               { HelpId = HID_GROUPWIZARD_CANCEL; }
-hidspecial HID_GROUPWIZARD_FINISH               { HelpId = HID_GROUPWIZARD_FINISH; }
-hidspecial HID_GROUPWIZARD_NEXT                 { HelpId = HID_GROUPWIZARD_NEXT; }
-hidspecial HID_GROUPWIZARD_PREVIOUS             { HelpId = HID_GROUPWIZARD_PREVIOUS; }
-
-hidspecial HID_LISTWIZARD_CANCEL                { HelpId = HID_LISTWIZARD_CANCEL; }
-hidspecial HID_LISTWIZARD_FINISH                { HelpId = HID_LISTWIZARD_FINISH; }
-hidspecial HID_LISTWIZARD_NEXT                  { HelpId = HID_LISTWIZARD_NEXT; }
-hidspecial HID_LISTWIZARD_PREVIOUS              { HelpId = HID_LISTWIZARD_PREVIOUS; }
-
-hidspecial HID_PROP_ALIGN                       { HelpId = HID_PROP_ALIGN; }
-hidspecial HID_PROP_ALLOW_ADDITIONS             { HelpId = HID_PROP_ALLOW_ADDITIONS; }
-hidspecial HID_PROP_ALLOW_DELETIONS             { HelpId = HID_PROP_ALLOW_DELETIONS; }
-hidspecial HID_PROP_ALLOW_EDITS                 { HelpId = HID_PROP_ALLOW_EDITS; }
-hidspecial HID_PROP_ANCHOR_TYPE                 { HelpId = HID_PROP_ANCHOR_TYPE; }
-hidspecial HID_PROP_AUTOCOMPLETE                { HelpId = HID_PROP_AUTOCOMPLETE; }
-hidspecial HID_PROP_AUTOLINEBREAK               { HelpId = HID_PROP_AUTOLINEBREAK; }
-hidspecial HID_PROP_BACKGROUNDCOLOR             { HelpId = HID_PROP_BACKGROUNDCOLOR; }
-hidspecial HID_PROP_BINDING_NAME                { HelpId = HID_PROP_BINDING_NAME; }
-hidspecial HID_PROP_BIND_EXPRESSION             { HelpId = HID_PROP_BIND_EXPRESSION; }
-hidspecial HID_PROP_BLOCKINCREMENT              { HelpId = HID_PROP_BLOCKINCREMENT; }
-hidspecial HID_PROP_BORDER                      { HelpId = HID_PROP_BORDER; }
-hidspecial HID_PROP_BORDERCOLOR                 { HelpId = HID_PROP_BORDERCOLOR; }
-hidspecial HID_PROP_BOUNDCOLUMN                 { HelpId = HID_PROP_BOUNDCOLUMN; }
-hidspecial HID_PROP_BOUND_CELL                  { HelpId = HID_PROP_BOUND_CELL; }
-hidspecial HID_PROP_BUTTONTYPE                  { HelpId = HID_PROP_BUTTONTYPE; }
-hidspecial HID_PROP_CELL_EXCHANGE_TYPE          { HelpId = HID_PROP_CELL_EXCHANGE_TYPE; }
-hidspecial HID_PROP_CLASSID                     { HelpId = HID_PROP_CLASSID; }
-hidspecial HID_PROP_CONTROLLABEL                { HelpId = HID_PROP_CONTROLLABEL; }
-hidspecial HID_PROP_CONTROLSOURCE               { HelpId = HID_PROP_CONTROLSOURCE; }
-hidspecial HID_PROP_CURRENCYSYMBOL              { HelpId = HID_PROP_CURRENCYSYMBOL; }
-hidspecial HID_PROP_CURRSYM_POSITION            { HelpId = HID_PROP_CURRSYM_POSITION; }
-hidspecial HID_PROP_CURSORSOURCE                { HelpId = HID_PROP_CURSORSOURCE; }
-hidspecial HID_PROP_CURSORSOURCETYPE            { HelpId = HID_PROP_CURSORSOURCETYPE; }
-hidspecial HID_PROP_CURSORTYPE                  { HelpId = HID_PROP_CURSORTYPE; }
-hidspecial HID_PROP_CYCLE                       { HelpId = HID_PROP_CYCLE; }
-hidspecial HID_PROP_DATAENTRY                   { HelpId = HID_PROP_DATAENTRY; }
-hidspecial HID_PROP_DATASOURCE                  { HelpId = HID_PROP_DATASOURCE; }
-hidspecial HID_PROP_DATE                        { HelpId = HID_PROP_DATE; }
-hidspecial HID_PROP_DATEFORMAT                  { HelpId = HID_PROP_DATEFORMAT; }
-hidspecial HID_PROP_DATEMAX                     { HelpId = HID_PROP_DATEMAX; }
-hidspecial HID_PROP_DATEMIN                     { HelpId = HID_PROP_DATEMIN; }
-hidspecial HID_PROP_DECIMAL_ACCURACY            { HelpId = HID_PROP_DECIMAL_ACCURACY; }
-hidspecial HID_PROP_DECORATION                  { HelpId = HID_PROP_DECORATION; }
-hidspecial HID_PROP_DEFAULTVALUE                { HelpId = HID_PROP_DEFAULTVALUE; }
-hidspecial HID_PROP_DEFAULT_BUTTON              { HelpId = HID_PROP_DEFAULT_BUTTON; }
-hidspecial HID_PROP_DEFAULT_DATE                { HelpId = HID_PROP_DEFAULT_DATE; }
-hidspecial HID_PROP_DEFAULT_LONG_VALUE          { HelpId = HID_PROP_DEFAULT_LONG_VALUE; }
-hidspecial HID_PROP_DEFAULT_SCROLLVALUE         { HelpId = HID_PROP_DEFAULT_SCROLLVALUE; }
-hidspecial HID_PROP_DEFAULT_SELECT_SEQ          { HelpId = HID_PROP_DEFAULT_SELECT_SEQ; }
-hidspecial HID_PROP_DEFAULT_SPINVALUE           { HelpId = HID_PROP_DEFAULT_SPINVALUE; }
-hidspecial HID_PROP_DEFAULT_STATE               { HelpId = HID_PROP_DEFAULT_STATE; }
-hidspecial HID_PROP_DEFAULT_TIME                { HelpId = HID_PROP_DEFAULT_TIME; }
-hidspecial HID_PROP_DIRTY                       { HelpId = HID_PROP_DIRTY; }
-hidspecial HID_PROP_DROPDOWN                    { HelpId = HID_PROP_DROPDOWN; }
-hidspecial HID_PROP_ECHO_CHAR                   { HelpId = HID_PROP_ECHO_CHAR; }
-hidspecial HID_PROP_EDITABLE                    { HelpId = HID_PROP_EDITABLE; }
-hidspecial HID_PROP_EDITMASK                    { HelpId = HID_PROP_EDITMASK; }
-hidspecial HID_PROP_EFFECTIVEDEFAULT            { HelpId = HID_PROP_EFFECTIVEDEFAULT; }
-hidspecial HID_PROP_EFFECTIVEMAX                { HelpId = HID_PROP_EFFECTIVEMAX; }
-hidspecial HID_PROP_EFFECTIVEMIN                { HelpId = HID_PROP_EFFECTIVEMIN; }
-hidspecial HID_PROP_EMPTY_IS_NULL               { HelpId = HID_PROP_EMPTY_IS_NULL; }
-hidspecial HID_PROP_ENABLED                     { HelpId = HID_PROP_ENABLED; }
-hidspecial HID_PROP_ENABLE_VISIBLE              { HelpId = HID_PROP_ENABLE_VISIBLE; }
-hidspecial HID_PROP_ESCAPE_PROCESSING           { HelpId = HID_PROP_ESCAPE_PROCESSING; }
-hidspecial HID_PROP_FILLCOLOR                   { HelpId = HID_PROP_FILLCOLOR; }
-hidspecial HID_PROP_FILTER                      { HelpId = HID_PROP_FILTER; }
-hidspecial HID_PROP_FILTERPROPOSAL              { HelpId = HID_PROP_FILTERPROPOSAL; }
-hidspecial HID_PROP_FOCUSONCLICK                { HelpId = HID_PROP_FOCUSONCLICK; }
-hidspecial HID_PROP_FONT                        { HelpId = HID_PROP_FONT; }
-hidspecial HID_PROP_FORMATKEY                   { HelpId = HID_PROP_FORMATKEY; }
-hidspecial HID_PROP_GROUPBOX                    { HelpId = HID_PROP_GROUPBOX; }
-hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
-hidspecial HID_PROP_HEIGHT                      { HelpId = HID_PROP_HEIGHT; }
-hidspecial HID_PROP_HELPTEXT                    { HelpId = HID_PROP_HELPTEXT; }
-hidspecial HID_PROP_HELPURL                     { HelpId = HID_PROP_HELPURL; }
-hidspecial HID_PROP_HIDDEN_VALUE                { HelpId = HID_PROP_HIDDEN_VALUE; }
-hidspecial HID_PROP_HIDEINACTIVESELECTION       { HelpId = HID_PROP_HIDEINACTIVESELECTION; }
-hidspecial HID_PROP_HSCROLL                     { HelpId = HID_PROP_HSCROLL; }
-hidspecial HID_PROP_ICONSIZE                    { HelpId = HID_PROP_ICONSIZE; }
-hidspecial HID_PROP_IMAGEPOSITION               { HelpId = HID_PROP_IMAGEPOSITION; }
-hidspecial HID_PROP_IMAGE_URL                   { HelpId = HID_PROP_IMAGE_URL; }
-hidspecial HID_PROP_INPUT_REQUIRED              { HelpId = HID_PROP_INPUT_REQUIRED; }
-hidspecial HID_PROP_INVOKES_STOP_NOT_EDITING    { HelpId = HID_PROP_INVOKES_STOP_NOT_EDITING; }
-hidspecial HID_PROP_LABEL                       { HelpId = HID_PROP_LABEL; }
-hidspecial HID_PROP_LEFT                        { HelpId = HID_PROP_LEFT; }
-hidspecial HID_PROP_LINECOLOR                   { HelpId = HID_PROP_LINECOLOR; }
-hidspecial HID_PROP_LINECOUNT                   { HelpId = HID_PROP_LINECOUNT; }
-hidspecial HID_PROP_LINEEND_FORMAT              { HelpId = HID_PROP_LINEEND_FORMAT; }
-hidspecial HID_PROP_LINEINCREMENT               { HelpId = HID_PROP_LINEINCREMENT; }
-hidspecial HID_PROP_LISTINDEX                   { HelpId = HID_PROP_LISTINDEX; }
-hidspecial HID_PROP_LISTSOURCE                  { HelpId = HID_PROP_LISTSOURCE; }
-hidspecial HID_PROP_LISTSOURCETYPE              { HelpId = HID_PROP_LISTSOURCETYPE; }
-hidspecial HID_PROP_LIST_BINDING                { HelpId = HID_PROP_LIST_BINDING; }
-hidspecial HID_PROP_LIST_CELL_RANGE             { HelpId = HID_PROP_LIST_CELL_RANGE; }
-hidspecial HID_PROP_LITERALMASK                 { HelpId = HID_PROP_LITERALMASK; }
-hidspecial HID_PROP_LOCKED                      { HelpId = HID_PROP_LOCKED; }
-hidspecial HID_PROP_MASTERFIELDS                { HelpId = HID_PROP_MASTERFIELDS; }
-hidspecial HID_PROP_MAXTEXTLEN                  { HelpId = HID_PROP_MAXTEXTLEN; }
-hidspecial HID_PROP_MULTILINE                   { HelpId = HID_PROP_MULTILINE; }
-hidspecial HID_PROP_MULTISELECTION              { HelpId = HID_PROP_MULTISELECTION; }
-hidspecial HID_PROP_NAME                        { HelpId = HID_PROP_NAME; }
-hidspecial HID_PROP_NAVIGATION                  { HelpId = HID_PROP_NAVIGATION; }
-hidspecial HID_PROP_NAVIGATIONBAR               { HelpId = HID_PROP_NAVIGATIONBAR; }
-hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
-hidspecial HID_PROP_OLDVALUE                    { HelpId = HID_PROP_OLDVALUE; }
-hidspecial HID_PROP_ORIENTATION                 { HelpId = HID_PROP_ORIENTATION; }
-hidspecial HID_PROP_POSITIONX                   { HelpId = HID_PROP_POSITIONX; }
-hidspecial HID_PROP_POSITIONY                   { HelpId = HID_PROP_POSITIONY; }
-hidspecial HID_PROP_PRINTABLE                   { HelpId = HID_PROP_PRINTABLE; }
-hidspecial HID_PROP_PROGRESSVALUE               { HelpId = HID_PROP_PROGRESSVALUE; }
-hidspecial HID_PROP_PROGRESSVALUE_MAX           { HelpId = HID_PROP_PROGRESSVALUE_MAX; }
-hidspecial HID_PROP_PROGRESSVALUE_MIN           { HelpId = HID_PROP_PROGRESSVALUE_MIN; }
-hidspecial HID_PROP_PUSHBUTTONTYPE              { HelpId = HID_PROP_PUSHBUTTONTYPE; }
-hidspecial HID_PROP_READONLY                    { HelpId = HID_PROP_READONLY; }
-hidspecial HID_PROP_RECORDMARKER                { HelpId = HID_PROP_RECORDMARKER; }
-hidspecial HID_PROP_REFVALUE                    { HelpId = HID_PROP_REFVALUE; }
-hidspecial HID_PROP_REPEAT                      { HelpId = HID_PROP_REPEAT; }
-hidspecial HID_PROP_REPEAT_DELAY                { HelpId = HID_PROP_REPEAT_DELAY; }
-hidspecial HID_PROP_REQUIRED                    { HelpId = HID_PROP_REQUIRED; }
-hidspecial HID_PROP_RIGHT                       { HelpId = HID_PROP_RIGHT; }
-hidspecial HID_PROP_ROOT_DISPLAYED              { HelpId = HID_PROP_ROOT_DISPLAYED; }
-hidspecial HID_PROP_ROWHEIGHT                   { HelpId = HID_PROP_ROWHEIGHT; }
-hidspecial HID_PROP_ROW_HEIGHT                  { HelpId = HID_PROP_ROW_HEIGHT; }
-hidspecial HID_PROP_SCALEIMAGE                  { HelpId = HID_PROP_SCALEIMAGE; }
-hidspecial HID_PROP_SCROLLVALUE                 { HelpId = HID_PROP_SCROLLVALUE; }
-hidspecial HID_PROP_SCROLLVALUEMIN              { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_SCROLLVALUE_MAX             { HelpId = HID_PROP_SCROLLVALUE_MAX; }
-hidspecial HID_PROP_SCROLLVALUE_MIN             { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_SEARCHING                   { HelpId = HID_PROP_SEARCHING; }
-hidspecial HID_PROP_SELECTEDITEMS               { HelpId = HID_PROP_SELECTEDITEMS; }
-hidspecial HID_PROP_SELECTION_TYPE              { HelpId = HID_PROP_SELECTION_TYPE; }
-hidspecial HID_PROP_SHOWS_HANDLES               { HelpId = HID_PROP_SHOWS_HANDLES; }
-hidspecial HID_PROP_SHOWS_ROOT_HANDLES          { HelpId = HID_PROP_SHOWS_ROOT_HANDLES; }
-hidspecial HID_PROP_SHOWTHOUSANDSEP             { HelpId = HID_PROP_SHOWTHOUSANDSEP; }
-hidspecial HID_PROP_SHOW_FILTERSORT             { HelpId = HID_PROP_SHOW_FILTERSORT; }
-hidspecial HID_PROP_SHOW_NAVIGATION             { HelpId = HID_PROP_SHOW_NAVIGATION; }
-hidspecial HID_PROP_SHOW_POSITION               { HelpId = HID_PROP_SHOW_POSITION; }
-hidspecial HID_PROP_SHOW_RECORDACTIONS          { HelpId = HID_PROP_SHOW_RECORDACTIONS; }
-hidspecial HID_PROP_SHOW_SCROLLBARS             { HelpId = HID_PROP_SHOW_SCROLLBARS; }
-hidspecial HID_PROP_SLAVEFIELDS                 { HelpId = HID_PROP_SLAVEFIELDS; }
-hidspecial HID_PROP_SORT_CRITERIA               { HelpId = HID_PROP_SORT_CRITERIA; }
-hidspecial HID_PROP_SPIN                        { HelpId = HID_PROP_SPIN; }
-hidspecial HID_PROP_SPININCREMENT               { HelpId = HID_PROP_SPININCREMENT; }
-hidspecial HID_PROP_SPINVALUE                   { HelpId = HID_PROP_SPINVALUE; }
-hidspecial HID_PROP_SPINVALUE_MAX               { HelpId = HID_PROP_SPINVALUE_MAX; }
-hidspecial HID_PROP_SPINVALUE_MIN               { HelpId = HID_PROP_SPINVALUE_MIN; }
-hidspecial HID_PROP_STATE                       { HelpId = HID_PROP_STATE; }
-hidspecial HID_PROP_STEP                        { HelpId = HID_PROP_STEP; }
-hidspecial HID_PROP_STRICTFORMAT                { HelpId = HID_PROP_STRICTFORMAT; }
-hidspecial HID_PROP_STRINGITEMLIST              { HelpId = HID_PROP_STRINGITEMLIST; }
-hidspecial HID_PROP_SUBMISSION_ID               { HelpId = HID_PROP_SUBMISSION_ID; }
-hidspecial HID_PROP_SUBMIT_ACTION               { HelpId = HID_PROP_SUBMIT_ACTION; }
-hidspecial HID_PROP_SUBMIT_ENCODING             { HelpId = HID_PROP_SUBMIT_ENCODING; }
-hidspecial HID_PROP_SUBMIT_METHOD               { HelpId = HID_PROP_SUBMIT_METHOD; }
-hidspecial HID_PROP_SUBMIT_TARGET               { HelpId = HID_PROP_SUBMIT_TARGET; }
-hidspecial HID_PROP_SYMBOLCOLOR                 { HelpId = HID_PROP_SYMBOLCOLOR; }
-hidspecial HID_PROP_TABINDEX                    { HelpId = HID_PROP_TABINDEX; }
-hidspecial HID_PROP_TABORDER_CONTROLS           { HelpId = HID_PROP_TABORDER_CONTROLS; }
-hidspecial HID_PROP_TABSTOP                     { HelpId = HID_PROP_TABSTOP; }
-hidspecial HID_PROP_TAG                         { HelpId = HID_PROP_TAG; }
-hidspecial HID_PROP_TARGET_FRAME                { HelpId = HID_PROP_TARGET_FRAME; }
-hidspecial HID_PROP_TARGET_URL                  { HelpId = HID_PROP_TARGET_URL; }
-hidspecial HID_PROP_TEXT                        { HelpId = HID_PROP_TEXT; }
-hidspecial HID_PROP_TEXTTYPE                    { HelpId = HID_PROP_TEXTTYPE; }
-hidspecial HID_PROP_TIME                        { HelpId = HID_PROP_TIME; }
-hidspecial HID_PROP_TIMEFORMAT                  { HelpId = HID_PROP_TIMEFORMAT; }
-hidspecial HID_PROP_TIMEMAX                     { HelpId = HID_PROP_TIMEMAX; }
-hidspecial HID_PROP_TIMEMIN                     { HelpId = HID_PROP_TIMEMIN; }
-hidspecial HID_PROP_TITLE                       { HelpId = HID_PROP_TITLE; }
-hidspecial HID_PROP_TOGGLE                      { HelpId = HID_PROP_TOGGLE; }
-hidspecial HID_PROP_TRISTATE                    { HelpId = HID_PROP_TRISTATE; }
-hidspecial HID_PROP_UNCHECKEDREFVALUE           { HelpId = HID_PROP_UNCHECKEDREFVALUE; }
-hidspecial HID_PROP_UNIQUE                      { HelpId = HID_PROP_UNIQUE; }
-hidspecial HID_PROP_VALUE                       { HelpId = HID_PROP_VALUE; }
-hidspecial HID_PROP_VALUEMAX                    { HelpId = HID_PROP_VALUEMAX; }
-hidspecial HID_PROP_VALUEMIN                    { HelpId = HID_PROP_VALUEMIN; }
-hidspecial HID_PROP_VALUESTEP                   { HelpId = HID_PROP_VALUESTEP; }
-hidspecial HID_PROP_VERTICAL_ALIGN              { HelpId = HID_PROP_VERTICAL_ALIGN; }
-hidspecial HID_PROP_VISIBLESIZE                 { HelpId = HID_PROP_VISIBLESIZE; }
-hidspecial HID_PROP_VISUALEFFECT                { HelpId = HID_PROP_VISUALEFFECT; }
-hidspecial HID_PROP_VSCROLL                     { HelpId = HID_PROP_VSCROLL; }
-hidspecial HID_PROP_WHEEL_BEHAVIOR              { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
-hidspecial HID_PROP_WIDTH                       { HelpId = HID_PROP_WIDTH; }
-hidspecial HID_PROP_WORDBREAK                   { HelpId = HID_PROP_WORDBREAK; }
-hidspecial HID_PROP_WRITING_MODE                { HelpId = HID_PROP_WRITING_MODE; }
-hidspecial HID_PROP_XML_DATA_MODEL              { HelpId = HID_PROP_XML_DATA_MODEL; }
-hidspecial HID_PROP_XSD_CALCULATION             { HelpId = HID_PROP_XSD_CALCULATION; }
-hidspecial HID_PROP_XSD_CONSTRAINT              { HelpId = HID_PROP_XSD_CONSTRAINT; }
-hidspecial HID_PROP_XSD_DATA_TYPE               { HelpId = HID_PROP_XSD_DATA_TYPE; }
-hidspecial HID_PROP_XSD_FRACTION_DIGITS         { HelpId = HID_PROP_XSD_FRACTION_DIGITS; }
-hidspecial HID_PROP_XSD_LENGTH                  { HelpId = HID_PROP_XSD_LENGTH; }
-hidspecial HID_PROP_XSD_MAX_EXCLUSIVE           { HelpId = HID_PROP_XSD_MAX_EXCLUSIVE; }
-hidspecial HID_PROP_XSD_MAX_INCLUSIVE           { HelpId = HID_PROP_XSD_MAX_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MAX_LENGTH              { HelpId = HID_PROP_XSD_MAX_LENGTH; }
-hidspecial HID_PROP_XSD_MIN_EXCLUSIVE           { HelpId = HID_PROP_XSD_MIN_EXCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_INCLUSIVE           { HelpId = HID_PROP_XSD_MIN_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_LENGTH              { HelpId = HID_PROP_XSD_MIN_LENGTH; }
-hidspecial HID_PROP_XSD_PATTERN                 { HelpId = HID_PROP_XSD_PATTERN; }
-hidspecial HID_PROP_XSD_READONLY                { HelpId = HID_PROP_XSD_READONLY; }
-hidspecial HID_PROP_XSD_RELEVANT                { HelpId = HID_PROP_XSD_RELEVANT; }
-hidspecial HID_PROP_XSD_REQUIRED                { HelpId = HID_PROP_XSD_REQUIRED; }
-hidspecial HID_PROP_XSD_TOTAL_DIGITS            { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }
-hidspecial HID_PROP_XSD_WHITESPACES             { HelpId = HID_PROP_XSD_WHITESPACES; }
-
-hidspecial HID_SELECTION_TLB                    { HelpId = HID_SELECTION_TLB; }
-
-hidspecial UID_ABSPILOT_HELP                    { HelpId = UID_ABSPILOT_HELP; }
-hidspecial UID_BIB_FRAME_WINDOW                 { HelpId = UID_BIB_FRAME_WINDOW;}
-
-hidspecial UID_BRWEVT_ACTIONPERFORMED           { HelpId = UID_BRWEVT_ACTIONPERFORMED; }
-hidspecial UID_BRWEVT_ADJUSTMENTVALUECHANGED    { HelpId = UID_BRWEVT_ADJUSTMENTVALUECHANGED; }
-hidspecial UID_BRWEVT_AFTERUPDATE               { HelpId = UID_BRWEVT_AFTERUPDATE; }
-hidspecial UID_BRWEVT_APPROVEACTIONPERFORMED    { HelpId = UID_BRWEVT_APPROVEACTIONPERFORMED; }
-hidspecial UID_BRWEVT_APPROVEPARAMETER          { HelpId = UID_BRWEVT_APPROVEPARAMETER; }
-hidspecial UID_BRWEVT_APPROVERESETTED           { HelpId = UID_BRWEVT_APPROVERESETTED; }
-hidspecial UID_BRWEVT_APPROVEROWCHANGE          { HelpId = UID_BRWEVT_APPROVEROWCHANGE; }
-hidspecial UID_BRWEVT_BEFOREUPDATE              { HelpId = UID_BRWEVT_BEFOREUPDATE; }
-hidspecial UID_BRWEVT_CHANGED                   { HelpId = UID_BRWEVT_CHANGED; }
-hidspecial UID_BRWEVT_CONFIRMDELETE             { HelpId = UID_BRWEVT_CONFIRMDELETE; }
-hidspecial UID_BRWEVT_ERROROCCURRED              { HelpId = UID_BRWEVT_ERROROCCURRED; }
-hidspecial UID_BRWEVT_FOCUSGAINED               { HelpId = UID_BRWEVT_FOCUSGAINED; }
-hidspecial UID_BRWEVT_FOCUSLOST                 { HelpId = UID_BRWEVT_FOCUSLOST; }
-hidspecial UID_BRWEVT_ITEMSTATECHANGED          { HelpId = UID_BRWEVT_ITEMSTATECHANGED; }
-hidspecial UID_BRWEVT_KEYTYPED                  { HelpId = UID_BRWEVT_KEYTYPED; }
-hidspecial UID_BRWEVT_KEYUP                     { HelpId = UID_BRWEVT_KEYUP; }
-hidspecial UID_BRWEVT_LOADED                    { HelpId = UID_BRWEVT_LOADED; }
-hidspecial UID_BRWEVT_MOUSEDRAGGED              { HelpId = UID_BRWEVT_MOUSEDRAGGED; }
-hidspecial UID_BRWEVT_MOUSEENTERED              { HelpId = UID_BRWEVT_MOUSEENTERED; }
-hidspecial UID_BRWEVT_MOUSEEXITED               { HelpId = UID_BRWEVT_MOUSEEXITED; }
-hidspecial UID_BRWEVT_MOUSEMOVED                { HelpId = UID_BRWEVT_MOUSEMOVED; }
-hidspecial UID_BRWEVT_MOUSEPRESSED              { HelpId = UID_BRWEVT_MOUSEPRESSED; }
-hidspecial UID_BRWEVT_MOUSERELEASED             { HelpId = UID_BRWEVT_MOUSERELEASED; }
-hidspecial UID_BRWEVT_POSITIONED                { HelpId = UID_BRWEVT_POSITIONED; }
-hidspecial UID_BRWEVT_POSITIONING               { HelpId = UID_BRWEVT_POSITIONING; }
-hidspecial UID_BRWEVT_RELOADED                  { HelpId = UID_BRWEVT_RELOADED; }
-hidspecial UID_BRWEVT_RELOADING                 { HelpId = UID_BRWEVT_RELOADING; }
-hidspecial UID_BRWEVT_RESETTED                  { HelpId = UID_BRWEVT_RESETTED; }
-hidspecial UID_BRWEVT_ROWCHANGE                 { HelpId = UID_BRWEVT_ROWCHANGE; }
-hidspecial UID_BRWEVT_SUBMITTED                 { HelpId = UID_BRWEVT_SUBMITTED; }
-hidspecial UID_BRWEVT_TEXTCHANGED               { HelpId = UID_BRWEVT_TEXTCHANGED; }
-hidspecial UID_BRWEVT_UNLOADED                  { HelpId = UID_BRWEVT_UNLOADED; }
-hidspecial UID_BRWEVT_UNLOADING                 { HelpId = UID_BRWEVT_UNLOADING; }
-
-hidspecial UID_EVT_MACRODLG                     { HelpId = UID_EVT_MACRODLG; }
-
-hidspecial UID_FIELDLINK_DETAIL1                { HelpId = UID_FIELDLINK_DETAIL1; }
-hidspecial UID_FIELDLINK_DETAIL2                { HelpId = UID_FIELDLINK_DETAIL2; }
-hidspecial UID_FIELDLINK_DETAIL3                { HelpId = UID_FIELDLINK_DETAIL3; }
-hidspecial UID_FIELDLINK_DETAIL4                { HelpId = UID_FIELDLINK_DETAIL4; }
-hidspecial UID_FIELDLINK_MASTER1                { HelpId = UID_FIELDLINK_MASTER1; }
-hidspecial UID_FIELDLINK_MASTER2                { HelpId = UID_FIELDLINK_MASTER2; }
-hidspecial UID_FIELDLINK_MASTER3                { HelpId = UID_FIELDLINK_MASTER3; }
-hidspecial UID_FIELDLINK_MASTER4                { HelpId = UID_FIELDLINK_MASTER4; }
-
-hidspecial UID_PROP_ADD_DATA_TYPE               { HelpId = UID_PROP_ADD_DATA_TYPE; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_BIND_EXPRESSION         { HelpId = UID_PROP_DLG_BIND_EXPRESSION; }
-hidspecial UID_PROP_DLG_BORDERCOLOR             { HelpId = UID_PROP_DLG_BORDERCOLOR; }
-hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_FILTER                  { HelpId = UID_PROP_DLG_FILTER; }
-hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_FORMLINKFIELDS          { HelpId = UID_PROP_DLG_FORMLINKFIELDS; }
-hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_ORDER                   { HelpId = UID_PROP_DLG_ORDER; }
-hidspecial UID_PROP_DLG_SELECTION               { HelpId = UID_PROP_DLG_SELECTION; }
-hidspecial UID_PROP_DLG_SQLCOMMAND              { HelpId = UID_PROP_DLG_SQLCOMMAND; }
-hidspecial UID_PROP_DLG_SYMBOLCOLOR             { HelpId = UID_PROP_DLG_SYMBOLCOLOR; }
-hidspecial UID_PROP_DLG_TABINDEX                { HelpId = UID_PROP_DLG_TABINDEX; }
-hidspecial UID_PROP_DLG_XSD_CALCULATION         { HelpId = UID_PROP_DLG_XSD_CALCULATION; }
-hidspecial UID_PROP_DLG_XSD_CONSTRAINT          { HelpId = UID_PROP_DLG_XSD_CONSTRAINT; }
-hidspecial UID_PROP_DLG_XSD_READONLY            { HelpId = UID_PROP_DLG_XSD_READONLY; }
-hidspecial UID_PROP_DLG_XSD_RELEVANT            { HelpId = UID_PROP_DLG_XSD_RELEVANT; }
-hidspecial UID_PROP_DLG_XSD_REQUIRED            { HelpId = UID_PROP_DLG_XSD_REQUIRED; }
-hidspecial UID_PROP_REMOVE_DATA_TYPE            { HelpId = UID_PROP_REMOVE_DATA_TYPE; }
-hidspecial HID_FM_PROPDLG_TABCTR                { HelpId = HID_FM_PROPDLG_TABCTR; }
-hidspecial HID_FM_PROPDLG_TAB_GENERAL           { HelpId = HID_FM_PROPDLG_TAB_GENERAL; }
-hidspecial HID_FM_PROPDLG_TAB_DATA              { HelpId = HID_FM_PROPDLG_TAB_DATA; }
-hidspecial HID_FM_PROPDLG_TAB_EVT               { HelpId = HID_FM_PROPDLG_TAB_EVT; }
diff --git a/extensions/util/makefile.mk b/extensions/util/makefile.mk
deleted file mode 100644
index af6b1ec8c600..000000000000
--- a/extensions/util/makefile.mk
+++ /dev/null
@@ -1,39 +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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=extensions
-TARGET=ext
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :	settings.mk
-
-.INCLUDE : target.mk
-
diff --git a/extensions/util/makefile.pmk b/extensions/util/makefile.pmk
deleted file mode 100644
index fde08af21c81..000000000000
--- a/extensions/util/makefile.pmk
+++ /dev/null
@@ -1,30 +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.
-#
-#*************************************************************************
-
-.INCLUDE :  settings.mk
-
-CDEFS += -DNOMINMAX
diff --git a/extensions/util/target.pmk b/extensions/util/target.pmk
deleted file mode 100644
index c7c1de9c2563..000000000000
--- a/extensions/util/target.pmk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-ALLSLO: $(SLOFILES)
-
-SOSHL: $(SHL1TARGETN)
-
-WHOLEPRJ:
-    cd $(PRJ)$/prj
-    make debug linkinc prjpch compinc
-    @echo "READY"
-
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1b1714e8ef67..20726df8ae1c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -165,28 +165,29 @@ my_components = \
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 my_components += \
-    abp \
-    bib \
     component/desktop/source/deployment/deployment \
     component/desktop/source/deployment/gui/deploymentgui \
     component/desktop/source/migration/services/migrationoo2 \
     component/desktop/source/migration/services/migrationoo3 \
     component/desktop/source/offacc/offacc \
     component/desktop/source/splash/spl \
+    component/extensions/source/abpilot/abp \
+    component/extensions/source/bibliography/bib \
+    component/extensions/source/dbpilots/dbp \
+    component/extensions/source/logging/log \
+    component/extensions/source/propctrlr/pcr \
+    component/extensions/source/resource/res \
+    component/extensions/source/scanner/scn \
+    component/extensions/source/update/check/updchk.uno \
+    component/extensions/source/update/feed/updatefeed \
+    component/extensions/source/update/ui/updchk \
+    component/extensions/source/xmlextract/xmx \
     component/fpicker/source/generic/fpicker \
     component/fpicker/source/office/fps_office \
-    dbp \
-    log \
-    pcr \
-    res \
-    scn \
     syssh \
     tvhlp1 \
     ucpchelp1 \
-    updatefeed \
-    updchk \
-    updchk.uno \
-    xmx
+
 .ENDIF
 
 .IF "$(DISABLE_PYTHON)" != "TRUE"
@@ -268,11 +269,11 @@ my_components += \
 .END
 
 .IF "$(WITH_LDAP)" == "YES"
-my_components += ldapbe2
+my_components += component/extensions/source/config/ldap/ldapbe2
 .END
 
 .IF "$(WITH_MOZILLA)" != "NO"
-my_components += pl
+my_components += component/extensions/source/plugin/pl
 .END
 
 .IF "$(ENABLE_XMLSEC)" == "YES"
@@ -321,7 +322,7 @@ my_components += \
 .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
 my_components += \
     emser \
-    oleautobridge
+    component/extensions/source/ole/oleautobridge
 .END
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 84cbfa114f59..2041bbda8ee6 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -356,8 +356,8 @@ MY_FILES_math = \
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
 MY_DEPS_onlineupdate = main
 MY_FILES_onlineupdate = \
-    $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \
-    $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu
+    $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \
+    $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu
 .ENDIF
 
 MY_DEPS_palm = main
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index d28537771dc9..47992b2ce6fc 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 55aeeb0d9e9a..71e2116fc24b 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -45,4 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
     reportdesign/source/core/resource/strings.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,reportdesign/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index c41b5b8fdee2..18674e0825bd 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -54,4 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\
 	reportdesign/source/ui/report/report.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,reportdesign/rptui) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 9fd7e79bc671..6078904eab5b 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -44,9 +44,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 /** === end UNO includes === **/
 
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
-
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <vcl/msgbox.hxx>
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 563d24f356ef..e197c661e4ac 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -34,8 +34,6 @@
 #include "ModuleHelper.hxx"
 #include "helpids.hrc"
 #include <vcl/msgbox.hxx>
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
 #include <connectivity/dbconversion.hxx>
 #include <unotools/syslocale.hxx>
 #include "UITools.hxx"
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 80d41f9207b0..75ad612b7b35 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -29,6 +29,7 @@
 #include "GroupsSorting.hrc"
 #include <connectivity/dbtools.hxx>
 #include <svtools/editbrowsebox.hxx>
+#include <svtools/imgdef.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/report/GroupOn.hpp>
@@ -40,11 +41,6 @@
 #include "rptui_slotid.hrc"
 #include "ModuleHelper.hxx"
 #include "helpids.hrc"
-
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
-#include <svtools/imgdef.hxx>
-
 #include "GroupExchange.hxx"
 #include "UITools.hxx"
 #include "UndoActions.hxx"
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index b5ecd583e0f0..78ddf3530dfa 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -40,8 +40,6 @@
 #include <com/sun/star/report/XFormattedField.hpp>
 #include <com/sun/star/report/XImageControl.hpp>
 #include <com/sun/star/report/XShape.hpp>
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
 #include "helpids.hrc"
 #include "RptResId.hrc"
 #include "rptui_slotid.hrc"
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index 7b6b077d6d07..cfc3ef7cb0b2 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -35,8 +35,6 @@
 #include "RptDef.hxx"
 #include "helpids.hrc"
 #include <vcl/msgbox.hxx>
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
 #include "UITools.hxx"
 #include "uistrings.hrc"
 #include "ReportController.hxx"
diff --git a/sal/systools/win32/onlineupdate/makefile.mk b/sal/systools/win32/onlineupdate/makefile.mk
deleted file mode 100755
index 027ddef11192..000000000000
--- a/sal/systools/win32/onlineupdate/makefile.mk
+++ /dev/null
@@ -1,78 +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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=sal
-TARGET=onlinecheck
-
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-# --- Targets ----------------------------------
-
-.IF "$(GUI)"=="WNT"
-
-.IF "$(COMEX)"=="9"
-.IF "$(PSDK_HOME)"!=""
-# Since the 02/2003 PSDK the "new" linker is needed here.
-LINK=$(WRAPCMD) "$(PSDK_HOME)$/Bin$/Win64$/LINK.EXE"
-.ENDIF
-.ENDIF
-
-SLOFILES=\
-        $(SLO)$/onlinecheck.obj
-        
-
-SHL1TARGET=$(TARGET)
-SHL1IMPLIB=$(SHL1TARGET)
-SHL1DEF=$(MISC)/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-DEF1DEPN=\
-        $(DEF1EXPORTFILE)\
-        makefile.mk
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1STDLIBS=\
-        $(KERNEL32LIB)\
-        $(LIBCMT)\
-        $(WININETLIB)
-
-        
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/sal/systools/win32/onlineupdate/onlinecheck.dxp b/sal/systools/win32/onlineupdate/onlinecheck.dxp
deleted file mode 100644
index 7d3a3cac01fd..000000000000
--- a/sal/systools/win32/onlineupdate/onlinecheck.dxp
+++ /dev/null
@@ -1,28 +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.
-;
-;*************************************************************************
-
-hasInternetConnection
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 22f3c76278e4..57228996e9e4 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -105,4 +105,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/core/src/compiler.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,sc/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 07ab650acc2b..526e6eb8c539 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -27,7 +27,7 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_LIB_FILE( gid_File_Lib_Updchk , updchk )
 
 File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 74c83f94bdd9..eecc16df0c07 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1475,7 +1475,7 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
 
-STD_LIB_FILE( gid_File_Lib_Updchkui , updchk )
+STD_LIB_FILE( gid_File_Lib_Updchkui , updatecheckui )
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index 6a23a9f8ef77..311dd9fe158c 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -68,7 +68,7 @@ STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter)
 
 #ifdef UNX
 
-STD_RES_FILE( gid_File_Res_San, san )
+STD_RES_FILE( gid_File_Res_San, scn )
 
 #endif
 
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 64f8f3cd0d0e..fd2225b4515d 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -107,4 +107,6 @@ $(eval $(call gb_SrsTarget_add_templates,sd/res,\
     sd/source/ui/app/toolbox2_tmpl.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,sd/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index b0134c02e910..0674837c1311 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -309,6 +309,11 @@ $(call gb_Configuration_get_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && touch $@)
 
+# TODO: ?
+define gb_Configuration_Configuration_nozip
+$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+endef
+
 # $(call gb_Configuration_Configuration,zipfile,repo,nodeliver)
 # cannot use target local variable for REPO because it's needed in prereq
 # last parameter may be used to turn off delivering of files
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 133496494e01..b9173ea74645 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -148,6 +148,7 @@ $(eval $(foreach method,\
 	add_asmobject \
 	add_asmobjects \
 	add_exception_objects \
+	add_x64_generated_exception_objects \
 	add_noexception_objects \
 	add_generated_cobjects \
 	add_generated_cxxobjects \
@@ -167,6 +168,7 @@ $(eval $(foreach method,\
 	set_include \
 	add_ldflags \
 	set_ldflags \
+	set_x64 \
 	add_libs \
 	set_library_path_flags \
 	add_api \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index eec7612b84bb..e4dbd469a96d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -416,6 +416,7 @@ $(call gb_LinkTarget_get_headers_target,%) : $(call gb_LinkTarget_get_external_h
 #   on clean.
 # - TARGETTYPE is the type of linktarget as some platforms need very different
 #   command to link different targettypes.
+# - LIBRARY_X64 is only relevent for building a x64 library on windows.
 #
 # Since most variables are set on the linktarget and not on the object, the
 # object learns about these setting via GNU makes scoping of target variables.
@@ -465,6 +466,7 @@ $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
+$(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
 $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
@@ -489,6 +491,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL)
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS :=
 endif
 
@@ -869,6 +872,12 @@ define gb_LinkTarget_add_exception_objects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
 endef
 
+#only useful for building x64 libraries on windows
+define gb_LinkTarget_add_x64_generated_exception_objects
+$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_exception_object,$(1),$(obj)))
+$(foreach obj,$(2),$(eval $(call gb_GenCxxObject_get_target,$(obj)) : CXXOBJECT_X64 := YES))
+endef
+
 define gb_LinkTarget_add_generated_cobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3)))
 endef
@@ -890,6 +899,11 @@ $(call gb_LinkTarget_get_target,$(1)) \
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2)
 endef
 
+define gb_LinkTarget_set_x64
+$(call gb_LinkTarget_get_target,$(1)) \
+$(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 := $(2)
+endef
+
 define gb_LinkTarget_set_dlltarget
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DLLTARGET := $(2)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 9e0109b350b8..d68157035292 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -265,10 +265,12 @@ gb_Library_PLAINLIBS_NONE += \
 	oleaut32 \
 	shell32 \
 	shlwapi \
+	urlmon \
 	user32 \
 	uuid \
 	winmm \
 	version \
+	wininet \
 	winspool \
 	ws2_32 \
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index ab8446d46481..318e0d2c580f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -69,9 +69,7 @@ gb_RCDEFS := \
 gb_RCFLAGS := \
 	 -V
 
-# FIXME: When porting to Windows64, we should use only:
-# /c /Cp
-gb_AFLAGS := /c /Cp /coff /safeseh
+gb_AFLAGS := /c /Cp
 
 gb_CFLAGS := \
 	-Gd \
@@ -201,7 +199,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-DEXCEPTIONS_OFF \
 
 gb_LinkTarget_LDFLAGS := \
-	-MACHINE:IX86 \
 	-MANIFEST \
 	$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
 
@@ -296,13 +293,14 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2).cxx,$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	$(gb_CXX) \
+	$(if $(filter YES,$(CXXOBJECT_X64)), $(CXX_X64_BINARY), $(gb_CXX)) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
 		-Fd$(PDBFILE) \
 		$(gb_COMPILERDEPFLAGS) \
 		-I$(realpath $(dir $(3))) \
 		$(INCLUDE_STL) $(INCLUDE) \
+		$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
 		-c $(realpath $(3)) \
 		-Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3)))
 endef
@@ -347,11 +345,13 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \
 		$(NATIVERES))) && \
-	$(gb_LINK) \
+	$(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
+		$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86) \
+		$(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
 		$(T_LDFLAGS) \
 		@$${RESPONSEFILE} \
 		$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
@@ -370,7 +370,6 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
     -opt:noref \
     -incremental:no \
     -debug \
-    -safeseh \
 	-nxcompat \
 	-dynamicbase \
 
@@ -417,6 +416,7 @@ gb_Library_PLAINLIBS_NONE += \
 	user32 \
 	uuid \
 	version \
+	wininet \
 	winmm \
 	winspool \
 	ws2_32 \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2c61e8fa6401..13abade7d908 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -84,7 +84,7 @@ endif
 # (see toolkit module for a case where it is necessary to do it this way)
 gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 
-gb_OBJCFLAGS := -x objective-c
+gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
 
 gb_LinkTarget_LDFLAGS := \
 	-Wl,-syslibroot,$(gb_SDKDIR) \
@@ -187,6 +187,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	DYLIB_FILE=`$(gb_MKTEMP)` && \
 	$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
@@ -194,6 +195,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(patsubst lib%.dylib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) > $${DYLIB_FILE} && \
 	$(gb_CXX) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
+		$(if $(filter Bundle,$(TARGETTYPE)),$(gb_Bundle_TARGETTYPEFLAGS)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
 		$(subst \d,$$,$(RPATH)) \
@@ -214,7 +216,7 @@ $(call gb_Helper_abbreviate_dirs,\
     $(if $(filter Executable,$(TARGETTYPE)), \
         $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Executable \
             $(LAYER) $(1) &&) \
-	$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
+	$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
 		$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library $(LAYER) $(if $(SOVERSION),$(1).$(SOVERSION),$(1)) && \
 		ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
 	rm -f $${DYLIB_FILE})
@@ -237,7 +239,7 @@ endef
 
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
-$(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
+$(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))
 $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1)))
 endef
 
@@ -246,6 +248,7 @@ endef
 
 gb_Library_DEFS :=
 gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module
+gb_Bundle_TARGETTYPEFLAGS := -bundle
 gb_Library_SYSPRE := lib
 gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
 gb_Library_PLAINEXT := .dylib
@@ -284,6 +287,7 @@ gb_Library_LAYER := \
 	$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
+	$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
 	$(foreach lib,$(gb_Library_RTLIBS),$(lib):OOO) \
 	$(foreach lib,$(gb_Library_RTVERLIBS),$(lib):URELIB) \
 	$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):URELIB) \
@@ -304,6 +308,14 @@ endef
 
 gb_Library__set_soversion_script_platform = $(gb_Library__set_soversion_script)
 
+# bundle is a special kind of library that exists only on Darwin/OSX
+# set the TARGETTYPE to Bundle, and clear install_name(RPATH)
+define gb_Library_Bundle
+$(call gb_Library_Library,$(1))
+$(call gb_LinkTarget_set_targettype,$(call gb_Library_get_linktargetname,$(1)),Bundle)
+$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : \
+	RPATH :=
+endef
 
 # StaticLibrary class
 
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index c4089add0c87..3cfda797c2ce 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -48,4 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sm/res,\
 	starmath/source/toolbox.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,sm/res) : $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index cd5a4bc8af4b..5bb50abdcfd7 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -188,4 +188,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/wrtsh/wrtsh.src \
 ))
 
+$(call gb_SrsTemplateTarget_get_target,sw/res) :| $(call gb_Package_get_target,svx_globlmn_hrc)
+
 # vim: set noet sw=4 ts=4:
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index b00d6830693d..2d6fecae8356 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess jvmfwk np_sdk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl svtools sysui test toolkit tools ucb ucbhelper udkapi unoil unotools ure vcl xmlhelp xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 381478deecc7..85c2e74b00b3 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -481,7 +481,7 @@ void CUPSManager::runDests()
         // all* first
         http_t* p_http;
         if( (p_http=m_pCUPSWrapper->httpConnectEncrypt(
-                 m_pCUPSWrapper->cupsServer(), 
+                 m_pCUPSWrapper->cupsServer(),
                  m_pCUPSWrapper->ippPort(),
                  m_pCUPSWrapper->cupsEncryption())) != NULL )
         {
author	Michael Stahl <mstahl@redhat.com>	2012-01-06 21:09:13 +0100
committer	Michael Stahl <mstahl@redhat.com>	2012-01-06 21:09:13 +0100
commit	23dd856d3c70a63dd47ae2a09a75833267296432 (patch)
tree	3ed426d983d5a46cc48dc1ee873ac5627b867f05
parent	5106b38a9cc64677b3fa4a0aea7450560775e78e (diff)
parent	7e5b321535977ccddc6703c0ad4e5d25af797654 (diff)