Merge branch 'master' into feature/gnumake4

Conflicts:
dbaccess/AllLangResTarget_adabasui.mk
dbaccess/AllLangResTarget_dba.mk
dbaccess/AllLangResTarget_dbmm.mk
dbaccess/AllLangResTarget_sdbt.mk
dbaccess/Executable_odbcconfig.mk
dbaccess/JunitTest_dbaccess_unoapi.mk
dbaccess/Library_adabasui.mk
dbaccess/Library_dba.mk
dbaccess/Library_dbaxml.mk
dbaccess/Library_dbmm.mk
dbaccess/Library_sdbt.mk
dbaccess/Makefile
dbaccess/Module_dbaccess.mk
dbaccess/Package_inc.mk
dbaccess/Package_uiconfig.mk
dbaccess/prj/build.lst
dbaccess/qa/unoapi/Test.java
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/filter/xml/xmlAutoStyle.cxx
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlComponent.cxx
dbaccess/source/filter/xml/xmlConnectionData.cxx
dbaccess/source/filter/xml/xmlConnectionResource.cxx
dbaccess/source/filter/xml/xmlDataSource.cxx
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
dbaccess/source/filter/xml/xmlDocuments.cxx
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
dbaccess/source/filter/xml/xmlHelper.cxx
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
dbaccess/source/filter/xml/xmlLogin.cxx
dbaccess/source/filter/xml/xmlQuery.cxx
dbaccess/source/filter/xml/xmlServerDatabase.cxx
dbaccess/source/filter/xml/xmlTable.cxx
dbaccess/source/filter/xml/xmlTableFilterList.cxx
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/app/AppTitleWindow.cxx
dbaccess/source/ui/app/AppView.cxx
dbaccess/source/ui/browser/AsyncronousLink.cxx
dbaccess/source/ui/browser/genericcontroller.cxx
dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
dbaccess/source/ui/dlg/RelationDlg.cxx
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/dlgsize.cxx
dbaccess/source/ui/dlg/queryorder.cxx
dbaccess/source/ui/dlg/tablespage.cxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WExtendPages.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WTypeSelect.cxx
dbaccess/source/ui/querydesign/ConnectionLine.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
dbaccess/source/ui/querydesign/JAccess.cxx
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/JoinDesignView.cxx
dbaccess/source/ui/querydesign/JoinExchange.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/QTableConnection.cxx
dbaccess/source/ui/querydesign/QTableConnectionData.cxx
dbaccess/source/ui/querydesign/QTableWindow.cxx
dbaccess/source/ui/querydesign/QTableWindowData.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
dbaccess/source/ui/querydesign/QueryTextView.cxx
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnection.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
dbaccess/source/ui/querydesign/TableWindowData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
dbaccess/source/ui/querydesign/querydlg.cxx
dbaccess/source/ui/querydesign/queryview.cxx
dbaccess/source/ui/relationdesign/RTableConnection.cxx
dbaccess/source/ui/relationdesign/RelationDesignView.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
dbaccess/source/ui/tabledesign/TableDesignView.cxx
dbaccess/source/ui/tabledesign/TableFieldControl.cxx
dbaccess/source/ui/tabledesign/TableRow.cxx
dbaccess/source/ui/tabledesign/TableRowExchange.cxx
dbaccess/source/ui/tabledesign/TableUndo.cxx
dbaccess/source/ui/uno/ColumnControl.cxx
dbaccess/source/ui/uno/ColumnPeer.cxx
reportdesign/AllLangResTarget_rpt.mk
reportdesign/AllLangResTarget_rptui.mk
reportdesign/Library_rpt.mk
reportdesign/Library_rptui.mk
reportdesign/Library_rptxml.mk
reportdesign/Module_reportdesign.mk
reportdesign/Package_uiconfig.mk
reportdesign/Package_xml.mk
reportdesign/prj/build.lst
reportdesign/prj/makefile.mk

1 files changed, 113 insertions, 116 deletions

diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index 674ad059273b..c532117ce9a7 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -1,116 +1,113 @@
-#*************************************************************************

-#

-# 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,rptui))

-$(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_rptui))

-

-$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))

-

-$(eval $(call gb_Library_set_include,rptui,\

-	-I$(SRCDIR)/reportdesign/inc \

-	-I$(SRCDIR)/reportdesign/source/ui/inc \

-	-I$(SRCDIR)/reportdesign/source/inc \

-	-I$(SRCDIR)/reportdesign/inc/pch \

-	$$(SOLARINC) \

-	-I$(OUTDIR)/inc/offuh \

-))

-

-$(eval $(call gb_Library_add_linked_libs,rptui,\

-	editeng \

-	comphelper \

-	cppuhelper \

-	cppu \

-	dbtools \

-	i18nisolang1 \

-	fwe \

-	sal \

-	salhelper \

-	sfx \

-	svl \

-	svt \

-	stl \

-	vcl \

-	for \

-	tl \

-	utl \

-	ucbhelper \

-	svxcore \

-	svx \

-	tk \

-	sot \

-	dba \

-	vos3 \

-	forui \

-	dbui \

-	rpt \

-    $(gb_STDLIBS) \

-))

-

