diff options
367 files changed, 3108 insertions, 1025 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 120000 index 000000000000..f18402b73cb9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk index 17ff9fc94efb..4e5ec41499e6 100644 --- a/dbaccess/AllLangResTarget_adabasui.mk +++ b/dbaccess/AllLangResTarget_adabasui.mk @@ -1,48 +1,47 @@ -# 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/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# 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. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. +# This file is part of OpenOffice.org. # -# Major Contributor(s): +# 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. # -# For minor contributions see the git repository. +# 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). # -# 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. +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* $(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui)) $(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess)) -$(eval $(call gb_AllLangResTarget_add_srs,adabasui,\ - dbaccess/adabasui \ -)) +$(eval $(call gb_AllLangResTarget_add_srs,adabasui,dbaccess/adabasui)) $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui)) $(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\ - $$(INCLUDE) \ - -I$(realpath $(SRCDIR)/dbaccess/inc) \ - -I$(OUTDIR)/inc \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/dbaccess/source/ext/adabas \ + -I$(SRCDIR)/dbaccess/inc \ )) $(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\ - dbaccess/source/ext/adabas/AdabasNewDb.src \ + dbaccess/source/ext/adabas/AdabasNewDb.src \ )) -# vim: set noet ts=4 sw=4: +# vim: set noet sw=4 ts=4: diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk deleted file mode 100644 index fc7fbe1b8fdb..000000000000 --- a/dbaccess/AllLangResTarget_dbu.mk +++ /dev/null @@ -1,95 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_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/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk new file mode 100644 index 000000000000..96ed853551d5 --- /dev/null +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -0,0 +1,96 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbui)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,dbui,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,dbui,dbaccess/dbui)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbui)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/dbaccess \ + -I$(SRCDIR)/dbaccess/source/ui/inc \ + -I$(SRCDIR)/dbaccess/source/ui/dlg \ + -I$(SRCDIR)/dbaccess/inc \ +)) + + +$(eval $(call gb_SrsTarget_add_files,dbaccess/dbui,\ + dbaccess/source/ui/app/app.src \ + dbaccess/source/ui/browser/sbabrw.src \ + dbaccess/source/ui/browser/sbagrid.src \ + dbaccess/source/ui/control/TableGrantCtrl.src \ + dbaccess/source/ui/control/tabletree.src \ + dbaccess/source/ui/control/undosqledit.src \ + dbaccess/source/ui/dlg/AdabasStat.src \ + dbaccess/source/ui/dlg/admincontrols.src \ + dbaccess/source/ui/dlg/adtabdlg.src \ + dbaccess/source/ui/dlg/advancedsettings.src \ + dbaccess/source/ui/dlg/AutoControls.src \ + dbaccess/source/ui/dlg/CollectionView.src \ + dbaccess/source/ui/dlg/ConnectionPage.src \ + dbaccess/source/ui/dlg/dbadmin.src \ + dbaccess/source/ui/dlg/dbadmin2.src \ + dbaccess/source/ui/dlg/dbadminsetup.src \ + dbaccess/source/ui/dlg/dbfindex.src \ + dbaccess/source/ui/dlg/directsql.src \ + dbaccess/source/ui/dlg/dlgattr.src \ + dbaccess/source/ui/dlg/dlgsave.src \ + dbaccess/source/ui/dlg/dlgsize.src \ + dbaccess/source/ui/dlg/dsselect.src \ + dbaccess/source/ui/dlg/indexdialog.src \ + dbaccess/source/ui/dlg/paramdialog.src \ + dbaccess/source/ui/dlg/queryfilter.src \ + dbaccess/source/ui/dlg/queryorder.src \ + dbaccess/source/ui/dlg/RelationDlg.src \ + dbaccess/source/ui/dlg/sqlmessage.src \ + dbaccess/source/ui/dlg/textconnectionsettings.src \ + dbaccess/source/ui/dlg/UserAdmin.src \ + dbaccess/source/ui/dlg/UserAdminDlg.src \ + dbaccess/source/ui/imagelists/dbimagelists.src \ + dbaccess/source/ui/misc/dbumiscres.src \ + dbaccess/source/ui/misc/WizardPages.src \ + dbaccess/source/ui/querydesign/query.src \ + dbaccess/source/ui/querydesign/querydlg.src \ + dbaccess/source/ui/relationdesign/relation.src \ + dbaccess/source/ui/tabledesign/table.src \ + dbaccess/source/ui/uno/copytablewizard.src \ + dbaccess/source/ui/uno/dbinteraction.src \ +)) + +$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbui,\ + dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \ + dbaccess/source/ui/inc/toolbox_tmpl.hrc \ +)) + +$(call gb_SrsTarget_get_target,dbaccess/dbui) :| $(OUTDIR)/inc/svx/globlmn.hrc + +# vim: set noet sw=4 ts=4: diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk new file mode 100644 index 000000000000..652f527aad62 --- /dev/null +++ b/dbaccess/JunitTest_dbaccess_complex.mk @@ -0,0 +1,82 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,dbaccess_complex,SRCDIR)) + +$(eval $(call gb_JunitTest_set_defs,dbaccess_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/dbaccess \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\ + dbaccess/qa/complex/dbaccess/ApplicationController \ + dbaccess/qa/complex/dbaccess/Beamer \ + dbaccess/qa/complex/dbaccess/DataSource \ + dbaccess/qa/complex/dbaccess/DatabaseDocument \ + dbaccess/qa/complex/dbaccess/Parser \ + dbaccess/qa/complex/dbaccess/PropertyBag \ + dbaccess/qa/complex/dbaccess/Query \ + dbaccess/qa/complex/dbaccess/QueryInQuery \ + dbaccess/qa/complex/dbaccess/RowSet \ + dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer \ + dbaccess/qa/complex/dbaccess/UISettings \ + dbaccess/qa/complex/dbaccess/CopyTableWizard \ + dbaccess/qa/complex/dbaccess/CRMBasedTestCase \ + dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler \ + dbaccess/qa/complex/dbaccess/DatabaseApplication \ + dbaccess/qa/complex/dbaccess/FileHelper \ + dbaccess/qa/complex/dbaccess/RowSetEventListener \ + dbaccess/qa/complex/dbaccess/TestCase \ +)) + +$(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ + $(OUTDIR)/bin/ConnectivityTools.jar \ +)) + +$(eval $(call gb_JunitTest_add_classes,dbaccess_complex,\ + complex.dbaccess.Beamer \ + complex.dbaccess.DatabaseDocument \ + complex.dbaccess.PropertyBag \ +)) +# deactivated since sb123; +# apparently most of these fail because OOo does not find JVM? +# complex.dbaccess.ApplicationController \ + complex.dbaccess.DataSource \ + complex.dbaccess.Parser \ + complex.dbaccess.Query \ + complex.dbaccess.QueryInQuery \ + complex.dbaccess.RowSet \ + complex.dbaccess.SingleSelectQueryComposer \ + complex.dbaccess.UISettings \ + complex.dbaccess.CopyTableWizard \ + +# vim: set noet sw=4 ts=4: diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk index 14929775648e..44ff86c5351e 100644 --- a/dbaccess/JunitTest_dbaccess_unoapi.mk +++ b/dbaccess/JunitTest_dbaccess_unoapi.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi)) +$(eval $(call gb_JunitTest_JunitTest,dbaccess_unoapi,SRCDIR)) $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\ $$(DEFS) \ @@ -42,6 +42,10 @@ $(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 deleted file mode 100644 index 0e5b7bbe191c..000000000000 --- a/dbaccess/Library_adabasui.mk +++ /dev/null @@ -1,76 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Library_Library,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_set_defs,adabasui,\ - $$(DEFS) \ - -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_dba.mk b/dbaccess/Library_dba.mk index 748c209ba06d..eabd13a9b74d 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -42,8 +42,7 @@ $(eval $(call gb_Library_set_include,dba,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,dba,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,dba,\ -DOOO_DLLIMPLEMENTATION_DBA \ )) diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk deleted file mode 100644 index 61910cfa7456..000000000000 --- a/dbaccess/Library_dbu.mk +++ /dev/null @@ -1,325 +0,0 @@ -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Library_Library,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_set_defs,dbu,\ - $$(DEFS) \ - -DDBACCESS_DLLIMPLEMENTATION \ - $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \ -)) - -ifeq (,$(strip $(PROF_EDITION))) -$(eval $(call gb_Library_set_defs,dbu,\ - $$(DEFS) \ - -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/Library_dbui.mk b/dbaccess/Library_dbui.mk new file mode 100644 index 000000000000..5e44b29d3c2c --- /dev/null +++ b/dbaccess/Library_dbui.mk @@ -0,0 +1,317 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,dbui)) +$(eval $(call gb_Library_add_precompiled_header,dbui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbui)) + +$(eval $(call gb_Library_set_componentfile,dbui,dbaccess/util/dbu)) + +$(eval $(call gb_Library_set_include,dbui,\ + -I$(SRCDIR)/dbaccess/inc \ + -I$(SRCDIR)/dbaccess/source/ui/inc \ + -I$(SRCDIR)/dbaccess/source/ui/dlg \ + -I$(SRCDIR)/dbaccess/source/inc \ + -I$(SRCDIR)/dbaccess/inc/pch \ + $$(SOLARINC) \ + -I$(OUTDIR)/inc/offuh \ +)) + +ifeq ($(SYSTEM_ODBC_HEADERS),TRUE) +$(eval $(call gb_Library_add_cflags,dbui,\ + -DSYSTEM_ODBC_HEADERS \ +)) +endif + +ifneq ($(WINDOWS_VISTA_PSDK),) +ifeq ($(PROF_EDITION),) +$(eval $(call gb_Library_add_defs,dbui,\ + -DDBACCESS_DLLIMPLEMENTATION\ + -DWINDOWS_VISTA_PSDK \ +)) +endif +endif + +ifeq ($(GUI)$(COM),WNTGCC) +$(eval $(call gb_Library_add_cflags,dbui,\ + -fpermissive \ +)) +endif + +ifeq ($(PROF_EDITION),) +ifneq ($(WINDOWS_VISTA_PSDK),) +DISABLE_ADO=TRUE +endif +endif + +ifeq ($(OS),WNT) +ifeq ($(DISABLE_ADO),) +$(eval $(call gb_Library_add_exception_objects,dbui,\ + dbaccess/source/ui/dlg/adodatalinks \ +)) +endif +endif + +$(eval $(call gb_Library_add_defs,dbui,\ + -DDBACCESS_DLLIMPLEMENTATION\ +)) + +$(eval $(call gb_Library_add_linked_libs,dbui,\ + comphelper \ + cppuhelper \ + cppu \ + dbtools \ + editeng \ + i18nisolang1 \ + fwe \ + sal \ + salhelper \ + sfx \ + svl \ + svt \ + vcl \ + tl \ + utl \ + ucbhelper \ + svxcore \ + svx \ + tk \ + sot \ + dba \ + $(gb_STDLIBS) \ +)) +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,dbui,\ + ole32 \ + oleaut32 \ + uuid \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,dbui,\ + dbaccess/source/ui/app/AppDetailView \ + dbaccess/source/ui/app/AppController \ + dbaccess/source/ui/app/AppControllerDnD \ + dbaccess/source/ui/app/AppControllerGen \ + dbaccess/source/ui/app/AppDetailPageHelper \ + dbaccess/source/ui/app/AppSwapWindow \ + dbaccess/source/ui/app/AppTitleWindow \ + dbaccess/source/ui/app/AppView \ + dbaccess/source/ui/app/closeveto \ + dbaccess/source/ui/app/subcomponentmanager \ + dbaccess/source/ui/browser/genericcontroller \ + dbaccess/source/ui/browser/dsbrowserDnD \ + dbaccess/source/ui/browser/dataview \ + dbaccess/source/ui/browser/dbexchange \ + dbaccess/source/ui/browser/dbloader \ + dbaccess/source/ui/browser/sbagrid \ + dbaccess/source/ui/browser/formadapter \ + dbaccess/source/ui/browser/brwview \ + dbaccess/source/ui/browser/brwctrlr \ + dbaccess/source/ui/browser/unodatbr \ + dbaccess/source/ui/browser/sbamultiplex \ + dbaccess/source/ui/browser/exsrcbrw \ + dbaccess/source/ui/browser/dbtreemodel \ + dbaccess/source/ui/browser/dsEntriesNoExp \ + dbaccess/source/ui/browser/dbtreeview \ + dbaccess/source/ui/control/statusbarontroller \ + dbaccess/source/ui/control/RelationControl \ + dbaccess/source/ui/control/toolboxcontroller \ + dbaccess/source/ui/control/tabletree \ + dbaccess/source/ui/control/TableGrantCtrl \ + dbaccess/source/ui/control/dbtreelistbox \ + dbaccess/source/ui/control/sqledit \ + dbaccess/source/ui/control/ColumnControlWindow \ + dbaccess/source/ui/control/FieldDescControl \ + dbaccess/source/ui/control/opendoccontrols \ + dbaccess/source/ui/dlg/directsql \ + dbaccess/source/ui/dlg/dbwiz \ + dbaccess/source/ui/dlg/dbwizsetup \ + dbaccess/source/ui/dlg/generalpage \ + dbaccess/source/ui/dlg/indexfieldscontrol \ + dbaccess/source/ui/dlg/indexdialog \ + dbaccess/source/ui/dlg/RelationDlg \ + dbaccess/source/ui/dlg/adtabdlg \ + dbaccess/source/ui/dlg/dlgsave \ + dbaccess/source/ui/dlg/admincontrols \ + dbaccess/source/ui/dlg/adminpages \ + dbaccess/source/ui/dlg/queryorder \ + dbaccess/source/ui/dlg/queryfilter \ + dbaccess/source/ui/dlg/paramdialog \ + dbaccess/source/ui/dlg/dbadmin \ + dbaccess/source/ui/dlg/detailpages \ + dbaccess/source/ui/dlg/sqlmessage \ + dbaccess/source/ui/dlg/finteraction \ + dbaccess/source/ui/dlg/ConnectionPage \ + dbaccess/source/ui/dlg/ConnectionHelper \ + dbaccess/source/ui/dlg/TextConnectionHelper \ + dbaccess/source/ui/dlg/ConnectionPageSetup \ + dbaccess/source/ui/dlg/DBSetupConnectionPages \ + dbaccess/source/ui/dlg/UserAdminDlg \ + dbaccess/source/ui/dlg/UserAdmin \ + dbaccess/source/ui/dlg/AdabasStat \ + dbaccess/source/ui/dlg/tablespage \ + dbaccess/source/ui/dlg/DbAdminImpl \ + dbaccess/source/ui/dlg/TablesSingleDlg \ + dbaccess/source/ui/dlg/CollectionView \ + dbaccess/source/ui/dlg/dsselect \ + dbaccess/source/ui/dlg/dbfindex \ + dbaccess/source/ui/dlg/DriverSettings \ + dbaccess/source/ui/dlg/odbcconfig \ + dbaccess/source/ui/dlg/advancedsettings \ + dbaccess/source/ui/dlg/textconnectionsettings \ + dbaccess/source/ui/misc/asyncmodaldialog \ + dbaccess/source/ui/misc/imageprovider \ + dbaccess/source/ui/misc/singledoccontroller \ + dbaccess/source/ui/misc/dbsubcomponentcontroller \ + dbaccess/source/ui/misc/datasourceconnector \ + dbaccess/source/ui/misc/linkeddocuments \ + dbaccess/source/ui/misc/indexcollection \ + dbaccess/source/ui/misc/UITools \ + dbaccess/source/ui/misc/WCPage \ + dbaccess/source/ui/misc/WCopyTable \ + dbaccess/source/ui/misc/WTypeSelect \ + dbaccess/source/ui/misc/TokenWriter \ + dbaccess/source/ui/misc/HtmlReader \ + dbaccess/source/ui/misc/RtfReader \ + dbaccess/source/ui/misc/propertysetitem \ + dbaccess/source/ui/misc/databaseobjectview \ + dbaccess/source/ui/misc/DExport \ + dbaccess/source/ui/misc/uiservices \ + dbaccess/source/ui/misc/RowSetDrop \ + dbaccess/source/ui/misc/TableCopyHelper \ + dbaccess/source/ui/misc/moduledbu \ + dbaccess/source/ui/misc/WColumnSelect \ + dbaccess/source/ui/misc/WExtendPages \ + dbaccess/source/ui/misc/WNameMatch \ + dbaccess/source/ui/misc/ToolBoxHelper \ + dbaccess/source/ui/misc/stringlistitem \ + dbaccess/source/ui/misc/charsets \ + dbaccess/source/ui/misc/defaultobjectnamecheck \ + dbaccess/source/ui/misc/dsmeta \ + dbaccess/source/ui/misc/controllerframe \ + dbaccess/source/ui/misc/propertystorage \ + dbaccess/source/ui/misc/dbaundomanager \ + dbaccess/source/ui/querydesign/ConnectionLineAccess \ + dbaccess/source/ui/querydesign/TableWindowAccess \ + dbaccess/source/ui/querydesign/JAccess \ + dbaccess/source/ui/querydesign/JoinDesignView \ + dbaccess/source/ui/querydesign/JoinController \ + dbaccess/source/ui/querydesign/QueryDesignView \ + dbaccess/source/ui/querydesign/SelectionBrowseBox \ + dbaccess/source/ui/querydesign/querydlg \ + dbaccess/source/ui/querydesign/QueryTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryTabConnUndoAction \ + dbaccess/source/ui/querydesign/TableFieldDescription \ + dbaccess/source/ui/querydesign/JoinTableView \ + dbaccess/source/ui/querydesign/QueryViewSwitch \ + dbaccess/source/ui/querydesign/QueryTableView \ + dbaccess/source/ui/querydesign/TableWindowData \ + dbaccess/source/ui/querydesign/QTableWindow \ + dbaccess/source/ui/querydesign/TableWindow \ + dbaccess/source/ui/querydesign/JoinExchange \ + dbaccess/source/ui/querydesign/TableWindowListBox \ + dbaccess/source/ui/querydesign/TableWindowTitle \ + dbaccess/source/ui/querydesign/QueryTextView \ + dbaccess/source/ui/querydesign/QTableConnection \ + dbaccess/source/ui/querydesign/querycontroller \ + dbaccess/source/ui/querydesign/querycontainerwindow \ + dbaccess/source/ui/querydesign/queryview \ + dbaccess/source/ui/querydesign/TableConnection \ + dbaccess/source/ui/querydesign/TableConnectionData \ + dbaccess/source/ui/relationdesign/RTableConnection \ + dbaccess/source/ui/relationdesign/RTableConnectionData \ + dbaccess/source/ui/relationdesign/RelationTableView \ + dbaccess/source/ui/relationdesign/RelationDesignView \ + dbaccess/source/ui/relationdesign/RelationController \ + dbaccess/source/ui/tabledesign/TableDesignControl \ + dbaccess/source/ui/tabledesign/TableFieldDescWin \ + dbaccess/source/ui/tabledesign/TableController \ + dbaccess/source/ui/tabledesign/TableDesignView \ + dbaccess/source/ui/tabledesign/TEditControl \ + dbaccess/source/ui/tabledesign/TableFieldControl \ + dbaccess/source/ui/tabledesign/TableDesignHelpBar \ + dbaccess/source/ui/tabledesign/FieldDescGenWin \ + dbaccess/source/ui/tabledesign/FieldDescriptions \ + dbaccess/source/ui/tabledesign/TableRow \ + dbaccess/source/ui/tabledesign/TableRowExchange \ + dbaccess/source/ui/tabledesign/TableUndo \ + dbaccess/source/ui/uno/composerdialogs \ + dbaccess/source/ui/uno/unosqlmessage \ + dbaccess/source/ui/uno/unoadmin \ + dbaccess/source/ui/uno/admindlg \ + dbaccess/source/ui/uno/TableFilterDlg \ + dbaccess/source/ui/uno/AdvancedSettingsDlg \ + dbaccess/source/ui/uno/unoDirectSql \ + dbaccess/source/ui/uno/DBTypeWizDlg \ + dbaccess/source/ui/uno/DBTypeWizDlgSetup \ + dbaccess/source/ui/uno/UserSettingsDlg \ + dbaccess/source/ui/uno/ColumnModel \ + dbaccess/source/ui/uno/ColumnControl \ + dbaccess/source/ui/uno/ColumnPeer \ + dbaccess/source/ui/uno/dbinteraction \ + dbaccess/source/ui/uno/textconnectionsettings_uno \ +)) + +$(eval $(call gb_Library_add_noexception_objects,dbui, \ + dbaccess/source/ui/control/ScrollHelper \ + dbaccess/source/ui/control/VertSplitView \ + dbaccess/source/ui/control/SqlNameEdit \ + dbaccess/source/ui/control/listviewitems \ + dbaccess/source/ui/control/undosqledit \ + dbaccess/source/ui/control/marktree \ + dbaccess/source/ui/control/curledit \ + dbaccess/source/ui/control/charsetlistbox \ + dbaccess/source/ui/app/AppIconControl \ + dbaccess/source/ui/browser/AsyncronousLink \ + dbaccess/source/ui/dlg/dlgsize \ + dbaccess/source/ui/dlg/dlgattr \ + dbaccess/source/ui/dlg/optionalboolitem \ + dbaccess/source/ui/querydesign/TableFieldInfo \ + dbaccess/source/ui/querydesign/QTableConnectionData \ + dbaccess/source/ui/querydesign/QTableWindowData \ + dbaccess/source/ui/querydesign/ConnectionLine \ + dbaccess/source/ui/querydesign/ConnectionLineData \ + dbaccess/source/shared/dbu_reghelper \ + dbaccess/source/shared/dbustrings \ +)) + +# the following source file can't be compiled with optimization by some compilers (crash or endless loop): +# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC +# the latter is currently not supported by gbuild and needs a fix here later +ifeq ($(COM),$(filter-out GCC,$(COM))) +$(eval $(call gb_Library_add_exception_objects,dbui,\ + dbaccess/source/ui/uno/copytablewizard \ +)) +else +$(eval $(call gb_Library_add_cxxobjects,dbui,\ + dbaccess/source/ui/uno/copytablewizard \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/dbaccess/Makefile b/dbaccess/Makefile index a79aff831024..90947b2e5f48 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 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 7042c49a1433..a44d27c45f9d 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -28,23 +28,24 @@ $(eval $(call gb_Module_Module,dbaccess)) $(eval $(call gb_Module_add_targets,dbaccess,\ - AllLangResTarget_adabasui \ + $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ AllLangResTarget_dba \ AllLangResTarget_dbmm \ - AllLangResTarget_dbu \ + AllLangResTarget_dbui \ AllLangResTarget_sdbt \ - $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ - Library_adabasui \ Library_dba \ Library_dbaxml \ Library_dbmm \ - Library_dbu \ + Library_dbui \ Library_sdbt \ Package_inc \ Package_uiconfig \ )) + #AllLangResTarget_adabasui \ + Library_adabasui \ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ + JunitTest_dbaccess_complex \ JunitTest_dbaccess_unoapi \ )) diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk index 659e954953c9..7ea77cd4b1ad 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/reportdesign/prj/makefile.mk b/dbaccess/Package_xml.mk index e312a7ccab65..64463fe0dbaf 100755..100644 --- a/reportdesign/prj/makefile.mk +++ b/dbaccess/Package_xml.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,16 +25,6 @@ # #************************************************************************* -PRJ=.. -TARGET=prj - -.INCLUDE : settings.mk - -.IF "$(VERBOSE)"!="" -VERBOSEFLAG := -.ELSE -VERBOSEFLAG := -s -.ENDIF - -all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog +$(eval $(call gb_Package_Package,dbaccess_xml,$(SRCDIR)/dbaccess/prj)) +$(eval $(call gb_Package_add_file,dbaccess_xml,prj/dba.xml,dba.xml)) +$(eval $(call gb_Package_add_file,dbaccess_xml,prj/dbu.xml,dbu.xml)) diff --git a/dbaccess/inc/pch/precompiled_dbaxml.cxx b/dbaccess/inc/pch/precompiled_dbaxml.cxx new file mode 100644 index 000000000000..2e555efb2a46 --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbaxml.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_dbaxml.hxx" + diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx new file mode 100644 index 000000000000..099adaf03988 --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -0,0 +1,520 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS + +//---MARKER--- +#include "sal/types.h" + + +#include "boost/mem_fn.hpp" +#include "boost/noncopyable.hpp" +#include "boost/optional.hpp" +#include "boost/shared_ptr.hpp" + +#include "com/sun/star/accessibility/AccessibleEventId.hpp" +#include "com/sun/star/accessibility/AccessibleRelationType.hpp" +#include "com/sun/star/accessibility/AccessibleRole.hpp" +#include "com/sun/star/accessibility/AccessibleStateType.hpp" +#include "com/sun/star/accessibility/XAccessible.hpp" +#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp" +#include "com/sun/star/awt/FontDescriptor.hpp" +#include "com/sun/star/awt/FontEmphasisMark.hpp" +#include "com/sun/star/awt/FontRelief.hpp" +#include "com/sun/star/awt/FontSlant.hpp" +#include "com/sun/star/awt/FontStrikeout.hpp" +#include "com/sun/star/awt/FontUnderline.hpp" +#include "com/sun/star/awt/FontWeight.hpp" +#include "com/sun/star/awt/FontWidth.hpp" +#include "com/sun/star/awt/LineEndFormat.hpp" +#include "com/sun/star/awt/PosSize.hpp" +#include "com/sun/star/awt/Size.hpp" +#include "com/sun/star/awt/TextAlign.hpp" +#include "com/sun/star/awt/VisualEffect.hpp" +#include "com/sun/star/awt/XControlModel.hpp" +#include "com/sun/star/awt/XFocusListener.hpp" +#include "com/sun/star/awt/XTabControllerModel.hpp" +#include "com/sun/star/awt/XTextComponent.hpp" +#include "com/sun/star/awt/XWindow.hpp" +#include "com/sun/star/beans/NamedValue.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/XFastPropertySet.hpp" +#include "com/sun/star/beans/XMultiPropertySet.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertyState.hpp" +#include "com/sun/star/beans/XPropertyStateChangeListener.hpp" +#include "com/sun/star/beans/XVetoableChangeListener.hpp" +#include "com/sun/star/chart/ChartDataRowSource.hpp" +#include "com/sun/star/configuration/backend/XLayer.hpp" +#include "com/sun/star/configuration/backend/XLayerHandler.hpp" +#include "com/sun/star/connection/XConnection.hpp" +#include "com/sun/star/container/ElementExistException.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XContainer.hpp" +#include "com/sun/star/container/XContainerApproveBroadcaster.hpp" +#include "com/sun/star/container/XContainerApproveListener.hpp" +#include "com/sun/star/container/XContainerListener.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameContainer.hpp" +#include "com/sun/star/container/XIndexAccess.hpp" +#include "com/sun/star/container/XIndexContainer.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/container/XSet.hpp" +#include "com/sun/star/datatransfer/DataFlavor.hpp" +#include "com/sun/star/datatransfer/XTransferable.hpp" +#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp" +#include "com/sun/star/datatransfer/dnd/XDragGestureListener.hdl" +#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp" +#include "com/sun/star/document/MacroExecMode.hpp" +#include "com/sun/star/document/XDocumentInfoSupplier.hpp" +#include "com/sun/star/document/XDocumentSubStorageSupplier.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XEventsSupplier.hpp" +#include "com/sun/star/document/XExporter.hpp" +#include "com/sun/star/document/XExtendedFilterDetection.hpp" +#include "com/sun/star/document/XFilter.hpp" +#include "com/sun/star/document/XImporter.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/document/XTypeDetection.hpp" +#include "com/sun/star/drawing/XDrawPageSupplier.hpp" +#include "com/sun/star/embed/Aspects.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/EmbedStates.hpp" +#include "com/sun/star/embed/EntryInitModes.hpp" +#include "com/sun/star/embed/XCommonEmbedPersist.hpp" +#include "com/sun/star/embed/XComponentSupplier.hpp" +#include "com/sun/star/embed/XEmbedObjectCreator.hpp" +#include "com/sun/star/embed/XEmbedObjectFactory.hpp" +#include "com/sun/star/embed/XEmbedPersist.hpp" +#include "com/sun/star/embed/XEmbeddedObject.hpp" +#include "com/sun/star/embed/XStateChangeBroadcaster.hpp" +#include "com/sun/star/embed/XStateChangeListener.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/embed/XTransactionBroadcaster.hpp" +#include "com/sun/star/embed/XTransactionListener.hpp" +#include "com/sun/star/form/DataSelectionType.hpp" +#include "com/sun/star/form/FormButtonType.hpp" +#include "com/sun/star/form/FormComponentType.hpp" +#include "com/sun/star/form/FormSubmitEncoding.hpp" +#include "com/sun/star/form/FormSubmitMethod.hpp" +#include "com/sun/star/form/XApproveActionBroadcaster.hpp" +#include "com/sun/star/form/XBoundControl.hpp" +#include "com/sun/star/form/XChangeBroadcaster.hpp" +#include "com/sun/star/form/XChangeListener.hpp" +#include "com/sun/star/form/XConfirmDeleteListener.hpp" +#include "com/sun/star/form/XDatabaseParameterBroadcaster.hpp" +#include "com/sun/star/form/XDatabaseParameterListener.hpp" +#include "com/sun/star/form/XDeleteListener.hpp" +#include "com/sun/star/form/XErrorListener.hpp" +#include "com/sun/star/form/XForm.hpp" +#include "com/sun/star/form/XFormComponent.hpp" +#include "com/sun/star/form/XFormsSupplier.hpp" +#include "com/sun/star/form/XGridColumnFactory.hpp" +#include "com/sun/star/form/XInsertListener.hpp" +#include "com/sun/star/form/XLoadListener.hpp" +#include "com/sun/star/form/XPositioningListener.hpp" +#include "com/sun/star/form/XReset.hpp" +#include "com/sun/star/form/XResetListener.hpp" +#include "com/sun/star/form/XRestoreListener.hpp" +#include "com/sun/star/form/XSubmitListener.hpp" +#include "com/sun/star/form/XUpdateListener.hpp" +#include "com/sun/star/frame/CommandGroup.hpp" +#include "com/sun/star/frame/FrameSearchFlag.hpp" +#include "com/sun/star/frame/XComponentLoader.hpp" +#include "com/sun/star/frame/XController.hpp" +#include "com/sun/star/frame/XDispatch.hpp" +#include "com/sun/star/frame/XDispatchInformationProvider.hpp" +#include "com/sun/star/frame/XDispatchProvider.hpp" +#include "com/sun/star/frame/XDispatchProviderInterception.hpp" +#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp" +#include "com/sun/star/frame/XFrame.hpp" +#include "com/sun/star/frame/XFrameActionListener.hpp" +#include "com/sun/star/frame/XFrameLoader.hpp" +#include "com/sun/star/frame/XFrames.hpp" +#include "com/sun/star/frame/XFramesSupplier.hpp" +#include "com/sun/star/frame/XInterceptorInfo.hpp" +#include "com/sun/star/frame/XLayoutManager.hpp" +#include "com/sun/star/frame/XLoadEventListener.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XStatusListener.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/graphic/GraphicColorMode.hpp" +#include "com/sun/star/graphic/XGraphic.hpp" +#include "com/sun/star/i18n/XCollator.hpp" +#include "com/sun/star/i18n/XLocaleData.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataSource.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XObjectInputStream.hpp" +#include "com/sun/star/io/XObjectOutputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XPersistObject.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/Locale.hpp" +#include "com/sun/star/lang/NullPointerException.hpp" +#include "com/sun/star/lang/ServiceNotRegisteredException.hpp" +#include "com/sun/star/lang/WrappedTargetException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XEventListener.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XUnoTunnel.hpp" +#include "com/sun/star/mozilla/XMozillaBootstrap.hpp" +#include "com/sun/star/packages/zip/ZipIOException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/InvalidRegistryException.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/sdb/DocumentSaveRequest.hpp" +#include "com/sun/star/sdb/ParametersRequest.hpp" +#include "com/sun/star/sdb/RowChangeAction.hpp" +#include "com/sun/star/sdb/RowSetVetoException.hpp" +#include "com/sun/star/sdb/SQLContext.hpp" +#include "com/sun/star/sdb/SQLFilterOperator.hpp" +#include "com/sun/star/sdb/XBookmarksSupplier.hpp" +#include "com/sun/star/sdb/XColumn.hpp" +#include "com/sun/star/sdb/XColumnUpdate.hpp" +#include "com/sun/star/sdb/XCommandPreparation.hpp" +#include "com/sun/star/sdb/XCompletedConnection.hpp" +#include "com/sun/star/sdb/XCompletedExecution.hpp" +#include "com/sun/star/sdb/XDatabaseEnvironment.hpp" +#include "com/sun/star/sdb/XDocumentDataSource.hpp" +#include "com/sun/star/sdb/XFormDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XInteractionDocumentSave.hpp" +#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp" +#include "com/sun/star/sdb/XOfficeDatabaseDocument.hpp" +#include "com/sun/star/sdb/XParametersSupplier.hpp" +#include "com/sun/star/sdb/XQueriesSupplier.hpp" +#include "com/sun/star/sdb/XQueryDefinitionsSupplier.hpp" +#include "com/sun/star/sdb/XReportDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XResultSetAccess.hpp" +#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp" +#include "com/sun/star/sdb/XRowSetApproveListener.hpp" +#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp" +#include "com/sun/star/sdb/XSQLErrorListener.hpp" +#include "com/sun/star/sdb/XSQLQueryComposer.hpp" +#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp" +#include "com/sun/star/sdb/application/DatabaseObject.hpp" +#include "com/sun/star/sdb/application/XDatabaseDocumentUI.hpp" +#include "com/sun/star/sdb/application/XTableUIProvider.hpp" +#include "com/sun/star/sdb/tools/CompositionType.hpp" +#include "com/sun/star/sdb/tools/XConnectionTools.hpp" +#include "com/sun/star/sdb/tools/XDataSourceMetaData.hpp" +#include "com/sun/star/sdb/tools/XObjectNames.hpp" +#include "com/sun/star/sdb/tools/XTableName.hpp" +#include "com/sun/star/sdbc/ColumnSearch.hpp" +#include "com/sun/star/sdbc/ColumnValue.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/IndexType.hpp" +#include "com/sun/star/sdbc/KeyRule.hpp" +#include "com/sun/star/sdbc/ResultSetConcurrency.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/SQLException.hpp" +#include "com/sun/star/sdbc/SQLWarning.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XColumnLocate.hpp" +#include "com/sun/star/sdbc/XConnection.hpp" +#include "com/sun/star/sdbc/XDataSource.hpp" +#include "com/sun/star/sdbc/XDatabaseMetaData.hpp" +#include "com/sun/star/sdbc/XDriver.hpp" +#include "com/sun/star/sdbc/XDriverAccess.hpp" +#include "com/sun/star/sdbc/XDriverManager.hpp" +#include "com/sun/star/sdbc/XGeneratedResultSet.hpp" +#include "com/sun/star/sdbc/XIsolatedConnection.hpp" +#include "com/sun/star/sdbc/XMultipleResults.hpp" +#include "com/sun/star/sdbc/XOutParameters.hpp" +#include "com/sun/star/sdbc/XParameters.hpp" +#include "com/sun/star/sdbc/XPreparedBatchExecution.hpp" +#include "com/sun/star/sdbc/XPreparedStatement.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hdl" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XResultSetUpdate.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/sdbc/XRowSet.hpp" +#include "com/sun/star/sdbc/XRowSetListener.hpp" +#include "com/sun/star/sdbc/XRowUpdate.hpp" +#include "com/sun/star/sdbc/XStatement.hpp" +#include "com/sun/star/sdbc/XWarningsSupplier.hpp" +#include "com/sun/star/sdbcx/CompareBookmark.hpp" +#include "com/sun/star/sdbcx/KeyType.hpp" +#include "com/sun/star/sdbcx/Privilege.hpp" +#include "com/sun/star/sdbcx/PrivilegeObject.hpp" +#include "com/sun/star/sdbcx/XAlterTable.hpp" +#include "com/sun/star/sdbcx/XAppend.hpp" +#include "com/sun/star/sdbcx/XAuthorizable.hpp" +#include "com/sun/star/sdbcx/XColumnsSupplier.hpp" +#include "com/sun/star/sdbcx/XCreateCatalog.hpp" +#include "com/sun/star/sdbcx/XDataDefinitionSupplier.hpp" +#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp" +#include "com/sun/star/sdbcx/XDeleteRows.hpp" +#include "com/sun/star/sdbcx/XDrop.hpp" +#include "com/sun/star/sdbcx/XGroupsSupplier.hpp" +#include "com/sun/star/sdbcx/XIndexesSupplier.hpp" +#include "com/sun/star/sdbcx/XKeysSupplier.hpp" +#include "com/sun/star/sdbcx/XRename.hpp" +#include "com/sun/star/sdbcx/XRowLocate.hpp" +#include "com/sun/star/sdbcx/XTablesSupplier.hpp" +#include "com/sun/star/sdbcx/XUser.hpp" +#include "com/sun/star/sdbcx/XUsersSupplier.hpp" +#include "com/sun/star/sdbcx/XViewsSupplier.hpp" +#include "com/sun/star/style/XStyleFamiliesSupplier.hpp" +#include "com/sun/star/task/ErrorCodeIOException.hpp" +#include "com/sun/star/task/InteractionClassification.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionRetry.hpp" +#include "com/sun/star/task/XJob.hpp" +#include "com/sun/star/task/XJobExecutor.hpp" +#include "com/sun/star/task/XStatusIndicator.hpp" +#include "com/sun/star/task/XStatusIndicatorFactory.hpp" +#include "com/sun/star/ucb/AuthenticationRequest.hpp" +#include "com/sun/star/ucb/Command.hpp" +#include "com/sun/star/ucb/CommandInfo.hpp" +#include "com/sun/star/ucb/IOErrorCode.hpp" +#include "com/sun/star/ucb/InsertCommandArgument.hpp" +#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" +#include "com/sun/star/ucb/InteractiveIOException.hpp" +#include "com/sun/star/ucb/MissingInputStreamException.hpp" +#include "com/sun/star/ucb/MissingPropertiesException.hpp" +#include "com/sun/star/ucb/OpenCommandArgument2.hpp" +#include "com/sun/star/ucb/OpenMode.hpp" +#include "com/sun/star/ucb/UnsupportedCommandException.hpp" +#include "com/sun/star/ucb/UnsupportedDataSinkException.hpp" +#include "com/sun/star/ucb/UnsupportedOpenModeException.hpp" +#include "com/sun/star/ucb/XCommandEnvironment.hpp" +#include "com/sun/star/ucb/XCommandProcessor.hpp" +#include "com/sun/star/ucb/XContent.hpp" +#include "com/sun/star/ucb/XContentCreator.hpp" +#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp" +#include "com/sun/star/ucb/XProgressHandler.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess.hpp" +#include "com/sun/star/ui/ImageType.hpp" +#include "com/sun/star/ui/XImageManager.hpp" +#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationManager.hpp" +#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationStorage.hpp" +#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp" +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" +#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" +#include "com/sun/star/ui/dialogs/XFilePicker.hpp" +#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp" +#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/TypeClass.hpp" +#include "com/sun/star/uno/XAggregation.hpp" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XNamingService.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/NumberFormat.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/URL.hpp" +#include "com/sun/star/util/XCancellable.hpp" +#include "com/sun/star/util/XCloneable.hpp" +#include "com/sun/star/util/XCloseBroadcaster.hpp" +#include "com/sun/star/util/XCloseable.hpp" +#include "com/sun/star/util/XFlushable.hpp" +#include "com/sun/star/util/XModifiable.hpp" +#include "com/sun/star/util/XModifyBroadcaster.hpp" +#include "com/sun/star/util/XModifyListener.hpp" +#include "com/sun/star/util/XNumberFormatTypes.hpp" +#include "com/sun/star/util/XNumberFormatsSupplier.hpp" +#include "com/sun/star/util/XRefreshListener.hpp" +#include "com/sun/star/util/XRefreshable.hpp" +#include "com/sun/star/util/XURLTransformer.hpp" +#include "com/sun/star/util/XVeto.hpp" +#include "com/sun/star/view/XPrintable.hpp" +#include "com/sun/star/view/XSelectionSupplier.hpp" +#include "com/sun/star/view/XViewSettingsSupplier.hpp" +#include "com/sun/star/xml/sax/InputSource.hpp" +#include "com/sun/star/xml/sax/XDocumentHandler.hpp" +#include "com/sun/star/xml/sax/XParser.hpp" + +#include "comphelper/basicio.hxx" +#include "comphelper/broadcasthelper.hxx" +#include "comphelper/componentcontext.hxx" +#include "comphelper/container.hxx" +#include "comphelper/documentconstants.hxx" +#include "comphelper/guarding.hxx" +#include "comphelper/mediadescriptor.hxx" +#include "comphelper/namecontainer.hxx" +#include "comphelper/namedvaluecollection.hxx" +#include "comphelper/processfactory.hxx" +#include "comphelper/propertycontainer.hxx" +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/stl_types.hxx" +#include "comphelper/storagehelper.hxx" +#include "comphelper/streamsection.hxx" +#include "comphelper/types.hxx" + +#include "connectivity/FValue.hxx" +#include <connectivity/DriversConfig.hxx> +#include "connectivity/dbcharset.hxx" +#include "connectivity/dbconversion.hxx" +#include "connectivity/dbexception.hxx" +#include "connectivity/dbmetadata.hxx" +#include "connectivity/sqlnode.hxx" +#include "connectivity/sqlparse.hxx" + +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/propshlp.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + + +#include "i18npool/mslangid.hxx" + +#include "osl/diagnose.h" +#include "osl/file.hxx" +#include "osl/getglobalmutex.hxx" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/thread.h" + +#include "rtl/digest.h" +#include "rtl/logfile.hxx" +#include "rtl/memory.h" +#include "rtl/tencinfo.h" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.hxx" +#include "rtl/uuid.h" + +#include "sfx2/QuerySaveDocument.hxx" +#include "sfx2/cntids.hrc" +#include "sfx2/sfx.hrc" +#include "sfx2/sfxsids.hrc" +#include "sfx2/sfxuno.hxx" + +#include "comphelper/classids.hxx" + + +#include "svl/cjkoptions.hxx" +#include "svl/filenotation.hxx" +#include "unotools/historyoptions.hxx" +#include "svtools/htmlkywd.hxx" +#include "svtools/imgdef.hxx" +#include "unotools/internaloptions.hxx" +#include "svtools/menuoptions.hxx" +#include "svtools/miscopt.hxx" +#include "svtools/rtfkeywd.hxx" +#include "svtools/rtftoken.h" +#include "svl/solar.hrc" +#include "svtools/toolboxcontroller.hxx" +#include "unotools/viewoptions.hxx" + +#include "svx/dataaccessdescriptor.hxx" +#include "svx/dbexch.hrc" +#include "svx/dialogs.hrc" +#include "svx/globlmn.hrc" +#include "editeng/svxenum.hxx" +#include "svx/svxids.hrc" + + +#include "tools/diagnose_ex.h" + +#include "typelib/typedescription.hxx" + +#include "ucbhelper/cancelcommandexecution.hxx" +#include "ucbhelper/commandenvironment.hxx" +#include "ucbhelper/content.hxx" +#include "ucbhelper/contentbroker.hxx" +#include "ucbhelper/contentidentifier.hxx" +#include "ucbhelper/propertyvalueset.hxx" +#include "ucbhelper/providerhelper.hxx" +#include "ucbhelper/resultset.hxx" +#include "ucbhelper/resultsethelper.hxx" + +#include "unotools/bootstrap.hxx" +#include "unotools/configmgr.hxx" +#include "unotools/confignode.hxx" +#include "unotools/eventlisteneradapter.hxx" +#include "unotools/processfactory.hxx" + + +#include "vos/mutex.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +#include "vos/thread.hxx" + +#include "xmloff/ProgressBarHelper.hxx" +#include "xmloff/XMLConstantsPropertyHandler.hxx" +#include "xmloff/contextid.hxx" +#include "xmloff/families.hxx" +#include "xmloff/nmspmap.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmltypes.hxx" + +//---MARKER--- + +#endif + + diff --git a/dbaccess/inc/pch/precompiled_dbmm.cxx b/dbaccess/inc/pch/precompiled_dbmm.cxx new file mode 100644 index 000000000000..ff6a55761958 --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbmm.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_dbmm.hxx" + diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx new file mode 100644 index 000000000000..099adaf03988 --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -0,0 +1,520 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS + +//---MARKER--- +#include "sal/types.h" + + +#include "boost/mem_fn.hpp" +#include "boost/noncopyable.hpp" +#include "boost/optional.hpp" +#include "boost/shared_ptr.hpp" + +#include "com/sun/star/accessibility/AccessibleEventId.hpp" +#include "com/sun/star/accessibility/AccessibleRelationType.hpp" +#include "com/sun/star/accessibility/AccessibleRole.hpp" +#include "com/sun/star/accessibility/AccessibleStateType.hpp" +#include "com/sun/star/accessibility/XAccessible.hpp" +#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp" +#include "com/sun/star/awt/FontDescriptor.hpp" +#include "com/sun/star/awt/FontEmphasisMark.hpp" +#include "com/sun/star/awt/FontRelief.hpp" +#include "com/sun/star/awt/FontSlant.hpp" +#include "com/sun/star/awt/FontStrikeout.hpp" +#include "com/sun/star/awt/FontUnderline.hpp" +#include "com/sun/star/awt/FontWeight.hpp" +#include "com/sun/star/awt/FontWidth.hpp" +#include "com/sun/star/awt/LineEndFormat.hpp" +#include "com/sun/star/awt/PosSize.hpp" +#include "com/sun/star/awt/Size.hpp" +#include "com/sun/star/awt/TextAlign.hpp" +#include "com/sun/star/awt/VisualEffect.hpp" +#include "com/sun/star/awt/XControlModel.hpp" +#include "com/sun/star/awt/XFocusListener.hpp" +#include "com/sun/star/awt/XTabControllerModel.hpp" +#include "com/sun/star/awt/XTextComponent.hpp" +#include "com/sun/star/awt/XWindow.hpp" +#include "com/sun/star/beans/NamedValue.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/XFastPropertySet.hpp" +#include "com/sun/star/beans/XMultiPropertySet.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertyState.hpp" +#include "com/sun/star/beans/XPropertyStateChangeListener.hpp" +#include "com/sun/star/beans/XVetoableChangeListener.hpp" +#include "com/sun/star/chart/ChartDataRowSource.hpp" +#include "com/sun/star/configuration/backend/XLayer.hpp" +#include "com/sun/star/configuration/backend/XLayerHandler.hpp" +#include "com/sun/star/connection/XConnection.hpp" +#include "com/sun/star/container/ElementExistException.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XContainer.hpp" +#include "com/sun/star/container/XContainerApproveBroadcaster.hpp" +#include "com/sun/star/container/XContainerApproveListener.hpp" +#include "com/sun/star/container/XContainerListener.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameContainer.hpp" +#include "com/sun/star/container/XIndexAccess.hpp" +#include "com/sun/star/container/XIndexContainer.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/container/XSet.hpp" +#include "com/sun/star/datatransfer/DataFlavor.hpp" +#include "com/sun/star/datatransfer/XTransferable.hpp" +#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp" +#include "com/sun/star/datatransfer/dnd/XDragGestureListener.hdl" +#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp" +#include "com/sun/star/document/MacroExecMode.hpp" +#include "com/sun/star/document/XDocumentInfoSupplier.hpp" +#include "com/sun/star/document/XDocumentSubStorageSupplier.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XEventsSupplier.hpp" +#include "com/sun/star/document/XExporter.hpp" +#include "com/sun/star/document/XExtendedFilterDetection.hpp" +#include "com/sun/star/document/XFilter.hpp" +#include "com/sun/star/document/XImporter.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/document/XTypeDetection.hpp" +#include "com/sun/star/drawing/XDrawPageSupplier.hpp" +#include "com/sun/star/embed/Aspects.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/EmbedStates.hpp" +#include "com/sun/star/embed/EntryInitModes.hpp" +#include "com/sun/star/embed/XCommonEmbedPersist.hpp" +#include "com/sun/star/embed/XComponentSupplier.hpp" +#include "com/sun/star/embed/XEmbedObjectCreator.hpp" +#include "com/sun/star/embed/XEmbedObjectFactory.hpp" +#include "com/sun/star/embed/XEmbedPersist.hpp" +#include "com/sun/star/embed/XEmbeddedObject.hpp" +#include "com/sun/star/embed/XStateChangeBroadcaster.hpp" +#include "com/sun/star/embed/XStateChangeListener.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/embed/XTransactionBroadcaster.hpp" +#include "com/sun/star/embed/XTransactionListener.hpp" +#include "com/sun/star/form/DataSelectionType.hpp" +#include "com/sun/star/form/FormButtonType.hpp" +#include "com/sun/star/form/FormComponentType.hpp" +#include "com/sun/star/form/FormSubmitEncoding.hpp" +#include "com/sun/star/form/FormSubmitMethod.hpp" +#include "com/sun/star/form/XApproveActionBroadcaster.hpp" +#include "com/sun/star/form/XBoundControl.hpp" +#include "com/sun/star/form/XChangeBroadcaster.hpp" +#include "com/sun/star/form/XChangeListener.hpp" +#include "com/sun/star/form/XConfirmDeleteListener.hpp" +#include "com/sun/star/form/XDatabaseParameterBroadcaster.hpp" +#include "com/sun/star/form/XDatabaseParameterListener.hpp" +#include "com/sun/star/form/XDeleteListener.hpp" +#include "com/sun/star/form/XErrorListener.hpp" +#include "com/sun/star/form/XForm.hpp" +#include "com/sun/star/form/XFormComponent.hpp" +#include "com/sun/star/form/XFormsSupplier.hpp" +#include "com/sun/star/form/XGridColumnFactory.hpp" +#include "com/sun/star/form/XInsertListener.hpp" +#include "com/sun/star/form/XLoadListener.hpp" +#include "com/sun/star/form/XPositioningListener.hpp" +#include "com/sun/star/form/XReset.hpp" +#include "com/sun/star/form/XResetListener.hpp" +#include "com/sun/star/form/XRestoreListener.hpp" +#include "com/sun/star/form/XSubmitListener.hpp" +#include "com/sun/star/form/XUpdateListener.hpp" +#include "com/sun/star/frame/CommandGroup.hpp" +#include "com/sun/star/frame/FrameSearchFlag.hpp" +#include "com/sun/star/frame/XComponentLoader.hpp" +#include "com/sun/star/frame/XController.hpp" +#include "com/sun/star/frame/XDispatch.hpp" +#include "com/sun/star/frame/XDispatchInformationProvider.hpp" +#include "com/sun/star/frame/XDispatchProvider.hpp" +#include "com/sun/star/frame/XDispatchProviderInterception.hpp" +#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp" +#include "com/sun/star/frame/XFrame.hpp" +#include "com/sun/star/frame/XFrameActionListener.hpp" +#include "com/sun/star/frame/XFrameLoader.hpp" +#include "com/sun/star/frame/XFrames.hpp" +#include "com/sun/star/frame/XFramesSupplier.hpp" +#include "com/sun/star/frame/XInterceptorInfo.hpp" +#include "com/sun/star/frame/XLayoutManager.hpp" +#include "com/sun/star/frame/XLoadEventListener.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XStatusListener.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/graphic/GraphicColorMode.hpp" +#include "com/sun/star/graphic/XGraphic.hpp" +#include "com/sun/star/i18n/XCollator.hpp" +#include "com/sun/star/i18n/XLocaleData.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataSource.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XObjectInputStream.hpp" +#include "com/sun/star/io/XObjectOutputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XPersistObject.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/Locale.hpp" +#include "com/sun/star/lang/NullPointerException.hpp" +#include "com/sun/star/lang/ServiceNotRegisteredException.hpp" +#include "com/sun/star/lang/WrappedTargetException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XEventListener.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XUnoTunnel.hpp" +#include "com/sun/star/mozilla/XMozillaBootstrap.hpp" +#include "com/sun/star/packages/zip/ZipIOException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/InvalidRegistryException.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/sdb/DocumentSaveRequest.hpp" +#include "com/sun/star/sdb/ParametersRequest.hpp" +#include "com/sun/star/sdb/RowChangeAction.hpp" +#include "com/sun/star/sdb/RowSetVetoException.hpp" +#include "com/sun/star/sdb/SQLContext.hpp" +#include "com/sun/star/sdb/SQLFilterOperator.hpp" +#include "com/sun/star/sdb/XBookmarksSupplier.hpp" +#include "com/sun/star/sdb/XColumn.hpp" +#include "com/sun/star/sdb/XColumnUpdate.hpp" +#include "com/sun/star/sdb/XCommandPreparation.hpp" +#include "com/sun/star/sdb/XCompletedConnection.hpp" +#include "com/sun/star/sdb/XCompletedExecution.hpp" +#include "com/sun/star/sdb/XDatabaseEnvironment.hpp" +#include "com/sun/star/sdb/XDocumentDataSource.hpp" +#include "com/sun/star/sdb/XFormDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XInteractionDocumentSave.hpp" +#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp" +#include "com/sun/star/sdb/XOfficeDatabaseDocument.hpp" +#include "com/sun/star/sdb/XParametersSupplier.hpp" +#include "com/sun/star/sdb/XQueriesSupplier.hpp" +#include "com/sun/star/sdb/XQueryDefinitionsSupplier.hpp" +#include "com/sun/star/sdb/XReportDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XResultSetAccess.hpp" +#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp" +#include "com/sun/star/sdb/XRowSetApproveListener.hpp" +#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp" +#include "com/sun/star/sdb/XSQLErrorListener.hpp" +#include "com/sun/star/sdb/XSQLQueryComposer.hpp" +#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp" +#include "com/sun/star/sdb/application/DatabaseObject.hpp" +#include "com/sun/star/sdb/application/XDatabaseDocumentUI.hpp" +#include "com/sun/star/sdb/application/XTableUIProvider.hpp" +#include "com/sun/star/sdb/tools/CompositionType.hpp" +#include "com/sun/star/sdb/tools/XConnectionTools.hpp" +#include "com/sun/star/sdb/tools/XDataSourceMetaData.hpp" +#include "com/sun/star/sdb/tools/XObjectNames.hpp" +#include "com/sun/star/sdb/tools/XTableName.hpp" +#include "com/sun/star/sdbc/ColumnSearch.hpp" +#include "com/sun/star/sdbc/ColumnValue.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/IndexType.hpp" +#include "com/sun/star/sdbc/KeyRule.hpp" +#include "com/sun/star/sdbc/ResultSetConcurrency.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/SQLException.hpp" +#include "com/sun/star/sdbc/SQLWarning.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XColumnLocate.hpp" +#include "com/sun/star/sdbc/XConnection.hpp" +#include "com/sun/star/sdbc/XDataSource.hpp" +#include "com/sun/star/sdbc/XDatabaseMetaData.hpp" +#include "com/sun/star/sdbc/XDriver.hpp" +#include "com/sun/star/sdbc/XDriverAccess.hpp" +#include "com/sun/star/sdbc/XDriverManager.hpp" +#include "com/sun/star/sdbc/XGeneratedResultSet.hpp" +#include "com/sun/star/sdbc/XIsolatedConnection.hpp" +#include "com/sun/star/sdbc/XMultipleResults.hpp" +#include "com/sun/star/sdbc/XOutParameters.hpp" +#include "com/sun/star/sdbc/XParameters.hpp" +#include "com/sun/star/sdbc/XPreparedBatchExecution.hpp" +#include "com/sun/star/sdbc/XPreparedStatement.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hdl" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XResultSetUpdate.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/sdbc/XRowSet.hpp" +#include "com/sun/star/sdbc/XRowSetListener.hpp" +#include "com/sun/star/sdbc/XRowUpdate.hpp" +#include "com/sun/star/sdbc/XStatement.hpp" +#include "com/sun/star/sdbc/XWarningsSupplier.hpp" +#include "com/sun/star/sdbcx/CompareBookmark.hpp" +#include "com/sun/star/sdbcx/KeyType.hpp" +#include "com/sun/star/sdbcx/Privilege.hpp" +#include "com/sun/star/sdbcx/PrivilegeObject.hpp" +#include "com/sun/star/sdbcx/XAlterTable.hpp" +#include "com/sun/star/sdbcx/XAppend.hpp" +#include "com/sun/star/sdbcx/XAuthorizable.hpp" +#include "com/sun/star/sdbcx/XColumnsSupplier.hpp" +#include "com/sun/star/sdbcx/XCreateCatalog.hpp" +#include "com/sun/star/sdbcx/XDataDefinitionSupplier.hpp" +#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp" +#include "com/sun/star/sdbcx/XDeleteRows.hpp" +#include "com/sun/star/sdbcx/XDrop.hpp" +#include "com/sun/star/sdbcx/XGroupsSupplier.hpp" +#include "com/sun/star/sdbcx/XIndexesSupplier.hpp" +#include "com/sun/star/sdbcx/XKeysSupplier.hpp" +#include "com/sun/star/sdbcx/XRename.hpp" +#include "com/sun/star/sdbcx/XRowLocate.hpp" +#include "com/sun/star/sdbcx/XTablesSupplier.hpp" +#include "com/sun/star/sdbcx/XUser.hpp" +#include "com/sun/star/sdbcx/XUsersSupplier.hpp" +#include "com/sun/star/sdbcx/XViewsSupplier.hpp" +#include "com/sun/star/style/XStyleFamiliesSupplier.hpp" +#include "com/sun/star/task/ErrorCodeIOException.hpp" +#include "com/sun/star/task/InteractionClassification.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionRetry.hpp" +#include "com/sun/star/task/XJob.hpp" +#include "com/sun/star/task/XJobExecutor.hpp" +#include "com/sun/star/task/XStatusIndicator.hpp" +#include "com/sun/star/task/XStatusIndicatorFactory.hpp" +#include "com/sun/star/ucb/AuthenticationRequest.hpp" +#include "com/sun/star/ucb/Command.hpp" +#include "com/sun/star/ucb/CommandInfo.hpp" +#include "com/sun/star/ucb/IOErrorCode.hpp" +#include "com/sun/star/ucb/InsertCommandArgument.hpp" +#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" +#include "com/sun/star/ucb/InteractiveIOException.hpp" +#include "com/sun/star/ucb/MissingInputStreamException.hpp" +#include "com/sun/star/ucb/MissingPropertiesException.hpp" +#include "com/sun/star/ucb/OpenCommandArgument2.hpp" +#include "com/sun/star/ucb/OpenMode.hpp" +#include "com/sun/star/ucb/UnsupportedCommandException.hpp" +#include "com/sun/star/ucb/UnsupportedDataSinkException.hpp" +#include "com/sun/star/ucb/UnsupportedOpenModeException.hpp" +#include "com/sun/star/ucb/XCommandEnvironment.hpp" +#include "com/sun/star/ucb/XCommandProcessor.hpp" +#include "com/sun/star/ucb/XContent.hpp" +#include "com/sun/star/ucb/XContentCreator.hpp" +#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp" +#include "com/sun/star/ucb/XProgressHandler.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess.hpp" +#include "com/sun/star/ui/ImageType.hpp" +#include "com/sun/star/ui/XImageManager.hpp" +#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationManager.hpp" +#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationStorage.hpp" +#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp" +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" +#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" +#include "com/sun/star/ui/dialogs/XFilePicker.hpp" +#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp" +#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/TypeClass.hpp" +#include "com/sun/star/uno/XAggregation.hpp" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XNamingService.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/NumberFormat.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/URL.hpp" +#include "com/sun/star/util/XCancellable.hpp" +#include "com/sun/star/util/XCloneable.hpp" +#include "com/sun/star/util/XCloseBroadcaster.hpp" +#include "com/sun/star/util/XCloseable.hpp" +#include "com/sun/star/util/XFlushable.hpp" +#include "com/sun/star/util/XModifiable.hpp" +#include "com/sun/star/util/XModifyBroadcaster.hpp" +#include "com/sun/star/util/XModifyListener.hpp" +#include "com/sun/star/util/XNumberFormatTypes.hpp" +#include "com/sun/star/util/XNumberFormatsSupplier.hpp" +#include "com/sun/star/util/XRefreshListener.hpp" +#include "com/sun/star/util/XRefreshable.hpp" +#include "com/sun/star/util/XURLTransformer.hpp" +#include "com/sun/star/util/XVeto.hpp" +#include "com/sun/star/view/XPrintable.hpp" +#include "com/sun/star/view/XSelectionSupplier.hpp" +#include "com/sun/star/view/XViewSettingsSupplier.hpp" +#include "com/sun/star/xml/sax/InputSource.hpp" +#include "com/sun/star/xml/sax/XDocumentHandler.hpp" +#include "com/sun/star/xml/sax/XParser.hpp" + +#include "comphelper/basicio.hxx" +#include "comphelper/broadcasthelper.hxx" +#include "comphelper/componentcontext.hxx" +#include "comphelper/container.hxx" +#include "comphelper/documentconstants.hxx" +#include "comphelper/guarding.hxx" +#include "comphelper/mediadescriptor.hxx" +#include "comphelper/namecontainer.hxx" +#include "comphelper/namedvaluecollection.hxx" +#include "comphelper/processfactory.hxx" +#include "comphelper/propertycontainer.hxx" +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/stl_types.hxx" +#include "comphelper/storagehelper.hxx" +#include "comphelper/streamsection.hxx" +#include "comphelper/types.hxx" + +#include "connectivity/FValue.hxx" +#include <connectivity/DriversConfig.hxx> +#include "connectivity/dbcharset.hxx" +#include "connectivity/dbconversion.hxx" +#include "connectivity/dbexception.hxx" +#include "connectivity/dbmetadata.hxx" +#include "connectivity/sqlnode.hxx" +#include "connectivity/sqlparse.hxx" + +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/propshlp.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + + +#include "i18npool/mslangid.hxx" + +#include "osl/diagnose.h" +#include "osl/file.hxx" +#include "osl/getglobalmutex.hxx" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/thread.h" + +#include "rtl/digest.h" +#include "rtl/logfile.hxx" +#include "rtl/memory.h" +#include "rtl/tencinfo.h" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.hxx" +#include "rtl/uuid.h" + +#include "sfx2/QuerySaveDocument.hxx" +#include "sfx2/cntids.hrc" +#include "sfx2/sfx.hrc" +#include "sfx2/sfxsids.hrc" +#include "sfx2/sfxuno.hxx" + +#include "comphelper/classids.hxx" + + +#include "svl/cjkoptions.hxx" +#include "svl/filenotation.hxx" +#include "unotools/historyoptions.hxx" +#include "svtools/htmlkywd.hxx" +#include "svtools/imgdef.hxx" +#include "unotools/internaloptions.hxx" +#include "svtools/menuoptions.hxx" +#include "svtools/miscopt.hxx" +#include "svtools/rtfkeywd.hxx" +#include "svtools/rtftoken.h" +#include "svl/solar.hrc" +#include "svtools/toolboxcontroller.hxx" +#include "unotools/viewoptions.hxx" + +#include "svx/dataaccessdescriptor.hxx" +#include "svx/dbexch.hrc" +#include "svx/dialogs.hrc" +#include "svx/globlmn.hrc" +#include "editeng/svxenum.hxx" +#include "svx/svxids.hrc" + + +#include "tools/diagnose_ex.h" + +#include "typelib/typedescription.hxx" + +#include "ucbhelper/cancelcommandexecution.hxx" +#include "ucbhelper/commandenvironment.hxx" +#include "ucbhelper/content.hxx" +#include "ucbhelper/contentbroker.hxx" +#include "ucbhelper/contentidentifier.hxx" +#include "ucbhelper/propertyvalueset.hxx" +#include "ucbhelper/providerhelper.hxx" +#include "ucbhelper/resultset.hxx" +#include "ucbhelper/resultsethelper.hxx" + +#include "unotools/bootstrap.hxx" +#include "unotools/configmgr.hxx" +#include "unotools/confignode.hxx" +#include "unotools/eventlisteneradapter.hxx" +#include "unotools/processfactory.hxx" + + +#include "vos/mutex.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +#include "vos/thread.hxx" + +#include "xmloff/ProgressBarHelper.hxx" +#include "xmloff/XMLConstantsPropertyHandler.hxx" +#include "xmloff/contextid.hxx" +#include "xmloff/families.hxx" +#include "xmloff/nmspmap.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmltypes.hxx" + +//---MARKER--- + +#endif + + diff --git a/dbaccess/inc/pch/precompiled_dbui.cxx b/dbaccess/inc/pch/precompiled_dbui.cxx new file mode 100644 index 000000000000..dbed0b67c7fe --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbui.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_dbui.hxx" + diff --git a/dbaccess/inc/pch/precompiled_dbui.hxx b/dbaccess/inc/pch/precompiled_dbui.hxx new file mode 100644 index 000000000000..1166288b9970 --- /dev/null +++ b/dbaccess/inc/pch/precompiled_dbui.hxx @@ -0,0 +1,523 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS + +//---MARKER--- +#include "sal/types.h" + + +#include "boost/mem_fn.hpp" +#include "boost/noncopyable.hpp" +#include "boost/optional.hpp" +#include "boost/shared_ptr.hpp" + +#include "com/sun/star/accessibility/AccessibleEventId.hpp" +#include "com/sun/star/accessibility/AccessibleRelationType.hpp" +#include "com/sun/star/accessibility/AccessibleRole.hpp" +#include "com/sun/star/accessibility/AccessibleStateType.hpp" +#include "com/sun/star/accessibility/XAccessible.hpp" +#include "com/sun/star/accessibility/XAccessibleRelationSet.hpp" +#include "com/sun/star/awt/FontDescriptor.hpp" +#include "com/sun/star/awt/FontEmphasisMark.hpp" +#include "com/sun/star/awt/FontRelief.hpp" +#include "com/sun/star/awt/FontSlant.hpp" +#include "com/sun/star/awt/FontStrikeout.hpp" +#include "com/sun/star/awt/FontUnderline.hpp" +#include "com/sun/star/awt/FontWeight.hpp" +#include "com/sun/star/awt/FontWidth.hpp" +#include "com/sun/star/awt/LineEndFormat.hpp" +#include "com/sun/star/awt/PosSize.hpp" +#include "com/sun/star/awt/Size.hpp" +#include "com/sun/star/awt/TextAlign.hpp" +#include "com/sun/star/awt/VisualEffect.hpp" +#include "com/sun/star/awt/XControlModel.hpp" +#include "com/sun/star/awt/XFocusListener.hpp" +#include "com/sun/star/awt/XTabControllerModel.hpp" +#include "com/sun/star/awt/XTextComponent.hpp" +#include "com/sun/star/awt/XWindow.hpp" +#include "com/sun/star/beans/NamedValue.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/XFastPropertySet.hpp" +#include "com/sun/star/beans/XMultiPropertySet.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertyState.hpp" +#include "com/sun/star/beans/XPropertyStateChangeListener.hpp" +#include "com/sun/star/beans/XVetoableChangeListener.hpp" +#include "com/sun/star/chart/ChartDataRowSource.hpp" +#include "com/sun/star/configuration/backend/XLayer.hpp" +#include "com/sun/star/configuration/backend/XLayerHandler.hpp" +#include "com/sun/star/connection/XConnection.hpp" +#include "com/sun/star/container/ElementExistException.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XContainer.hpp" +#include "com/sun/star/container/XContainerApproveBroadcaster.hpp" +#include "com/sun/star/container/XContainerApproveListener.hpp" +#include "com/sun/star/container/XContainerListener.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameContainer.hpp" +#include "com/sun/star/container/XIndexAccess.hpp" +#include "com/sun/star/container/XIndexContainer.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/container/XSet.hpp" +#include "com/sun/star/datatransfer/DataFlavor.hpp" +#include "com/sun/star/datatransfer/XTransferable.hpp" +#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp" +#include "com/sun/star/datatransfer/dnd/XDragGestureListener.hdl" +#include "com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp" +#include "com/sun/star/document/MacroExecMode.hpp" +#include "com/sun/star/document/XDocumentInfoSupplier.hpp" +#include "com/sun/star/document/XDocumentSubStorageSupplier.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XEventsSupplier.hpp" +#include "com/sun/star/document/XExporter.hpp" +#include "com/sun/star/document/XExtendedFilterDetection.hpp" +#include "com/sun/star/document/XFilter.hpp" +#include "com/sun/star/document/XImporter.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/document/XTypeDetection.hpp" +#include "com/sun/star/drawing/XDrawPageSupplier.hpp" +#include "com/sun/star/embed/Aspects.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/EmbedStates.hpp" +#include "com/sun/star/embed/EntryInitModes.hpp" +#include "com/sun/star/embed/XCommonEmbedPersist.hpp" +#include "com/sun/star/embed/XComponentSupplier.hpp" +#include "com/sun/star/embed/XEmbedObjectCreator.hpp" +#include "com/sun/star/embed/XEmbedObjectFactory.hpp" +#include "com/sun/star/embed/XEmbedPersist.hpp" +#include "com/sun/star/embed/XEmbeddedObject.hpp" +#include "com/sun/star/embed/XStateChangeBroadcaster.hpp" +#include "com/sun/star/embed/XStateChangeListener.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/embed/XTransactionBroadcaster.hpp" +#include "com/sun/star/embed/XTransactionListener.hpp" +#include "com/sun/star/form/DataSelectionType.hpp" +#include "com/sun/star/form/FormButtonType.hpp" +#include "com/sun/star/form/FormComponentType.hpp" +#include "com/sun/star/form/FormSubmitEncoding.hpp" +#include "com/sun/star/form/FormSubmitMethod.hpp" +#include "com/sun/star/form/XApproveActionBroadcaster.hpp" +#include "com/sun/star/form/XBoundControl.hpp" +#include "com/sun/star/form/XChangeBroadcaster.hpp" +#include "com/sun/star/form/XChangeListener.hpp" +#include "com/sun/star/form/XConfirmDeleteListener.hpp" +#include "com/sun/star/form/XDatabaseParameterBroadcaster.hpp" +#include "com/sun/star/form/XDatabaseParameterListener.hpp" +#include "com/sun/star/form/XDeleteListener.hpp" +#include "com/sun/star/form/XErrorListener.hpp" +#include "com/sun/star/form/XForm.hpp" +#include "com/sun/star/form/XFormComponent.hpp" +#include "com/sun/star/form/XFormsSupplier.hpp" +#include "com/sun/star/form/XGridColumnFactory.hpp" +#include "com/sun/star/form/XInsertListener.hpp" +#include "com/sun/star/form/XLoadListener.hpp" +#include "com/sun/star/form/XPositioningListener.hpp" +#include "com/sun/star/form/XReset.hpp" +#include "com/sun/star/form/XResetListener.hpp" +#include "com/sun/star/form/XRestoreListener.hpp" +#include "com/sun/star/form/XSubmitListener.hpp" +#include "com/sun/star/form/XUpdateListener.hpp" +#include "com/sun/star/frame/CommandGroup.hpp" +#include "com/sun/star/frame/FrameSearchFlag.hpp" +#include "com/sun/star/frame/XComponentLoader.hpp" +#include "com/sun/star/frame/XController.hpp" +#include "com/sun/star/frame/XDispatch.hpp" +#include "com/sun/star/frame/XDispatchInformationProvider.hpp" +#include "com/sun/star/frame/XDispatchProvider.hpp" +#include "com/sun/star/frame/XDispatchProviderInterception.hpp" +#include "com/sun/star/frame/XDispatchProviderInterceptor.hpp" +#include "com/sun/star/frame/XFrame.hpp" +#include "com/sun/star/frame/XFrameActionListener.hpp" +#include "com/sun/star/frame/XFrameLoader.hpp" +#include "com/sun/star/frame/XFrames.hpp" +#include "com/sun/star/frame/XFramesSupplier.hpp" +#include "com/sun/star/frame/XInterceptorInfo.hpp" +#include "com/sun/star/frame/XLayoutManager.hpp" +#include "com/sun/star/frame/XLoadEventListener.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XStatusListener.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/graphic/GraphicColorMode.hpp" +#include "com/sun/star/graphic/XGraphic.hpp" +#include "com/sun/star/i18n/XCollator.hpp" +#include "com/sun/star/i18n/XLocaleData.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataSource.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XObjectInputStream.hpp" +#include "com/sun/star/io/XObjectOutputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XPersistObject.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/Locale.hpp" +#include "com/sun/star/lang/NullPointerException.hpp" +#include "com/sun/star/lang/ServiceNotRegisteredException.hpp" +#include "com/sun/star/lang/WrappedTargetException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XEventListener.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XUnoTunnel.hpp" +#include "com/sun/star/mozilla/XMozillaBootstrap.hpp" +#include "com/sun/star/packages/zip/ZipIOException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/InvalidRegistryException.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/sdb/DocumentSaveRequest.hpp" +#include "com/sun/star/sdb/ParametersRequest.hpp" +#include "com/sun/star/sdb/RowChangeAction.hpp" +#include "com/sun/star/sdb/RowSetVetoException.hpp" +#include "com/sun/star/sdb/SQLContext.hpp" +#include "com/sun/star/sdb/SQLFilterOperator.hpp" +#include "com/sun/star/sdb/XBookmarksSupplier.hpp" +#include "com/sun/star/sdb/XColumn.hpp" +#include "com/sun/star/sdb/XColumnUpdate.hpp" +#include "com/sun/star/sdb/XCommandPreparation.hpp" +#include "com/sun/star/sdb/XCompletedConnection.hpp" +#include "com/sun/star/sdb/XCompletedExecution.hpp" +#include "com/sun/star/sdb/XDatabaseEnvironment.hpp" +#include "com/sun/star/sdb/XDocumentDataSource.hpp" +#include "com/sun/star/sdb/XFormDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XInteractionDocumentSave.hpp" +#include "com/sun/star/sdb/XInteractionSupplyParameters.hpp" +#include "com/sun/star/sdb/XOfficeDatabaseDocument.hpp" +#include "com/sun/star/sdb/XParametersSupplier.hpp" +#include "com/sun/star/sdb/XQueriesSupplier.hpp" +#include "com/sun/star/sdb/XQueryDefinitionsSupplier.hpp" +#include "com/sun/star/sdb/XReportDocumentsSupplier.hpp" +#include "com/sun/star/sdb/XResultSetAccess.hpp" +#include "com/sun/star/sdb/XRowSetApproveBroadcaster.hpp" +#include "com/sun/star/sdb/XRowSetApproveListener.hpp" +#include "com/sun/star/sdb/XSQLErrorBroadcaster.hpp" +#include "com/sun/star/sdb/XSQLErrorListener.hpp" +#include "com/sun/star/sdb/XSQLQueryComposer.hpp" +#include "com/sun/star/sdb/XSQLQueryComposerFactory.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp" +#include "com/sun/star/sdb/XSingleSelectQueryComposer.hpp" +#include "com/sun/star/sdb/application/DatabaseObject.hpp" +#include "com/sun/star/sdb/application/XDatabaseDocumentUI.hpp" +#include "com/sun/star/sdb/application/XTableUIProvider.hpp" +#include "com/sun/star/sdb/tools/CompositionType.hpp" +#include "com/sun/star/sdb/tools/XConnectionTools.hpp" +#include "com/sun/star/sdb/tools/XDataSourceMetaData.hpp" +#include "com/sun/star/sdb/tools/XObjectNames.hpp" +#include "com/sun/star/sdb/tools/XTableName.hpp" +#include "com/sun/star/sdbc/ColumnSearch.hpp" +#include "com/sun/star/sdbc/ColumnValue.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/IndexType.hpp" +#include "com/sun/star/sdbc/KeyRule.hpp" +#include "com/sun/star/sdbc/ResultSetConcurrency.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/SQLException.hpp" +#include "com/sun/star/sdbc/SQLWarning.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XColumnLocate.hpp" +#include "com/sun/star/sdbc/XConnection.hpp" +#include "com/sun/star/sdbc/XDataSource.hpp" +#include "com/sun/star/sdbc/XDatabaseMetaData.hpp" +#include "com/sun/star/sdbc/XDriver.hpp" +#include "com/sun/star/sdbc/XDriverAccess.hpp" +#include "com/sun/star/sdbc/XDriverManager.hpp" +#include "com/sun/star/sdbc/XGeneratedResultSet.hpp" +#include "com/sun/star/sdbc/XIsolatedConnection.hpp" +#include "com/sun/star/sdbc/XMultipleResults.hpp" +#include "com/sun/star/sdbc/XOutParameters.hpp" +#include "com/sun/star/sdbc/XParameters.hpp" +#include "com/sun/star/sdbc/XPreparedBatchExecution.hpp" +#include "com/sun/star/sdbc/XPreparedStatement.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hdl" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XResultSetUpdate.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/sdbc/XRowSet.hpp" +#include "com/sun/star/sdbc/XRowSetListener.hpp" +#include "com/sun/star/sdbc/XRowUpdate.hpp" +#include "com/sun/star/sdbc/XStatement.hpp" +#include "com/sun/star/sdbc/XWarningsSupplier.hpp" +#include "com/sun/star/sdbcx/CompareBookmark.hpp" +#include "com/sun/star/sdbcx/KeyType.hpp" +#include "com/sun/star/sdbcx/Privilege.hpp" +#include "com/sun/star/sdbcx/PrivilegeObject.hpp" +#include "com/sun/star/sdbcx/XAlterTable.hpp" +#include "com/sun/star/sdbcx/XAppend.hpp" +#include "com/sun/star/sdbcx/XAuthorizable.hpp" +#include "com/sun/star/sdbcx/XColumnsSupplier.hpp" +#include "com/sun/star/sdbcx/XCreateCatalog.hpp" +#include "com/sun/star/sdbcx/XDataDefinitionSupplier.hpp" +#include "com/sun/star/sdbcx/XDataDescriptorFactory.hpp" +#include "com/sun/star/sdbcx/XDeleteRows.hpp" +#include "com/sun/star/sdbcx/XDrop.hpp" +#include "com/sun/star/sdbcx/XGroupsSupplier.hpp" +#include "com/sun/star/sdbcx/XIndexesSupplier.hpp" +#include "com/sun/star/sdbcx/XKeysSupplier.hpp" +#include "com/sun/star/sdbcx/XRename.hpp" +#include "com/sun/star/sdbcx/XRowLocate.hpp" +#include "com/sun/star/sdbcx/XTablesSupplier.hpp" +#include "com/sun/star/sdbcx/XUser.hpp" +#include "com/sun/star/sdbcx/XUsersSupplier.hpp" +#include "com/sun/star/sdbcx/XViewsSupplier.hpp" +#include "com/sun/star/style/XStyleFamiliesSupplier.hpp" +#include "com/sun/star/task/ErrorCodeIOException.hpp" +#include "com/sun/star/task/InteractionClassification.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionRetry.hpp" +#include "com/sun/star/task/XJob.hpp" +#include "com/sun/star/task/XJobExecutor.hpp" +#include "com/sun/star/task/XStatusIndicator.hpp" +#include "com/sun/star/task/XStatusIndicatorFactory.hpp" +#include "com/sun/star/ucb/AuthenticationRequest.hpp" +#include "com/sun/star/ucb/Command.hpp" +#include "com/sun/star/ucb/CommandInfo.hpp" +#include "com/sun/star/ucb/IOErrorCode.hpp" +#include "com/sun/star/ucb/InsertCommandArgument.hpp" +#include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp" +#include "com/sun/star/ucb/InteractiveIOException.hpp" +#include "com/sun/star/ucb/MissingInputStreamException.hpp" +#include "com/sun/star/ucb/MissingPropertiesException.hpp" +#include "com/sun/star/ucb/OpenCommandArgument2.hpp" +#include "com/sun/star/ucb/OpenMode.hpp" +#include "com/sun/star/ucb/UnsupportedCommandException.hpp" +#include "com/sun/star/ucb/UnsupportedDataSinkException.hpp" +#include "com/sun/star/ucb/UnsupportedOpenModeException.hpp" +#include "com/sun/star/ucb/XCommandEnvironment.hpp" +#include "com/sun/star/ucb/XCommandProcessor.hpp" +#include "com/sun/star/ucb/XContent.hpp" +#include "com/sun/star/ucb/XContentCreator.hpp" +#include "com/sun/star/ucb/XInteractionSupplyAuthentication.hpp" +#include "com/sun/star/ucb/XProgressHandler.hpp" +#include "com/sun/star/ucb/XSimpleFileAccess.hpp" +#include "com/sun/star/ui/ImageType.hpp" +#include "com/sun/star/ui/XImageManager.hpp" +#include "com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationManager.hpp" +#include "com/sun/star/ui/XUIConfigurationManagerSupplier.hpp" +#include "com/sun/star/ui/XUIConfigurationStorage.hpp" +#include "com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp" +#include "com/sun/star/ui/dialogs/TemplateDescription.hpp" +#include "com/sun/star/ui/dialogs/XExecutableDialog.hpp" +#include "com/sun/star/ui/dialogs/XFilePicker.hpp" +#include "com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp" +#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/TypeClass.hpp" +#include "com/sun/star/uno/XAggregation.hpp" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XNamingService.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/NumberFormat.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/URL.hpp" +#include "com/sun/star/util/XCancellable.hpp" +#include "com/sun/star/util/XCloneable.hpp" +#include "com/sun/star/util/XCloseBroadcaster.hpp" +#include "com/sun/star/util/XCloseable.hpp" +#include "com/sun/star/util/XFlushable.hpp" +#include "com/sun/star/util/XModifiable.hpp" +#include "com/sun/star/util/XModifyBroadcaster.hpp" +#include "com/sun/star/util/XModifyListener.hpp" +#include "com/sun/star/util/XNumberFormatTypes.hpp" +#include "com/sun/star/util/XNumberFormatsSupplier.hpp" +#include "com/sun/star/util/XRefreshListener.hpp" +#include "com/sun/star/util/XRefreshable.hpp" +#include "com/sun/star/util/XURLTransformer.hpp" +#include "com/sun/star/util/XVeto.hpp" +#include "com/sun/star/view/XPrintable.hpp" +#include "com/sun/star/view/XSelectionSupplier.hpp" +#include "com/sun/star/view/XViewSettingsSupplier.hpp" +#include "com/sun/star/xml/sax/InputSource.hpp" +#include "com/sun/star/xml/sax/XDocumentHandler.hpp" +#include "com/sun/star/xml/sax/XParser.hpp" + +#include "comphelper/basicio.hxx" +#include "comphelper/broadcasthelper.hxx" +#include "comphelper/componentcontext.hxx" +#include "comphelper/container.hxx" +#include "comphelper/documentconstants.hxx" +#include "comphelper/guarding.hxx" +#include "comphelper/mediadescriptor.hxx" +#include "comphelper/namecontainer.hxx" +#include "comphelper/namedvaluecollection.hxx" +#include "comphelper/processfactory.hxx" +#include "comphelper/propertycontainer.hxx" +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/stl_types.hxx" +#include "comphelper/storagehelper.hxx" +#include "comphelper/streamsection.hxx" +#include "comphelper/types.hxx" + +#include "connectivity/FValue.hxx" +#include <connectivity/DriversConfig.hxx> +#include "connectivity/dbcharset.hxx" +#include "connectivity/dbconversion.hxx" +#include "connectivity/dbexception.hxx" +#include "connectivity/dbmetadata.hxx" +#include "connectivity/sqlnode.hxx" +#include "connectivity/sqlparse.hxx" + +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/propshlp.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + + +#include "i18npool/mslangid.hxx" + +#include "osl/diagnose.h" +#include "osl/file.hxx" +#include "osl/getglobalmutex.hxx" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/thread.h" + +#include "rtl/digest.h" +#include "rtl/logfile.hxx" +#include "rtl/memory.h" +#include "rtl/tencinfo.h" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.hxx" +#include "rtl/uuid.h" + +#include "sfx2/QuerySaveDocument.hxx" +#include "sfx2/cntids.hrc" +#include "sfx2/sfx.hrc" +#include "sfx2/sfxsids.hrc" +#include "sfx2/sfxuno.hxx" + +#include "comphelper/classids.hxx" + + +#include "svl/cjkoptions.hxx" +#include "svl/filenotation.hxx" +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include "unotools/historyoptions.hxx" +#include "svtools/htmlkywd.hxx" +#include "svtools/imgdef.hxx" +#include "unotools/internaloptions.hxx" +#include "svtools/menuoptions.hxx" +#include "svtools/miscopt.hxx" +#include "svtools/rtfkeywd.hxx" +#include "svtools/rtftoken.h" +#include "svl/solar.hrc" +#include "svtools/toolboxcontroller.hxx" +#include "unotools/viewoptions.hxx" + +#include "svx/dataaccessdescriptor.hxx" +#include "svx/dbexch.hrc" +#include "svx/dialogs.hrc" +#include "svx/globlmn.hrc" +#include "editeng/svxenum.hxx" +#include "svx/svxids.hrc" + + +#include "tools/diagnose_ex.h" + +#include "typelib/typedescription.hxx" + +#include "ucbhelper/cancelcommandexecution.hxx" +#include "ucbhelper/commandenvironment.hxx" +#include "ucbhelper/content.hxx" +#include "ucbhelper/contentbroker.hxx" +#include "ucbhelper/contentidentifier.hxx" +#include "ucbhelper/propertyvalueset.hxx" +#include "ucbhelper/providerhelper.hxx" +#include "ucbhelper/resultset.hxx" +#include "ucbhelper/resultsethelper.hxx" + +#include "unotools/bootstrap.hxx" +#include "unotools/configmgr.hxx" +#include "unotools/confignode.hxx" +#include "unotools/eventlisteneradapter.hxx" +#include "unotools/processfactory.hxx" + + +#include "vos/mutex.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +#include "vos/thread.hxx" + +#include "xmloff/ProgressBarHelper.hxx" +#include "xmloff/XMLConstantsPropertyHandler.hxx" +#include "xmloff/contextid.hxx" +#include "xmloff/families.hxx" +#include "xmloff/nmspmap.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmlnmspe.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmltypes.hxx" + +//---MARKER--- + +#endif + + diff --git a/dbaccess/qa/unoapi/Test.java b/dbaccess/qa/unoapi/Test.java new file mode 100644 index 000000000000..9871ef3403fe --- /dev/null +++ b/dbaccess/qa/unoapi/Test.java @@ -0,0 +1,55 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +package org.openoffice.dbaccess.qa.unoapi; + +import org.openoffice.Runner; +import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; +import static org.junit.Assert.*; + +public final class Test { + @org.junit.Before public void setUp() throws Exception { + connection.setUp(); + } + + @org.junit.After public void tearDown() + throws InterruptedException, com.sun.star.uno.Exception + { + connection.tearDown(); + } + + @org.junit.Test public void test() { + assertTrue( + Runner.run( + "-sce", Argument.get("sce"), + "-xcl", Argument.get("xcl"), + "-ini", Argument.get("ini"), + "-tdoc", Argument.get("tdoc"), + "-cs", connection.getDescription())); + } + + private final OfficeConnection connection = new OfficeConnection(); +} diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index a9b97dbf72d2..0951b3de8ac2 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -29,6 +29,7 @@ #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 673fcd91cc3f..4b226e73787e 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -60,6 +60,7 @@ #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/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 9302899e775f..4d29b4426a89 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" +#include "SharedConnection.hxx" #include "datasource.hxx" #include "module_dba.hxx" @@ -37,7 +38,6 @@ #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 d133dc0fcae2..36a8695979f5 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index 85ae133a2424..c88c6de887d4 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "dbmm_module.hxx" diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index e85026ae5ec1..b5e10432a1aa 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "dbmm_types.hxx" diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 63670e88b323..3200a53cf5c1 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "docinteraction.hxx" diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index c1c55fd6dad7..1c7cc12ae850 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_dbaccess.hxx" +#include "precompiled_dbmm.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 54051841b9f5..bdbab6d93430 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_dbaccess.hxx" +#include "precompiled_dbmm.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 9a03a8e4f63e..0b1d27b0061d 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_dbaccess.hxx" +#include "precompiled_dbmm.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 e85f60379514..55cc8b0c6d7a 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_dbaccess.hxx" +#include "precompiled_dbmm.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 e2396be224e3..7e2e0acf73e2 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_dbaccess.hxx" +#include "precompiled_dbmm.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 869983c14c02..daf8c022fb0c 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "progresscapture.hxx" #include "migrationprogress.hxx" diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index bed5f7f33b8f..9ec628c58380 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_dbaccess.hxx" +#include "precompiled_dbmm.hxx" #include "progressmixer.hxx" diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 11f0b667abd8..210c5c9f7937 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 a84b69dfa43b..0d0f2ba75381 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 47b9126acdd5..0517e9b13282 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 2af3b4d9c102..88b08533e439 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 3695f24c6590..c843312e633e 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 3f0c91706500..1f490360dd61 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 51f2c580f029..62431e9b01a4 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 ad1b238ee836..c1039f76c82b 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 c004e7b62534..2be63bdd00d5 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 284971fd8a07..c4458924452c 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 6bb928b2b541..6795103be666 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 73faf3a5a64a..efe2e7237c6c 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 259425f2aff0..6a0251a48420 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 3d4d2ab3dfde..7e8457d34c6e 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_dbaccess.hxx" +#include "precompiled_dbaxml.hxx" #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index c857e04376db..130d1e04b525 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 4854bdce71fd..a1418593ad0f 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 4b3639d1300f..3e55ab88f4fa 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 1188b67d7e4c..cf255778a349 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 dd083f616e33..38fa654841e2 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 cb089ecc43b8..f670bc1365bb 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 2e1fb2db2bfc..f48d9b96437c 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_dbaccess.hxx" +#include "precompiled_dbaxml.hxx" #include "xmlStyleImport.hxx" diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 21958d06a28e..8652f77cc113 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 4291c244a341..0256afa63330 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 12ce89a823f1..4a8a87da30b5 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 d8427787f3be..a7eb078f8f29 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 d2edce3039bf..119418209286 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_dbaccess.hxx" +#include "precompiled_dbaxml.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 3acbee9d2d91..1b7345d344f9 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index 6352e15fb72c..b065ec7338ac 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbustrings.hrc" namespace dbaui diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx index bf98c4ddd82d..a2f44f1590a6 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_dbaccess.hxx" +#include "precompiled_dbaxml.hxx" #include "flt_reghelper.hxx" diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index 4ae1bf472495..cd397b4ae25d 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_dbaccess.hxx" +#include "precompiled_dbaxml.hxx" #include "xmlstrings.hrc" namespace dbaxml diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 94ee696b8112..96e0ae16ae4c 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "AppController.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 7e8f56972e0f..0789d693da03 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_dbaccess.hxx" +#include "precompiled_dbui.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 b1bcd961438b..9ff49f9ea1a5 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "AppController.hxx" #include "AppDetailView.hxx" diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index c488a0cafa1f..a71ae69477d4 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_dbaccess.hxx" +#include "precompiled_dbui.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 fe7e7a26e4d5..520f206f769a 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_dbaccess.hxx" +#include "precompiled_dbui.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 c6c3f2e480a2..b2a3b6e51a86 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_dbaccess.hxx" +#include "precompiled_dbui.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 36475115d972..9e161d86908e 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_dbaccess.hxx" +#include "precompiled_dbui.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 e2473432e8cc..448f6ea6e9f7 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_dbaccess.hxx" +#include "precompiled_dbui.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 4974a3ef6333..c670c3558737 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_dbaccess.hxx" +#include "precompiled_dbui.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 9b6d612b1b4c..dc25272395af 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 7cc0ac71d23b..f4072f5e6d1f 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_dbaccess.hxx" +#include "precompiled_dbui.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 9a632e960499..b6a42cfc9cda 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 44e29f08913d..179ae16eaac4 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "brwctrlr.hxx" #include "brwview.hxx" diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index ff4817eba056..d58eee0feb35 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_dbaccess.hxx" +#include "precompiled_dbui.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 0273c7f5a746..867805bc6761 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_dbaccess.hxx" +#include "precompiled_dbui.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 244347057906..0997b2f863c5 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_dbaccess.hxx" +#include "precompiled_dbui.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 c2975b9d8314..44b3508e786e 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_dbaccess.hxx" +#include "precompiled_dbui.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 b69c67bc4bee..55452581dbb1 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_dbaccess.hxx" +#include "precompiled_dbui.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 f9fe22be550b..d0d6bb663a53 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "unodatbr.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index a426013b609a..f30345757ddf 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbexchange.hxx" #include "dbtreelistbox.hxx" diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 898f78cd3ebe..0d93b52eabd2 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_dbaccess.hxx" +#include "precompiled_dbui.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 913a491b0c0f..c74af7b41750 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_dbaccess.hxx" +#include "precompiled_dbui.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 318fdb152cde..77489aa422ae 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_dbaccess.hxx" +#include "precompiled_dbui.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 a796778822da..cfd2bc0ec109 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "sbagrid.hrc" diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 65733d7ae563..a37722ff489b 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "sbamultiplex.hxx" using namespace dbaui; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 8ab98cade86c..0da24c5a3f9a 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "browserids.hxx" #include "dbaccess_helpid.hrc" @@ -321,7 +321,8 @@ void SAL_CALL SbaTableQueryBrowser::disposing() // doin' a lot of VCL stuff here -> lock the SolarMutex // kiss our listeners goodbye - EventObject aEvt(*this); + + ::com::sun::star::lang::EventObject aEvt(*this); m_aSelectionListeners.disposeAndClear(aEvt); m_aContextMenuInterceptors.disposeAndClear(aEvt); @@ -1397,7 +1398,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId ) } // ------------------------------------------------------------------------- -void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) throw(RuntimeException) +void SAL_CALL SbaTableQueryBrowser::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(RuntimeException) { // our frame ? Reference< ::com::sun::star::frame::XFrame > xSourceFrame(_rSource.Source, UNO_QUERY); @@ -1693,7 +1694,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) } // if the form has been loaded, this means that our "selection" has changed - EventObject aEvent( *this ); + ::com::sun::star::lang::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 36c89d858be5..015cecc76531 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_dbaccess.hxx" +#include "precompiled_dbui.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 f7a7065c1be4..7f24b7b37fe1 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_dbaccess.hxx" +#include "precompiled_dbui.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 df2ac9b6e4b6..f3efb7c741b1 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RelationControl.hxx" #include "RelationControl.hrc" diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 47cac018ffc5..7f80abd3e2c8 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_dbaccess.hxx" +#include "precompiled_dbui.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 5acc67d433a6..80cf34bbc18c 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "SqlNameEdit.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index afb6fa777352..cb8be985c104 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_dbaccess.hxx" +#include "precompiled_dbui.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 929b5c050743..52c3ca5a0c9e 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_dbaccess.hxx" +#include "precompiled_dbui.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 cc092ccfe3b3..6fb77f0293e5 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "charsetlistbox.hxx" diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index d649647e70b0..e4bc004e1298 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_dbaccess.hxx" +#include "precompiled_dbui.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 15cd74538c54..4bce0d3b8720 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_dbaccess.hxx" +#include "precompiled_dbui.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 74193e682409..3d109f8b713e 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "listviewitems.hxx" //........................................................................ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index e97f8a4a33fc..9f07857936fa 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_dbaccess.hxx" +#include "precompiled_dbui.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 e02b7c000501..dc88dfb555a6 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "opendoccontrols.hxx" diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 1caa8917be8b..579740e43b42 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_dbaccess.hxx" +#include "precompiled_dbui.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 37cb9c85f990..c71c5f86a289 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_dbaccess.hxx" +#include "precompiled_dbui.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 c1c12947cb9b..c86cac49e5ad 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "tabletree.hxx" #include "tabletree.hrc" diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 5f36c9678b99..5ce59b5f804a 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_dbaccess.hxx" +#include "precompiled_dbui.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 39e44be96f3f..edf12cb78bb7 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "undosqledit.hxx" #include "sqledit.hxx" diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index 25710d04abfc..fae3a5e6efb3 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_dbaccess.hxx" +#include "precompiled_dbui.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 e43e2a13a7fb..a286cdf33516 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif String STR_DBASE_PATH_OR_FILE { diff --git a/dbaccess/source/ui/dlg/AutoControlsDef.hrc b/dbaccess/source/ui/dlg/AutoControlsDef.hrc new file mode 100644 index 000000000000..2f3cd3b4ec19 --- /dev/null +++ b/dbaccess/source/ui/dlg/AutoControlsDef.hrc @@ -0,0 +1,86 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + + +#ifndef _DBAUI_AUTOCONTROLSDEF_HRC_ +#define _DBAUI_AUTOCONTROLSDEF_HRC_ + +#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 +#endif // _DBAUI_AUTOCONTROLSDEF_HRC_ diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 258eec3a2acf..8cce3283f3f9 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,60 +50,7 @@ #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 89e3a8d8439a..71ce69138934 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_dbaccess.hxx" +#include "precompiled_dbui.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 753b0fa4e245..64e00fe4e7ca 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -27,11 +27,10 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dsnItem.hxx" #include "ConnectionHelper.hxx" -#include "AutoControls.hrc" #include "dbu_dlg.hrc" #include "dbu_misc.hrc" #include <svl/itemset.hxx> @@ -70,6 +69,7 @@ #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 9e9f9cd027a9..96ed31cd2f09 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionPage.hxx" #include "ConnectionPage.hrc" @@ -80,7 +80,7 @@ #include "adodatalinks.hxx" #endif //_ADO_DATALINK_BROWSE_ -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 6ee4c808aeb5..1bfab47ead99 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionPageSetup.hxx" -#include "AutoControls.hrc" +#include "AutoControlsDef.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 d2b4bb956b67..0253c97a1fba 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DBSetupConnectionPages.hxx" #include "sqlmessage.hxx" #include "dbu_resource.hrc" -#include "AutoControls.hrc" +#include "AutoControlsDef.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 583f180bb8f3..b3145475143b 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DbAdminImpl.hxx" #include "dsmeta.hxx" diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 2408297e20cf..aaa6b6379a7f 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DriverSettings.hxx" #include "dsmeta.hxx" diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 7618e732fd1a..b5ef913b3c6d 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RelationDlg.hrc" #include "RelationDlg.hxx" diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 17fcf7861e51..b717b1384200 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TablesSingleDlg.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 9d2fc4da8f1e..3213b324acb6 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "moduledbu.hxx" #include "TextConnectionHelper.hxx" @@ -34,7 +34,7 @@ #include "sqlmessage.hxx" #include "dbu_dlg.hrc" #include "dbu_resource.hrc" -#include "AutoControls.hrc" +#include "AutoControlsDef.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 d22e8c4839a7..05879d05df20 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "UserAdmin.hxx" #include "UserAdmin.hrc" diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 553f5446ca86..726a4ab70a10 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adminpages.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index a8b11805dcb3..d9c591f3221f 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "admincontrols.hxx" #include "admincontrols.hrc" diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src index 8ce3bb4030dc..8f5bf2c0210d 100644 --- a/dbaccess/source/ui/dlg/admincontrols.src +++ b/dbaccess/source/ui/dlg/admincontrols.src @@ -24,7 +24,7 @@ * ************************************************************************/ -#include "AutoControls.hrc" +#include "AutoControlsDef.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 2bf12cf82740..d65c2ff8d572 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adminpages.hxx" #include "dbadmin.hrc" diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index 9af7714a1cdc..7fc484ad4c56 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #if defined(WNT) diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 540e26982039..fa16813dd8fa 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adtabdlg.hxx" #include "adtabdlg.hrc" diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 2ee4b8b8df33..4b8d244fb03b 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "advancedsettings.hxx" #include "advancedsettingsdlg.hxx" diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 65929fb204d6..c77d2aa133cb 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionPage.hxx" #include "DbAdminImpl.hxx" diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index bd7532c3799a..f9c7ec0fed77 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbfindex.hxx" diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index f23f340b5e78..0fb8484f5f8b 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbwiz.hxx" #include "dbadmin.hrc" diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 17843bd898a4..07793cea5c19 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbwizsetup.hxx" #include "dsmeta.hxx" @@ -992,8 +992,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException); - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException); + 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); // 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 EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) + void SAL_CALL AsyncLoader::queryTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) { throw TerminationVetoException(); } // ............................................................................. - void SAL_CALL AsyncLoader::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::notifyTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (RuntimeException) { } // ............................................................................. - void SAL_CALL AsyncLoader::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException) { } } diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index c02f603c99eb..a1050a603d33 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "detailpages.hxx" #include "sqlmessage.hxx" @@ -57,7 +57,7 @@ #include "DriverSettings.hxx" #include "dbadmin.hxx" #include <comphelper/types.hxx> -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 0e4a61414de8..96541a21da17 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "directsql.hxx" #include "directsql.hrc" diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index e77c20704d26..414853448b79 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dlgattr.hxx" diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 7d5738d1e7ff..4a7bdf349505 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dlgsave.hxx" #include "dlgsave.hrc" diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index a42122657c23..089b70a6d3e3 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_dbaccess.hxx" +#include "precompiled_dbui.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 e6bbb8494e16..9f6dfda58a97 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dsselect.hxx" #include "dsselect.hrc" diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index 562ebf435223..2a0e6be0715a 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_dbaccess.hxx" +#include "precompiled_dbui.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 060f83d43853..b9628fe046cc 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dsnItem.hxx" #include "generalpage.hxx" diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index d4480c464d59..10af9cdcc3cf 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_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "indexdialog.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 2a85b1a5d58b..ae6b365859d6 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "indexfieldscontrol.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 858bf0a8f5d9..a31e9ebed021 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index 5a271ab4be45..963a12b1a300 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "optionalboolitem.hxx" diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 18eab7138f2e..8293b6231e42 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "paramdialog.hxx" #include "paramdialog.hrc" diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 3d52af736216..6432334b79e4 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "queryfilter.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 3097c385c5e3..98c388ec16a6 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "queryorder.hrc" #include "queryorder.hxx" diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 80a1378d6a5d..cfdb702d23ff 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "sqlmessage.hxx" #include "dbu_dlg.hrc" diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 9b5e771b2173..8d0f261cbafc 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "tablespage.hxx" #include "dbu_dlg.hrc" @@ -60,7 +60,7 @@ #include "TablesSingleDlg.hxx" #include <tools/diagnose_ex.h> #include <cppuhelper/exc_hlp.hxx> -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 2ceefab64a35..44471469d401 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "textconnectionsettings.hxx" #include "TextConnectionHelper.hxx" diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 2ce3a919351b..258c6c27e10f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DExport.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index d4b4c4c5e329..d71460d1cb87 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "HtmlReader.hxx" #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 4ac330a3fc87..5342b59b27d6 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -28,7 +28,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TokenWriter.hxx" #include <com/sun/star/sdbc/XColumnLocate.hpp> diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index fb25f77d70f1..feae9fa58f26 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RtfReader.hxx" #include <tools/debug.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 655484d69920..6b095f371a6b 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableCopyHelper.hxx" #include "dbustrings.hrc" #include "sqlmessage.hxx" diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index 1cd369b485df..d5f4b47c8976 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TokenWriter.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 4e9c5b6c565a..91466e9c9560 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ToolBoxHelper.hxx" #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 596010170d20..bbf93b96a13d 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "UITools.hxx" #include <sfx2/docfilt.hxx> diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index b0df6f61f1b5..91ab2b13fc26 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WCPage.hxx" #include "WCopyTable.hxx" diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 07affc1c2015..38bf77652f06 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WColumnSelect.hxx" #include "dbu_misc.hrc" diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index ceb8f6d6745e..7fff204f8404 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_misc.hrc" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 3b00f2289359..7d4a770d184b 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WExtendPages.hxx" #include "RtfReader.hxx" #include "HtmlReader.hxx" diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 8f3222181146..05c26b389668 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WNameMatch.hxx" #include <osl/diagnose.h> #include "FieldDescriptions.hxx" diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 757b5723d794..151ed18ffaf5 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WTypeSelect.hxx" #include "WizardPages.hrc" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 5d866839748e..8ea2e88fafee 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "asyncmodaldialog.hxx" diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 425aef75db87..993630d6599e 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "charsets.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 54d612329400..8e50d0d00c6b 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -26,6 +26,9 @@ * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" + #include "controllerframe.hxx" #include "IController.hxx" diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 572190fb746e..4850b7e6cf42 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "databaseobjectview.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index abd0aceb9433..dc1dec8830cc 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "datasourceconnector.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx index 83f55e0cbc5e..d369c6905ea8 100644 --- a/dbaccess/source/ui/misc/dbaundomanager.cxx +++ b/dbaccess/source/ui/misc/dbaundomanager.cxx @@ -24,7 +24,7 @@ * ************************************************************************/ -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbaundomanager.hxx" diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 2ae10118a248..8d8e15f59ae9 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -26,7 +26,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "browserids.hxx" #include "commontypes.hxx" diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index bac5dfbaa5f6..6a85b6a9be95 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "defaultobjectnamecheck.hxx" diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index afc4f109f0ab..7c70f65e7a4e 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -25,7 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" #include "dsmeta.hxx" #include <connectivity/DriversConfig.hxx> #include "dsntypes.hxx" diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index 7f8522ee9070..d46d540cb462 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "imageprovider.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index ae68cd988f55..4cb0942ef32e 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "indexcollection.hxx" #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index d1c5ccd14fe1..c8b8e6085d20 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "linkeddocuments.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 3e8457361222..a85c3838a78c 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "moduledbu.hxx" diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 817b4a68aee8..e39d36f71202 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "propertysetitem.hxx" diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index b1dbfb27558d..2e9c89680cd5 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "propertystorage.hxx" @@ -69,7 +69,7 @@ namespace dbaui namespace { //---------------------------------------------------------------- - template < class ITEMTYPE, class UNOTYPE > + template < class ITEMTYPE, class UNOTYPE_Type > class ItemAdapter { public: @@ -80,7 +80,7 @@ namespace dbaui if ( !pTypedItem ) return false; - UNOTYPE aValue( pTypedItem->GetValue() ); + UNOTYPE_Type aValue( pTypedItem->GetValue() ); OSL_VERIFY( _rValue >>= aValue ); // TODO: one could throw an IllegalArgumentException here - finally, this method // is (to be) used from within an XPropertySet::setPropertyValue implementation, @@ -97,7 +97,7 @@ namespace dbaui if ( !pTypedItem ) return false; - _out_rValue <<= UNOTYPE( pTypedItem->GetValue() ); + _out_rValue <<= UNOTYPE_Type( pTypedItem->GetValue() ); return true; } }; diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 5cfceae1a0e0..ff6679c55f56 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbaundomanager.hxx" #include "singledoccontroller.hxx" diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index 655dce15c4e8..20ab3820fc2d 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "stringlistitem.hxx" diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 596a5a1f557d..68405fcaadcd 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 91d67b82108c..36c7853e9733 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionLine.hxx" #include "ConnectionLineData.hxx" #include "TableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index a1297dfc68b0..084a8893bd5b 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionLineAccess.hxx" #include "JoinTableView.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index 49360b0959b5..adbdf5edab3a 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionLineData.hxx" #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 90feae92b25d..4a0e3888a1ea 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "JAccess.hxx" #include "JoinTableView.hxx" #include "JoinTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index f4552253d84f..7ccf4db07cf9 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include <sfx2/sfxsids.hrc> #include "dbu_qry.hrc" #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 397bb804c829..ba1ddc2b5c59 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "JoinDesignView.hxx" #include "JoinTableView.hxx" #include "JoinController.hxx" diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 75d69afa5b09..2ec6ccea0257 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "JoinExchange.hxx" #include <sot/formats.hxx> #include <svx/dbexch.hrc> diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index f2d906e5017a..112411be0a2f 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "JoinTableView.hxx" #include <osl/diagnose.h> #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx index 8e18232e02ff..d8d98679d18b 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QTableConnection.hxx" #include <osl/diagnose.h> #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index fc702cf94cfa..5a10614f89e7 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QTableConnectionData.hxx" #include <tools/debug.hxx> #include "QTableConnectionData.hxx" diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index e20ca59c5494..48f9237bda97 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QTableWindow.hxx" #include "QueryTableView.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 5fc047a9fbcf..1da1c2f30d63 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QTableWindowData.hxx" #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 27912e355d69..a05bf39d5432 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryDesignView.hxx" #include "QueryTableView.hxx" #include "QTableWindow.hxx" @@ -550,7 +550,7 @@ namespace else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung: pNode->count() == 3) { - // nur AND Verknüpfung zulassen + // nur AND Verkn�pfung zulassen if (!SQL_ISTOKEN(pNode->getChild(1),AND)) eErrorCode = eIllegalJoinCondition; else if ( eOk == (eErrorCode = InsertJoinConnection(_pView,pNode->getChild(0), _eJoinType,pLeftTable,pRightTable)) ) @@ -841,7 +841,7 @@ namespace } } } - // nur einmal für jedes Feld + // nur einmal f�r jedes Feld else if ( !i && pEntryField->isCondition() ) { if (!aWhereStr.getLength()) // noch keine Kriterien @@ -1865,7 +1865,7 @@ namespace if ( !checkJoinConditions(_pView,pNode->getChild(0)) || !checkJoinConditions(_pView,pRightTableRef)) return sal_False; - // named column join wird später vieleicht noch implementiert + // named column join wird sp�ter vieleicht noch implementiert // SQL_ISRULE(pNode->getChild(4),named_columns_join) EJoinType eJoinType = INNER_JOIN; bool bNatural = false; @@ -2144,7 +2144,7 @@ namespace return eNoSelectStatement; ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection - sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden + sal_Bool bFirstField = sal_True; // bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden SqlParseError eErrorCode = eOk; diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index fb662a8b7438..73d056e6cd5d 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryMoveTabWinUndoAct.hxx" #include "JoinTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 6f9a45d59228..daa6c840c1f3 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryTabConnUndoAction.hxx" #include "QTableConnection.hxx" #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index 599afe015379..09ce9cd87d4c 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryTabWinUndoAct.hxx" #include <osl/diagnose.h> #include "QTableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 302b57cef86d..4fe07e5331e8 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryTableView.hxx" #include "TableFieldInfo.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 3f403a4c4892..47d076163d27 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" #include "QueryViewSwitch.hxx" diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 0ad058656489..845e63b0a052 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "QueryViewSwitch.hxx" #include "QueryDesignView.hxx" #include "QueryTextView.hxx" diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index f48ff8767b50..b361a9ff5f2c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "SelectionBrowseBox.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbc/DataType.hpp> diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index db6a8efd328c..0edc45d81868 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableConnection.hxx" #include "ConnectionLine.hxx" #include "TableConnectionData.hxx" diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index d820c5efa280..2c5737159884 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableConnectionData.hxx" #include <tools/debug.hxx> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 8edf83464b96..ef607a73da96 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableFieldDescription.hxx" #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index 7ef432c32bd8..bb990295e60b 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableFieldInfo.hxx" #include <tools/debug.hxx> diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 57185506f84c..44e226852802 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableWindow.hxx" #include "TableWindowListBox.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 44b3953b57e8..4d316871efd8 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableWindowAccess.hxx" #include "JAccess.hxx" #include "TableWindow.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 56cad8c62fff..708a12906d22 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableWindowData.hxx" #include <tools/debug.hxx> #include <com/sun/star/sdb/XQueriesSupplier.hpp> diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 9d0f29701421..4df65db90916 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableWindowListBox.hxx" #include "TableWindow.hxx" #include "QueryDesignView.hxx" diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 6c740fb6c52d..e09b3dc4d3c1 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableWindowTitle.hxx" #include "TableWindow.hxx" #include "QueryTableView.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 15fbc7611c75..76a4d30ed845 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "querycontainerwindow.hxx" #include "QueryDesignView.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 054c854e846a..3df54e243b5a 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adtabdlg.hxx" #include "browserids.hxx" diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 2b9e70e8d07b..1b932edbb16d 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "querydlg.hxx" #include "dbu_qry.hrc" #include "querydlg.hrc" diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index dea455795484..ff68e029b311 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "queryview.hxx" #include "dbu_qry.hrc" #include "querycontroller.hxx" diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 9cc6a42b4fe8..a90653596855 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RTableConnection.hxx" #include <tools/debug.hxx> #include "RelationTableView.hxx" diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 713f2677b255..2d5562406a9e 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RTableConnectionData.hxx" #include <tools/debug.hxx> #include <com/sun/star/sdbc/KeyRule.hpp> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 9af062981e78..6ab4bd3c96f4 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include <sfx2/sfxsids.hrc> #include "dbu_rel.hrc" diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 4030abfb46a2..e0dc240cc9ec 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RelationDesignView.hxx" #include "RelationTableView.hxx" #include "RelationController.hxx" diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d334aa93b133..d78bc74cc6b2 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RelationTableView.hxx" #include "JoinExchange.hxx" #include <comphelper/extract.hxx> diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 45165c16605f..fd2e38f4d571 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "FieldDescGenWin.hxx" #include <osl/diagnose.h> #include "dbaccess_helpid.hrc" diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index cc8b60bd1cb6..93ff76bcbcb3 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "FieldDescriptions.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e0606f90d6fe..ed295372e990 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TEditControl.hxx" #include <tools/debug.hxx> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index b79eba4f8378..2f90611cf2ba 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "FieldDescriptions.hxx" #include "TEditControl.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 0867deb7a4b7..e83ebe3cbace 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableDesignControl.hxx" #include "dbu_tbl.hrc" diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 7279c1ec1fca..4df1b65432c7 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableDesignHelpBar.hxx" #include <tools/debug.hxx> #include <svtools/svmedit.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 4c5882c7ef9e..74dced06eb96 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableDesignView.hxx" #include <tools/debug.hxx> #include "TableController.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 97484d519948..83951491b232 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableFieldControl.hxx" #include "TableController.hxx" #include "TableDesignView.hxx" @@ -66,7 +66,7 @@ sal_Bool OTableFieldControl::IsReadOnly() sal_Bool bRead(GetCtrl()->IsReadOnly()); if( !bRead ) { - // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden + // Die Spalten einer ::com::sun::star::sdbcx::View k�nnen nicht ver�ndert werden Reference<XPropertySet> xTable = GetCtrl()->GetView()->getController().getTable(); if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) bRead = sal_True; diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index ca2680fc09a8..4add6de25fe7 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableFieldDescWin.hxx" #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index b9891730c1e5..fb43d295ef25 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableRow.hxx" #include <tools/debug.hxx> #include "FieldDescriptions.hxx" diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 97a6f2d649f1..cb7d983b9f88 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableRowExchange.hxx" #include <sot/formats.hxx> #include <sot/storage.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 36262c5a0ac1..0a6a299058b8 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TableUndo.hxx" #include "dbu_tbl.hrc" #include "TEditControl.hxx" diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx index d138782392da..299c483d147d 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "AdabasSettingsDlg.hxx" diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index ce30b85d57cc..bba4feed5ccb 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "unoadmin.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index beac49e1513f..785080224b32 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ColumnControl.hxx" #include "ColumnPeer.hxx" #include "dbustrings.hrc" diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index ec48a29409a0..440ae3ae8fd3 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ColumnModel.hxx" #include <com/sun/star/awt/FontRelief.hpp> diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index f39bd5c47543..bdf364eeef54 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ColumnPeer.hxx" #include "ColumnControlWindow.hxx" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index ef214bf1a8d0..20fba85b948e 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "DBTypeWizDlg.hxx" diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 6d5a2fb5ecd9..1fc9f9f6b4eb 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include <com/sun/star/document/XEventListener.hpp> diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 4f0cc4d0196d..f52d693bc496 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "TableFilterDlg.hxx" diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index e30a06037b50..4d8b80aa5a85 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "UserSettingsDlg.hxx" diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index fd751e807c40..3794c34cfefe 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "admindlg.hxx" diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 647251deed6b..c90c1d4b9ec1 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "composerdialogs.hxx" diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 3fb4b032e3bc..8fc61a268c30 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -25,6 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" #include "dbu_reghelper.hxx" #include "dbu_resource.hrc" diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 8e029adfdbde..fa9e913e6556 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbinteraction.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 23658530be71..b2be6d475acf 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "textconnectionsettings.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 998b79a136ad..310705974590 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "unoDirectSql.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index c48a2e54a250..64cb5f671f03 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbustrings.hrc" #include <toolkit/awt/vclxwindow.hxx> diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 66d65552b264..5166debafdf5 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "sqlmessage.hxx" #include "unosqlmessage.hxx" diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index 234c6a5eea80..ffc76e5092df 100644 --- a/reportdesign/AllLangResTarget_rptui.mk +++ b/reportdesign/AllLangResTarget_rptui.mk @@ -1,57 +1,56 @@ -# 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/ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # -# 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. +# OpenOffice.org - a multi-platform office productivity suite # -# The Initial Developer of the Original Code is -# David Tardon, Red Hat Inc. <dtardon@redhat.com> -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. +# This file is part of OpenOffice.org. # -# Major Contributor(s): +# 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. # -# For minor contributions see the git repository. +# 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). # -# 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. +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* $(eval $(call gb_AllLangResTarget_AllLangResTarget,rptui)) $(eval $(call gb_AllLangResTarget_set_reslocation,rptui,reportdesign)) -$(eval $(call gb_AllLangResTarget_add_srs,rptui,\ - reportdesign/ui \ -)) +$(eval $(call gb_AllLangResTarget_add_srs,rptui,reportdesign/rptui)) -$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/ui)) +$(eval $(call gb_SrsTarget_SrsTarget,reportdesign/rptui)) -$(eval $(call gb_SrsTarget_set_include,reportdesign/ui,\ - $$(INCLUDE) \ - -I$(realpath $(SRCDIR)/reportdesign/inc) \ - -I$(OUTDIR)/inc \ +$(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc/reportdesign \ + -I$(SRCDIR)/reportdesign/source/ui/inc \ + -I$(SRCDIR)/reportdesign/inc \ )) -$(eval $(call gb_SrsTarget_add_files,reportdesign/ui,\ - reportdesign/source/ui/dlg/CondFormat.src \ - reportdesign/source/ui/inspection/inspection.src \ - reportdesign/source/ui/report/report.src \ - reportdesign/source/ui/dlg/DateTime.src \ - reportdesign/source/ui/dlg/dlgpage.src \ - reportdesign/source/ui/dlg/GroupsSorting.src \ - reportdesign/source/ui/dlg/Navigator.src \ - reportdesign/source/ui/dlg/PageNumber.src \ -)) -$(call gb_SrsTarget_get_target,reportdesign/ui) :| $(OUTDIR)/inc/svx/globlmn.hrc +$(eval $(call gb_SrsTarget_add_files,reportdesign/rptui,\ + reportdesign/source/ui/dlg/dlgpage.src \ + reportdesign/source/ui/dlg/PageNumber.src \ + reportdesign/source/ui/dlg/DateTime.src \ + reportdesign/source/ui/dlg/CondFormat.src \ + reportdesign/source/ui/dlg/Navigator.src \ + reportdesign/source/ui/dlg/GroupsSorting.src \ + reportdesign/source/ui/inspection/inspection.src \ + reportdesign/source/ui/report/report.src \ +)) -# vim: set noet ts=4 sw=4: +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk new file mode 100644 index 000000000000..3ad0f24f9265 --- /dev/null +++ b/reportdesign/JunitTest_reportdesign_complex.mk @@ -0,0 +1,53 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_JunitTest_JunitTest,reportdesign_complex,SRCDIR)) + +$(eval $(call gb_JunitTest_set_defs,reportdesign_complex,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/reportdesign/qa/complex/reportdesign/test_documents \ +)) + +$(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\ + reportdesign/qa/complex/reportdesign/ReportDesignerTest \ + reportdesign/qa/complex/reportdesign/TestDocument \ + reportdesign/qa/complex/reportdesign/FileURL \ +)) + +$(eval $(call gb_JunitTest_add_jars,reportdesign_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) + +$(eval $(call gb_JunitTest_add_classes,reportdesign_complex,\ + complex.reportdesign.ReportDesignerTest \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index 93e1adb5a442..bfd0564ed886 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,rpt,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,rpt,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) @@ -53,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,rpt,\ cppu \ cppuhelper \ dbtools \ - dbu \ + dbui \ editeng \ fwe \ i18nisolang1 \ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 7aee950fa723..4183b8473865 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,rptui,\ cppu \ cppuhelper \ dbtools \ - dbu \ + dbui \ editeng \ for \ forui \ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index ff9eb4436ccb..4e4bd0935c42 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -37,15 +37,11 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(OUTDIR)/inc \ )) -$(eval $(call gb_Library_set_defs,rptxml,\ - $$(DEFS) \ )) $(eval $(call gb_Library_add_api,rptxml,\ offapi \ udkapi \ -)) - $(eval $(call gb_Library_add_linked_libs,rptxml,\ comphelper \ cppu \ diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index b348b8943d8f..e06ff36c7787 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -36,4 +36,11 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ Package_uiconfig \ )) -# vim: set noet ts=4 sw=4: +# deactivated since sb123; +# apparently fails because OOo does not find JVM? +#$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\ + JunitTest_reportdesign_complex \ +)) + + +# vim: set noet ts=4 sw=4:
\ No newline at end of file diff --git a/reportdesign/qa/complex/reportdesign/makefile.mk b/reportdesign/Package_xml.mk index 4174eb02ce3a..75c18a04a1da 100755..100644 --- a/reportdesign/qa/complex/reportdesign/makefile.mk +++ b/reportdesign/Package_xml.mk @@ -1,8 +1,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,38 +25,5 @@ # #************************************************************************* -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = reportdesign -TARGET = qa_complex_reportdesign - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/reportdesign - -# here store only Files which contain a @Test -JAVATESTFILES = \ - ReportDesignerTest.java - -# put here all other files -JAVAFILES = $(JAVATESTFILES) \ - TestDocument.java \ - FileURL.java - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y - -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END +$(eval $(call gb_Package_Package,reportdesign_xml,$(SRCDIR)/reportdesign/prj)) +$(eval $(call gb_Package_add_file,reportdesign_xml,prj/rpt.xml,rpt.xml)) diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx index c0dfd77c3e5f..2b27e2a81d2b 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.hxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx @@ -33,6 +33,35 @@ #include "com/sun/star/chart2/data/XDataReceiver.hpp" #include "com/sun/star/reflection/XProxyFactory.hpp" #include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/report/XFormatCondition.hpp"
+#include "com/sun/star/report/XFunction.hpp"
+#include "com/sun/star/report/XReportComponent.hpp"
+#include <com/sun/star/report/ForceNewPage.hpp>
+#include <com/sun/star/report/GroupKeepTogether.hpp>
+#include <com/sun/star/report/GroupOn.hpp>
+#include <com/sun/star/report/KeepTogether.hpp>
+#include <com/sun/star/report/ReportPrintOption.hpp>
+#include <com/sun/star/report/XFixedLine.hpp>
+#include <com/sun/star/report/XFixedText.hpp>
+#include <com/sun/star/report/XFormatCondition.hpp>
+#include <com/sun/star/report/XFormattedField.hpp>
+#include <com/sun/star/report/XFunction.hpp>
+#include <com/sun/star/report/XFunctions.hpp>
+#include <com/sun/star/report/XFunctionsSupplier.hpp>
+#include <com/sun/star/report/XGroup.hpp>
+#include <com/sun/star/report/XGroups.hpp>
+#include <com/sun/star/report/XImageControl.hpp>
+#include <com/sun/star/report/XReportComponent.hpp>
+#include <com/sun/star/report/XReportControlFormat.hpp>
+#include <com/sun/star/report/XReportControlModel.hpp>
+#include <com/sun/star/report/XReportDefinition.hpp>
+#include <com/sun/star/report/XReportEngine.hpp>
+#include <com/sun/star/report/XSection.hpp>
+#include <com/sun/star/report/XShape.hpp>
+#include <com/sun/star/report/meta/XFormulaParser.hpp>
+#include <com/sun/star/report/meta/XFunctionCategory.hpp>
+#include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <com/sun/star/report/meta/XFunctionManager.hpp> #include "comphelper/sequence.hxx" #include "comphelper/sequenceashashmap.hxx" #include "comphelper/documentconstants.hxx" diff --git a/reportdesign/inc/pch/precompiled_rptui.cxx b/reportdesign/inc/pch/precompiled_rptui.cxx new file mode 100644 index 000000000000..37cdcd1885c9 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptui.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_rptui.hxx" + diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx new file mode 100644 index 000000000000..6087563398a4 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -0,0 +1,74 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS +#include "com/sun/star/sdb/CommandType.hpp" +//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp" +#include "com/sun/star/chart2/data/XDataReceiver.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/report/XFormatCondition.hpp"
+#include "com/sun/star/report/XFunction.hpp"
+#include "com/sun/star/report/XReportComponent.hpp"
+#include <com/sun/star/report/ForceNewPage.hpp>
+#include <com/sun/star/report/GroupKeepTogether.hpp>
+#include <com/sun/star/report/GroupOn.hpp>
+#include <com/sun/star/report/KeepTogether.hpp>
+#include <com/sun/star/report/ReportPrintOption.hpp>
+#include <com/sun/star/report/XFixedLine.hpp>
+#include <com/sun/star/report/XFixedText.hpp>
+#include <com/sun/star/report/XFormatCondition.hpp>
+#include <com/sun/star/report/XFormattedField.hpp>
+#include <com/sun/star/report/XFunction.hpp>
+#include <com/sun/star/report/XFunctions.hpp>
+#include <com/sun/star/report/XFunctionsSupplier.hpp>
+#include <com/sun/star/report/XGroup.hpp>
+#include <com/sun/star/report/XGroups.hpp>
+#include <com/sun/star/report/XImageControl.hpp>
+#include <com/sun/star/report/XReportComponent.hpp>
+#include <com/sun/star/report/XReportControlFormat.hpp>
+#include <com/sun/star/report/XReportControlModel.hpp>
+#include <com/sun/star/report/XReportDefinition.hpp>
+#include <com/sun/star/report/XReportEngine.hpp>
+#include <com/sun/star/report/XSection.hpp>
+#include <com/sun/star/report/XShape.hpp>
+#include <com/sun/star/report/meta/XFormulaParser.hpp>
+#include <com/sun/star/report/meta/XFunctionCategory.hpp>
+#include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <com/sun/star/report/meta/XFunctionManager.hpp> +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/documentconstants.hxx" +#include "xmloff/attrlist.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmluconv.hxx" +#include "xmloff/xmltkmap.hxx" +#include "xmloff/xmlnmspe.hxx" +#endif diff --git a/reportdesign/inc/pch/precompiled_rptxml.cxx b/reportdesign/inc/pch/precompiled_rptxml.cxx new file mode 100644 index 000000000000..b5c8cc49aefa --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptxml.cxx @@ -0,0 +1,29 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "precompiled_rptxml.hxx" + diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx b/reportdesign/inc/pch/precompiled_rptxml.hxx new file mode 100644 index 000000000000..6087563398a4 --- /dev/null +++ b/reportdesign/inc/pch/precompiled_rptxml.hxx @@ -0,0 +1,74 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:38.561560 + +#ifdef PRECOMPILED_HEADERS +#include "com/sun/star/sdb/CommandType.hpp" +//#include "com/sun/star/chart2/data/DatabaseDataProvider.hpp" +#include "com/sun/star/chart2/data/XDataReceiver.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/sdb/CommandType.hpp" +#include "com/sun/star/report/XFormatCondition.hpp"
+#include "com/sun/star/report/XFunction.hpp"
+#include "com/sun/star/report/XReportComponent.hpp"
+#include <com/sun/star/report/ForceNewPage.hpp>
+#include <com/sun/star/report/GroupKeepTogether.hpp>
+#include <com/sun/star/report/GroupOn.hpp>
+#include <com/sun/star/report/KeepTogether.hpp>
+#include <com/sun/star/report/ReportPrintOption.hpp>
+#include <com/sun/star/report/XFixedLine.hpp>
+#include <com/sun/star/report/XFixedText.hpp>
+#include <com/sun/star/report/XFormatCondition.hpp>
+#include <com/sun/star/report/XFormattedField.hpp>
+#include <com/sun/star/report/XFunction.hpp>
+#include <com/sun/star/report/XFunctions.hpp>
+#include <com/sun/star/report/XFunctionsSupplier.hpp>
+#include <com/sun/star/report/XGroup.hpp>
+#include <com/sun/star/report/XGroups.hpp>
+#include <com/sun/star/report/XImageControl.hpp>
+#include <com/sun/star/report/XReportComponent.hpp>
+#include <com/sun/star/report/XReportControlFormat.hpp>
+#include <com/sun/star/report/XReportControlModel.hpp>
+#include <com/sun/star/report/XReportDefinition.hpp>
+#include <com/sun/star/report/XReportEngine.hpp>
+#include <com/sun/star/report/XSection.hpp>
+#include <com/sun/star/report/XShape.hpp>
+#include <com/sun/star/report/meta/XFormulaParser.hpp>
+#include <com/sun/star/report/meta/XFunctionCategory.hpp>
+#include <com/sun/star/report/meta/XFunctionDescription.hpp>
+#include <com/sun/star/report/meta/XFunctionManager.hpp> +#include "comphelper/sequence.hxx" +#include "comphelper/sequenceashashmap.hxx" +#include "comphelper/documentconstants.hxx" +#include "xmloff/attrlist.hxx" +#include "xmloff/xmltoken.hxx" +#include "xmloff/xmlement.hxx" +#include "xmloff/xmluconv.hxx" +#include "xmloff/xmltkmap.hxx" +#include "xmloff/xmlnmspe.hxx" +#endif diff --git a/reportdesign/prj/build.lst b/reportdesign/prj/build.lst index 9ae4cc7d7455..c08517e01bd6 100644 --- a/reportdesign/prj/build.lst +++ b/reportdesign/prj/build.lst @@ -1,3 +1,3 @@ rd reportdesign : TRANSLATIONS:translations BOOST:boost comphelper dbaccess formula LIBXSLT:libxslt NULL -rd reportdesign usr1 - all rd_mkout NULL +rd reportdesign\prj nmake - all rd_prj NULL rd reportdesign\prj nmake - all rd_prj NULL diff --git a/reportdesign/qa/complex/reportdesign/TestDocument.java b/reportdesign/qa/complex/reportdesign/TestDocument.java index a6e294d4d3ec..7ab874395015 100644 --- a/reportdesign/qa/complex/reportdesign/TestDocument.java +++ b/reportdesign/qa/complex/reportdesign/TestDocument.java @@ -29,13 +29,14 @@ package complex.reportdesign; import java.io.File; import org.openoffice.test.OfficeFileUrl; +import org.openoffice.test.Argument; final class TestDocument { public static String getUrl(String name) - { - return OfficeFileUrl.getAbsolute(new File("test_documents", name)); - } + { + return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); + } private TestDocument() {} } diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 6db745085f61..a17696b11ba3 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedLine.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 7225803034d5..9b87003a0f52 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FixedText.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 73315be74314..acbf15065840 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormatCondition.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 237822575de6..e1aadb8c1692 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "FormattedField.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 05e52ae6f93c..8a14a9395c7f 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Function.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index 80a06c85ef61..b10db887b2e7 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Functions.hxx" #include "Function.hxx" #include <tools/debug.hxx> diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index fbcad5aeb276..418f476dc0c6 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Group.hxx" #include "Section.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index b65d8faf75fe..6ae4a1fd7fd4 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Groups.hxx" #include "Group.hxx" #include <tools/debug.hxx> diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index f1b18970bd22..c1918515d7f1 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ImageControl.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 6854cec6e635..150a58095bbc 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportComponent.hxx" #include "corestrings.hrc" diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index a1617d75d86f..b92a007ff2cf 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportControlModel.hxx" #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 29467fa2f6bc..724664aeb51f 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDefinition.hxx" #include "FixedLine.hxx" diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 87d9982b57fe..458fd59206c5 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include "ReportEngineJFree.hxx" #include <comphelper/enumhelper.hxx> diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index 8ee97e2369c9..46c1f8603f69 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportVisitor.hxx" namespace reportdesign { diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 6c6aba20a81b..d49bd1ab60eb 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Section.hxx" #include <comphelper/enumhelper.hxx> #include <connectivity/dbtools.hxx> diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 2fa28cd0f81d..c3a4e59a3c0a 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Shape.hxx" #include <com/sun/star/beans/NamedValue.hpp> diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 99028d9c7e4f..2a1f6a55e941 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "Tools.hxx" #include "core_resource.hrc" #include "core_resource.hxx" diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 20c7ceb3b139..bbb7db0f5c76 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "sal/types.h" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 1c2d88a546d2..2df6cc670a7c 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionalexpression.hxx" /** === begin UNO includes === **/ diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index ed02acdb254f..f7c4b08f91e9 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "conditionupdater.hxx" #include "reportformula.hxx" diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index c854a9987742..403ccc61e6b6 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "core_resource.hxx" #include <tools/simplerm.hxx> diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 9c78d9efc35d..a36b37f96a03 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ModuleHelper.hxx" #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index b645d3b3a812..c346a377954c 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "PropertyForward.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 3843b894673b..d34b72de3722 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "ReportDrawPage.hxx" #include "RptObject.hxx" #include "RptModel.hxx" diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 054b3dd311cc..37bbfdf965c4 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "ReportUndoFactory.hxx" #include "RptObject.hxx" #include "UndoActions.hxx" diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index f6ab95585ee7..30d99f85927e 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptModel.hxx" #include "RptPage.hxx" diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 693e76028faf..e5fe0c9fbf31 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "RptObjectListener.hxx" #include "RptObject.hxx" #include "RptDef.hxx" diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index 2ebbd53a2603..2f2f6e17e1b1 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -25,6 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ +#include "precompiled_reportdesign.hxx" #include "RptPage.hxx" #include "RptModel.hxx" #include "Section.hxx" diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index b21a3c91278d..53865e4da086 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - +#include "precompiled_reportdesign.hxx" #include "UndoActions.hxx" #include "UndoEnv.hxx" #include "formatnormalizer.hxx" diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index 2c66523bb15a..83b5e2ac9441 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "dbloader2.hxx" #include <comphelper/sequence.hxx> // ------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/rptxml.component b/reportdesign/source/filter/xml/rptxml.component new file mode 100644 index 000000000000..c34758d64dd9 --- /dev/null +++ b/reportdesign/source/filter/xml/rptxml.component @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.report.XMLSettingsExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLContentExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLStylesExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLMetaExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.XMLFullExporter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.ExportFilter"> + <service name="com.sun.star.document.ExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.ORptTypeDetection"> + <service name="com.sun.star.document.ExtendedTypeDetection"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisContentImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.report.OReportFilter"> + <service name="com.sun.star.document.ImportFilter"/> + </implementation> +</component> diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index e5fec78cda69..06a887557c5a 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlAutoStyle.hxx" #include "xmlHelper.hxx" #include "xmlExport.hxx" diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index 868a73002315..b2fcecc28b12 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCell.hxx" #include "xmlHelper.hxx" #include <xmloff/xmluconv.hxx> diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index a6599cce79ff..e44de4e099b6 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlColumn.hxx" #include <xmloff/xmluconv.hxx> diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index aa8da4c42b62..1a9d375e72ab 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlComponent.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 56eb0c4eabb9..0cc89d4d5881 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlCondPrtExpr.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 1de438f425ea..8a7776ce7a28 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlControlProperty.hxx" #include <xmloff/xmluconv.hxx> #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 767fc340d1f8..7abad99bcc6f 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 166ba87db540..4c6dfc71ae69 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlExportDocumentHandler.hxx" #include <com/sun/star/sdb/CommandType.hpp> diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index faec25209fbf..d77c590efbfc 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFixedContent.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 71b4f05f95be..74ff10111af0 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormatCondition.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 73fd83dc474d..8f1af35845dc 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFormattedField.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 998e40839bd2..809683f2fe4a 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlFunction.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index d2524371ae98..255b8a93c8af 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlGroup.hxx" #include "xmlSection.hxx" #include "xmlFunction.hxx" diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 8446bf6bdd5f..8aab4d9d53f8 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlHelper.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 0e254e92eab2..56eaed82e0b3 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImage.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index c2dea15b7023..73ba163f7b39 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlImportDocumentHandler.hxx" #include <com/sun/star/sdb/CommandType.hpp> diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 745203f25c51..eb460e93d4cb 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlMasterFields.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 358aeba8e0f4..514e7d09e8bb 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlPropertyHandler.hxx" #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 3edb30acd555..445450ccbece 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReport.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 6ed989c06dbb..cdbe7c0f9614 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElement.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 0a86638028b9..6a20f41e13e7 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include "xmlControlProperty.hxx" diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index fbff64b2a617..38faab34b0e4 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlColumn.hxx" #include <xmloff/xmluconv.hxx> diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 5d19b6e9c202..45b7ea0cf235 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSection.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index eab257017a91..e46a4bcdda06 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlStyleImport.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 847752adaeae..a6f21c01a177 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlSubDocument.hxx" #include "xmlCell.hxx" #include "xmlfilter.hxx" diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 92fbf0658867..d3d1b54df8d8 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlTable.hxx" #include "xmlfilter.hxx" #include <xmloff/xmltoken.hxx> diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 4f087e343817..bcf6289ca558 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include <com/sun/star/packages/zip/ZipIOException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index ffb09734b46a..2561fb475856 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx index a9dc08d1a491..bb28e45499b5 100644 --- a/reportdesign/source/shared/uistrings.cxx +++ b/reportdesign/source/shared/uistrings.cxx @@ -25,12 +25,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "uistrings.hrc" namespace rptui { + #include "stringconstants.cxx" IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REPORTNAME , "ReportName"); IMPLEMENT_CONSTASCII_USTRING(CFG_REPORTDESIGNER , "SunReportBuilder"); diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx index 6933a01a4d2c..6ec5b8dad90d 100644 --- a/reportdesign/source/shared/xmlstrings.cxx +++ b/reportdesign/source/shared/xmlstrings.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptxml.hxx" #include "xmlstrings.hrc" @@ -35,7 +35,7 @@ namespace rptxml IMPLEMENT_CONSTASCII_USTRING(SERVICE_SETTINGSIMPORTER , "com.sun.star.comp.Report.XMLOasisSettingsImporter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_STYLESIMPORTER , "com.sun.star.comp.Report.XMLOasisStylesImporter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTENTIMPORTER , "com.sun.star.comp.Report.XMLOasisContentImporter"); -IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.comp.document.ImportFilter"); +IMPLEMENT_CONSTASCII_USTRING(SERVICE_IMPORTFILTER , "com.sun.star.document.ImportFilter"); IMPLEMENT_CONSTASCII_USTRING(SERVICE_METAIMPORTER , "com.sun.star.comp.Report.XMLOasisMetaImporter"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERLEFT , "BorderLeft"); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 1193e63d694a..81f24d3eb2d8 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "AddField.hxx" #include "UITools.hxx" #include <svx/dbaexchange.hxx> diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index e90b08faab6a..77cb28e7ce0d 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "CondFormat.hxx" #include "CondFormat.hrc" diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 3b979d9649a0..2825cba14163 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "Condition.hxx" #include "UITools.hxx" diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 4a817deab842..8e8df3f2b4fb 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DateTime.hxx" #include "DateTime.hrc" #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c84d846002e5..60e97c7257a5 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" //---------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 7f6720fd68ec..0aaf04bc4811 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GroupExchange.hxx" #include <sot/formats.hxx> #include <sot/storage.hxx> diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index f8470a6b6002..917f4c9732df 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GroupsSorting.hxx" #include "GroupsSorting.hrc" #include <connectivity/dbtools.hxx> diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 072a9430d7b0..4209e456621d 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "Navigator.hxx" diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 10e9f64b852c..39454ffb8c85 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "PageNumber.hxx" #include "PageNumber.hrc" #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 33547cdd3fe0..90a197d435a0 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <svx/dialogs.hrc> diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index fadd0fd065cc..d6a6a15bfc4b 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DataProviderHandler.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/namedvaluecollection.hxx> diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 7701c91e83d4..f402224077ef 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DefaultInspection.hxx" #include <comphelper/sequence.hxx> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 94565d669026..a0f655540c98 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "GeometryHandler.hxx" #include <comphelper/sequence.hxx> diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 87e1f006c177..8b066a19a42c 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportComponentHandler.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/sequence.hxx> diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 4d53bca64388..a0582427c889 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "metadata.hxx" #include <svtools/localresaccess.hxx> #include "com/sun/star/inspection/XPropertyHandler.hpp" diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index fc9c57d829cf..02c1be5dd3a4 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ColorListener.hxx" #include <svl/smplhint.hxx> #include "uistrings.hrc" diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 0f8787a07dd1..378a3879b4c7 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -27,7 +27,7 @@ ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "FunctionHelper.hxx" #include <tools/debug.hxx> diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 9e1fb6c66861..bbb628903768 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "RptUndo.hxx" #include "uistrings.hrc" diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 912b60c4acbf..6fafee3d07ca 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <toolkit/helper/convert.hxx> diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 920fec4e3087..2d051a3ca361 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include <cppuhelper/implementationentry.hxx> diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 2de27a2217c4..7a5c58d24ec2 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "statusbarcontroller.hxx" #include <svx/zoomsliderctrl.hxx> diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 016573d21c01..ec03a4d89710 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "toolboxcontroller.hxx" #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 257da996f5f7..26aa98a447d1 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "DesignView.hxx" #include <tools/debug.hxx> diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 11a3b7127a88..e07111c8ab1b 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "EndMarker.hxx" #include "ColorChanger.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 2d6555dff6bc..2233d8b9037d 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <FixedTextColor.hxx> #include <com/sun/star/report/XFixedText.hpp> diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index f7529c94bce8..0fee41855ee7 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <FormattedFieldBeautifier.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d8db9bf4967d..781a78aec69b 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #define RPTUI_ID_LRSPACE 1 #define RPTUI_ID_ULSPACE 2 diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 4c6e15a6ef0d..8faca401dad0 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -27,7 +27,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <ReportControllerObserver.hxx> #include <ReportController.hxx> diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index 7c63b73c9299..2c5e0cb50696 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportRuler.hxx" #include "ReportSection.hxx" #include "ReportWindow.hxx" diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index c169d798562b..7e03857406f8 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportSection.hxx" #include "ReportWindow.hxx" #include "DesignView.hxx" diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 318451db19c1..e0e74598d5df 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ReportWindow.hxx" #include "ReportSection.hxx" #include "SectionView.hxx" diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 0abd5b75f666..8903e7d25263 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ScrollHelper.hxx" #include "DesignView.hxx" #include "ReportController.hxx" diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index c60c8e011403..90f56517e0dd 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "SectionView.hxx" #include "DesignView.hxx" #include <RptPage.hxx> diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index a682a6b01f08..abe1b2a03eea 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "SectionWindow.hxx" #include "ReportWindow.hxx" #include "ReportRuler.hxx" diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 9d69bb79f5e8..c8a332de13d5 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "StartMarker.hxx" #include <vcl/image.hxx> #include <vcl/svapp.hxx> diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 576131433a03..c6d2c6c2425a 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "ViewsWindow.hxx" #include "ScrollHelper.hxx" diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index b18c645aa18e..614b9237afc5 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "dlgedclip.hxx" #include <comphelper/processfactory.hxx> #include <com/sun/star/datatransfer/XMimeContentType.hpp> diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index d5db6eb1d101..5873611648b1 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "dlgedfac.hxx" #include "uistrings.hrc" #include "RptObject.hxx" diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 65308fe6fbe2..74998c162f60 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/seleng.hxx> diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 1d5564cace0d..4a54fa612094 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "precompiled_reportdesign.hxx" +#include "precompiled_rptui.hxx" #include "propbrw.hxx" #include "RptObject.hxx" #include "ReportController.hxx" |