[Libreoffice-commits] .: 21 commits - dbaccess/AllLangResTarget_dbui.mk dbaccess/inc dbaccess/JunitTest_dbaccess_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbui.mk dbaccess/Library_dbu.mk dbaccess/Module_dbaccess.mk dbaccess/Package_xml.mk dbaccess/qa dbaccess/source .gitattributes reportdesign/AllLangResTarget_rptui.mk reportdesign/inc reportdesign/JunitTest_reportdesign_complex.mk reportdesign/Library_rpt.mk reportdesign/Library_rptxml.mk reportdesign/Module_reportdesign.mk reportdesign/Package_xml.mk reportdesign/prj reportdesign/qa reportdesign/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:48:27 PDT 2011
.gitattributes | 1
dbaccess/AllLangResTarget_dbui.mk | 96 ++
dbaccess/JunitTest_dbaccess_complex.mk | 82 +
dbaccess/JunitTest_dbaccess_unoapi.mk | 2
dbaccess/Library_adabasui.mk | 3
dbaccess/Library_dba.mk | 3
dbaccess/Library_dbu.mk | 6
dbaccess/Library_dbui.mk | 321 ++++++
dbaccess/Module_dbaccess.mk | 1
dbaccess/Package_xml.mk | 30
dbaccess/inc/pch/precompiled_dbaxml.cxx | 29
dbaccess/inc/pch/precompiled_dbaxml.hxx | 520 ++++++++++
dbaccess/inc/pch/precompiled_dbmm.cxx | 29
dbaccess/inc/pch/precompiled_dbmm.hxx | 520 ++++++++++
dbaccess/inc/pch/precompiled_dbui.cxx | 29
dbaccess/inc/pch/precompiled_dbui.hxx | 523 +++++++++++
dbaccess/qa/unoapi/Test.java | 55 +
dbaccess/source/ui/dlg/AutoControlsDef.hrc | 86 +
reportdesign/AllLangResTarget_rptui.mk | 79 -
reportdesign/JunitTest_reportdesign_complex.mk | 53 +
reportdesign/Library_rpt.mk | 3
reportdesign/Library_rptxml.mk | 4
reportdesign/Module_reportdesign.mk | 9
reportdesign/Package_xml.mk | 29
reportdesign/inc/pch/precompiled_reportdesign.hxx | 29
reportdesign/inc/pch/precompiled_rptui.cxx | 29
reportdesign/inc/pch/precompiled_rptui.hxx | 74 +
reportdesign/inc/pch/precompiled_rptxml.cxx | 29
reportdesign/inc/pch/precompiled_rptxml.hxx | 74 +
reportdesign/prj/build.lst | 2
reportdesign/prj/makefile.mk | 40
reportdesign/qa/complex/reportdesign/TestDocument.java | 9
reportdesign/qa/complex/reportdesign/makefile.mk | 62 -
reportdesign/source/core/api/FixedLine.cxx | 1
reportdesign/source/core/api/FixedText.cxx | 1
reportdesign/source/core/api/FormatCondition.cxx | 1
reportdesign/source/core/api/FormattedField.cxx | 1
reportdesign/source/core/api/Function.cxx | 1
reportdesign/source/core/api/Functions.cxx | 1
reportdesign/source/core/api/Group.cxx | 1
reportdesign/source/core/api/Groups.cxx | 1
reportdesign/source/core/api/ImageControl.cxx | 1
reportdesign/source/core/api/ReportComponent.cxx | 1
reportdesign/source/core/api/ReportControlModel.cxx | 1
reportdesign/source/core/api/ReportDefinition.cxx | 2
reportdesign/source/core/api/ReportEngineJFree.cxx | 1
reportdesign/source/core/api/ReportVisitor.cxx | 1
reportdesign/source/core/api/Section.cxx | 1
reportdesign/source/core/api/Shape.cxx | 1
reportdesign/source/core/api/Tools.cxx | 1
reportdesign/source/core/api/services.cxx | 2
reportdesign/source/core/misc/conditionalexpression.cxx | 2
reportdesign/source/core/misc/conditionupdater.cxx | 2
reportdesign/source/core/resource/core_resource.cxx | 2
reportdesign/source/core/sdr/ModuleHelper.cxx | 1
reportdesign/source/core/sdr/PropertyForward.cxx | 1
reportdesign/source/core/sdr/ReportDrawPage.cxx | 2
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 1
reportdesign/source/core/sdr/RptModel.cxx | 2
reportdesign/source/core/sdr/RptObjectListener.cxx | 2
reportdesign/source/core/sdr/RptPage.cxx | 1
reportdesign/source/core/sdr/UndoEnv.cxx | 2
reportdesign/source/filter/xml/dbloader2.cxx | 2
reportdesign/source/filter/xml/rptxml.component | 67 +
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 2
reportdesign/source/filter/xml/xmlCell.cxx | 2
reportdesign/source/filter/xml/xmlColumn.cxx | 2
reportdesign/source/filter/xml/xmlComponent.cxx | 2
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 2
reportdesign/source/filter/xml/xmlControlProperty.cxx | 2
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlFixedContent.cxx | 2
reportdesign/source/filter/xml/xmlFormatCondition.cxx | 2
reportdesign/source/filter/xml/xmlFormattedField.cxx | 2
reportdesign/source/filter/xml/xmlFunction.cxx | 2
reportdesign/source/filter/xml/xmlGroup.cxx | 2
reportdesign/source/filter/xml/xmlHelper.cxx | 2
reportdesign/source/filter/xml/xmlImage.cxx | 2
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2
reportdesign/source/filter/xml/xmlMasterFields.cxx | 2
reportdesign/source/filter/xml/xmlPropertyHandler.cxx | 2
reportdesign/source/filter/xml/xmlReport.cxx | 2
reportdesign/source/filter/xml/xmlReportElement.cxx | 2
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 2
reportdesign/source/filter/xml/xmlRow.cxx | 2
reportdesign/source/filter/xml/xmlSection.cxx | 2
reportdesign/source/filter/xml/xmlStyleImport.cxx | 2
reportdesign/source/filter/xml/xmlSubDocument.cxx | 2
reportdesign/source/filter/xml/xmlTable.cxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 2
reportdesign/source/filter/xml/xmlservices.cxx | 2
reportdesign/source/shared/uistrings.cxx | 3
reportdesign/source/shared/xmlstrings.cxx | 4
reportdesign/source/ui/dlg/AddField.cxx | 2
reportdesign/source/ui/dlg/CondFormat.cxx | 2
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/dlg/DateTime.cxx | 2
reportdesign/source/ui/dlg/Formula.cxx | 2
reportdesign/source/ui/dlg/GroupExchange.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/dlg/PageNumber.cxx | 2
reportdesign/source/ui/dlg/dlgpage.cxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2
reportdesign/source/ui/inspection/DefaultInspection.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
reportdesign/source/ui/inspection/metadata.cxx | 2
reportdesign/source/ui/misc/ColorListener.cxx | 2
reportdesign/source/ui/misc/FunctionHelper.cxx | 2
reportdesign/source/ui/misc/RptUndo.cxx | 2
reportdesign/source/ui/misc/UITools.cxx | 2
reportdesign/source/ui/misc/rptuiservices.cxx | 2
reportdesign/source/ui/misc/statusbarcontroller.cxx | 2
reportdesign/source/ui/misc/toolboxcontroller.cxx | 2
reportdesign/source/ui/report/DesignView.cxx | 2
reportdesign/source/ui/report/EndMarker.cxx | 2
reportdesign/source/ui/report/FixedTextColor.cxx | 2
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/ReportControllerObserver.cxx | 2
reportdesign/source/ui/report/ReportRuler.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 2
reportdesign/source/ui/report/ReportWindow.cxx | 2
reportdesign/source/ui/report/ScrollHelper.cxx | 2
reportdesign/source/ui/report/SectionView.cxx | 2
reportdesign/source/ui/report/SectionWindow.cxx | 2
reportdesign/source/ui/report/StartMarker.cxx | 2
reportdesign/source/ui/report/ViewsWindow.cxx | 2
reportdesign/source/ui/report/dlgedclip.cxx | 2
reportdesign/source/ui/report/dlgedfac.cxx | 2
reportdesign/source/ui/report/dlgedfunc.cxx | 2
reportdesign/source/ui/report/propbrw.cxx | 2
134 files changed, 2867 insertions(+), 244 deletions(-)
New commits:
commit bd0ad3fad8ec90b5560a783cd47be20c2a9e7b87
Merge: e851f41... 68a37ad...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:58 2011 +0200
Merge branch 'master' into feature/gnumake4
commit e851f4185bcda511f33fb38e0aba9162252b7fce
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 10:13:13 2011 +0200
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
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index 4e5ec41..17ff9fc 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. <dtardon at redhat.com>
+# 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
-# <http://www.openoffice.org/license.html>
-# 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 0000000..fc7fbe1
--- /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. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_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 652f527..9a36e2b 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 44ff86c..dabe12b 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 0000000..d2934bc
--- /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. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,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 0000000..5c6b31e
--- /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. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,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 90947b2..a79aff8 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 a44d27c..b61f54a 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 7ea77cd..659e954 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 03f98cb..9fab5c2 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 <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 243b7ad..4bfd313 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -60,7 +60,6 @@
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <rtl/logfile.hxx>
-#include "SharedConnection.hxx"
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 87a2b44..1461525 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -173,7 +173,7 @@ namespace dbaccess
void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException)
{
}
-
+
void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException)
{
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index d68f57d..334d971 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 d7e81bc..45553b7 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 1c244fb..3999493 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 cacbfac..eb27b11 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 7f96e21..1fe9c16 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 e5db897..3817911 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 7dc05cd..cd4608b 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 b8b9491..75dcfca 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 80215ee..90b77e3 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 3dacec2..480bf4e 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 ee42bb8..6ff10cf 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 22685b6..a461eed 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 48cf7fa..a5c1937 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 8685f68..50c72a1 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 4a09216..e2beb26 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index 59a9a15..f2cbf64 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index 0edb8a9..1da225c 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 53c40ee..005455d 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 13018ed..8344fa8 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 bfd5f54..5c0b4c9 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 c460aca..37e07bd 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 <xmloff/xmluconv.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index d14425f..93547a4 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 1ef7766..8628ae0 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index 7ef8256..b01f7b4 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 32ddca6..3e65218 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index fa6bf1b..b1b49f3 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 53b6cca..4958633 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 5f6a5b5..bc11046 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 <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 69b012c..974e06f 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 a61d65e..6925878 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 12a5e2a..5ad5894 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 8cafb35..77e786f 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 47b279b..feeb8f5 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 dc5cc36..2ed0a35 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 <xmloff/xmltoken.hxx>
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 15eecb5..94915d0 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 fabbeed..b4c62f3 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 <tools/debug.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index d1f2dc3..383fc29 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 <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 687dac6..d309551 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 <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index bbfa236..51e258d 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 2eab5ab..6224ca1 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 55c5e3d..bbe5063 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 d121d48..b531cf0 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 bf53c13..01a4a0d 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 3359261..854e2b6 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 <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 79724aa..0773944 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 a71ae69..c488a0c 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index ce41d98..21fe3ca 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 <osl/diagnose.h>
#include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 3d0ba60..3c3689f 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 <tools/debug.hxx>
#include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index ca30021..164fa5f 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 <tools/debug.hxx>
#include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index e8ec8b3..8109927 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 fd488c6..50001c2 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index a377f83..4a56bbe 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 7bb147e..9e61509 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 <vcl/svapp.hxx>
#include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index eba0a58..fab1123 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 6d18c80..e237036 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 ce408d2..7be5d58 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 <toolkit/unohlp.hxx>
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 9c178c0..c15fb91 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 <sot/formats.hxx>
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 982e5a6..860b947 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 669e537..e2a94aa 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 a910eeb..967df21 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 <svtools/svtreebx.hxx>
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index d44e21c..605c26e 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 6f8aab4..d1be1f5 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 8fcd726..4738545 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 <com/sun/star/form/FormComponentType.hpp>
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 5a1dd20..75062e1 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 92e3f8b..28fa67f 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 <comphelper/uno3.hxx>
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 2ecb7f7..dc1582a 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 9586a10..b637035 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 ea256fc..8ab98ca 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 a040b4e..14024f9 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 <unotools/syslocale.hxx>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1d9d9c7..30d22b9 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 f78ef05..e18bc79 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 43763f0..2299e47 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 07e1430..8e05e67 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 8b4f81b..8be7e57 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 <tools/debug.hxx>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index 1d40357..c3eed83 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index c35b66e..e420bb1 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 c6f076b..49f5850 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 <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 4bce0d3..15cd745 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 760c614..ab37eae 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 587a28b..a80a337 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 dc88dfb..e02b7c0 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 9f1778d..ab4cf4e 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 3f72056..ddf46a3 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 ef3f889..c32b2b1 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 2c5d84b..180e318 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 <com/sun/star/ui/ImageType.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx
index d69acc0..ae527a9 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 6f29f46..af03c78 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 <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index a286cdf..e43e2a1 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 4a1799d..3d837e2 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 a6f0c82..e10396c 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 084fae6..8c0d2c3 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 <svl/itemset.hxx>
@@ -69,7 +70,6 @@
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <sfx2/docfilt.hxx>
-#include <AutoControlsDef.hrc>
#ifdef _ADO_DATALINK_BROWSE_
#include <vcl/sysdata.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 71a5b26..7cfd6e7 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 bfe1471..bbba4a4 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 <svl/itemset.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index bce6c23..8ea13e2 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 <svl/itemset.hxx>
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 25d0fd6..9a08090 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 e1c19c7..82e8cd7 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 936e8e6..35d3fb3 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 af2c0d9..4726c9d 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 d6f4bb3..1d9429b 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 <svl/itemset.hxx>
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index eb16e27..9613752 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 41fdcad..edad277 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 e758d67..7ef16bc 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 da7bbc5..5e5ceda 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 a54fb54..14ef2cd 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 350ee6b..f03a37a 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 f017258..2834abf 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 4d2efe2..6fa8b0f 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 c19ad6d..0b4f5e6 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 ef0c11b..6403be2 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 1f590e6..7161096 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 48f5ec2..7c0acb1 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 c4f5d57..7d7d24c 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 <comphelper/types.hxx>
-#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 e431406..ada2b43 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 a35d051..a95b4ef 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 f55ed2f..146028f 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 d33d9bf..f70bdac 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 8a46652..d8967b0 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 8156a65..6ce3ec1 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 <tools/debug.hxx>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index e6d7df7..626019e 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 0d45e6e..550a667 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"
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list