-$(eval $(call gb_Library_add_exception_objects,rptui,\

-	reportdesign/source/ui/dlg/dlgpage					\

-	reportdesign/source/ui/dlg/Condition				\

-	reportdesign/source/ui/dlg/CondFormat				\

-	reportdesign/source/ui/dlg/GroupExchange			\

-	reportdesign/source/ui/dlg/PageNumber				\

-	reportdesign/source/ui/dlg/DateTime				\

-	reportdesign/source/ui/dlg/AddField				\

-	reportdesign/source/ui/dlg/Navigator				\

-	reportdesign/source/ui/dlg/GroupsSorting           \

-	reportdesign/source/ui/dlg/Formula \

-	reportdesign/source/ui/inspection/DefaultInspection		\

-	reportdesign/source/ui/inspection/ReportComponentHandler	\

-	reportdesign/source/ui/inspection/GeometryHandler			\

-	reportdesign/source/ui/inspection/DataProviderHandler		\

-	reportdesign/source/ui/inspection/metadata \

-	reportdesign/source/ui/misc/RptUndo					\

-	reportdesign/source/ui/misc/ColorListener			\

-	reportdesign/source/ui/misc/UITools					\

-	reportdesign/source/ui/misc/rptuiservices			\

-	reportdesign/source/ui/misc/toolboxcontroller		\

-	reportdesign/source/ui/misc/statusbarcontroller		\

-	reportdesign/source/ui/misc/FunctionHelper \

-	reportdesign/source/ui/report/SectionWindow			\

-	reportdesign/source/ui/report/ReportController		\

-	reportdesign/source/ui/report/ReportControllerObserver \

-	reportdesign/source/ui/report/FormattedFieldBeautifier \

-	reportdesign/source/ui/report/FixedTextColor           \

-	reportdesign/source/ui/report/ReportSection			\

-	reportdesign/source/ui/report/SectionView				\

-	reportdesign/source/ui/report/ViewsWindow				\

-	reportdesign/source/ui/report/ScrollHelper			\

-	reportdesign/source/ui/report/StartMarker				\

-	reportdesign/source/ui/report/EndMarker				\

-	reportdesign/source/ui/report/dlgedfunc				\

-	reportdesign/source/ui/report/dlgedfac				\

-	reportdesign/source/ui/report/dlgedclip				\

-	reportdesign/source/ui/report/ReportWindow			\

-	reportdesign/source/ui/report/DesignView				\

-	reportdesign/source/ui/report/propbrw \

-	reportdesign/source/shared/uistrings \

-))

-

-# vim: set noet sw=4 ts=4:

+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       David Tardon, Red Hat Inc. <dtardon@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,rptui))
+
+$(eval $(call gb_Library_add_precompiled_header,rptui,$(SRCDIR)/reportdesign/inc/pch/precompiled_reportdesign))
+
+$(eval $(call gb_Library_set_include,rptui,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
+    -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
+    -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_linked_libs,rptui,\
+    comphelper \
+    cppu \
+    cppuhelper \
+    dbtools \
+    dbu \
+    editeng \
+    for \
+    forui \
+    fwe \
+    i18nisolang1 \
+    rpt \
+    sal \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svxcore \
+    svx \
+    tk \
+    tl \
+    utl \
+    vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,rptui,reportdesign/util/rptui))
+
+$(eval $(call gb_Library_add_exception_objects,rptui,\
+    reportdesign/source/shared/uistrings \
+    reportdesign/source/ui/dlg/AddField \
+    reportdesign/source/ui/dlg/CondFormat \
+    reportdesign/source/ui/dlg/Condition \
+    reportdesign/source/ui/dlg/DateTime \
+    reportdesign/source/ui/dlg/dlgpage \
+    reportdesign/source/ui/dlg/Formula \
+    reportdesign/source/ui/dlg/GroupExchange \
+    reportdesign/source/ui/dlg/GroupsSorting \
+    reportdesign/source/ui/dlg/Navigator \
+    reportdesign/source/ui/dlg/PageNumber \
+    reportdesign/source/ui/inspection/DataProviderHandler \
+    reportdesign/source/ui/inspection/DefaultInspection \
+    reportdesign/source/ui/inspection/GeometryHandler \
+    reportdesign/source/ui/inspection/metadata \
+    reportdesign/source/ui/inspection/ReportComponentHandler \
+    reportdesign/source/ui/misc/ColorListener \
+    reportdesign/source/ui/misc/FunctionHelper \
+    reportdesign/source/ui/misc/rptuiservices \
+    reportdesign/source/ui/misc/RptUndo \
+    reportdesign/source/ui/misc/statusbarcontroller \
+    reportdesign/source/ui/misc/toolboxcontroller \
+    reportdesign/source/ui/misc/UITools \
+    reportdesign/source/ui/report/DesignView \
+    reportdesign/source/ui/report/dlgedclip \
+    reportdesign/source/ui/report/dlgedfac \
+    reportdesign/source/ui/report/dlgedfunc \
+    reportdesign/source/ui/report/EndMarker \
+    reportdesign/source/ui/report/FixedTextColor \
+    reportdesign/source/ui/report/FormattedFieldBeautifier \
+    reportdesign/source/ui/report/propbrw \
+    reportdesign/source/ui/report/ReportController \
+    reportdesign/source/ui/report/ReportControllerObserver \
+    reportdesign/source/ui/report/ReportSection \
+    reportdesign/source/ui/report/ReportWindow \
+    reportdesign/source/ui/report/ScrollHelper \
+    reportdesign/source/ui/report/SectionView \
+    reportdesign/source/ui/report/SectionWindow \
+    reportdesign/source/ui/report/StartMarker \
+    reportdesign/source/ui/report/ViewsWindow \
+))
+
+# vim: set noet ts=4 sw=4: