gnumake4: reportdesign, dbaccess: remove DOS lineendings [hg:ba7a15028880]

author: Michael Stahl <mst@openoffice.org> 2011-04-15 17:27:06 +0000
committer: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> 2011-06-17 16:51:32 +0200
commit: 2ac6f1c4f775d10e92e22379d473c1c31835e8ff (patch)
tree: 8204f931bd1bc6073bd81126b9fc4b526456ea8d /dbaccess
parent: 6a91b70e1f5646f194044d14d9a1eaa8edb422d2 (diff)
15 files changed, 843 insertions, 843 deletions
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index 1fc31b1388f4..8657b5ffc7a4 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,\
+#*************************************************************************
+#
+# 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:
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 6263b03ba011..df114aecf88a 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,\
+#*************************************************************************
+#
+# 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:
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index 0f54f7ebbf69..152bf58003ef 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,\
+#*************************************************************************
+#
+# 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:
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index d12eed374a84..322b344e0d4b 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -1,48 +1,48 @@
-#*************************************************************************
-#
-# 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,\
+#*************************************************************************
+#
+# 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 \
@@ -83,73 +83,73 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\
 	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:
+))
+
+$(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 b1cdb77dc22c..5e8bb6638aa0 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,\
+#*************************************************************************
+#
+# 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:
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 1de5433ffc1b..0330fd75582f 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -78,4 +78,4 @@ $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\
 	complex.dbaccess.TestCase \
 ))
 
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 400f9b250876..bbae54a464d2 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -50,4 +50,4 @@ $(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
 	org.openoffice.dbaccess.qa.unoapi.Test \
 ))
 
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index a8ef08cc47c0..373f9f2c1130 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))
+#*************************************************************************
+#
+# 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,\
+
+$(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:
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 58835101a4fa..7325c1213f5e 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -1,72 +1,72 @@
-#*************************************************************************
-#
-# 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))
+#*************************************************************************
+#
+# 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,\
+
+$(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 \
@@ -102,7 +102,7 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
 	dbaccess/source/core/api/WrappedResultSet \
 	dbaccess/source/core/api/OptimisticSet \
 	dbaccess/source/core/api/PrivateRow \
-	dbaccess/source/core/api/columnsettings \
+	dbaccess/source/core/api/columnsettings \
 	dbaccess/source/core/dataaccess/SharedConnection \
 	dbaccess/source/core/dataaccess/ContentHelper \
 	dbaccess/source/core/dataaccess/bookmarkcontainer \
@@ -124,7 +124,7 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
 	dbaccess/source/core/dataaccess/ModelImpl \
 	dbaccess/source/core/dataaccess/documentevents \
 	dbaccess/source/core/dataaccess/documenteventexecutor \
-	dbaccess/source/core/dataaccess/documenteventnotifier \
+	dbaccess/source/core/dataaccess/documenteventnotifier \
 	dbaccess/source/core/misc/sdbcoretools \
 	dbaccess/source/core/misc/services \
 	dbaccess/source/core/misc/PropertyForward \
@@ -137,15 +137,15 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
 	dbaccess/source/core/misc/dsntypes \
 	dbaccess/source/core/misc/veto \
 	dbaccess/source/core/misc/apitools \
-	dbaccess/source/core/misc/dbastrings \
+	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:
+	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 337d16a300e8..61ee0e072bdc 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -1,65 +1,65 @@
-#*************************************************************************
-#
-# 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))
+#*************************************************************************
+#
+# 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,\
+
+$(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                         \
@@ -85,12 +85,12 @@ $(eval $(call gb_Library_add_exception_objects,dbaxml,\
 	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:
+	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 59923cf48e9e..319a85f7f6d8 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -1,45 +1,45 @@
-#*************************************************************************
-#
-# 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))
+#*************************************************************************
+#
+# 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,\
+
+$(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    \
@@ -52,12 +52,12 @@ $(eval $(call gb_Library_add_linked_libs,dbmm,\
 	svxcore           \
 	svx           \
 	ucbhelper     \
-	stl \
-	xcr \
-    $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,dbmm,\
+	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 \
@@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_exception_objects,dbmm,\
 	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:
+	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 157dc277583c..11123318c812 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -1,119 +1,119 @@
-#*************************************************************************
-#
-# 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))
+#*************************************************************************
+#
+# 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 \
-))
+
+$(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),) 
+ifneq ($(WINDOWS_VISTA_PSDK),)
 ifeq ($(PROF_EDITION),)
-$(eval $(call gb_Library_add_defs,dbui,\
-	-DDBACCESS_DLLIMPLEMENTATION\
-	-DWINDOWS_VISTA_PSDK \
+$(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 \
+$(eval $(call gb_Library_add_cflags,dbui,\
+	-fpermissive \
 ))
-endif
-
+endif
+
 ifeq ($(PROF_EDITION),)
 ifneq ($(WINDOWS_VISTA_PSDK),)
 DISABLE_ADO=TRUE
 endif
 endif
 
-ifeq ($(OS),WNT) 
+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,\
+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 \
@@ -137,8 +137,8 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	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/browser/dsEntriesNoExp \
+	dbaccess/source/ui/browser/dbtreeview \
 	dbaccess/source/ui/control/statusbarontroller \
 	dbaccess/source/ui/control/RelationControl \
 	dbaccess/source/ui/control/toolboxcontroller \
@@ -148,7 +148,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/control/sqledit \
 	dbaccess/source/ui/control/ColumnControlWindow \
 	dbaccess/source/ui/control/FieldDescControl \
-	dbaccess/source/ui/control/opendoccontrols \
+	dbaccess/source/ui/control/opendoccontrols \
 	dbaccess/source/ui/dlg/directsql \
 	dbaccess/source/ui/dlg/dbwiz \
 	dbaccess/source/ui/dlg/dbwizsetup \
@@ -184,7 +184,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/dlg/DriverSettings \
 	dbaccess/source/ui/dlg/odbcconfig \
 	dbaccess/source/ui/dlg/advancedsettings \
-	dbaccess/source/ui/dlg/textconnectionsettings \
+	dbaccess/source/ui/dlg/textconnectionsettings \
 	dbaccess/source/ui/misc/asyncmodaldialog \
 	dbaccess/source/ui/misc/imageprovider \
 	dbaccess/source/ui/misc/singledoccontroller \
@@ -216,7 +216,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/misc/dsmeta \
 	dbaccess/source/ui/misc/controllerframe \
 	dbaccess/source/ui/misc/propertystorage \
-	dbaccess/source/ui/misc/dbaundomanager \
+	dbaccess/source/ui/misc/dbaundomanager \
 	dbaccess/source/ui/querydesign/ConnectionLineAccess \
 	dbaccess/source/ui/querydesign/TableWindowAccess \
 	dbaccess/source/ui/querydesign/JAccess \
@@ -244,12 +244,12 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/querydesign/querycontainerwindow \
 	dbaccess/source/ui/querydesign/queryview \
 	dbaccess/source/ui/querydesign/TableConnection \
-	dbaccess/source/ui/querydesign/TableConnectionData \
+	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/relationdesign/RelationController \
 	dbaccess/source/ui/tabledesign/TableDesignControl \
 	dbaccess/source/ui/tabledesign/TableFieldDescWin \
 	dbaccess/source/ui/tabledesign/TableController \
@@ -261,7 +261,7 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	dbaccess/source/ui/tabledesign/FieldDescriptions \
 	dbaccess/source/ui/tabledesign/TableRow \
 	dbaccess/source/ui/tabledesign/TableRowExchange \
-	dbaccess/source/ui/tabledesign/TableUndo \
+	dbaccess/source/ui/tabledesign/TableUndo \
 	dbaccess/source/ui/uno/composerdialogs \
 	dbaccess/source/ui/uno/unosqlmessage \
 	dbaccess/source/ui/uno/unoadmin \
@@ -276,44 +276,44 @@ $(eval $(call gb_Library_add_exception_objects,dbui,\
 	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/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/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:
+	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 d5a7dc070490..6c24a456017c 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))
+#*************************************************************************
+#
+# 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,\
+$(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/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:
+	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 e2a785a316bf..ee854e51fd99 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -1,53 +1,53 @@
-#*************************************************************************
-#
-# 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 \
+	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:
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
index 56df593b0326..183d663464d1 100644
--- a/dbaccess/Package_inc.mk
+++ b/dbaccess/Package_inc.mk
@@ -1,32 +1,32 @@
-#*************************************************************************
-#
-# 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))
-
+#*************************************************************************
+#
+# 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 ))
author	Michael Stahl <mst@openoffice.org>	2011-04-15 17:27:06 +0000
committer	Bjoern Michaelsen <bjoern.michaelsen@canonical.com>	2011-06-17 16:51:32 +0200
commit	2ac6f1c4f775d10e92e22379d473c1c31835e8ff (patch)
tree	8204f931bd1bc6073bd81126b9fc4b526456ea8d /dbaccess
parent	6a91b70e1f5646f194044d14d9a1eaa8edb422d2 (diff)