From dae8595066271e6f07320c2181e495fab1e97ecd Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 23 Jul 2011 10:13:13 +0200 Subject: revert to dbaccess gbuildization from master mostly * only add JunitTest_dbaccess_complex, which was missing on master * disable complex.dbaccess.DatabaseDocument in JunitTest_dbaccess_complex for now as it fails --- dbaccess/AllLangResTarget_adabasui.mk | 55 ++-- dbaccess/AllLangResTarget_dbu.mk | 95 ++++++ dbaccess/JunitTest_dbaccess_complex.mk | 2 +- dbaccess/JunitTest_dbaccess_unoapi.mk | 4 - dbaccess/Library_adabasui.mk | 75 +++++ dbaccess/Library_dbu.mk | 323 +++++++++++++++++++++ dbaccess/Makefile | 2 +- dbaccess/Module_dbaccess.mk | 10 +- dbaccess/Package_inc.mk | 6 +- dbaccess/source/core/api/CacheSet.hxx | 1 - dbaccess/source/core/dataaccess/connection.cxx | 1 - dbaccess/source/core/dataaccess/datasource.cxx | 2 +- dbaccess/source/ext/macromigration/dbmm_module.cxx | 2 +- .../source/ext/macromigration/dbmm_services.cxx | 2 +- dbaccess/source/ext/macromigration/dbmm_types.cxx | 2 +- .../source/ext/macromigration/docinteraction.cxx | 2 +- .../ext/macromigration/macromigrationdialog.cxx | 2 +- .../ext/macromigration/macromigrationpages.cxx | 2 +- .../ext/macromigration/macromigrationwizard.cxx | 2 +- .../source/ext/macromigration/migrationengine.cxx | 2 +- .../source/ext/macromigration/migrationlog.cxx | 2 +- .../source/ext/macromigration/progresscapture.cxx | 2 +- .../source/ext/macromigration/progressmixer.cxx | 2 +- dbaccess/source/filter/xml/dbloader2.cxx | 2 +- dbaccess/source/filter/xml/xmlAutoStyle.cxx | 2 +- dbaccess/source/filter/xml/xmlColumn.cxx | 2 +- dbaccess/source/filter/xml/xmlComponent.cxx | 2 +- dbaccess/source/filter/xml/xmlConnectionData.cxx | 2 +- .../source/filter/xml/xmlConnectionResource.cxx | 2 +- dbaccess/source/filter/xml/xmlDataSource.cxx | 2 +- dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 2 +- .../source/filter/xml/xmlDataSourceSetting.cxx | 2 +- .../source/filter/xml/xmlDataSourceSettings.cxx | 2 +- dbaccess/source/filter/xml/xmlDatabase.cxx | 2 +- .../source/filter/xml/xmlDatabaseDescription.cxx | 2 +- dbaccess/source/filter/xml/xmlDocuments.cxx | 2 +- dbaccess/source/filter/xml/xmlExport.cxx | 2 +- .../source/filter/xml/xmlFileBasedDatabase.cxx | 2 +- dbaccess/source/filter/xml/xmlHelper.cxx | 2 +- .../source/filter/xml/xmlHierarchyCollection.cxx | 2 +- dbaccess/source/filter/xml/xmlLogin.cxx | 2 +- dbaccess/source/filter/xml/xmlQuery.cxx | 2 +- dbaccess/source/filter/xml/xmlServerDatabase.cxx | 2 +- dbaccess/source/filter/xml/xmlStyleImport.cxx | 2 +- dbaccess/source/filter/xml/xmlTable.cxx | 2 +- dbaccess/source/filter/xml/xmlTableFilterList.cxx | 2 +- .../source/filter/xml/xmlTableFilterPattern.cxx | 2 +- dbaccess/source/filter/xml/xmlfilter.cxx | 2 +- dbaccess/source/filter/xml/xmlservices.cxx | 2 +- dbaccess/source/shared/dbu_reghelper.cxx | 2 +- dbaccess/source/shared/dbustrings.cxx | 2 +- dbaccess/source/shared/flt_reghelper.cxx | 2 +- dbaccess/source/shared/xmlstrings.cxx | 2 +- dbaccess/source/ui/app/AppController.cxx | 2 +- dbaccess/source/ui/app/AppControllerDnD.cxx | 2 +- dbaccess/source/ui/app/AppControllerGen.cxx | 2 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +- dbaccess/source/ui/app/AppDetailView.cxx | 2 +- dbaccess/source/ui/app/AppIconControl.cxx | 2 +- dbaccess/source/ui/app/AppSwapWindow.cxx | 2 +- dbaccess/source/ui/app/AppTitleWindow.cxx | 2 +- dbaccess/source/ui/app/AppView.cxx | 2 +- dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +- dbaccess/source/ui/browser/AsyncronousLink.cxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 2 +- dbaccess/source/ui/browser/brwview.cxx | 2 +- dbaccess/source/ui/browser/dataview.cxx | 2 +- dbaccess/source/ui/browser/dbexchange.cxx | 2 +- dbaccess/source/ui/browser/dbloader.cxx | 2 +- dbaccess/source/ui/browser/dbtreemodel.cxx | 2 +- dbaccess/source/ui/browser/dbtreeview.cxx | 2 +- dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 2 +- dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2 +- dbaccess/source/ui/browser/exsrcbrw.cxx | 2 +- dbaccess/source/ui/browser/formadapter.cxx | 2 +- dbaccess/source/ui/browser/genericcontroller.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 2 +- dbaccess/source/ui/browser/sbamultiplex.cxx | 2 +- dbaccess/source/ui/browser/unodatbr.cxx | 9 +- dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 +- dbaccess/source/ui/control/FieldDescControl.cxx | 2 +- dbaccess/source/ui/control/RelationControl.cxx | 2 +- dbaccess/source/ui/control/ScrollHelper.cxx | 2 +- dbaccess/source/ui/control/SqlNameEdit.cxx | 2 +- dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 +- dbaccess/source/ui/control/VertSplitView.cxx | 2 +- dbaccess/source/ui/control/charsetlistbox.cxx | 2 +- dbaccess/source/ui/control/curledit.cxx | 2 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 2 +- dbaccess/source/ui/control/listviewitems.cxx | 2 +- dbaccess/source/ui/control/marktree.cxx | 2 +- dbaccess/source/ui/control/opendoccontrols.cxx | 2 +- dbaccess/source/ui/control/sqledit.cxx | 2 +- dbaccess/source/ui/control/statusbarontroller.cxx | 2 +- dbaccess/source/ui/control/tabletree.cxx | 2 +- dbaccess/source/ui/control/toolboxcontroller.cxx | 2 +- dbaccess/source/ui/control/undosqledit.cxx | 2 +- dbaccess/source/ui/dlg/AdabasStat.cxx | 2 +- dbaccess/source/ui/dlg/AutoControls.src | 2 + dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 57 +++- dbaccess/source/ui/dlg/CollectionView.cxx | 2 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 4 +- dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 4 +- dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 +- dbaccess/source/ui/dlg/DriverSettings.cxx | 2 +- dbaccess/source/ui/dlg/RelationDlg.cxx | 2 +- dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 2 +- dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 4 +- dbaccess/source/ui/dlg/UserAdmin.cxx | 2 +- dbaccess/source/ui/dlg/UserAdminDlg.cxx | 2 +- dbaccess/source/ui/dlg/admincontrols.cxx | 2 +- dbaccess/source/ui/dlg/admincontrols.src | 2 +- dbaccess/source/ui/dlg/adminpages.cxx | 2 +- dbaccess/source/ui/dlg/adodatalinks.cxx | 2 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 2 +- dbaccess/source/ui/dlg/advancedsettings.cxx | 2 +- dbaccess/source/ui/dlg/dbadmin.cxx | 2 +- dbaccess/source/ui/dlg/dbfindex.cxx | 2 +- dbaccess/source/ui/dlg/dbwiz.cxx | 2 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 12 +- dbaccess/source/ui/dlg/detailpages.cxx | 4 +- dbaccess/source/ui/dlg/directsql.cxx | 2 +- dbaccess/source/ui/dlg/dlgattr.cxx | 2 +- dbaccess/source/ui/dlg/dlgsave.cxx | 2 +- dbaccess/source/ui/dlg/dlgsize.cxx | 2 +- dbaccess/source/ui/dlg/dsselect.cxx | 2 +- dbaccess/source/ui/dlg/finteraction.cxx | 2 +- dbaccess/source/ui/dlg/generalpage.cxx | 2 +- dbaccess/source/ui/dlg/indexdialog.cxx | 2 +- dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2 +- dbaccess/source/ui/dlg/odbcconfig.cxx | 2 +- dbaccess/source/ui/dlg/optionalboolitem.cxx | 2 +- dbaccess/source/ui/dlg/paramdialog.cxx | 2 +- dbaccess/source/ui/dlg/queryfilter.cxx | 2 +- dbaccess/source/ui/dlg/queryorder.cxx | 2 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 2 +- dbaccess/source/ui/dlg/tablespage.cxx | 4 +- dbaccess/source/ui/dlg/textconnectionsettings.cxx | 2 +- dbaccess/source/ui/misc/DExport.cxx | 2 +- dbaccess/source/ui/misc/HtmlReader.cxx | 2 +- dbaccess/source/ui/misc/RowSetDrop.cxx | 2 +- dbaccess/source/ui/misc/RtfReader.cxx | 2 +- dbaccess/source/ui/misc/TableCopyHelper.cxx | 2 +- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2 +- dbaccess/source/ui/misc/UITools.cxx | 2 +- dbaccess/source/ui/misc/WCPage.cxx | 2 +- dbaccess/source/ui/misc/WColumnSelect.cxx | 2 +- dbaccess/source/ui/misc/WCopyTable.cxx | 2 +- dbaccess/source/ui/misc/WExtendPages.cxx | 2 +- dbaccess/source/ui/misc/WNameMatch.cxx | 2 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 2 +- dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2 +- dbaccess/source/ui/misc/charsets.cxx | 2 +- dbaccess/source/ui/misc/controllerframe.cxx | 3 - dbaccess/source/ui/misc/databaseobjectview.cxx | 2 +- dbaccess/source/ui/misc/datasourceconnector.cxx | 2 +- dbaccess/source/ui/misc/dbaundomanager.cxx | 2 +- .../source/ui/misc/dbsubcomponentcontroller.cxx | 2 +- dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 +- dbaccess/source/ui/misc/dsmeta.cxx | 3 +- dbaccess/source/ui/misc/imageprovider.cxx | 2 +- dbaccess/source/ui/misc/indexcollection.cxx | 2 +- dbaccess/source/ui/misc/linkeddocuments.cxx | 2 +- dbaccess/source/ui/misc/moduledbu.cxx | 2 +- dbaccess/source/ui/misc/propertysetitem.cxx | 2 +- dbaccess/source/ui/misc/propertystorage.cxx | 8 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 2 +- dbaccess/source/ui/misc/stringlistitem.cxx | 2 +- dbaccess/source/ui/misc/uiservices.cxx | 2 +- dbaccess/source/ui/querydesign/ConnectionLine.cxx | 2 +- .../source/ui/querydesign/ConnectionLineAccess.cxx | 2 +- .../source/ui/querydesign/ConnectionLineData.cxx | 2 +- dbaccess/source/ui/querydesign/JAccess.cxx | 2 +- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/JoinDesignView.cxx | 2 +- dbaccess/source/ui/querydesign/JoinExchange.cxx | 2 +- dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 +- .../source/ui/querydesign/QTableConnection.cxx | 2 +- .../source/ui/querydesign/QTableConnectionData.cxx | 2 +- dbaccess/source/ui/querydesign/QTableWindow.cxx | 2 +- .../source/ui/querydesign/QTableWindowData.cxx | 2 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 10 +- .../ui/querydesign/QueryMoveTabWinUndoAct.cxx | 2 +- .../ui/querydesign/QueryTabConnUndoAction.cxx | 2 +- .../source/ui/querydesign/QueryTabWinUndoAct.cxx | 2 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 +- dbaccess/source/ui/querydesign/QueryTextView.cxx | 2 +- dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 2 +- .../source/ui/querydesign/SelectionBrowseBox.cxx | 2 +- dbaccess/source/ui/querydesign/TableConnection.cxx | 2 +- .../source/ui/querydesign/TableConnectionData.cxx | 2 +- .../ui/querydesign/TableFieldDescription.cxx | 2 +- dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 2 +- dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +- .../source/ui/querydesign/TableWindowAccess.cxx | 2 +- dbaccess/source/ui/querydesign/TableWindowData.cxx | 2 +- .../source/ui/querydesign/TableWindowListBox.cxx | 2 +- .../source/ui/querydesign/TableWindowTitle.cxx | 2 +- .../source/ui/querydesign/querycontainerwindow.cxx | 2 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +- dbaccess/source/ui/querydesign/querydlg.cxx | 2 +- dbaccess/source/ui/querydesign/queryview.cxx | 2 +- .../source/ui/relationdesign/RTableConnection.cxx | 2 +- .../ui/relationdesign/RTableConnectionData.cxx | 2 +- .../ui/relationdesign/RelationController.cxx | 2 +- .../ui/relationdesign/RelationDesignView.cxx | 2 +- .../source/ui/relationdesign/RelationTableView.cxx | 2 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 2 +- .../source/ui/tabledesign/FieldDescriptions.cxx | 2 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +- dbaccess/source/ui/tabledesign/TableController.cxx | 2 +- .../source/ui/tabledesign/TableDesignControl.cxx | 2 +- .../source/ui/tabledesign/TableDesignHelpBar.cxx | 2 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2 +- .../source/ui/tabledesign/TableFieldControl.cxx | 4 +- .../source/ui/tabledesign/TableFieldDescWin.cxx | 2 +- dbaccess/source/ui/tabledesign/TableRow.cxx | 2 +- .../source/ui/tabledesign/TableRowExchange.cxx | 2 +- dbaccess/source/ui/tabledesign/TableUndo.cxx | 2 +- dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 2 +- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 2 +- dbaccess/source/ui/uno/ColumnControl.cxx | 2 +- dbaccess/source/ui/uno/ColumnModel.cxx | 2 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 2 +- dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 2 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 2 +- dbaccess/source/ui/uno/TableFilterDlg.cxx | 2 +- dbaccess/source/ui/uno/UserSettingsDlg.cxx | 2 +- dbaccess/source/ui/uno/admindlg.cxx | 2 +- dbaccess/source/ui/uno/composerdialogs.cxx | 2 +- dbaccess/source/ui/uno/copytablewizard.cxx | 2 - dbaccess/source/ui/uno/dbinteraction.cxx | 2 +- .../source/ui/uno/textconnectionsettings_uno.cxx | 2 +- dbaccess/source/ui/uno/unoDirectSql.cxx | 2 +- dbaccess/source/ui/uno/unoadmin.cxx | 2 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 2 +- 239 files changed, 835 insertions(+), 299 deletions(-) create mode 100644 dbaccess/AllLangResTarget_dbu.mk create mode 100644 dbaccess/Library_adabasui.mk create mode 100644 dbaccess/Library_dbu.mk (limited to 'dbaccess') diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk index 4e5ec41499e6..17ff9fc94efb 100644 --- a/dbaccess/AllLangResTarget_adabasui.mk +++ b/dbaccess/AllLangResTarget_adabasui.mk @@ -1,47 +1,48 @@ -#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# 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/ # -# OpenOffice.org - a multi-platform office productivity suite +# 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. # -# This file is part of OpenOffice.org. +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. # -# 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. +# Major Contributor(s): # -# 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). +# For minor contributions see the git repository. # -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. $(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui)) $(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess)) -$(eval $(call gb_AllLangResTarget_add_srs,adabasui,dbaccess/adabasui)) +$(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 \ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(OUTDIR)/inc \ )) $(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\ - dbaccess/source/ext/adabas/AdabasNewDb.src \ + dbaccess/source/ext/adabas/AdabasNewDb.src \ )) -# vim: set noet sw=4 ts=4: +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk new file mode 100644 index 000000000000..fc7fbe1b8fdb --- /dev/null +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -0,0 +1,95 @@ +# 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. +# 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_AllLangResTarget_AllLangResTarget,dbu)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,dbu,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,dbu,\ + dbaccess/dbu \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/dbaccess \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ + 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/dbadmin2.src \ + dbaccess/source/ui/dlg/dbadminsetup.src \ + dbaccess/source/ui/dlg/dbadmin.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/UserAdminDlg.src \ + dbaccess/source/ui/dlg/UserAdmin.src \ + dbaccess/source/ui/imagelists/dbimagelists.src \ + dbaccess/source/ui/misc/dbumiscres.src \ + dbaccess/source/ui/misc/WizardPages.src \ + dbaccess/source/ui/querydesign/querydlg.src \ + dbaccess/source/ui/querydesign/query.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 \ +)) + +$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ + dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \ + dbaccess/source/ui/inc/toolbox_tmpl.hrc \ +)) + +$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk index 652f527aad62..9a36e2bd0f6c 100644 --- a/dbaccess/JunitTest_dbaccess_complex.mk +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -64,9 +64,9 @@ $(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\ $(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\ complex.dbaccess.Beamer \ - complex.dbaccess.DatabaseDocument \ complex.dbaccess.PropertyBag \ )) +# complex.dbaccess.DatabaseDocument \ # deactivated since sb123; # apparently most of these fail because OOo does not find JVM? # complex.dbaccess.ApplicationController \ diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk index 44ff86c5351e..dabe12baa982 100644 --- a/dbaccess/JunitTest_dbaccess_unoapi.mk +++ b/dbaccess/JunitTest_dbaccess_unoapi.mk @@ -42,10 +42,6 @@ $(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\ $(OUTDIR)/bin/jurt.jar \ )) -$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_unoapi,\ - dbaccess/qa/unoapi/Test \ -)) - $(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\ org.openoffice.test.UnoApiTest \ )) diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk new file mode 100644 index 000000000000..d2934bceda8e --- /dev/null +++ b/dbaccess/Library_adabasui.mk @@ -0,0 +1,75 @@ +# 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. +# 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,adabasui)) + +$(eval $(call gb_Library_add_precompiled_header,adabasui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,adabasui,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_defs,adabasui,\ + -DCOMPMOD_NAMESPACE=adabasui \ +)) + +$(eval $(call gb_Library_add_api,adabasui,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,adabasui,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + sal \ + sfx \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui)) + +$(eval $(call gb_Library_add_exception_objects,adabasui,\ + dbaccess/source/ext/adabas/Acomponentmodule \ + dbaccess/source/ext/adabas/AdabasNewDb \ + dbaccess/source/ext/adabas/adabasuistrings \ + dbaccess/source/ext/adabas/ANewDb \ + dbaccess/source/ext/adabas/Aservices \ + dbaccess/source/ext/adabas/ASqlNameEdit \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk new file mode 100644 index 000000000000..5c6b31e2043f --- /dev/null +++ b/dbaccess/Library_dbu.mk @@ -0,0 +1,323 @@ +# 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. +# 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,dbu)) + +$(eval $(call gb_Library_add_precompiled_header,dbu,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,dbu,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \ + -I$(WORKDIR)/inc/dbaccess \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_api,dbu,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_defs,dbu,\ + -DDBACCESS_DLLIMPLEMENTATION \ + $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \ +)) + +ifeq (,$(strip $(PROF_EDITION))) +$(eval $(call gb_Library_add_defs,dbu,\ + -DWINDOWS_VISTA_PSDK \ +)) +endif + +ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h +$(eval $(call gb_Library_set_cflags,dbu,\ + $$(CFLAGS) \ + -fpermissive \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,dbu,\ + comphelper \ + cppu \ + cppuhelper \ + dba \ + dbtools \ + editeng \ + fwe \ + sal \ + salhelper \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + svx \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,dbu,\ + ole32 \ + oleaut32 \ + uuid \ +)) +endif + +$(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu)) + +$(eval $(call gb_Library_add_exception_objects,dbu,\ + dbaccess/source/shared/dbu_reghelper \ + dbaccess/source/ui/app/AppController \ + dbaccess/source/ui/app/AppControllerDnD \ + dbaccess/source/ui/app/AppControllerGen \ + dbaccess/source/ui/app/AppDetailPageHelper \ + dbaccess/source/ui/app/AppDetailView \ + dbaccess/source/ui/app/AppIconControl \ + 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/AsyncronousLink \ + dbaccess/source/ui/browser/brwctrlr \ + dbaccess/source/ui/browser/brwview \ + dbaccess/source/ui/browser/dataview \ + dbaccess/source/ui/browser/dbexchange \ + dbaccess/source/ui/browser/dbloader \ + dbaccess/source/ui/browser/dbtreemodel \ + dbaccess/source/ui/browser/dbtreeview \ + dbaccess/source/ui/browser/dsbrowserDnD \ + dbaccess/source/ui/browser/dsEntriesNoExp \ + dbaccess/source/ui/browser/exsrcbrw \ + dbaccess/source/ui/browser/formadapter \ + dbaccess/source/ui/browser/genericcontroller \ + dbaccess/source/ui/browser/sbagrid \ + dbaccess/source/ui/browser/sbamultiplex \ + dbaccess/source/ui/browser/unodatbr \ + dbaccess/source/ui/control/charsetlistbox \ + dbaccess/source/ui/control/ColumnControlWindow \ + dbaccess/source/ui/control/curledit \ + dbaccess/source/ui/control/dbtreelistbox \ + dbaccess/source/ui/control/FieldDescControl \ + dbaccess/source/ui/control/listviewitems \ + dbaccess/source/ui/control/marktree \ + dbaccess/source/ui/control/opendoccontrols \ + dbaccess/source/ui/control/RelationControl \ + dbaccess/source/ui/control/sqledit \ + dbaccess/source/ui/control/SqlNameEdit \ + dbaccess/source/ui/control/statusbarontroller \ + dbaccess/source/ui/control/TableGrantCtrl \ + dbaccess/source/ui/control/tabletree \ + dbaccess/source/ui/control/toolboxcontroller \ + dbaccess/source/ui/control/undosqledit \ + dbaccess/source/ui/control/VertSplitView \ + dbaccess/source/ui/dlg/AdabasStat \ + dbaccess/source/ui/dlg/admincontrols \ + dbaccess/source/ui/dlg/adminpages \ + dbaccess/source/ui/dlg/adtabdlg \ + dbaccess/source/ui/dlg/advancedsettings \ + dbaccess/source/ui/dlg/CollectionView \ + dbaccess/source/ui/dlg/ConnectionHelper \ + dbaccess/source/ui/dlg/ConnectionPage \ + dbaccess/source/ui/dlg/ConnectionPageSetup \ + dbaccess/source/ui/dlg/dbadmin \ + dbaccess/source/ui/dlg/DbAdminImpl \ + dbaccess/source/ui/dlg/dbfindex \ + dbaccess/source/ui/dlg/DBSetupConnectionPages \ + dbaccess/source/ui/dlg/dbwiz \ + dbaccess/source/ui/dlg/dbwizsetup \ + dbaccess/source/ui/dlg/detailpages \ + dbaccess/source/ui/dlg/directsql \ + dbaccess/source/ui/dlg/dlgattr \ + dbaccess/source/ui/dlg/dlgsave \ + dbaccess/source/ui/dlg/dlgsize \ + dbaccess/source/ui/dlg/DriverSettings \ + dbaccess/source/ui/dlg/dsselect \ + dbaccess/source/ui/dlg/finteraction \ + dbaccess/source/ui/dlg/generalpage \ + dbaccess/source/ui/dlg/indexdialog \ + dbaccess/source/ui/dlg/indexfieldscontrol \ + dbaccess/source/ui/dlg/odbcconfig \ + dbaccess/source/ui/dlg/paramdialog \ + dbaccess/source/ui/dlg/queryfilter \ + dbaccess/source/ui/dlg/queryorder \ + dbaccess/source/ui/dlg/RelationDlg \ + dbaccess/source/ui/dlg/sqlmessage \ + dbaccess/source/ui/dlg/tablespage \ + dbaccess/source/ui/dlg/TablesSingleDlg \ + dbaccess/source/ui/dlg/TextConnectionHelper \ + dbaccess/source/ui/dlg/textconnectionsettings \ + dbaccess/source/ui/dlg/UserAdmin \ + dbaccess/source/ui/dlg/UserAdminDlg \ + dbaccess/source/ui/misc/asyncmodaldialog \ + dbaccess/source/ui/misc/charsets \ + dbaccess/source/ui/misc/controllerframe \ + dbaccess/source/ui/misc/databaseobjectview \ + dbaccess/source/ui/misc/datasourceconnector \ + dbaccess/source/ui/misc/dbaundomanager \ + dbaccess/source/ui/misc/dbsubcomponentcontroller \ + dbaccess/source/ui/misc/defaultobjectnamecheck \ + dbaccess/source/ui/misc/DExport \ + dbaccess/source/ui/misc/dsmeta \ + dbaccess/source/ui/misc/HtmlReader \ + dbaccess/source/ui/misc/imageprovider \ + dbaccess/source/ui/misc/indexcollection \ + dbaccess/source/ui/misc/linkeddocuments \ + dbaccess/source/ui/misc/moduledbu \ + dbaccess/source/ui/misc/propertysetitem \ + dbaccess/source/ui/misc/propertystorage \ + dbaccess/source/ui/misc/RowSetDrop \ + dbaccess/source/ui/misc/RtfReader \ + dbaccess/source/ui/misc/singledoccontroller \ + dbaccess/source/ui/misc/stringlistitem \ + dbaccess/source/ui/misc/TableCopyHelper \ + dbaccess/source/ui/misc/TokenWriter \ + dbaccess/source/ui/misc/ToolBoxHelper \ + dbaccess/source/ui/misc/uiservices \ + dbaccess/source/ui/misc/UITools \ + dbaccess/source/ui/misc/WColumnSelect \ + dbaccess/source/ui/misc/WCopyTable \ + dbaccess/source/ui/misc/WCPage \ + dbaccess/source/ui/misc/WExtendPages \ + dbaccess/source/ui/misc/WNameMatch \ + dbaccess/source/ui/misc/WTypeSelect \ + dbaccess/source/ui/querydesign/ConnectionLine \ + dbaccess/source/ui/querydesign/ConnectionLineAccess \ + dbaccess/source/ui/querydesign/JAccess \ + dbaccess/source/ui/querydesign/JoinController \ + dbaccess/source/ui/querydesign/JoinDesignView \ + dbaccess/source/ui/querydesign/JoinExchange \ + dbaccess/source/ui/querydesign/JoinTableView \ + dbaccess/source/ui/querydesign/QTableConnection \ + dbaccess/source/ui/querydesign/QTableConnectionData \ + dbaccess/source/ui/querydesign/QTableWindow \ + dbaccess/source/ui/querydesign/QTableWindowData \ + dbaccess/source/ui/querydesign/querycontainerwindow \ + dbaccess/source/ui/querydesign/querycontroller \ + dbaccess/source/ui/querydesign/QueryDesignView \ + dbaccess/source/ui/querydesign/querydlg \ + dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryTabConnUndoAction \ + dbaccess/source/ui/querydesign/QueryTableView \ + dbaccess/source/ui/querydesign/QueryTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryTextView \ + dbaccess/source/ui/querydesign/queryview \ + dbaccess/source/ui/querydesign/QueryViewSwitch \ + dbaccess/source/ui/querydesign/SelectionBrowseBox \ + dbaccess/source/ui/querydesign/TableConnection \ + dbaccess/source/ui/querydesign/TableConnectionData \ + dbaccess/source/ui/querydesign/TableFieldDescription \ + dbaccess/source/ui/querydesign/TableWindow \ + dbaccess/source/ui/querydesign/TableWindowAccess \ + dbaccess/source/ui/querydesign/TableWindowData \ + dbaccess/source/ui/querydesign/TableWindowListBox \ + dbaccess/source/ui/querydesign/TableWindowTitle \ + dbaccess/source/ui/relationdesign/RelationController \ + dbaccess/source/ui/relationdesign/RelationDesignView \ + dbaccess/source/ui/relationdesign/RelationTableView \ + dbaccess/source/ui/relationdesign/RTableConnection \ + dbaccess/source/ui/relationdesign/RTableConnectionData \ + dbaccess/source/ui/tabledesign/FieldDescGenWin \ + dbaccess/source/ui/tabledesign/FieldDescriptions \ + dbaccess/source/ui/tabledesign/TableController \ + dbaccess/source/ui/tabledesign/TableDesignControl \ + dbaccess/source/ui/tabledesign/TableDesignHelpBar \ + dbaccess/source/ui/tabledesign/TableDesignView \ + dbaccess/source/ui/tabledesign/TableFieldControl \ + dbaccess/source/ui/tabledesign/TableFieldDescWin \ + dbaccess/source/ui/tabledesign/TableRow \ + dbaccess/source/ui/tabledesign/TableRowExchange \ + dbaccess/source/ui/tabledesign/TableUndo \ + dbaccess/source/ui/tabledesign/TEditControl \ + dbaccess/source/ui/uno/admindlg \ + dbaccess/source/ui/uno/AdvancedSettingsDlg \ + dbaccess/source/ui/uno/ColumnControl \ + dbaccess/source/ui/uno/ColumnModel \ + dbaccess/source/ui/uno/ColumnPeer \ + dbaccess/source/ui/uno/composerdialogs \ + dbaccess/source/ui/uno/dbinteraction \ + dbaccess/source/ui/uno/DBTypeWizDlg \ + dbaccess/source/ui/uno/DBTypeWizDlgSetup \ + dbaccess/source/ui/uno/TableFilterDlg \ + dbaccess/source/ui/uno/textconnectionsettings_uno \ + dbaccess/source/ui/uno/unoadmin \ + dbaccess/source/ui/uno/unoDirectSql \ + dbaccess/source/ui/uno/unosqlmessage \ + dbaccess/source/ui/uno/UserSettingsDlg \ +)) + +$(eval $(call gb_Library_add_noexception_objects,dbu,\ + dbaccess/source/shared/dbustrings \ + dbaccess/source/ui/control/ScrollHelper \ + dbaccess/source/ui/dlg/optionalboolitem \ + dbaccess/source/ui/querydesign/ConnectionLineData \ + dbaccess/source/ui/querydesign/TableFieldInfo \ +)) + +ifeq ($(GUI),WNT) +ifneq (,$(strip $(WINDOWS_VISTA_PSDK))) +ifeq (,$(strip $(PROF_EDITION))) +dbu_DISABLE_ADO := $(true) +endif +endif +ifneq ($(dbu_DISABLE_ADO),$(true)) +$(eval $(call gb_Library_add_noexception_objects,dbu,\ + dbaccess/source/ui/dlg/adodatalinks \ +)) +endif +endif + +# workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific +ifeq ($(COM),GCC) +$(eval $(call gb_Library_add_cxxobjects,dbu,\ + dbaccess/source/ui/uno/copytablewizard \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) \ +)) +else +$(eval $(call gb_Library_add_exception_objects,dbu,\ + dbaccess/source/ui/uno/copytablewizard \ +)) +endif + +$(foreach object,\ + dbaccess/source/ui/dlg/ConnectionHelper \ + dbaccess/source/ui/dlg/ConnectionPage \ + dbaccess/source/ui/dlg/ConnectionPageSetup \ + dbaccess/source/ui/dlg/DBSetupConnectionPages \ + dbaccess/source/ui/dlg/detailpages \ + dbaccess/source/ui/dlg/tablespage \ + dbaccess/source/ui/dlg/TextConnectionHelper \ + ,$(eval $(call gb_CxxObject_get_target,$(object)) : $(WORKDIR)/inc/dbaccess/AutoControls.hrc)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Makefile b/dbaccess/Makefile index 90947b2e5f48..a79aff831024 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index a44d27c45f9d..b61f54ad3a1e 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -28,21 +28,21 @@ $(eval $(call gb_Module_Module,dbaccess)) $(eval $(call gb_Module_add_targets,dbaccess,\ - $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ + AllLangResTarget_adabasui \ AllLangResTarget_dba \ AllLangResTarget_dbmm \ - AllLangResTarget_dbui \ + AllLangResTarget_dbu \ AllLangResTarget_sdbt \ + $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ + Library_adabasui \ Library_dba \ Library_dbaxml \ Library_dbmm \ - Library_dbui \ + Library_dbu \ Library_sdbt \ Package_inc \ Package_uiconfig \ )) - #AllLangResTarget_adabasui \ - Library_adabasui \ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_complex \ diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk index 7ea77cd4b1ad..659e954953c9 100644 --- a/dbaccess/Package_inc.mk +++ b/dbaccess/Package_inc.mk @@ -28,14 +28,14 @@ $(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/dbaccessdllapi.h,dbaccessdllapi.h)) $(eval $(call gb_Package_add_file,dbaccess_inc,inc/dbaccess/dbaundomanager.hxx,dbaundomanager.hxx)) $(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)) +$(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)) # vim: set noet ts=4 sw=4: diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 0951b3de8ac2..a9b97dbf72d2 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -29,7 +29,6 @@ #define DBACCESS_CORE_API_CACHESET_HXX #include -#include #include #include #include diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 4b226e73787e..673fcd91cc3f 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -60,7 +60,6 @@ #include #include #include -#include "SharedConnection.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 4d29b4426a89..9302899e775f 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -28,7 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#include "SharedConnection.hxx" #include "datasource.hxx" #include "module_dba.hxx" @@ -38,6 +37,7 @@ #include "core_resource.hxx" #include "core_resource.hrc" #include "connection.hxx" +#include "SharedConnection.hxx" #include "databasedocument.hxx" #include "OAuthenticationContinuation.hxx" diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx index 36a8695979f5..d133dc0fcae2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index c88c6de887d4..85ae133a2424 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index b5e10432a1aa..e85026ae5ec1 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_types.hxx" diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 3200a53cf5c1..63670e88b323 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "docinteraction.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 1c7cc12ae850..c1c55fd6dad7 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_global.hrc" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index bdbab6d93430..54051841b9f5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbaccess_helpid.hrc" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 0b1d27b0061d..9a03a8e4f63e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_module.hxx" #include "dbmm_global.hrc" diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 55cc8b0c6d7a..e85f60379514 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_global.hrc" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 7e2e0acf73e2..e2396be224e3 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "dbmm_module.hxx" #include "dbmm_global.hrc" diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index daf8c022fb0c..869983c14c02 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "progresscapture.hxx" #include "migrationprogress.hxx" diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index 9ec628c58380..bed5f7f33b8f 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbmm.hxx" +#include "precompiled_dbaccess.hxx" #include "progressmixer.hxx" diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 210c5c9f7937..11f0b667abd8 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "flt_reghelper.hxx" #include "xmlstrings.hrc" diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 0d0f2ba75381..a84b69dfa43b 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlAutoStyle.hxx" #include "xmlHelper.hxx" #include "xmlExport.hxx" diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 0517e9b13282..47b9126acdd5 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlColumn.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 88b08533e439..2af3b4d9c102 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlComponent.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index c843312e633e..3695f24c6590 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlConnectionData.hxx" #include "xmlLogin.hxx" #include "xmlTableFilterList.hxx" diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 1f490360dd61..3f0c91706500 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlConnectionResource.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 62431e9b01a4..51f2c580f029 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDataSource.hxx" #include "xmlLogin.hxx" #include "xmlTableFilterList.hxx" diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index c1039f76c82b..ad1b238ee836 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDataSourceInfo.hxx" #include "xmlDataSource.hxx" #include "xmlfilter.hxx" diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 2be63bdd00d5..c004e7b62534 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDataSourceSetting.hxx" #include "xmlDataSource.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index c4458924452c..284971fd8a07 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDataSourceSettings.hxx" #include "xmlDataSourceSetting.hxx" #include "xmlfilter.hxx" diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 6795103be666..6bb928b2b541 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDatabase.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index efe2e7237c6c..73faf3a5a64a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDatabaseDescription.hxx" #include "xmlLogin.hxx" #include "xmlfilter.hxx" diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 6a0251a48420..259425f2aff0 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlDocuments.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 7e8457d34c6e..3d4d2ab3dfde 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 130d1e04b525..c857e04376db 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlFileBasedDatabase.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index a1418593ad0f..4854bdce71fd 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlHelper.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 3e55ab88f4fa..4b3639d1300f 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlHierarchyCollection.hxx" #include "xmlComponent.hxx" #include "xmlQuery.hxx" diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index cf255778a349..1188b67d7e4c 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlLogin.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 38fa654841e2..dd083f616e33 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlQuery.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index f670bc1365bb..cb089ecc43b8 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlServerDatabase.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index f48d9b96437c..2e1fb2db2bfc 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlStyleImport.hxx" diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 8652f77cc113..21958d06a28e 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlTable.hxx" #include "xmlfilter.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 0256afa63330..4291c244a341 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlTableFilterList.hxx" #include "xmlTableFilterPattern.hxx" #include "xmlEnums.hxx" diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index 4a8a87da30b5..12ce89a823f1 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlTableFilterPattern.hxx" #include "xmlTableFilterList.hxx" #include diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index a7eb078f8f29..d8427787f3be 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include #include diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 119418209286..d2edce3039bf 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include #include diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx index 1b7345d344f9..3acbee9d2d91 100644 --- a/dbaccess/source/shared/dbu_reghelper.cxx +++ b/dbaccess/source/shared/dbu_reghelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index b065ec7338ac..6352e15fb72c 100644 --- a/dbaccess/source/shared/dbustrings.cxx +++ b/dbaccess/source/shared/dbustrings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbustrings.hrc" namespace dbaui diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx index a2f44f1590a6..bf98c4ddd82d 100644 --- a/dbaccess/source/shared/flt_reghelper.cxx +++ b/dbaccess/source/shared/flt_reghelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "flt_reghelper.hxx" diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index cd397b4ae25d..4ae1bf472495 100644 --- a/dbaccess/source/shared/xmlstrings.cxx +++ b/dbaccess/source/shared/xmlstrings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaxml.hxx" +#include "precompiled_dbaccess.hxx" #include "xmlstrings.hrc" namespace dbaxml diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 96e0ae16ae4c..94ee696b8112 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppController.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 0789d693da03..7e8f56972e0f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppController.hxx" #include diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 9ff49f9ea1a5..b1bcd961438b 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppController.hxx" #include "AppDetailView.hxx" diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index a71ae69477d4..c488a0cafa1f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppDetailPageHelper.hxx" #include "moduledbu.hxx" #include diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 520f206f769a..fe7e7a26e4d5 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppDetailView.hxx" #include #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index b2a3b6e51a86..c6c3f2e480a2 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppIconControl.hxx" #include #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 9e161d86908e..36475115d972 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppSwapWindow.hxx" #include #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 448f6ea6e9f7..e2473432e8cc 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppTitleWindow.hxx" #include "moduledbu.hxx" #include "memory" diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index c670c3558737..4974a3ef6333 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AppView.hxx" #include "dbu_app.hrc" #include diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index dc25272395af..9b6d612b1b4c 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_dbui.hxx" + #include "subcomponentmanager.hxx" #include "AppController.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx index f4072f5e6d1f..7cc0ac71d23b 100644 --- a/dbaccess/source/ui/browser/AsyncronousLink.cxx +++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "AsyncronousLink.hxx" #include #include diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index b6a42cfc9cda..9a632e960499 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 179ae16eaac4..44e29f08913d 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "brwctrlr.hxx" #include "brwview.hxx" diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index d58eee0feb35..ff4817eba056 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dataview.hxx" #include diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 867805bc6761..0273c7f5a746 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbexchange.hxx" #include diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 0997b2f863c5..244347057906 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index 44b3508e786e..c2975b9d8314 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbtreemodel.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 55452581dbb1..b69c67bc4bee 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbtreeview.hxx" #include diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index d0d6bb663a53..f9fe22be550b 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "unodatbr.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index f30345757ddf..a426013b609a 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbexchange.hxx" #include "dbtreelistbox.hxx" diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 0d93b52eabd2..898f78cd3ebe 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "exsrcbrw.hxx" #include diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index c74af7b41750..913a491b0c0f 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "formadapter.hxx" #include diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 77489aa422ae..318fdb152cde 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "genericcontroller.hxx" #include #include diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index cfd2bc0ec109..a796778822da 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "sbagrid.hrc" diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index a37722ff489b..65733d7ae563 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "sbamultiplex.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 0da24c5a3f9a..8ab98cade86c 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "browserids.hxx" #include "dbaccess_helpid.hrc" @@ -321,8 +321,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() // doin' a lot of VCL stuff here -> lock the SolarMutex // kiss our listeners goodbye - - ::com::sun::star::lang::EventObject aEvt(*this); + EventObject aEvt(*this); m_aSelectionListeners.disposeAndClear(aEvt); m_aContextMenuInterceptors.disposeAndClear(aEvt); @@ -1398,7 +1397,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId ) } // ------------------------------------------------------------------------- -void SAL_CALL SbaTableQueryBrowser::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(RuntimeException) +void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) throw(RuntimeException) { // our frame ? Reference< ::com::sun::star::frame::XFrame > xSourceFrame(_rSource.Source, UNO_QUERY); @@ -1694,7 +1693,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) } // if the form has been loaded, this means that our "selection" has changed - ::com::sun::star::lang::EventObject aEvent( *this ); + EventObject aEvent( *this ); m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvent ); } diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 015cecc76531..36c89d858be5 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ColumnControlWindow.hxx" #include "FieldControls.hxx" #include diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 7f24b7b37fe1..f7a7065c1be4 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY #define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index f3efb7c741b1..df2ac9b6e4b6 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RelationControl.hxx" #include "RelationControl.hrc" diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 7f80abd3e2c8..47cac018ffc5 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ScrollHelper.hxx" #include diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 80cf34bbc18c..5acc67d433a6 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "SqlNameEdit.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index cb8be985c104..afb6fa777352 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableGrantCtrl.hxx" #include #include diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 52c3ca5a0c9e..929b5c050743 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "VertSplitView.hxx" #include diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index 6fb77f0293e5..cc092ccfe3b3 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "charsetlistbox.hxx" diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index e4bc004e1298..d649647e70b0 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "curledit.hxx" #include diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 4bce0d3b8720..15cd74538c54 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbtreelistbox.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 3d109f8b713e..74193e682409 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "listviewitems.hxx" //........................................................................ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 9f07857936fa..e97f8a4a33fc 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "marktree.hxx" #include "dbu_control.hrc" diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index dc88dfb555a6..e02b7c000501 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "opendoccontrols.hxx" diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 579740e43b42..1caa8917be8b 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "sqledit.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx index c71c5f86a289..37cb9c85f990 100644 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ b/dbaccess/source/ui/control/statusbarontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "statusbarontroller.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index c86cac49e5ad..c1c12947cb9b 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "tabletree.hxx" #include "tabletree.hrc" diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 5ce59b5f804a..5f36c9678b99 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "toolboxcontroller.hxx" #include #include diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx index edf12cb78bb7..39e44be96f3f 100644 --- a/dbaccess/source/ui/control/undosqledit.cxx +++ b/dbaccess/source/ui/control/undosqledit.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "undosqledit.hxx" #include "sqledit.hxx" diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index fae3a5e6efb3..25710d04abfc 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include #include diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index a286cdf33516..e43e2a13a7fb 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -25,7 +25,9 @@ * ************************************************************************/ +#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" +#endif String STR_DBASE_PATH_OR_FILE { diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 8cce3283f3f9..258eec3a2acf 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -41,7 +41,7 @@ #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif -#include "AutoControlsDef.hrc" + #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 @@ -50,7 +50,60 @@ #define EDIT_HEIGHT 12 #define EDIT_X 101 - +#define FT_AUTOJDBCDRIVERCLASS 80 +#define FT_AUTOFIELDSEPARATOR 81 +#define FT_AUTOTEXTSEPARATOR 82 +#define FT_AUTODECIMALSEPARATOR 83 +#define FT_AUTOTHOUSANDSSEPARATOR 84 +#define FT_AUTOPORTNUMBER 85 +#define FT_AUTOPORTNUMBERDEFAULT 86 +#define FT_AUTOBASEDN 87 +#define FT_AUTOHOSTNAME 88 +#define FT_AUTOBROWSEURL 89 +#define FT_AUTODATABASENAME 90 +#define FT_AUTOWIZARDHELPTEXT 91 +#define FT_AUTOWIZARDHEADER 92 +#define FT_AUTOEXTENSIONHEADER 93 +#define FT_AUTOOWNEXTENSIONAPPENDIX 94 +#define FT_CHARSET 95 +#define FT_SOCKET 96 + +#define FL_AUTOSEPARATOR2 80 +#define FL_DATACONVERT 81 +#define FL_SEPARATOR1 82 + +#define CB_AUTOHEADER 80 + +#define PB_AUTOTESTDRIVERCLASS 80 +#define PB_AUTOBROWSEURL 81 + +#define CM_AUTOFIELDSEPARATOR 80 +#define CM_AUTOTEXTSEPARATOR 81 +#define CM_AUTODECIMALSEPARATOR 82 +#define CM_AUTOTHOUSANDSSEPARATOR 83 + +#define NF_AUTOPORTNUMBER 80 + +#define ET_AUTOBASEDN 80 +#define ET_AUTOHOSTNAME 81 +#define ET_AUTODATABASENAME 82 +#define ET_AUTOBROWSEURL 83 +#define ET_AUTOJDBCDRIVERCLASS 84 +#define ET_AUTOOWNEXTENSION 85 +#define ET_SOCKET 86 + +#define RB_AUTOACCESSCTEXTFILES 80 +#define RB_AUTOACCESSCCSVFILES 81 +#define RB_AUTOACCESSOTHERS 82 + +#define LB_CHARSET 80 + +#define STR_AUTOFIELDSEPARATORLIST 100 +#define STR_AUTOTEXTSEPARATORLIST 101 +#define STR_AUTOTEXT_FIELD_SEP_NONE 102 +#define STR_AUTODELIMITER_MISSING 103 +#define STR_AUTODELIMITER_MUST_DIFFER 104 +#define STR_AUTONO_WILDCARDS 105 #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 71ce69138934..89e3a8d8439a 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "CollectionView.hxx" #include "CollectionView.hrc" #include diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 64e00fe4e7ca..753b0fa4e245 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -27,10 +27,11 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dsnItem.hxx" #include "ConnectionHelper.hxx" +#include "AutoControls.hrc" #include "dbu_dlg.hrc" #include "dbu_misc.hrc" #include @@ -69,7 +70,6 @@ #include #include #include -#include #ifdef _ADO_DATALINK_BROWSE_ #include diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 96ed31cd2f09..9e9f9cd027a9 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionPage.hxx" #include "ConnectionPage.hrc" @@ -80,7 +80,7 @@ #include "adodatalinks.hxx" #endif //_ADO_DATALINK_BROWSE_ -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 1bfab47ead99..6ee4c808aeb5 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -27,10 +27,10 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionPageSetup.hxx" -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" #include "dbadminsetup.hrc" #include "dbu_dlg.hrc" #include diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 0253c97a1fba..d2b4bb956b67 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -27,11 +27,11 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "DBSetupConnectionPages.hxx" #include "sqlmessage.hxx" #include "dbu_resource.hrc" -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" #include "dbadminsetup.hrc" #include #include diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index b3145475143b..583f180bb8f3 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "DbAdminImpl.hxx" #include "dsmeta.hxx" diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index aaa6b6379a7f..2408297e20cf 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "DriverSettings.hxx" #include "dsmeta.hxx" diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index b5ef913b3c6d..7618e732fd1a 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RelationDlg.hrc" #include "RelationDlg.hxx" diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index b717b1384200..17fcf7861e51 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TablesSingleDlg.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 3213b324acb6..9d2fc4da8f1e 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -26,7 +26,7 @@ * ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "moduledbu.hxx" #include "TextConnectionHelper.hxx" @@ -34,7 +34,7 @@ #include "sqlmessage.hxx" #include "dbu_dlg.hrc" #include "dbu_resource.hrc" -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" #include #include diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 05879d05df20..d22e8c4839a7 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "UserAdmin.hxx" #include "UserAdmin.hrc" diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 726a4ab70a10..553f5446ca86 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "adminpages.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index d9c591f3221f..a8b11805dcb3 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "admincontrols.hxx" #include "admincontrols.hrc" diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8f5bf2c0210d..8ce3bb4030dc 100644 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -24,7 +24,7 @@ * ************************************************************************/ -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" #include "dbu_dlg.hrc" #include "admincontrols.hrc" diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index d65c2ff8d572..2bf12cf82740 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "adminpages.hxx" #include "dbadmin.hrc" diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index 7fc484ad4c56..9af7714a1cdc 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #if defined(WNT) diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index fa16813dd8fa..540e26982039 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "adtabdlg.hxx" #include "adtabdlg.hrc" diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 4b8d244fb03b..2ee4b8b8df33 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "advancedsettings.hxx" #include "advancedsettingsdlg.hxx" diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index c77d2aa133cb..65929fb204d6 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionPage.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index f9c7ec0fed77..bd7532c3799a 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbfindex.hxx" diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 0fb8484f5f8b..f23f340b5e78 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbwiz.hxx" #include "dbadmin.hrc" diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 07793cea5c19..17843bd898a4 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbwizsetup.hxx" #include "dsmeta.hxx" @@ -992,8 +992,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (RuntimeException); + virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException); + virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); @@ -1077,17 +1077,17 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } // ............................................................................. - void SAL_CALL AsyncLoader::queryTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) + void SAL_CALL AsyncLoader::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) { throw TerminationVetoException(); } // ............................................................................. - void SAL_CALL AsyncLoader::notifyTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException) { } // ............................................................................. - void SAL_CALL AsyncLoader::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) { } } diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index a1050a603d33..c02f603c99eb 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "detailpages.hxx" #include "sqlmessage.hxx" @@ -57,7 +57,7 @@ #include "DriverSettings.hxx" #include "dbadmin.hxx" #include -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 96541a21da17..0e4a61414de8 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "directsql.hxx" #include "directsql.hrc" diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 414853448b79..e77c20704d26 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dlgattr.hxx" diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 4a7bdf349505..7d5738d1e7ff 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dlgsave.hxx" #include "dlgsave.hrc" diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 089b70a6d3e3..a42122657c23 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dlgsize.hrc" #include "dlgsize.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 9f6dfda58a97..e6bbb8494e16 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dsselect.hxx" #include "dsselect.hrc" diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index 2a0e6be0715a..562ebf435223 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "finteraction.hxx" #include diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index b9628fe046cc..060f83d43853 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dsnItem.hxx" #include "generalpage.hxx" diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 10af9cdcc3cf..d4480c464d59 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "indexdialog.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index ae6b365859d6..2a85b1a5d58b 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "indexfieldscontrol.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index a31e9ebed021..858bf0a8f5d9 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 963a12b1a300..5a271ab4be45 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "optionalboolitem.hxx" diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 8293b6231e42..18eab7138f2e 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "paramdialog.hxx" #include "paramdialog.hrc" diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 6432334b79e4..3d52af736216 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "queryfilter.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 98c388ec16a6..3097c385c5e3 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "queryorder.hrc" #include "queryorder.hxx" diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index cfdb702d23ff..80a1378d6a5d 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "sqlmessage.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 8d0f261cbafc..9b5e771b2173 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "tablespage.hxx" #include "dbu_dlg.hrc" @@ -60,7 +60,7 @@ #include "TablesSingleDlg.hxx" #include #include -#include "AutoControlsDef.hrc" +#include "AutoControls.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 44471469d401..2ceefab64a35 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "textconnectionsettings.hxx" #include "TextConnectionHelper.hxx" diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 258c6c27e10f..2ce3a919351b 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "DExport.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index d71460d1cb87..d4b4c4c5e329 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "HtmlReader.hxx" #include #include diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 5342b59b27d6..4ac330a3fc87 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -28,7 +28,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TokenWriter.hxx" #include diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index feae9fa58f26..fb25f77d70f1 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RtfReader.hxx" #include #include diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 6b095f371a6b..655484d69920 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableCopyHelper.hxx" #include "dbustrings.hrc" #include "sqlmessage.hxx" diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index d5f4b47c8976..1cd369b485df 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TokenWriter.hxx" #include #include diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 91466e9c9560..4e9c5b6c565a 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ToolBoxHelper.hxx" #include #include diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index bbf93b96a13d..596010170d20 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "UITools.hxx" #include diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 91ab2b13fc26..b0df6f61f1b5 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "WCPage.hxx" #include "WCopyTable.hxx" diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 38bf77652f06..07affc1c2015 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "WColumnSelect.hxx" #include "dbu_misc.hrc" diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 7fff204f8404..ceb8f6d6745e 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_misc.hrc" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 7d4a770d184b..3b00f2289359 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "WExtendPages.hxx" #include "RtfReader.hxx" #include "HtmlReader.hxx" diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 05c26b389668..8f3222181146 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "WNameMatch.hxx" #include #include "FieldDescriptions.hxx" diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 151ed18ffaf5..757b5723d794 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "WTypeSelect.hxx" #include "WizardPages.hrc" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 8ea2e88fafee..5d866839748e 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "asyncmodaldialog.hxx" diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 993630d6599e..425aef75db87 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "charsets.hxx" #include diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 8e50d0d00c6b..54d612329400 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" - #include "controllerframe.hxx" #include "IController.hxx" diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 4850b7e6cf42..572190fb746e 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "databaseobjectview.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index dc1dec8830cc..abd0aceb9433 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "datasourceconnector.hxx" #include diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index d369c6905ea8..83f55e0cbc5e 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -24,7 +24,7 @@ * ************************************************************************/ -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbaundomanager.hxx" diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 8d8e15f59ae9..2ae10118a248 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "browserids.hxx" #include "commontypes.hxx" diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index 6a85b6a9be95..bac5dfbaa5f6 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "defaultobjectnamecheck.hxx" diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 7c70f65e7a4e..afc4f109f0ab 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -25,8 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" + #include "dsmeta.hxx" #include #include "dsntypes.hxx" diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index d46d540cb462..7f8522ee9070 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "imageprovider.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index 4cb0942ef32e..ae68cd988f55 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "indexcollection.hxx" #include diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index c8b8e6085d20..d1c5ccd14fe1 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "linkeddocuments.hxx" #include diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index a85c3838a78c..3e8457361222 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index e39d36f71202..817b4a68aee8 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "propertysetitem.hxx" diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index 2e9c89680cd5..b1dbfb27558d 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "propertystorage.hxx" @@ -69,7 +69,7 @@ namespace dbaui namespace { //---------------------------------------------------------------- - template < class ITEMTYPE, class UNOTYPE_Type > + template < class ITEMTYPE, class UNOTYPE > class ItemAdapter { public: @@ -80,7 +80,7 @@ namespace dbaui if ( !pTypedItem ) return false; - UNOTYPE_Type aValue( pTypedItem->GetValue() ); + UNOTYPE aValue( pTypedItem->GetValue() ); OSL_VERIFY( _rValue >>= aValue ); // TODO: one could throw an IllegalArgumentException here - finally, this method // is (to be) used from within an XPropertySet::setPropertyValue implementation, @@ -97,7 +97,7 @@ namespace dbaui if ( !pTypedItem ) return false; - _out_rValue <<= UNOTYPE_Type( pTypedItem->GetValue() ); + _out_rValue <<= UNOTYPE( pTypedItem->GetValue() ); return true; } }; diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index ff6679c55f56..5cfceae1a0e0 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbaundomanager.hxx" #include "singledoccontroller.hxx" diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 20ab3820fc2d..655dce15c4e8 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "stringlistitem.hxx" diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 68405fcaadcd..596a5a1f557d 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include #include diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 36c7853e9733..91d67b82108c 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "TableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 084a8893bd5b..a1297dfc68b0 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionLineAccess.hxx" #include "JoinTableView.hxx" #include diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index adbdf5edab3a..49360b0959b5 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ConnectionLineData.hxx" #include diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 4a0e3888a1ea..90feae92b25d 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "JAccess.hxx" #include "JoinTableView.hxx" #include "JoinTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 7ccf4db07cf9..f4552253d84f 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include #include "dbu_qry.hrc" #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index ba1ddc2b5c59..397bb804c829 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "JoinDesignView.hxx" #include "JoinTableView.hxx" #include "JoinController.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 2ec6ccea0257..75d69afa5b09 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "JoinExchange.hxx" #include #include diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 112411be0a2f..f2d906e5017a 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "JoinTableView.hxx" #include #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx index d8d98679d18b..8e18232e02ff 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QTableConnection.hxx" #include #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index 5a10614f89e7..fc702cf94cfa 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QTableConnectionData.hxx" #include #include "QTableConnectionData.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 48f9237bda97..e20ca59c5494 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QTableWindow.hxx" #include "QueryTableView.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 1da1c2f30d63..5fc047a9fbcf 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QTableWindowData.hxx" #include diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index a05bf39d5432..27912e355d69 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryDesignView.hxx" #include "QueryTableView.hxx" #include "QTableWindow.hxx" @@ -550,7 +550,7 @@ namespace else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: pNode->count() == 3) { - // nur AND Verkn�pfung zulassen + // nur AND Verknüpfung zulassen if (!SQL_ISTOKEN(pNode->getChild(1),AND)) eErrorCode = eIllegalJoinCondition; else if ( eOk == (eErrorCode = InsertJoinConnection(_pView,pNode->getChild(0), _eJoinType,pLeftTable,pRightTable)) ) @@ -841,7 +841,7 @@ namespace } } } - // nur einmal f�r jedes Feld + // nur einmal für jedes Feld else if ( !i && pEntryField->isCondition() ) { if (!aWhereStr.getLength()) // noch keine Kriterien @@ -1865,7 +1865,7 @@ namespace if ( !checkJoinConditions(_pView,pNode->getChild(0)) || !checkJoinConditions(_pView,pRightTableRef)) return sal_False; - // named column join wird sp�ter vieleicht noch implementiert + // named column join wird später vieleicht noch implementiert // SQL_ISRULE(pNode->getChild(4),named_columns_join) EJoinType eJoinType = INNER_JOIN; bool bNatural = false; @@ -2144,7 +2144,7 @@ namespace return eNoSelectStatement; ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection - sal_Bool bFirstField = sal_True; // bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden + sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden SqlParseError eErrorCode = eOk; diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index 73d056e6cd5d..fb662a8b7438 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryMoveTabWinUndoAct.hxx" #include "JoinTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index daa6c840c1f3..6f9a45d59228 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryTabConnUndoAction.hxx" #include "QTableConnection.hxx" #include diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 09ce9cd87d4c..599afe015379 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryTabWinUndoAct.hxx" #include #include "QTableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4fe07e5331e8..302b57cef86d 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryTableView.hxx" #include "TableFieldInfo.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 47d076163d27..3f403a4c4892 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" #include "QueryViewSwitch.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 845e63b0a052..0ad058656489 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "QueryViewSwitch.hxx" #include "QueryDesignView.hxx" #include "QueryTextView.hxx" diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b361a9ff5f2c..f48ff8767b50 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "SelectionBrowseBox.hxx" #include #include diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 0edc45d81868..db6a8efd328c 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableConnection.hxx" #include "ConnectionLine.hxx" #include "TableConnectionData.hxx" diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index 2c5737159884..d820c5efa280 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableConnectionData.hxx" #include #include diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index ef607a73da96..8edf83464b96 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableFieldDescription.hxx" #include diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index bb990295e60b..7ef432c32bd8 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableFieldInfo.hxx" #include diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 44e226852802..57185506f84c 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableWindow.hxx" #include "TableWindowListBox.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 4d316871efd8..44b3953b57e8 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableWindowAccess.hxx" #include "JAccess.hxx" #include "TableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 708a12906d22..56cad8c62fff 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableWindowData.hxx" #include #include diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 4df65db90916..9d0f29701421 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableWindowListBox.hxx" #include "TableWindow.hxx" #include "QueryDesignView.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index e09b3dc4d3c1..6c740fb6c52d 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableWindowTitle.hxx" #include "TableWindow.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 76a4d30ed845..15fbc7611c75 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "querycontainerwindow.hxx" #include "QueryDesignView.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 3df54e243b5a..054c854e846a 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "adtabdlg.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 1b932edbb16d..2b9e70e8d07b 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "querydlg.hxx" #include "dbu_qry.hrc" #include "querydlg.hrc" diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index ff68e029b311..dea455795484 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "queryview.hxx" #include "dbu_qry.hrc" #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index a90653596855..9cc6a42b4fe8 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RTableConnection.hxx" #include #include "RelationTableView.hxx" diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 2d5562406a9e..713f2677b255 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RTableConnectionData.hxx" #include #include diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 6ab4bd3c96f4..9af062981e78 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include #include "dbu_rel.hrc" diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index e0dc240cc9ec..4030abfb46a2 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RelationDesignView.hxx" #include "RelationTableView.hxx" #include "RelationController.hxx" diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d78bc74cc6b2..d334aa93b133 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "RelationTableView.hxx" #include "JoinExchange.hxx" #include diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index fd2e38f4d571..45165c16605f 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "FieldDescGenWin.hxx" #include #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 93ff76bcbcb3..cc8b60bd1cb6 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "FieldDescriptions.hxx" #include #include diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index ed295372e990..e0606f90d6fe 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TEditControl.hxx" #include #include diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 2f90611cf2ba..b79eba4f8378 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "FieldDescriptions.hxx" #include "TEditControl.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index e83ebe3cbace..0867deb7a4b7 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableDesignControl.hxx" #include "dbu_tbl.hrc" diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 4df1b65432c7..7279c1ec1fca 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableDesignHelpBar.hxx" #include #include diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 74dced06eb96..4c5882c7ef9e 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableDesignView.hxx" #include #include "TableController.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 83951491b232..97484d519948 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableFieldControl.hxx" #include "TableController.hxx" #include "TableDesignView.hxx" @@ -66,7 +66,7 @@ sal_Bool OTableFieldControl::IsReadOnly() sal_Bool bRead(GetCtrl()->IsReadOnly()); if( !bRead ) { - // Die Spalten einer ::com::sun::star::sdbcx::View k�nnen nicht ver�ndert werden + // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference xTable = GetCtrl()->GetView()->getController().getTable(); if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) bRead = sal_True; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 4add6de25fe7..ca2680fc09a8 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableFieldDescWin.hxx" #include diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index fb43d295ef25..b9891730c1e5 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableRow.hxx" #include #include "FieldDescriptions.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index cb7d983b9f88..97a6f2d649f1 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableRowExchange.hxx" #include #include diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 0a6a299058b8..36262c5a0ac1 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "TableUndo.hxx" #include "dbu_tbl.hrc" #include "TEditControl.hxx" diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx index 299c483d147d..d138782392da 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "AdabasSettingsDlg.hxx" diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index bba4feed5ccb..ce30b85d57cc 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "unoadmin.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 785080224b32..beac49e1513f 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ColumnControl.hxx" #include "ColumnPeer.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 440ae3ae8fd3..ec48a29409a0 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ColumnModel.hxx" #include diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index bdf364eeef54..f39bd5c47543 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "ColumnPeer.hxx" #include "ColumnControlWindow.hxx" #include diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 20fba85b948e..ef214bf1a8d0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "DBTypeWizDlg.hxx" diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 1fc9f9f6b4eb..6d5a2fb5ecd9 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index f52d693bc496..4f0cc4d0196d 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "TableFilterDlg.hxx" diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 4d8b80aa5a85..e30a06037b50 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "UserSettingsDlg.hxx" diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 3794c34cfefe..fd751e807c40 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbu_reghelper.hxx" #include "admindlg.hxx" diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index c90c1d4b9ec1..647251deed6b 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "composerdialogs.hxx" diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 8fc61a268c30..3fb4b032e3bc 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -25,8 +25,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index fa9e913e6556..8e029adfdbde 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbinteraction.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index b2be6d475acf..23658530be71 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "textconnectionsettings.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 310705974590..998b79a136ad 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "unoDirectSql.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 64cb5f671f03..c48a2e54a250 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "dbustrings.hrc" #include diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 5166debafdf5..66d65552b264 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbui.hxx" +#include "precompiled_dbaccess.hxx" #include "sqlmessage.hxx" #include "unosqlmessage.hxx" -- cgit