From 6d89e19bad7267504dd4479b7de5c651c13ea427 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Fri, 15 Apr 2011 17:27:06 +0000
Subject: gnumake4: dbaccess: fix non-WNT error [hg:80b1d47ae710]

---
 dbaccess/AllLangResTarget_adabasui.mk |  94 ++---
 dbaccess/AllLangResTarget_dba.mk      |  94 ++---
 dbaccess/AllLangResTarget_dbmm.mk     |  94 ++---
 dbaccess/AllLangResTarget_dbui.mk     | 310 ++++++++---------
 dbaccess/AllLangResTarget_sdbt.mk     |  94 ++---
 dbaccess/Executable_odbcconfig.mk     |   2 +-
 dbaccess/Library_adabasui.mk          | 142 ++++----
 dbaccess/Library_dba.mk               | 302 ++++++++--------
 dbaccess/Library_dbaxml.mk            | 192 +++++-----
 dbaccess/Library_dbmm.mk              | 148 ++++----
 dbaccess/Library_dbui.mk              | 638 +++++++++++++++++-----------------
 dbaccess/Library_sdbt.mk              | 136 ++++----
 dbaccess/Module_dbaccess.mk           | 111 +++---
 dbaccess/Package_inc.mk               |  78 ++---
 14 files changed, 1220 insertions(+), 1215 deletions(-)

diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index 8657b5ffc..4e5ec4149 100644
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -1,47 +1,47 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,adabasui,dbaccess/adabasui))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
-	-I$(SRCDIR)/dbaccess/source/ext/adabas \
-	-I$(SRCDIR)/dbaccess/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
-	dbaccess/source/ext/adabas/AdabasNewDb.src \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,adabasui,dbaccess/adabasui))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/dbaccess/source/ext/adabas \
+	-I$(SRCDIR)/dbaccess/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\
+	dbaccess/source/ext/adabas/AdabasNewDb.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index df114aecf..116bb459d 100644
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -1,47 +1,47 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platdbam 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 dba A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 dba 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>
-# dba a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dba))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dba,dbaccess/dba))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
-	-I$(SRCDIR)/dbaccess/source/core/inc \
-	-I$(SRCDIR)/dbaccess/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
-	dbaccess/source/core/resource/strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platdbam 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 dba A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 dba 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>
+# dba a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dba))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dba,dbaccess/dba))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/dbaccess/source/core/inc \
+	-I$(SRCDIR)/dbaccess/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\
+	dbaccess/source/core/resource/strings.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index 152bf5800..85be4b048 100644
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -1,47 +1,47 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbamm))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbamm,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dbamm,dbaccess/dbamm))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbamm))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dbamm,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
-	-I$(SRCDIR)/dbaccess/source/ext/macromigration \
-	-I$(SRCDIR)/dbaccess/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbamm,\
-	dbaccess/source/ext/macromigration/macromigration.src \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbamm))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbamm,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbamm,dbaccess/dbamm))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbamm))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbamm,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/dbaccess/source/ext/macromigration \
+	-I$(SRCDIR)/dbaccess/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbamm,\
+	dbaccess/source/ext/macromigration/macromigration.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index 322b344e0..a1d284a3a 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -1,155 +1,155 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbui))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,dbui,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,dbui,dbaccess/dbui))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
-	-I$(WORKDIR)/inc/dbaccess \
-	-I$(SRCDIR)/dbaccess/source/ui/inc \
-	-I$(SRCDIR)/dbaccess/inc \
-))
-
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\
-	dbaccess/source/ui/app/app.src \
-	dbaccess/source/ui/browser/sbabrw.src \
-	dbaccess/source/ui/browser/sbagrid.src \
-	dbaccess/source/ui/control/TableGrantCtrl.src \
-	dbaccess/source/ui/control/tabletree.src \
-	dbaccess/source/ui/control/undosqledit.src \
-	dbaccess/source/ui/dlg/AdabasStat.src \
-	dbaccess/source/ui/dlg/admincontrols.src \
-	dbaccess/source/ui/dlg/adtabdlg.src \
-	dbaccess/source/ui/dlg/advancedsettings.src \
-	dbaccess/source/ui/dlg/AutoControls.src \
-	dbaccess/source/ui/dlg/CollectionView.src \
-	dbaccess/source/ui/dlg/ConnectionPage.src \
-	dbaccess/source/ui/dlg/dbadmin.src \
-	dbaccess/source/ui/dlg/dbadmin2.src \
-	dbaccess/source/ui/dlg/dbadminsetup.src \
-	dbaccess/source/ui/dlg/dbfindex.src \
-	dbaccess/source/ui/dlg/directsql.src \
-	dbaccess/source/ui/dlg/dlgattr.src \
-	dbaccess/source/ui/dlg/dlgsave.src \
-	dbaccess/source/ui/dlg/dlgsize.src \
-	dbaccess/source/ui/dlg/dsselect.src \
-	dbaccess/source/ui/dlg/indexdialog.src \
-	dbaccess/source/ui/dlg/paramdialog.src \
-	dbaccess/source/ui/dlg/queryfilter.src \
-	dbaccess/source/ui/dlg/queryorder.src \
-	dbaccess/source/ui/dlg/RelationDlg.src \
-	dbaccess/source/ui/dlg/sqlmessage.src \
-	dbaccess/source/ui/dlg/textconnectionsettings.src \
-	dbaccess/source/ui/dlg/UserAdmin.src \
-	dbaccess/source/ui/dlg/UserAdminDlg.src \
-	dbaccess/source/ui/imagelists/dbimagelists.src \
-	dbaccess/source/ui/misc/dbumiscres.src \
-	dbaccess/source/ui/misc/WizardPages.src \
-	dbaccess/source/ui/querydesign/query.src \
-	dbaccess/source/ui/querydesign/querydlg.src \
-	dbaccess/source/ui/relationdesign/relation.src \
-	dbaccess/source/ui/tabledesign/table.src \
-	dbaccess/source/ui/uno/copytablewizard.src \
-	dbaccess/source/ui/uno/dbinteraction.src \
-))
-
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/admincontrols.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/AutoControls.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/ConnectionPage.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadminsetup.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/textconnectionsettings.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/app/app.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbabrw.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbagrid.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/queryfilter.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/querydesign/query.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/tabledesign/table.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
-
-# hack !!!
-# just a temporary - globlmn.hrc about to be removed!
-ifeq ($(strip $(WITH_LANG)),)
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
-	echo copying $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	cp $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-
-$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
-	echo copying $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	cp $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(WORKDIR)/inc/dbaccess/toolbox.hrc
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-else
--include $(WORKDIR)/inc/dbaccess/lastrun.mk
-ifneq ($(gb_lastrun_globlmn),MERGED)
-.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
-endif
-
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
-	echo merging $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
-	$(call gb_Helper_abbreviate_dirs_native, \
-		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-p svx \
-		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
-
-$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
-	echo merging $@
-	-mkdir -p $(WORKDIR)/inc/dbaccess
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
-	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
-	$(call gb_Helper_abbreviate_dirs_native, \
-		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-		-p svx \
-		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
-
-endif
-
-.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc_clean $(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean
-$(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean :
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
-		$(WORKDIR)/inc/dbaccess/AutoControls.hrc
-
-$(WORKDIR)/inc/dbaccess/toolbox.hrc_clean :
-	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
-		$(WORKDIR)/inc/dbaccess/toolbox.hrc
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,dbui,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,dbui,dbaccess/dbui))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(WORKDIR)/inc/dbaccess \
+	-I$(SRCDIR)/dbaccess/source/ui/inc \
+	-I$(SRCDIR)/dbaccess/inc \
+))
+
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\
+	dbaccess/source/ui/app/app.src \
+	dbaccess/source/ui/browser/sbabrw.src \
+	dbaccess/source/ui/browser/sbagrid.src \
+	dbaccess/source/ui/control/TableGrantCtrl.src \
+	dbaccess/source/ui/control/tabletree.src \
+	dbaccess/source/ui/control/undosqledit.src \
+	dbaccess/source/ui/dlg/AdabasStat.src \
+	dbaccess/source/ui/dlg/admincontrols.src \
+	dbaccess/source/ui/dlg/adtabdlg.src \
+	dbaccess/source/ui/dlg/advancedsettings.src \
+	dbaccess/source/ui/dlg/AutoControls.src \
+	dbaccess/source/ui/dlg/CollectionView.src \
+	dbaccess/source/ui/dlg/ConnectionPage.src \
+	dbaccess/source/ui/dlg/dbadmin.src \
+	dbaccess/source/ui/dlg/dbadmin2.src \
+	dbaccess/source/ui/dlg/dbadminsetup.src \
+	dbaccess/source/ui/dlg/dbfindex.src \
+	dbaccess/source/ui/dlg/directsql.src \
+	dbaccess/source/ui/dlg/dlgattr.src \
+	dbaccess/source/ui/dlg/dlgsave.src \
+	dbaccess/source/ui/dlg/dlgsize.src \
+	dbaccess/source/ui/dlg/dsselect.src \
+	dbaccess/source/ui/dlg/indexdialog.src \
+	dbaccess/source/ui/dlg/paramdialog.src \
+	dbaccess/source/ui/dlg/queryfilter.src \
+	dbaccess/source/ui/dlg/queryorder.src \
+	dbaccess/source/ui/dlg/RelationDlg.src \
+	dbaccess/source/ui/dlg/sqlmessage.src \
+	dbaccess/source/ui/dlg/textconnectionsettings.src \
+	dbaccess/source/ui/dlg/UserAdmin.src \
+	dbaccess/source/ui/dlg/UserAdminDlg.src \
+	dbaccess/source/ui/imagelists/dbimagelists.src \
+	dbaccess/source/ui/misc/dbumiscres.src \
+	dbaccess/source/ui/misc/WizardPages.src \
+	dbaccess/source/ui/querydesign/query.src \
+	dbaccess/source/ui/querydesign/querydlg.src \
+	dbaccess/source/ui/relationdesign/relation.src \
+	dbaccess/source/ui/tabledesign/table.src \
+	dbaccess/source/ui/uno/copytablewizard.src \
+	dbaccess/source/ui/uno/dbinteraction.src \
+))
+
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/admincontrols.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/AutoControls.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/ConnectionPage.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadminsetup.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/textconnectionsettings.src) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/app/app.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbabrw.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/browser/sbagrid.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/dbadmin2.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/dlg/queryfilter.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/querydesign/query.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+$(call gb_SrsPartTarget_get_target,dbaccess/source/ui/tabledesign/table.src) : $(WORKDIR)/inc/dbaccess/toolbox.hrc
+
+# hack !!!
+# just a temporary - globlmn.hrc about to be removed!
+ifeq ($(strip $(WITH_LANG)),)
+$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+	echo copying $@
+	-mkdir -p $(WORKDIR)/inc/dbaccess
+	cp $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+
+$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+	echo copying $@
+	-mkdir -p $(WORKDIR)/inc/dbaccess
+	cp $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(WORKDIR)/inc/dbaccess/toolbox.hrc
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+else
+-include $(WORKDIR)/inc/dbaccess/lastrun.mk
+ifneq ($(gb_lastrun_globlmn),MERGED)
+.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
+endif
+
+$(WORKDIR)/inc/dbaccess/AutoControls.hrc : $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
+	echo merging $@
+	-mkdir -p $(WORKDIR)/inc/dbaccess
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+		-p svx \
+		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+
+$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf
+	echo merging $@
+	-mkdir -p $(WORKDIR)/inc/dbaccess
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+	echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/dbaccess/lastrun.mk
+	$(call gb_Helper_abbreviate_dirs_native, \
+		$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+		-p svx \
+		 -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/dbaccess/inc/localize.sdf -l all)
+
+endif
+
+.PHONY : $(WORKDIR)/inc/dbaccess/toolbox.hrc_clean $(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean
+$(WORKDIR)/inc/dbaccess/AutoControls.hrc_clean :
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
+		$(WORKDIR)/inc/dbaccess/AutoControls.hrc
+
+$(WORKDIR)/inc/dbaccess/toolbox.hrc_clean :
+	rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk \
+		$(WORKDIR)/inc/dbaccess/toolbox.hrc
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index 5e8bb6638..633c87f08 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -1,47 +1,47 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbt))
-
-$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess))
-
-$(eval $(call gb_AllLangResTarget_add_srs,sdbt,dbaccess/sdbt))
-
-$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
-
-$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
-	$$(INCLUDE) \
-	-I$(OUTDIR)/inc \
-	-I$(SRCDIR)/dbaccess\source\sdbtools\inc \
-	-I$(SRCDIR)/dbaccess/inc \
-))
-
-$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
-	dbaccess/source/sdbtools/resource/sdbt_strings.src \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbt))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdbt,dbaccess/sdbt))
+
+$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
+
+$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc \
+	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
+	-I$(SRCDIR)/dbaccess/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\
+	dbaccess/source/sdbtools/resource/sdbt_strings.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 726e29ad0..cf39fde24 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -24,7 +24,6 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Executable_Executable,odbcconfig))
 
@@ -53,5 +52,6 @@ $(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
 	dbaccess/win32/source/odbcconfig/odbcconfig \
 ))
 
+# vim: set noet sw=4 ts=4:
 endif
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index 373f9f2c1..16cefaafa 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -1,71 +1,71 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,adabasui))
-$(eval $(call gb_Library_add_package_headers,adabasui,dbaccess_inc))
-
-$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui))
-
-$(eval $(call gb_Library_set_include,adabasui,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/ext/adabas \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_Library_add_defs,adabasui,\
-	-DCOMPMOD_NAMESPACE=adabasui \
-))
-
-$(eval $(call gb_Library_add_linked_libs,adabasui,\
-	tl \
-	svt \
-	svl \
-	cppuhelper \
-	cppu \
-	comphelper \
-	utl \
-	ucbhelper \
-	vcl \
-	sal \
-	stl \
-	sfx \
-	tk \
-	dbtools \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,adabasui,\
-    dbaccess/source/ext/adabas/ASqlNameEdit \
-	dbaccess/source/ext/adabas/AdabasNewDb \
-	dbaccess/source/ext/adabas/ANewDb \
-	dbaccess/source/ext/adabas/Aservices \
-	dbaccess/source/ext/adabas/adabasuistrings \
-	dbaccess/source/ext/adabas/Acomponentmodule \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,adabasui))
+$(eval $(call gb_Library_add_package_headers,adabasui,dbaccess_inc))
+
+$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui))
+
+$(eval $(call gb_Library_set_include,adabasui,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/ext/adabas \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_defs,adabasui,\
+	-DCOMPMOD_NAMESPACE=adabasui \
+))
+
+$(eval $(call gb_Library_add_linked_libs,adabasui,\
+	tl \
+	svt \
+	svl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	utl \
+	ucbhelper \
+	vcl \
+	sal \
+	stl \
+	sfx \
+	tk \
+	dbtools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,adabasui,\
+    dbaccess/source/ext/adabas/ASqlNameEdit \
+	dbaccess/source/ext/adabas/AdabasNewDb \
+	dbaccess/source/ext/adabas/ANewDb \
+	dbaccess/source/ext/adabas/Aservices \
+	dbaccess/source/ext/adabas/adabasuistrings \
+	dbaccess/source/ext/adabas/Acomponentmodule \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 7325c1213..dd6d101f8 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -1,151 +1,151 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,dba))
-$(eval $(call gb_Library_add_package_headers,dba,dbaccess_inc))
-$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
-
-$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
-
-$(eval $(call gb_Library_set_include,dba,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/core/inc \
-	-I$(SRCDIR)/dbaccess/source/inc \
-	-I$(SRCDIR)/dbaccess/inc/pch \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_Library_add_defs,dba,\
-	-DOOO_DLLIMPLEMENTATION_DBA \
-))
-
-$(eval $(call gb_Library_add_linked_libs,dba,\
-	sb \
-	tl \
-	svt \
-	svl \
-	cppuhelper \
-	cppu \
-	comphelper \
-	dbtools \
-	utl \
-	vcl \
-	sal \
-	stl \
-	i18nisolang1 \
-	ucbhelper \
-	sfx \
-	salhelper \
-	xo \
-	fwe \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dba,\
-	dbaccess/source/core/api/querydescriptor \
-	dbaccess/source/core/api/FilteredContainer \
-	dbaccess/source/core/api/TableDeco \
-	dbaccess/source/core/api/RowSetCacheIterator \
-	dbaccess/source/core/api/RowSet \
-	dbaccess/source/core/api/column \
-	dbaccess/source/core/api/RowSetBase \
-	dbaccess/source/core/api/CRowSetDataColumn \
-	dbaccess/source/core/api/CRowSetColumn \
-	dbaccess/source/core/api/querycomposer \
-	dbaccess/source/core/api/CIndexes \
-	dbaccess/source/core/api/BookmarkSet \
-	dbaccess/source/core/api/KeySet \
-	dbaccess/source/core/api/StaticSet \
-	dbaccess/source/core/api/CacheSet \
-	dbaccess/source/core/api/RowSetCache \
-	dbaccess/source/core/api/definitioncolumn \
-	dbaccess/source/core/api/resultcolumn \
-	dbaccess/source/core/api/datacolumn \
-	dbaccess/source/core/api/resultset \
-	dbaccess/source/core/api/statement \
-	dbaccess/source/core/api/preparedstatement \
-	dbaccess/source/core/api/callablestatement \
-	dbaccess/source/core/api/query \
-	dbaccess/source/core/api/querycontainer \
-	dbaccess/source/core/api/table \
-	dbaccess/source/core/api/viewcontainer \
-	dbaccess/source/core/api/tablecontainer \
-	dbaccess/source/core/api/SingleSelectQueryComposer \
-	dbaccess/source/core/api/HelperCollections \
-	dbaccess/source/core/api/datasettings \
-	dbaccess/source/core/api/View \
-	dbaccess/source/core/api/WrappedResultSet \
-	dbaccess/source/core/api/OptimisticSet \
-	dbaccess/source/core/api/PrivateRow \
-	dbaccess/source/core/api/columnsettings \
-	dbaccess/source/core/dataaccess/SharedConnection \
-	dbaccess/source/core/dataaccess/ContentHelper \
-	dbaccess/source/core/dataaccess/bookmarkcontainer \
-	dbaccess/source/core/dataaccess/definitioncontainer \
-	dbaccess/source/core/dataaccess/commanddefinition \
-	dbaccess/source/core/dataaccess/documentcontainer \
-	dbaccess/source/core/dataaccess/commandcontainer \
-	dbaccess/source/core/dataaccess/documentdefinition \
-	dbaccess/source/core/dataaccess/ComponentDefinition \
-	dbaccess/source/core/dataaccess/databasecontext \
-	dbaccess/source/core/dataaccess/connection \
-	dbaccess/source/core/dataaccess/datasource \
-	dbaccess/source/core/dataaccess/databaseregistrations \
-	dbaccess/source/core/dataaccess/intercept \
-	dbaccess/source/core/dataaccess/myucp_datasupplier \
-	dbaccess/source/core/dataaccess/myucp_resultset \
-	dbaccess/source/core/dataaccess/databasedocument \
-	dbaccess/source/core/dataaccess/dataaccessdescriptor \
-	dbaccess/source/core/dataaccess/ModelImpl \
-	dbaccess/source/core/dataaccess/documentevents \
-	dbaccess/source/core/dataaccess/documenteventexecutor \
-	dbaccess/source/core/dataaccess/documenteventnotifier \
-	dbaccess/source/core/misc/sdbcoretools \
-	dbaccess/source/core/misc/services \
-	dbaccess/source/core/misc/PropertyForward \
-	dbaccess/source/core/misc/ContainerMediator \
-	dbaccess/source/core/misc/userinformation \
-	dbaccess/source/core/misc/ContainerListener \
-	dbaccess/source/core/misc/objectnameapproval \
-	dbaccess/source/core/misc/DatabaseDataProvider \
-	dbaccess/source/core/misc/module_dba \
-	dbaccess/source/core/misc/dsntypes \
-	dbaccess/source/core/misc/veto \
-	dbaccess/source/core/misc/apitools \
-	dbaccess/source/core/misc/dbastrings \
-	dbaccess/source/core/recovery/dbdocrecovery \
-	dbaccess/source/core/recovery/subcomponentloader \
-	dbaccess/source/core/recovery/storagestream \
-	dbaccess/source/core/recovery/storagexmlstream \
-	dbaccess/source/core/recovery/storagetextstream \
-	dbaccess/source/core/recovery/subcomponentrecovery \
-	dbaccess/source/core/recovery/settingsimport \
-	dbaccess/source/core/resource/core_resource \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,dba))
+$(eval $(call gb_Library_add_package_headers,dba,dbaccess_inc))
+$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
+
+$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
+
+$(eval $(call gb_Library_set_include,dba,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/core/inc \
+	-I$(SRCDIR)/dbaccess/source/inc \
+	-I$(SRCDIR)/dbaccess/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_defs,dba,\
+	-DOOO_DLLIMPLEMENTATION_DBA \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dba,\
+	sb \
+	tl \
+	svt \
+	svl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	dbtools \
+	utl \
+	vcl \
+	sal \
+	stl \
+	i18nisolang1 \
+	ucbhelper \
+	sfx \
+	salhelper \
+	xo \
+	fwe \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dba,\
+	dbaccess/source/core/api/querydescriptor \
+	dbaccess/source/core/api/FilteredContainer \
+	dbaccess/source/core/api/TableDeco \
+	dbaccess/source/core/api/RowSetCacheIterator \
+	dbaccess/source/core/api/RowSet \
+	dbaccess/source/core/api/column \
+	dbaccess/source/core/api/RowSetBase \
+	dbaccess/source/core/api/CRowSetDataColumn \
+	dbaccess/source/core/api/CRowSetColumn \
+	dbaccess/source/core/api/querycomposer \
+	dbaccess/source/core/api/CIndexes \
+	dbaccess/source/core/api/BookmarkSet \
+	dbaccess/source/core/api/KeySet \
+	dbaccess/source/core/api/StaticSet \
+	dbaccess/source/core/api/CacheSet \
+	dbaccess/source/core/api/RowSetCache \
+	dbaccess/source/core/api/definitioncolumn \
+	dbaccess/source/core/api/resultcolumn \
+	dbaccess/source/core/api/datacolumn \
+	dbaccess/source/core/api/resultset \
+	dbaccess/source/core/api/statement \
+	dbaccess/source/core/api/preparedstatement \
+	dbaccess/source/core/api/callablestatement \
+	dbaccess/source/core/api/query \
+	dbaccess/source/core/api/querycontainer \
+	dbaccess/source/core/api/table \
+	dbaccess/source/core/api/viewcontainer \
+	dbaccess/source/core/api/tablecontainer \
+	dbaccess/source/core/api/SingleSelectQueryComposer \
+	dbaccess/source/core/api/HelperCollections \
+	dbaccess/source/core/api/datasettings \
+	dbaccess/source/core/api/View \
+	dbaccess/source/core/api/WrappedResultSet \
+	dbaccess/source/core/api/OptimisticSet \
+	dbaccess/source/core/api/PrivateRow \
+	dbaccess/source/core/api/columnsettings \
+	dbaccess/source/core/dataaccess/SharedConnection \
+	dbaccess/source/core/dataaccess/ContentHelper \
+	dbaccess/source/core/dataaccess/bookmarkcontainer \
+	dbaccess/source/core/dataaccess/definitioncontainer \
+	dbaccess/source/core/dataaccess/commanddefinition \
+	dbaccess/source/core/dataaccess/documentcontainer \
+	dbaccess/source/core/dataaccess/commandcontainer \
+	dbaccess/source/core/dataaccess/documentdefinition \
+	dbaccess/source/core/dataaccess/ComponentDefinition \
+	dbaccess/source/core/dataaccess/databasecontext \
+	dbaccess/source/core/dataaccess/connection \
+	dbaccess/source/core/dataaccess/datasource \
+	dbaccess/source/core/dataaccess/databaseregistrations \
+	dbaccess/source/core/dataaccess/intercept \
+	dbaccess/source/core/dataaccess/myucp_datasupplier \
+	dbaccess/source/core/dataaccess/myucp_resultset \
+	dbaccess/source/core/dataaccess/databasedocument \
+	dbaccess/source/core/dataaccess/dataaccessdescriptor \
+	dbaccess/source/core/dataaccess/ModelImpl \
+	dbaccess/source/core/dataaccess/documentevents \
+	dbaccess/source/core/dataaccess/documenteventexecutor \
+	dbaccess/source/core/dataaccess/documenteventnotifier \
+	dbaccess/source/core/misc/sdbcoretools \
+	dbaccess/source/core/misc/services \
+	dbaccess/source/core/misc/PropertyForward \
+	dbaccess/source/core/misc/ContainerMediator \
+	dbaccess/source/core/misc/userinformation \
+	dbaccess/source/core/misc/ContainerListener \
+	dbaccess/source/core/misc/objectnameapproval \
+	dbaccess/source/core/misc/DatabaseDataProvider \
+	dbaccess/source/core/misc/module_dba \
+	dbaccess/source/core/misc/dsntypes \
+	dbaccess/source/core/misc/veto \
+	dbaccess/source/core/misc/apitools \
+	dbaccess/source/core/misc/dbastrings \
+	dbaccess/source/core/recovery/dbdocrecovery \
+	dbaccess/source/core/recovery/subcomponentloader \
+	dbaccess/source/core/recovery/storagestream \
+	dbaccess/source/core/recovery/storagexmlstream \
+	dbaccess/source/core/recovery/storagetextstream \
+	dbaccess/source/core/recovery/subcomponentrecovery \
+	dbaccess/source/core/recovery/settingsimport \
+	dbaccess/source/core/resource/core_resource \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 61ee0e072..5b0a5ddb8 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -1,96 +1,96 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,dbaxml))
-$(eval $(call gb_Library_add_package_headers,dbaxml,dbaccess_inc))
-$(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaxml))
-
-$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
-
-$(eval $(call gb_Library_set_include,dbaxml,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/filter/xml \
-	-I$(SRCDIR)/dbaccess/source/inc \
-	-I$(SRCDIR)/dbaccess/inc/pch \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_Library_add_linked_libs,dbaxml,\
-	tl \
-	svl \
-	cppuhelper \
-	cppu \
-	comphelper \
-	utl \
-	vcl \
-	sal \
-	sfx \
-	dbtools \
-	xo \
-	sot \
-	tk \
-	dba \
-	stl \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dbaxml,\
-	dbaccess/source/filter/xml/xmlfilter                           \
-	dbaccess/source/filter/xml/dbloader2                           \
-	dbaccess/source/filter/xml/xmlDatabase                         \
-	dbaccess/source/filter/xml/xmlDataSource                       \
-	dbaccess/source/filter/xml/xmlTableFilterPattern       \
-	dbaccess/source/filter/xml/xmlTableFilterList          \
-	dbaccess/source/filter/xml/xmlDataSourceInfo           \
-	dbaccess/source/filter/xml/xmlDataSourceSetting        \
-	dbaccess/source/filter/xml/xmlDataSourceSettings       \
-	dbaccess/source/filter/xml/xmlDocuments                        \
-	dbaccess/source/filter/xml/xmlComponent                        \
-	dbaccess/source/filter/xml/xmlHierarchyCollection      \
-	dbaccess/source/filter/xml/xmlLogin                            \
-	dbaccess/source/filter/xml/xmlExport                           \
-	dbaccess/source/filter/xml/xmlQuery                            \
-	dbaccess/source/filter/xml/xmlTable                            \
-	dbaccess/source/filter/xml/xmlColumn                           \
-	dbaccess/source/filter/xml/xmlStyleImport                      \
-	dbaccess/source/filter/xml/xmlHelper                           \
-	dbaccess/source/filter/xml/xmlAutoStyle                        \
-	dbaccess/source/filter/xml/xmlConnectionData           \
-	dbaccess/source/filter/xml/xmlDatabaseDescription      \
-	dbaccess/source/filter/xml/xmlFileBasedDatabase        \
-	dbaccess/source/filter/xml/xmlServerDatabase           \
-	dbaccess/source/filter/xml/xmlConnectionResource       \
-	dbaccess/source/filter/xml/xmlservices \
-))
-
-$(eval $(call gb_Library_add_noexception_objects,dbaxml, \
-	dbaccess/source/shared/flt_reghelper \
-	dbaccess/source/shared/xmlstrings \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,dbaxml))
+$(eval $(call gb_Library_add_package_headers,dbaxml,dbaccess_inc))
+$(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaxml))
+
+$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
+
+$(eval $(call gb_Library_set_include,dbaxml,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/filter/xml \
+	-I$(SRCDIR)/dbaccess/source/inc \
+	-I$(SRCDIR)/dbaccess/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbaxml,\
+	tl \
+	svl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	utl \
+	vcl \
+	sal \
+	sfx \
+	dbtools \
+	xo \
+	sot \
+	tk \
+	dba \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dbaxml,\
+	dbaccess/source/filter/xml/xmlfilter                           \
+	dbaccess/source/filter/xml/dbloader2                           \
+	dbaccess/source/filter/xml/xmlDatabase                         \
+	dbaccess/source/filter/xml/xmlDataSource                       \
+	dbaccess/source/filter/xml/xmlTableFilterPattern       \
+	dbaccess/source/filter/xml/xmlTableFilterList          \
+	dbaccess/source/filter/xml/xmlDataSourceInfo           \
+	dbaccess/source/filter/xml/xmlDataSourceSetting        \
+	dbaccess/source/filter/xml/xmlDataSourceSettings       \
+	dbaccess/source/filter/xml/xmlDocuments                        \
+	dbaccess/source/filter/xml/xmlComponent                        \
+	dbaccess/source/filter/xml/xmlHierarchyCollection      \
+	dbaccess/source/filter/xml/xmlLogin                            \
+	dbaccess/source/filter/xml/xmlExport                           \
+	dbaccess/source/filter/xml/xmlQuery                            \
+	dbaccess/source/filter/xml/xmlTable                            \
+	dbaccess/source/filter/xml/xmlColumn                           \
+	dbaccess/source/filter/xml/xmlStyleImport                      \
+	dbaccess/source/filter/xml/xmlHelper                           \
+	dbaccess/source/filter/xml/xmlAutoStyle                        \
+	dbaccess/source/filter/xml/xmlConnectionData           \
+	dbaccess/source/filter/xml/xmlDatabaseDescription      \
+	dbaccess/source/filter/xml/xmlFileBasedDatabase        \
+	dbaccess/source/filter/xml/xmlServerDatabase           \
+	dbaccess/source/filter/xml/xmlConnectionResource       \
+	dbaccess/source/filter/xml/xmlservices \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbaxml, \
+	dbaccess/source/shared/flt_reghelper \
+	dbaccess/source/shared/xmlstrings \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 319a85f7f..ef918f89a 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -1,74 +1,74 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,dbmm))
-$(eval $(call gb_Library_add_package_headers,dbmm,dbaccess_inc))
-$(eval $(call gb_Library_add_precompiled_header,dbmm,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbmm))
-
-$(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
-
-$(eval $(call gb_Library_set_include,dbmm,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/ext/macromigration \
-	-I$(SRCDIR)/dbaccess/inc/pch \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_Library_add_linked_libs,dbmm,\
-	cppu          \
-    cppuhelper    \
-    comphelper    \
-    utl      \
-    tl         \
-	sal           \
-	svt        \
-	svl           \
-	vcl           \
-	svxcore           \
-	svx           \
-	ucbhelper     \
-	stl \
-	xcr \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dbmm,\
-	dbaccess/source/ext/macromigration/macromigrationwizard \
-	dbaccess/source/ext/macromigration/macromigrationdialog \
-	dbaccess/source/ext/macromigration/macromigrationpages \
-	dbaccess/source/ext/macromigration/dbmm_module \
-	dbaccess/source/ext/macromigration/dbmm_services \
-	dbaccess/source/ext/macromigration/migrationengine \
-	dbaccess/source/ext/macromigration/docinteraction \
-	dbaccess/source/ext/macromigration/progresscapture \
-	dbaccess/source/ext/macromigration/progressmixer \
-	dbaccess/source/ext/macromigration/migrationlog \
-	dbaccess/source/ext/macromigration/dbmm_types \
-))
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,dbmm))
+$(eval $(call gb_Library_add_package_headers,dbmm,dbaccess_inc))
+$(eval $(call gb_Library_add_precompiled_header,dbmm,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbmm))
+
+$(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
+
+$(eval $(call gb_Library_set_include,dbmm,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/ext/macromigration \
+	-I$(SRCDIR)/dbaccess/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbmm,\
+	cppu          \
+    cppuhelper    \
+    comphelper    \
+    utl      \
+    tl         \
+	sal           \
+	svt        \
+	svl           \
+	vcl           \
+	svxcore           \
+	svx           \
+	ucbhelper     \
+	stl \
+	xcr \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dbmm,\
+	dbaccess/source/ext/macromigration/macromigrationwizard \
+	dbaccess/source/ext/macromigration/macromigrationdialog \
+	dbaccess/source/ext/macromigration/macromigrationpages \
+	dbaccess/source/ext/macromigration/dbmm_module \
+	dbaccess/source/ext/macromigration/dbmm_services \
+	dbaccess/source/ext/macromigration/migrationengine \
+	dbaccess/source/ext/macromigration/docinteraction \
+	dbaccess/source/ext/macromigration/progresscapture \
+	dbaccess/source/ext/macromigration/progressmixer \
+	dbaccess/source/ext/macromigration/migrationlog \
+	dbaccess/source/ext/macromigration/dbmm_types \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 11123318c..3e3fcbd33 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -1,319 +1,319 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,dbui))
-$(eval $(call gb_Library_add_package_headers,dbui,dbaccess_inc))
-$(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui))
-
-$(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu))
-
-$(eval $(call gb_Library_set_include,dbui,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/ui/inc \
-	-I$(SRCDIR)/dbaccess/source/inc \
-	-I$(SRCDIR)/dbaccess/inc/pch \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
-$(eval $(call gb_Library_add_cflags,dbui,\
-	-DSYSTEM_ODBC_HEADERS \
-))
-endif
-
-ifneq ($(WINDOWS_VISTA_PSDK),)
-ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_add_defs,dbui,\
-	-DDBACCESS_DLLIMPLEMENTATION\
-	-DWINDOWS_VISTA_PSDK \
-))
-endif
-endif
-
-ifeq ($(GUI)$(COM),WNTGCC)
-$(eval $(call gb_Library_add_cflags,dbui,\
-	-fpermissive \
-))
-endif
-
-ifeq ($(PROF_EDITION),)
-ifneq ($(WINDOWS_VISTA_PSDK),)
-DISABLE_ADO=TRUE
-endif
-endif
-
-ifeq ($(OS),WNT)
-ifeq ($(DISABLE_ADO),)
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-	dbaccess/source/ui/dlg/adodatalinks \
-))
-endif
-endif
-
-$(eval $(call gb_Library_add_defs,dbui,\
-	-DDBACCESS_DLLIMPLEMENTATION\
-))
-
-$(eval $(call gb_Library_add_linked_libs,dbui,\
-	comphelper \
-	cppuhelper \
-	cppu \
-	dbtools \
-	i18nisolang1 \
-	fwe \
-	sal \
-	salhelper \
-	sfx \
-	svl \
-	svt \
-	stl \
-	vcl \
-	for \
-	tl \
-	utl \
-	ucbhelper \
-	svxcore \
-	svx \
-	tk \
-	sot \
-	dba \
-	vos3 \
-    $(gb_STDLIBS) \
-))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,dbui,\
-	ole32 \
-	oleaut32 \
-	uuid \
-))
-endif
-
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-	dbaccess/source/ui/app/AppDetailView \
-	dbaccess/source/ui/app/AppController \
-	dbaccess/source/ui/app/AppControllerDnD \
-	dbaccess/source/ui/app/AppControllerGen \
-	dbaccess/source/ui/app/AppDetailPageHelper \
-	dbaccess/source/ui/app/AppSwapWindow \
-	dbaccess/source/ui/app/AppTitleWindow \
-	dbaccess/source/ui/app/AppView \
-	dbaccess/source/ui/app/closeveto \
-	dbaccess/source/ui/app/subcomponentmanager \
-	dbaccess/source/ui/browser/genericcontroller \
-	dbaccess/source/ui/browser/dsbrowserDnD \
-	dbaccess/source/ui/browser/dataview \
-	dbaccess/source/ui/browser/dbexchange \
-	dbaccess/source/ui/browser/dbloader \
-	dbaccess/source/ui/browser/sbagrid \
-	dbaccess/source/ui/browser/formadapter \
-	dbaccess/source/ui/browser/brwview \
-	dbaccess/source/ui/browser/brwctrlr \
-	dbaccess/source/ui/browser/unodatbr \
-	dbaccess/source/ui/browser/sbamultiplex \
-	dbaccess/source/ui/browser/exsrcbrw \
-	dbaccess/source/ui/browser/dbtreemodel \
-	dbaccess/source/ui/browser/dsEntriesNoExp \
-	dbaccess/source/ui/browser/dbtreeview \
-	dbaccess/source/ui/control/statusbarontroller \
-	dbaccess/source/ui/control/RelationControl \
-	dbaccess/source/ui/control/toolboxcontroller \
-	dbaccess/source/ui/control/tabletree \
-	dbaccess/source/ui/control/TableGrantCtrl \
-	dbaccess/source/ui/control/dbtreelistbox \
-	dbaccess/source/ui/control/sqledit \
-	dbaccess/source/ui/control/ColumnControlWindow \
-	dbaccess/source/ui/control/FieldDescControl \
-	dbaccess/source/ui/control/opendoccontrols \
-	dbaccess/source/ui/dlg/directsql \
-	dbaccess/source/ui/dlg/dbwiz \
-	dbaccess/source/ui/dlg/dbwizsetup \
-	dbaccess/source/ui/dlg/generalpage \
-	dbaccess/source/ui/dlg/indexfieldscontrol \
-	dbaccess/source/ui/dlg/indexdialog \
-	dbaccess/source/ui/dlg/RelationDlg \
-	dbaccess/source/ui/dlg/adtabdlg \
-	dbaccess/source/ui/dlg/dlgsave \
-	dbaccess/source/ui/dlg/admincontrols \
-	dbaccess/source/ui/dlg/adminpages \
-	dbaccess/source/ui/dlg/queryorder \
-	dbaccess/source/ui/dlg/queryfilter \
-	dbaccess/source/ui/dlg/paramdialog \
-	dbaccess/source/ui/dlg/dbadmin \
-	dbaccess/source/ui/dlg/detailpages \
-	dbaccess/source/ui/dlg/sqlmessage \
-	dbaccess/source/ui/dlg/finteraction \
-	dbaccess/source/ui/dlg/ConnectionPage \
-	dbaccess/source/ui/dlg/ConnectionHelper \
-	dbaccess/source/ui/dlg/TextConnectionHelper \
-	dbaccess/source/ui/dlg/ConnectionPageSetup \
-	dbaccess/source/ui/dlg/DBSetupConnectionPages \
-	dbaccess/source/ui/dlg/UserAdminDlg \
-	dbaccess/source/ui/dlg/UserAdmin \
-	dbaccess/source/ui/dlg/AdabasStat \
-	dbaccess/source/ui/dlg/tablespage \
-	dbaccess/source/ui/dlg/DbAdminImpl \
-	dbaccess/source/ui/dlg/TablesSingleDlg \
-	dbaccess/source/ui/dlg/CollectionView \
-	dbaccess/source/ui/dlg/dsselect \
-	dbaccess/source/ui/dlg/dbfindex \
-	dbaccess/source/ui/dlg/DriverSettings \
-	dbaccess/source/ui/dlg/odbcconfig \
-	dbaccess/source/ui/dlg/advancedsettings \
-	dbaccess/source/ui/dlg/textconnectionsettings \
-	dbaccess/source/ui/misc/asyncmodaldialog \
-	dbaccess/source/ui/misc/imageprovider \
-	dbaccess/source/ui/misc/singledoccontroller \
-	dbaccess/source/ui/misc/dbsubcomponentcontroller \
-	dbaccess/source/ui/misc/datasourceconnector \
-	dbaccess/source/ui/misc/linkeddocuments \
-	dbaccess/source/ui/misc/indexcollection \
-	dbaccess/source/ui/misc/UITools \
-	dbaccess/source/ui/misc/WCPage \
-	dbaccess/source/ui/misc/WCopyTable \
-	dbaccess/source/ui/misc/WTypeSelect \
-	dbaccess/source/ui/misc/TokenWriter \
-	dbaccess/source/ui/misc/HtmlReader \
-	dbaccess/source/ui/misc/RtfReader \
-	dbaccess/source/ui/misc/propertysetitem \
-	dbaccess/source/ui/misc/databaseobjectview \
-	dbaccess/source/ui/misc/DExport \
-	dbaccess/source/ui/misc/uiservices \
-	dbaccess/source/ui/misc/RowSetDrop \
-	dbaccess/source/ui/misc/TableCopyHelper \
-	dbaccess/source/ui/misc/moduledbu \
-	dbaccess/source/ui/misc/WColumnSelect \
-	dbaccess/source/ui/misc/WExtendPages \
-	dbaccess/source/ui/misc/WNameMatch \
-	dbaccess/source/ui/misc/ToolBoxHelper \
-	dbaccess/source/ui/misc/stringlistitem \
-	dbaccess/source/ui/misc/charsets \
-	dbaccess/source/ui/misc/defaultobjectnamecheck \
-	dbaccess/source/ui/misc/dsmeta \
-	dbaccess/source/ui/misc/controllerframe \
-	dbaccess/source/ui/misc/propertystorage \
-	dbaccess/source/ui/misc/dbaundomanager \
-	dbaccess/source/ui/querydesign/ConnectionLineAccess \
-	dbaccess/source/ui/querydesign/TableWindowAccess \
-	dbaccess/source/ui/querydesign/JAccess \
-	dbaccess/source/ui/querydesign/JoinDesignView \
-	dbaccess/source/ui/querydesign/JoinController \
-	dbaccess/source/ui/querydesign/QueryDesignView \
-	dbaccess/source/ui/querydesign/SelectionBrowseBox \
-	dbaccess/source/ui/querydesign/querydlg \
-	dbaccess/source/ui/querydesign/QueryTabWinUndoAct \
-	dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \
-	dbaccess/source/ui/querydesign/QueryTabConnUndoAction \
-	dbaccess/source/ui/querydesign/TableFieldDescription \
-	dbaccess/source/ui/querydesign/JoinTableView \
-	dbaccess/source/ui/querydesign/QueryViewSwitch \
-	dbaccess/source/ui/querydesign/QueryTableView \
-	dbaccess/source/ui/querydesign/TableWindowData \
-	dbaccess/source/ui/querydesign/QTableWindow \
-	dbaccess/source/ui/querydesign/TableWindow \
-	dbaccess/source/ui/querydesign/JoinExchange \
-	dbaccess/source/ui/querydesign/TableWindowListBox \
-	dbaccess/source/ui/querydesign/TableWindowTitle \
-	dbaccess/source/ui/querydesign/QueryTextView \
-	dbaccess/source/ui/querydesign/QTableConnection \
-	dbaccess/source/ui/querydesign/querycontroller \
-	dbaccess/source/ui/querydesign/querycontainerwindow \
-	dbaccess/source/ui/querydesign/queryview \
-	dbaccess/source/ui/querydesign/TableConnection \
-	dbaccess/source/ui/querydesign/TableConnectionData \
-	dbaccess/source/ui/relationdesign/RTableConnection \
-	dbaccess/source/ui/relationdesign/RTableConnectionData \
-	dbaccess/source/ui/relationdesign/RelationTableView \
-	dbaccess/source/ui/relationdesign/RelationDesignView \
-	dbaccess/source/ui/relationdesign/RelationController \
-	dbaccess/source/ui/tabledesign/TableDesignControl \
-	dbaccess/source/ui/tabledesign/TableFieldDescWin \
-	dbaccess/source/ui/tabledesign/TableController \
-	dbaccess/source/ui/tabledesign/TableDesignView \
-	dbaccess/source/ui/tabledesign/TEditControl \
-	dbaccess/source/ui/tabledesign/TableFieldControl \
-	dbaccess/source/ui/tabledesign/TableDesignHelpBar \
-	dbaccess/source/ui/tabledesign/FieldDescGenWin \
-	dbaccess/source/ui/tabledesign/FieldDescriptions \
-	dbaccess/source/ui/tabledesign/TableRow \
-	dbaccess/source/ui/tabledesign/TableRowExchange \
-	dbaccess/source/ui/tabledesign/TableUndo \
-	dbaccess/source/ui/uno/composerdialogs \
-	dbaccess/source/ui/uno/unosqlmessage \
-	dbaccess/source/ui/uno/unoadmin \
-	dbaccess/source/ui/uno/admindlg \
-	dbaccess/source/ui/uno/TableFilterDlg \
-	dbaccess/source/ui/uno/AdvancedSettingsDlg \
-	dbaccess/source/ui/uno/unoDirectSql \
-	dbaccess/source/ui/uno/DBTypeWizDlg \
-	dbaccess/source/ui/uno/DBTypeWizDlgSetup \
-	dbaccess/source/ui/uno/UserSettingsDlg \
-	dbaccess/source/ui/uno/ColumnModel \
-	dbaccess/source/ui/uno/ColumnControl \
-	dbaccess/source/ui/uno/ColumnPeer \
-	dbaccess/source/ui/uno/dbinteraction \
-	dbaccess/source/ui/uno/textconnectionsettings_uno \
-))
-
-$(eval $(call gb_Library_add_noexception_objects,dbui, \
-	dbaccess/source/ui/control/ScrollHelper		\
-	dbaccess/source/ui/control/VertSplitView		\
-	dbaccess/source/ui/control/SqlNameEdit			\
-	dbaccess/source/ui/control/listviewitems		\
-	dbaccess/source/ui/control/undosqledit			\
-	dbaccess/source/ui/control/marktree			\
-	dbaccess/source/ui/control/curledit            \
-	dbaccess/source/ui/control/charsetlistbox		\
-	dbaccess/source/ui/app/AppIconControl \
-	dbaccess/source/ui/browser/AsyncronousLink \
-	dbaccess/source/ui/dlg/dlgsize \
-	dbaccess/source/ui/dlg/dlgattr \
-	dbaccess/source/ui/dlg/optionalboolitem \
-	dbaccess/source/ui/querydesign/TableFieldInfo \
-	dbaccess/source/ui/querydesign/QTableConnectionData \
-	dbaccess/source/ui/querydesign/QTableWindowData \
-	dbaccess/source/ui/querydesign/ConnectionLine \
-	dbaccess/source/ui/querydesign/ConnectionLineData \
-	dbaccess/source/shared/dbu_reghelper \
-	dbaccess/source/shared/dbustrings \
-))
-
-# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
-# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
-# the latter is currently not supported by gbuild and needs a fix here later
-ifeq ($(COM),$(filter-out GCC,$(COM)))
-$(eval $(call gb_Library_add_exception_objects,dbui,\
-    dbaccess/source/ui/uno/copytablewizard \
-))
-else
-$(eval $(call gb_Library_add_cxxobjects,dbui,\
-    dbaccess/source/ui/uno/copytablewizard \
-    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,dbui))
+$(eval $(call gb_Library_add_package_headers,dbui,dbaccess_inc))
+$(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui))
+
+$(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu))
+
+$(eval $(call gb_Library_set_include,dbui,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/ui/inc \
+	-I$(SRCDIR)/dbaccess/source/inc \
+	-I$(SRCDIR)/dbaccess/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),TRUE)
+$(eval $(call gb_Library_add_cflags,dbui,\
+	-DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+ifneq ($(WINDOWS_VISTA_PSDK),)
+ifeq ($(PROF_EDITION),)
+$(eval $(call gb_Library_add_defs,dbui,\
+	-DDBACCESS_DLLIMPLEMENTATION\
+	-DWINDOWS_VISTA_PSDK \
+))
+endif
+endif
+
+ifeq ($(GUI)$(COM),WNTGCC)
+$(eval $(call gb_Library_add_cflags,dbui,\
+	-fpermissive \
+))
+endif
+
+ifeq ($(PROF_EDITION),)
+ifneq ($(WINDOWS_VISTA_PSDK),)
+DISABLE_ADO=TRUE
+endif
+endif
+
+ifeq ($(OS),WNT)
+ifeq ($(DISABLE_ADO),)
+$(eval $(call gb_Library_add_exception_objects,dbui,\
+	dbaccess/source/ui/dlg/adodatalinks \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_defs,dbui,\
+	-DDBACCESS_DLLIMPLEMENTATION\
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbui,\
+	comphelper \
+	cppuhelper \
+	cppu \
+	dbtools \
+	i18nisolang1 \
+	fwe \
+	sal \
+	salhelper \
+	sfx \
+	svl \
+	svt \
+	stl \
+	vcl \
+	for \
+	tl \
+	utl \
+	ucbhelper \
+	svxcore \
+	svx \
+	tk \
+	sot \
+	dba \
+	vos3 \
+    $(gb_STDLIBS) \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,dbui,\
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,dbui,\
+	dbaccess/source/ui/app/AppDetailView \
+	dbaccess/source/ui/app/AppController \
+	dbaccess/source/ui/app/AppControllerDnD \
+	dbaccess/source/ui/app/AppControllerGen \
+	dbaccess/source/ui/app/AppDetailPageHelper \
+	dbaccess/source/ui/app/AppSwapWindow \
+	dbaccess/source/ui/app/AppTitleWindow \
+	dbaccess/source/ui/app/AppView \
+	dbaccess/source/ui/app/closeveto \
+	dbaccess/source/ui/app/subcomponentmanager \
+	dbaccess/source/ui/browser/genericcontroller \
+	dbaccess/source/ui/browser/dsbrowserDnD \
+	dbaccess/source/ui/browser/dataview \
+	dbaccess/source/ui/browser/dbexchange \
+	dbaccess/source/ui/browser/dbloader \
+	dbaccess/source/ui/browser/sbagrid \
+	dbaccess/source/ui/browser/formadapter \
+	dbaccess/source/ui/browser/brwview \
+	dbaccess/source/ui/browser/brwctrlr \
+	dbaccess/source/ui/browser/unodatbr \
+	dbaccess/source/ui/browser/sbamultiplex \
+	dbaccess/source/ui/browser/exsrcbrw \
+	dbaccess/source/ui/browser/dbtreemodel \
+	dbaccess/source/ui/browser/dsEntriesNoExp \
+	dbaccess/source/ui/browser/dbtreeview \
+	dbaccess/source/ui/control/statusbarontroller \
+	dbaccess/source/ui/control/RelationControl \
+	dbaccess/source/ui/control/toolboxcontroller \
+	dbaccess/source/ui/control/tabletree \
+	dbaccess/source/ui/control/TableGrantCtrl \
+	dbaccess/source/ui/control/dbtreelistbox \
+	dbaccess/source/ui/control/sqledit \
+	dbaccess/source/ui/control/ColumnControlWindow \
+	dbaccess/source/ui/control/FieldDescControl \
+	dbaccess/source/ui/control/opendoccontrols \
+	dbaccess/source/ui/dlg/directsql \
+	dbaccess/source/ui/dlg/dbwiz \
+	dbaccess/source/ui/dlg/dbwizsetup \
+	dbaccess/source/ui/dlg/generalpage \
+	dbaccess/source/ui/dlg/indexfieldscontrol \
+	dbaccess/source/ui/dlg/indexdialog \
+	dbaccess/source/ui/dlg/RelationDlg \
+	dbaccess/source/ui/dlg/adtabdlg \
+	dbaccess/source/ui/dlg/dlgsave \
+	dbaccess/source/ui/dlg/admincontrols \
+	dbaccess/source/ui/dlg/adminpages \
+	dbaccess/source/ui/dlg/queryorder \
+	dbaccess/source/ui/dlg/queryfilter \
+	dbaccess/source/ui/dlg/paramdialog \
+	dbaccess/source/ui/dlg/dbadmin \
+	dbaccess/source/ui/dlg/detailpages \
+	dbaccess/source/ui/dlg/sqlmessage \
+	dbaccess/source/ui/dlg/finteraction \
+	dbaccess/source/ui/dlg/ConnectionPage \
+	dbaccess/source/ui/dlg/ConnectionHelper \
+	dbaccess/source/ui/dlg/TextConnectionHelper \
+	dbaccess/source/ui/dlg/ConnectionPageSetup \
+	dbaccess/source/ui/dlg/DBSetupConnectionPages \
+	dbaccess/source/ui/dlg/UserAdminDlg \
+	dbaccess/source/ui/dlg/UserAdmin \
+	dbaccess/source/ui/dlg/AdabasStat \
+	dbaccess/source/ui/dlg/tablespage \
+	dbaccess/source/ui/dlg/DbAdminImpl \
+	dbaccess/source/ui/dlg/TablesSingleDlg \
+	dbaccess/source/ui/dlg/CollectionView \
+	dbaccess/source/ui/dlg/dsselect \
+	dbaccess/source/ui/dlg/dbfindex \
+	dbaccess/source/ui/dlg/DriverSettings \
+	dbaccess/source/ui/dlg/odbcconfig \
+	dbaccess/source/ui/dlg/advancedsettings \
+	dbaccess/source/ui/dlg/textconnectionsettings \
+	dbaccess/source/ui/misc/asyncmodaldialog \
+	dbaccess/source/ui/misc/imageprovider \
+	dbaccess/source/ui/misc/singledoccontroller \
+	dbaccess/source/ui/misc/dbsubcomponentcontroller \
+	dbaccess/source/ui/misc/datasourceconnector \
+	dbaccess/source/ui/misc/linkeddocuments \
+	dbaccess/source/ui/misc/indexcollection \
+	dbaccess/source/ui/misc/UITools \
+	dbaccess/source/ui/misc/WCPage \
+	dbaccess/source/ui/misc/WCopyTable \
+	dbaccess/source/ui/misc/WTypeSelect \
+	dbaccess/source/ui/misc/TokenWriter \
+	dbaccess/source/ui/misc/HtmlReader \
+	dbaccess/source/ui/misc/RtfReader \
+	dbaccess/source/ui/misc/propertysetitem \
+	dbaccess/source/ui/misc/databaseobjectview \
+	dbaccess/source/ui/misc/DExport \
+	dbaccess/source/ui/misc/uiservices \
+	dbaccess/source/ui/misc/RowSetDrop \
+	dbaccess/source/ui/misc/TableCopyHelper \
+	dbaccess/source/ui/misc/moduledbu \
+	dbaccess/source/ui/misc/WColumnSelect \
+	dbaccess/source/ui/misc/WExtendPages \
+	dbaccess/source/ui/misc/WNameMatch \
+	dbaccess/source/ui/misc/ToolBoxHelper \
+	dbaccess/source/ui/misc/stringlistitem \
+	dbaccess/source/ui/misc/charsets \
+	dbaccess/source/ui/misc/defaultobjectnamecheck \
+	dbaccess/source/ui/misc/dsmeta \
+	dbaccess/source/ui/misc/controllerframe \
+	dbaccess/source/ui/misc/propertystorage \
+	dbaccess/source/ui/misc/dbaundomanager \
+	dbaccess/source/ui/querydesign/ConnectionLineAccess \
+	dbaccess/source/ui/querydesign/TableWindowAccess \
+	dbaccess/source/ui/querydesign/JAccess \
+	dbaccess/source/ui/querydesign/JoinDesignView \
+	dbaccess/source/ui/querydesign/JoinController \
+	dbaccess/source/ui/querydesign/QueryDesignView \
+	dbaccess/source/ui/querydesign/SelectionBrowseBox \
+	dbaccess/source/ui/querydesign/querydlg \
+	dbaccess/source/ui/querydesign/QueryTabWinUndoAct \
+	dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \
+	dbaccess/source/ui/querydesign/QueryTabConnUndoAction \
+	dbaccess/source/ui/querydesign/TableFieldDescription \
+	dbaccess/source/ui/querydesign/JoinTableView \
+	dbaccess/source/ui/querydesign/QueryViewSwitch \
+	dbaccess/source/ui/querydesign/QueryTableView \
+	dbaccess/source/ui/querydesign/TableWindowData \
+	dbaccess/source/ui/querydesign/QTableWindow \
+	dbaccess/source/ui/querydesign/TableWindow \
+	dbaccess/source/ui/querydesign/JoinExchange \
+	dbaccess/source/ui/querydesign/TableWindowListBox \
+	dbaccess/source/ui/querydesign/TableWindowTitle \
+	dbaccess/source/ui/querydesign/QueryTextView \
+	dbaccess/source/ui/querydesign/QTableConnection \
+	dbaccess/source/ui/querydesign/querycontroller \
+	dbaccess/source/ui/querydesign/querycontainerwindow \
+	dbaccess/source/ui/querydesign/queryview \
+	dbaccess/source/ui/querydesign/TableConnection \
+	dbaccess/source/ui/querydesign/TableConnectionData \
+	dbaccess/source/ui/relationdesign/RTableConnection \
+	dbaccess/source/ui/relationdesign/RTableConnectionData \
+	dbaccess/source/ui/relationdesign/RelationTableView \
+	dbaccess/source/ui/relationdesign/RelationDesignView \
+	dbaccess/source/ui/relationdesign/RelationController \
+	dbaccess/source/ui/tabledesign/TableDesignControl \
+	dbaccess/source/ui/tabledesign/TableFieldDescWin \
+	dbaccess/source/ui/tabledesign/TableController \
+	dbaccess/source/ui/tabledesign/TableDesignView \
+	dbaccess/source/ui/tabledesign/TEditControl \
+	dbaccess/source/ui/tabledesign/TableFieldControl \
+	dbaccess/source/ui/tabledesign/TableDesignHelpBar \
+	dbaccess/source/ui/tabledesign/FieldDescGenWin \
+	dbaccess/source/ui/tabledesign/FieldDescriptions \
+	dbaccess/source/ui/tabledesign/TableRow \
+	dbaccess/source/ui/tabledesign/TableRowExchange \
+	dbaccess/source/ui/tabledesign/TableUndo \
+	dbaccess/source/ui/uno/composerdialogs \
+	dbaccess/source/ui/uno/unosqlmessage \
+	dbaccess/source/ui/uno/unoadmin \
+	dbaccess/source/ui/uno/admindlg \
+	dbaccess/source/ui/uno/TableFilterDlg \
+	dbaccess/source/ui/uno/AdvancedSettingsDlg \
+	dbaccess/source/ui/uno/unoDirectSql \
+	dbaccess/source/ui/uno/DBTypeWizDlg \
+	dbaccess/source/ui/uno/DBTypeWizDlgSetup \
+	dbaccess/source/ui/uno/UserSettingsDlg \
+	dbaccess/source/ui/uno/ColumnModel \
+	dbaccess/source/ui/uno/ColumnControl \
+	dbaccess/source/ui/uno/ColumnPeer \
+	dbaccess/source/ui/uno/dbinteraction \
+	dbaccess/source/ui/uno/textconnectionsettings_uno \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbui, \
+	dbaccess/source/ui/control/ScrollHelper		\
+	dbaccess/source/ui/control/VertSplitView		\
+	dbaccess/source/ui/control/SqlNameEdit			\
+	dbaccess/source/ui/control/listviewitems		\
+	dbaccess/source/ui/control/undosqledit			\
+	dbaccess/source/ui/control/marktree			\
+	dbaccess/source/ui/control/curledit            \
+	dbaccess/source/ui/control/charsetlistbox		\
+	dbaccess/source/ui/app/AppIconControl \
+	dbaccess/source/ui/browser/AsyncronousLink \
+	dbaccess/source/ui/dlg/dlgsize \
+	dbaccess/source/ui/dlg/dlgattr \
+	dbaccess/source/ui/dlg/optionalboolitem \
+	dbaccess/source/ui/querydesign/TableFieldInfo \
+	dbaccess/source/ui/querydesign/QTableConnectionData \
+	dbaccess/source/ui/querydesign/QTableWindowData \
+	dbaccess/source/ui/querydesign/ConnectionLine \
+	dbaccess/source/ui/querydesign/ConnectionLineData \
+	dbaccess/source/shared/dbu_reghelper \
+	dbaccess/source/shared/dbustrings \
+))
+
+# the following source file can't be compiled with optimization by some compilers (crash or endless loop):
+# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC
+# the latter is currently not supported by gbuild and needs a fix here later
+ifeq ($(COM),$(filter-out GCC,$(COM)))
+$(eval $(call gb_Library_add_exception_objects,dbui,\
+    dbaccess/source/ui/uno/copytablewizard \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,dbui,\
+    dbaccess/source/ui/uno/copytablewizard \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 6c24a4560..0ca735892 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -1,68 +1,68 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,sdbt))
-$(eval $(call gb_Library_add_package_headers,sdbt,dbaccess_inc))
-
-$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
-
-$(eval $(call gb_Library_set_include,sdbt,\
-	-I$(SRCDIR)/dbaccess/inc \
-	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
-	-I$(SRCDIR)/dbaccess/source/inc \
-	-I$(SRCDIR)/dbaccess/inc/pch \
-	$$(SOLARINC) \
-	-I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_Library_add_linked_libs,sdbt,\
-	tl \
-	cppuhelper \
-	cppu \
-	comphelper \
-	utl \
-	sal \
-	stl \
-	dbtools \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,sdbt,\
-	dbaccess/source/sdbtools/connection/connectiontools \
-	dbaccess/source/sdbtools/connection/tablename \
-	dbaccess/source/sdbtools/connection/objectnames \
-	dbaccess/source/sdbtools/connection/datasourcemetadata \
-	dbaccess/source/sdbtools/misc/sdbt_services \
-	dbaccess/source/sdbtools/misc/module_sdbt \
-))
-
-$(eval $(call gb_Library_add_noexception_objects,sdbt, \
-	dbaccess/source/shared/sdbtstrings \
-))
-
-# vim: set noet sw=4 ts=4:
-# vim: set noet sw=4 ts=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sdbt))
+$(eval $(call gb_Library_add_package_headers,sdbt,dbaccess_inc))
+
+$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
+
+$(eval $(call gb_Library_set_include,sdbt,\
+	-I$(SRCDIR)/dbaccess/inc \
+	-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
+	-I$(SRCDIR)/dbaccess/source/inc \
+	-I$(SRCDIR)/dbaccess/inc/pch \
+	$$(SOLARINC) \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdbt,\
+	tl \
+	cppuhelper \
+	cppu \
+	comphelper \
+	utl \
+	sal \
+	stl \
+	dbtools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sdbt,\
+	dbaccess/source/sdbtools/connection/connectiontools \
+	dbaccess/source/sdbtools/connection/tablename \
+	dbaccess/source/sdbtools/connection/objectnames \
+	dbaccess/source/sdbtools/connection/datasourcemetadata \
+	dbaccess/source/sdbtools/misc/sdbt_services \
+	dbaccess/source/sdbtools/misc/module_sdbt \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,sdbt, \
+	dbaccess/source/shared/sdbtstrings \
+))
+
+# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index ee854e51f..2f41e13c7 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -1,53 +1,58 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,dbaccess))
-
-$(eval $(call gb_Module_add_targets,dbaccess,\
-	AllLangResTarget_adabasui \
-	AllLangResTarget_dba \
-	AllLangResTarget_dbmm \
-	AllLangResTarget_dbui \
-	AllLangResTarget_sdbt \
-	Library_adabasui \
-	Library_dba \
-	Library_dbaxml \
-	Library_dbmm \
-	Library_dbui \
-	Library_sdbt \
-	Executable_odbcconfig \
-	Package_inc \
-	Package_uiconfig \
-	Package_xml \
-))
-
-$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
-	JunitTest_dbaccess_complex \
-	JunitTest_dbaccess_unoapi \
-))
-
-# vim: set noet ts=4 sw=4:
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,dbaccess))
+
+$(eval $(call gb_Module_add_targets,dbaccess,\
+	AllLangResTarget_adabasui \
+	AllLangResTarget_dba \
+	AllLangResTarget_dbmm \
+	AllLangResTarget_dbui \
+	AllLangResTarget_sdbt \
+	Library_adabasui \
+	Library_dba \
+	Library_dbaxml \
+	Library_dbmm \
+	Library_dbui \
+	Library_sdbt \
+	Package_inc \
+	Package_uiconfig \
+	Package_xml \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,dbaccess,\
+	Executable_odbcconfig \
+))
+endif
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
+	JunitTest_dbaccess_complex \
+	JunitTest_dbaccess_unoapi \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
index 183d66346..753fd9c69 100644
--- a/dbaccess/Package_inc.mk
+++ b/dbaccess/Package_inc.mk
@@ -1,39 +1,39 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,dbaccess_inc,$(SRCDIR)/dbaccess/inc))
-
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/AsyncronousLink.hxx ,AsyncronousLink.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/IController.hxx ,IController.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/IReference.hxx ,IReference.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/ToolBoxHelper.hxx ,ToolBoxHelper.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/controllerframe.hxx ,controllerframe.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dataview.hxx ,dataview.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbaundomanager.hxx ,dbaundomanager.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbaccessdllapi.h ,dbaccessdllapi.h ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbsubcomponentcontroller.hxx ,dbsubcomponentcontroller.hxx ))
-$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/genericcontroller.hxx ,genericcontroller.hxx ))
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,dbaccess_inc,$(SRCDIR)/dbaccess/inc))
+
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/AsyncronousLink.hxx ,AsyncronousLink.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/IController.hxx ,IController.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/IReference.hxx ,IReference.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/ToolBoxHelper.hxx ,ToolBoxHelper.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/controllerframe.hxx ,controllerframe.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dataview.hxx ,dataview.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbaundomanager.hxx ,dbaundomanager.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbaccessdllapi.h ,dbaccessdllapi.h ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbsubcomponentcontroller.hxx ,dbsubcomponentcontroller.hxx ))
+$(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/genericcontroller.hxx ,genericcontroller.hxx ))
-- 
cgit v1.2.3