[Libreoffice-commits] .: Branch 'feature/gnumake4' - 283 commits - dbaccess/AllLangResTarget_dba.mk dbaccess/AllLangResTarget_dbmm.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/AllLangResTarget_sdbt.mk dbaccess/Executable_odbcconfig.mk dbaccess/inc dbaccess/JunitTest_dbaccess_unoapi.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/Module_dbaccess.mk dbaccess/Package_inc.mk dbaccess/Package_uiconfig.mk dbaccess/prj dbaccess/qa dbaccess/source dbaccess/uiconfig dbaccess/util dbaccess/win32 .gitignore reportdesign/AllLangResTarget_rpt.mk reportdesign/inc reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk reportdesign/Makefile reportdesign/Module_reportdesign.mk reportdesign/Package_uiconfig.mk reportdesign/prj reportdesign/qa reportdesign/source reportdesign/uiconfig reportdesign/util
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Jun 20 00:59:17 PDT 2011
.gitignore | 18
dbaccess/AllLangResTarget_dba.mk | 55 -
dbaccess/AllLangResTarget_dbmm.mk | 54 -
dbaccess/AllLangResTarget_dbu.mk | 95 ++
dbaccess/AllLangResTarget_sdbt.mk | 57 -
dbaccess/Executable_odbcconfig.mk | 71 -
dbaccess/JunitTest_dbaccess_unoapi.mk | 63 -
dbaccess/Library_adabasui.mk | 71 -
dbaccess/Library_dba.mk | 260 +++---
dbaccess/Library_dbaxml.mk | 144 +--
dbaccess/Library_dbmm.mk | 111 +-
dbaccess/Library_dbu.mk | 321 +++++++
dbaccess/Library_sdbt.mk | 95 +-
dbaccess/Module_dbaccess.mk | 76 -
dbaccess/Package_inc.mk | 62 -
dbaccess/Package_uiconfig.mk | 54 -
dbaccess/inc/AsyncronousLink.hxx | 2
dbaccess/inc/IController.hxx | 9
dbaccess/inc/IReference.hxx | 2
dbaccess/inc/ToolBoxHelper.hxx | 20
dbaccess/inc/controllerframe.hxx | 3
dbaccess/inc/dataview.hxx | 3
dbaccess/inc/dbaccessdllapi.h | 2
dbaccess/inc/dbsubcomponentcontroller.hxx | 6
dbaccess/inc/genericcontroller.hxx | 2
dbaccess/inc/makefile.mk | 47 -
dbaccess/inc/pch/precompiled_dbaccess.cxx | 2
dbaccess/inc/pch/precompiled_dbaccess.hxx | 9
dbaccess/prj/build.lst | 2
dbaccess/prj/makefile.mk | 2
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2
dbaccess/qa/complex/dbaccess/RowSet.java | 5
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java | 14
dbaccess/qa/unoapi/makefile.mk | 48 -
dbaccess/source/core/api/BookmarkSet.cxx | 40
dbaccess/source/core/api/BookmarkSet.hxx | 8
dbaccess/source/core/api/CIndexColumn.hxx | 7
dbaccess/source/core/api/CIndexes.cxx | 33
dbaccess/source/core/api/CIndexes.hxx | 7
dbaccess/source/core/api/CRowSetColumn.cxx | 24
dbaccess/source/core/api/CRowSetColumn.hxx | 15
dbaccess/source/core/api/CRowSetDataColumn.cxx | 71 -
dbaccess/source/core/api/CRowSetDataColumn.hxx | 15
dbaccess/source/core/api/CacheSet.cxx | 232 ++---
dbaccess/source/core/api/CacheSet.hxx | 8
dbaccess/source/core/api/FilteredContainer.cxx | 43 -
dbaccess/source/core/api/HelperCollections.cxx | 27
dbaccess/source/core/api/HelperCollections.hxx | 25
dbaccess/source/core/api/KeySet.cxx | 277 ++----
dbaccess/source/core/api/KeySet.hxx | 36
dbaccess/source/core/api/OptimisticSet.cxx | 92 --
dbaccess/source/core/api/OptimisticSet.hxx | 21
dbaccess/source/core/api/PrivateRow.cxx | 4
dbaccess/source/core/api/PrivateRow.hxx | 8
dbaccess/source/core/api/RowSet.cxx | 444 ++++-------
dbaccess/source/core/api/RowSet.hxx | 12
dbaccess/source/core/api/RowSetBase.cxx | 327 ++++----
dbaccess/source/core/api/RowSetBase.hxx | 57 -
dbaccess/source/core/api/RowSetCache.cxx | 225 ++---
dbaccess/source/core/api/RowSetCache.hxx | 53 -
dbaccess/source/core/api/RowSetCacheIterator.cxx | 41 -
dbaccess/source/core/api/RowSetCacheIterator.hxx | 15
dbaccess/source/core/api/RowSetRow.hxx | 24
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 179 +---
dbaccess/source/core/api/StaticSet.cxx | 97 --
dbaccess/source/core/api/StaticSet.hxx | 6
dbaccess/source/core/api/TableDeco.cxx | 243 ++----
dbaccess/source/core/api/View.cxx | 26
dbaccess/source/core/api/WrappedResultSet.cxx | 42 -
dbaccess/source/core/api/WrappedResultSet.hxx | 9
dbaccess/source/core/api/callablestatement.cxx | 48 -
dbaccess/source/core/api/column.cxx | 55 -
dbaccess/source/core/api/columnsettings.cxx | 17
dbaccess/source/core/api/datacolumn.cxx | 79 -
dbaccess/source/core/api/datacolumn.hxx | 16
dbaccess/source/core/api/datasettings.cxx | 41 -
dbaccess/source/core/api/definitioncolumn.cxx | 80 -
dbaccess/source/core/api/makefile.mk | 82 --
dbaccess/source/core/api/preparedstatement.cxx | 47 -
dbaccess/source/core/api/query.cxx | 99 --
dbaccess/source/core/api/query.hxx | 20
dbaccess/source/core/api/querycomposer.cxx | 107 --
dbaccess/source/core/api/querycontainer.cxx | 101 --
dbaccess/source/core/api/querydescriptor.cxx | 78 -
dbaccess/source/core/api/querydescriptor.hxx | 28
dbaccess/source/core/api/resultcolumn.cxx | 52 -
dbaccess/source/core/api/resultcolumn.hxx | 8
dbaccess/source/core/api/resultset.cxx | 174 ----
dbaccess/source/core/api/resultset.hxx | 44 -
dbaccess/source/core/api/statement.cxx | 80 -
dbaccess/source/core/api/table.cxx | 79 -
dbaccess/source/core/api/tablecontainer.cxx | 76 -
dbaccess/source/core/api/viewcontainer.cxx | 40
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 82 --
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 37
dbaccess/source/core/dataaccess/ContentHelper.cxx | 203 +----
dbaccess/source/core/dataaccess/ModelImpl.cxx | 118 --
dbaccess/source/core/dataaccess/ModelImpl.hxx | 17
dbaccess/source/core/dataaccess/SharedConnection.cxx | 65 -
dbaccess/source/core/dataaccess/SharedConnection.hxx | 53 -
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 69 -
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 37
dbaccess/source/core/dataaccess/commandcontainer.cxx | 30
dbaccess/source/core/dataaccess/commandcontainer.hxx | 16
dbaccess/source/core/dataaccess/commanddefinition.cxx | 30
dbaccess/source/core/dataaccess/commanddefinition.hxx | 29
dbaccess/source/core/dataaccess/connection.cxx | 100 --
dbaccess/source/core/dataaccess/connection.hxx | 6
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 28
dbaccess/source/core/dataaccess/databasecontext.cxx | 86 --
dbaccess/source/core/dataaccess/databasecontext.hxx | 5
dbaccess/source/core/dataaccess/databasedocument.cxx | 193 +---
dbaccess/source/core/dataaccess/databasedocument.hxx | 16
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 44 -
dbaccess/source/core/dataaccess/databaseregistrations.hxx | 9
dbaccess/source/core/dataaccess/datasource.cxx | 154 +--
dbaccess/source/core/dataaccess/datasource.hxx | 74 -
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 111 --
dbaccess/source/core/dataaccess/documentcontainer.cxx | 130 ---
dbaccess/source/core/dataaccess/documentcontainer.hxx | 28
dbaccess/source/core/dataaccess/documentdefinition.cxx | 354 +-------
dbaccess/source/core/dataaccess/documentdefinition.hxx | 32
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 31
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 9
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 25
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 9
dbaccess/source/core/dataaccess/documentevents.cxx | 34
dbaccess/source/core/dataaccess/documentevents.hxx | 9
dbaccess/source/core/dataaccess/intercept.cxx | 25
dbaccess/source/core/dataaccess/intercept.hxx | 103 +-
dbaccess/source/core/dataaccess/makefile.mk | 69 -
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 53 -
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 11
dbaccess/source/core/dataaccess/myucp_resultset.cxx | 13
dbaccess/source/core/dataaccess/myucp_resultset.hxx | 11
dbaccess/source/core/inc/ContainerListener.hxx | 20
dbaccess/source/core/inc/ContainerMediator.hxx | 30
dbaccess/source/core/inc/ContentHelper.hxx | 56 -
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 7
dbaccess/source/core/inc/FilteredContainer.hxx | 7
dbaccess/source/core/inc/PropertyForward.hxx | 21
dbaccess/source/core/inc/RefreshListener.hxx | 11
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 7
dbaccess/source/core/inc/TableDeco.hxx | 46 -
dbaccess/source/core/inc/View.hxx | 12
dbaccess/source/core/inc/callablestatement.hxx | 10
dbaccess/source/core/inc/column.hxx | 13
dbaccess/source/core/inc/columnsettings.hxx | 25
dbaccess/source/core/inc/commandbase.hxx | 15
dbaccess/source/core/inc/composertools.hxx | 10
dbaccess/source/core/inc/containerapprove.hxx | 10
dbaccess/source/core/inc/core_resource.hrc | 5
dbaccess/source/core/inc/core_resource.hxx | 17
dbaccess/source/core/inc/datasettings.hxx | 20
dbaccess/source/core/inc/dbamiscres.hrc | 10
dbaccess/source/core/inc/definitioncolumn.hxx | 4
dbaccess/source/core/inc/definitioncontainer.hxx | 47 -
dbaccess/source/core/inc/module_dba.hxx | 8
dbaccess/source/core/inc/object.hxx | 4
dbaccess/source/core/inc/objectnameapproval.hxx | 15
dbaccess/source/core/inc/preparedstatement.hxx | 20
dbaccess/source/core/inc/querycomposer.hxx | 31
dbaccess/source/core/inc/querycontainer.hxx | 58 -
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 9
dbaccess/source/core/inc/sdbcoretools.hxx | 12
dbaccess/source/core/inc/statement.hxx | 34
dbaccess/source/core/inc/table.hxx | 5
dbaccess/source/core/inc/tablecontainer.hxx | 40
dbaccess/source/core/inc/userinformation.hxx | 8
dbaccess/source/core/inc/veto.hxx | 12
dbaccess/source/core/inc/viewcontainer.hxx | 32
dbaccess/source/core/misc/ContainerListener.cxx | 5
dbaccess/source/core/misc/ContainerMediator.cxx | 27
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 25
dbaccess/source/core/misc/PropertyForward.cxx | 2
dbaccess/source/core/misc/apitools.cxx | 12
dbaccess/source/core/misc/dbastrings.cxx | 5
dbaccess/source/core/misc/dsntypes.cxx | 44 -
dbaccess/source/core/misc/makefile.mk | 60 -
dbaccess/source/core/misc/module_dba.cxx | 2
dbaccess/source/core/misc/objectnameapproval.cxx | 16
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/core/misc/services.cxx | 31
dbaccess/source/core/misc/userinformation.cxx | 12
dbaccess/source/core/misc/veto.cxx | 4
dbaccess/source/core/recovery/dbdocrecovery.cxx | 18
dbaccess/source/core/recovery/makefile.mk | 58 -
dbaccess/source/core/recovery/settingsimport.cxx | 25
dbaccess/source/core/recovery/settingsimport.hxx | 3
dbaccess/source/core/recovery/storagestream.cxx | 3
dbaccess/source/core/recovery/storagestream.hxx | 3
dbaccess/source/core/recovery/storagetextstream.cxx | 3
dbaccess/source/core/recovery/storagetextstream.hxx | 3
dbaccess/source/core/recovery/storagexmlstream.cxx | 3
dbaccess/source/core/recovery/storagexmlstream.hxx | 3
dbaccess/source/core/recovery/subcomponentloader.cxx | 3
dbaccess/source/core/recovery/subcomponentloader.hxx | 3
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 29
dbaccess/source/core/recovery/subcomponentrecovery.hxx | 3
dbaccess/source/core/recovery/subcomponents.hxx | 7
dbaccess/source/core/resource/core_resource.cxx | 6
dbaccess/source/core/resource/makefile.mk | 48 -
dbaccess/source/core/resource/strings.src | 53 +
dbaccess/source/ext/adabas/ANewDb.cxx | 18
dbaccess/source/ext/adabas/ANewDb.hxx | 9
dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 6
dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 4
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 22
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 18
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 64 -
dbaccess/source/ext/adabas/AdabasNewDb.hxx | 18
dbaccess/source/ext/adabas/AdabasNewDb.src | 84 +-
dbaccess/source/ext/adabas/Aservices.cxx | 12
dbaccess/source/ext/adabas/Astringconstants.cxx | 2
dbaccess/source/ext/adabas/adabasuistrings.cxx | 4
dbaccess/source/ext/adabas/makefile.mk | 100 --
dbaccess/source/ext/macromigration/dbmm_module.cxx | 2
dbaccess/source/ext/macromigration/dbmm_module.hxx | 2
dbaccess/source/ext/macromigration/dbmm_services.cxx | 14
dbaccess/source/ext/macromigration/dbmm_types.cxx | 3
dbaccess/source/ext/macromigration/dbmm_types.hxx | 4
dbaccess/source/ext/macromigration/docinteraction.cxx | 3
dbaccess/source/ext/macromigration/docinteraction.hxx | 3
dbaccess/source/ext/macromigration/macromigration.src | 9
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 9
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 3
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 3
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 3
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 3
dbaccess/source/ext/macromigration/makefile.mk | 109 --
dbaccess/source/ext/macromigration/migrationengine.cxx | 35
dbaccess/source/ext/macromigration/migrationengine.hxx | 3
dbaccess/source/ext/macromigration/migrationerror.hxx | 2
dbaccess/source/ext/macromigration/migrationlog.cxx | 9
dbaccess/source/ext/macromigration/migrationlog.hxx | 3
dbaccess/source/ext/macromigration/migrationprogress.hxx | 3
dbaccess/source/ext/macromigration/progresscapture.cxx | 17
dbaccess/source/ext/macromigration/progresscapture.hxx | 3
dbaccess/source/ext/macromigration/progressmixer.cxx | 3
dbaccess/source/ext/macromigration/progressmixer.hxx | 3
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 3
dbaccess/source/filter/xml/dbloader2.cxx | 30
dbaccess/source/filter/xml/makefile.mk | 122 ---
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 13
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 10
dbaccess/source/filter/xml/xmlColumn.cxx | 40
dbaccess/source/filter/xml/xmlColumn.hxx | 3
dbaccess/source/filter/xml/xmlComponent.cxx | 25
dbaccess/source/filter/xml/xmlComponent.hxx | 7
dbaccess/source/filter/xml/xmlConnectionData.cxx | 23
dbaccess/source/filter/xml/xmlConnectionData.hxx | 7
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 23
dbaccess/source/filter/xml/xmlConnectionResource.hxx | 6
dbaccess/source/filter/xml/xmlDataSource.cxx | 45 -
dbaccess/source/filter/xml/xmlDataSource.hxx | 7
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 25
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 5
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 31
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 9
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 23
dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 5
dbaccess/source/filter/xml/xmlDatabase.cxx | 3
dbaccess/source/filter/xml/xmlDatabase.hxx | 5
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 19
dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 7
dbaccess/source/filter/xml/xmlDocuments.cxx | 26
dbaccess/source/filter/xml/xmlDocuments.hxx | 9
dbaccess/source/filter/xml/xmlEnums.hxx | 3
dbaccess/source/filter/xml/xmlExport.cxx | 77 -
dbaccess/source/filter/xml/xmlExport.hxx | 45 -
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 23
dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx | 7
dbaccess/source/filter/xml/xmlHelper.cxx | 52 -
dbaccess/source/filter/xml/xmlHelper.hxx | 8
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 35
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 3
dbaccess/source/filter/xml/xmlLogin.cxx | 29
dbaccess/source/filter/xml/xmlLogin.hxx | 5
dbaccess/source/filter/xml/xmlQuery.cxx | 29
dbaccess/source/filter/xml/xmlQuery.hxx | 7
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 23
dbaccess/source/filter/xml/xmlServerDatabase.hxx | 6
dbaccess/source/filter/xml/xmlStyleImport.cxx | 45 -
dbaccess/source/filter/xml/xmlStyleImport.hxx | 24
dbaccess/source/filter/xml/xmlTable.cxx | 39
dbaccess/source/filter/xml/xmlTable.hxx | 9
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 27
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 5
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 9
dbaccess/source/filter/xml/xmlTableFilterPattern.hxx | 5
dbaccess/source/filter/xml/xmlfilter.cxx | 124 ---
dbaccess/source/filter/xml/xmlfilter.hxx | 41 -
dbaccess/source/filter/xml/xmlservices.cxx | 8
dbaccess/source/inc/OAuthenticationContinuation.hxx | 2
dbaccess/source/inc/apitools.hxx | 16
dbaccess/source/inc/constasciistring.hxx | 3
dbaccess/source/inc/dbadllapi.hxx | 3
dbaccess/source/inc/dbu_reghelper.hxx | 14
dbaccess/source/inc/dsntypes.hxx | 4
dbaccess/source/inc/flt_reghelper.hxx | 14
dbaccess/source/inc/registrationhelper.hxx | 2
dbaccess/source/inc/stringconstants.hrc | 2
dbaccess/source/inc/stringconstants.inc | 1
dbaccess/source/sdbtools/connection/connectiondependent.hxx | 2
dbaccess/source/sdbtools/connection/connectiontools.cxx | 12
dbaccess/source/sdbtools/connection/connectiontools.hxx | 18
dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 8
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 9
dbaccess/source/sdbtools/connection/makefile.mk | 49 -
dbaccess/source/sdbtools/connection/objectnames.cxx | 10
dbaccess/source/sdbtools/connection/objectnames.hxx | 2
dbaccess/source/sdbtools/connection/tablename.cxx | 7
dbaccess/source/sdbtools/connection/tablename.hxx | 8
dbaccess/source/sdbtools/inc/module_sdbt.hxx | 4
dbaccess/source/sdbtools/misc/makefile.mk | 47 -
dbaccess/source/sdbtools/misc/module_sdbt.cxx | 4
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4
dbaccess/source/sdbtools/resource/makefile.mk | 45 -
dbaccess/source/sdbtools/resource/sdbt_strings.src | 2
dbaccess/source/shared/dbu_reghelper.cxx | 6
dbaccess/source/shared/dbustrings.cxx | 3
dbaccess/source/shared/flt_reghelper.cxx | 9
dbaccess/source/shared/makefile.mk | 69 -
dbaccess/source/shared/registrationhelper.cxx | 6
dbaccess/source/shared/sdbtstrings.cxx | 3
dbaccess/source/shared/xmlstrings.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 65 -
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/app/AppControllerDnD.cxx | 160 ---
dbaccess/source/ui/app/AppControllerGen.cxx | 40
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 201 +---
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 39
dbaccess/source/ui/app/AppDetailView.cxx | 160 +--
dbaccess/source/ui/app/AppDetailView.hxx | 29
dbaccess/source/ui/app/AppIconControl.cxx | 43 -
dbaccess/source/ui/app/AppIconControl.hxx | 6
dbaccess/source/ui/app/AppSwapWindow.cxx | 25
dbaccess/source/ui/app/AppSwapWindow.hxx | 10
dbaccess/source/ui/app/AppTitleWindow.cxx | 18
dbaccess/source/ui/app/AppTitleWindow.hxx | 4
dbaccess/source/ui/app/AppView.cxx | 72 -
dbaccess/source/ui/app/AppView.hxx | 20
dbaccess/source/ui/app/IApplicationController.hxx | 3
dbaccess/source/ui/app/app.src | 27
dbaccess/source/ui/app/closeveto.cxx | 2
dbaccess/source/ui/app/makefile.mk | 70 -
dbaccess/source/ui/app/subcomponentmanager.cxx | 10
dbaccess/source/ui/app/subcomponentmanager.hxx | 3
dbaccess/source/ui/browser/AsyncronousLink.cxx | 9
dbaccess/source/ui/browser/bcommon.src | 3
dbaccess/source/ui/browser/brwctrlr.cxx | 189 ++--
dbaccess/source/ui/browser/brwview.cxx | 37
dbaccess/source/ui/browser/dataview.cxx | 21
dbaccess/source/ui/browser/dbexchange.cxx | 2
dbaccess/source/ui/browser/dbloader.cxx | 27
dbaccess/source/ui/browser/dbtreemodel.cxx | 9
dbaccess/source/ui/browser/dbtreemodel.hxx | 13
dbaccess/source/ui/browser/dbtreeview.cxx | 10
dbaccess/source/ui/browser/dbtreeview.hxx | 6
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 54 -
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 12
dbaccess/source/ui/browser/exsrcbrw.cxx | 76 -
dbaccess/source/ui/browser/formadapter.cxx | 55 -
dbaccess/source/ui/browser/genericcontroller.cxx | 150 +--
dbaccess/source/ui/browser/makefile.mk | 71 -
dbaccess/source/ui/browser/sbabrw.src | 19
dbaccess/source/ui/browser/sbagrid.cxx | 248 +-----
dbaccess/source/ui/browser/sbagrid.src | 7
dbaccess/source/ui/browser/sbamultiplex.cxx | 4
dbaccess/source/ui/browser/unodatbr.cxx | 413 ++++------
dbaccess/source/ui/control/ColumnControlWindow.cxx | 17
dbaccess/source/ui/control/FieldDescControl.cxx | 40
dbaccess/source/ui/control/RelationControl.cxx | 48 -
dbaccess/source/ui/control/ScrollHelper.cxx | 6
dbaccess/source/ui/control/SqlNameEdit.cxx | 4
dbaccess/source/ui/control/TableGrantCtrl.cxx | 20
dbaccess/source/ui/control/TableGrantCtrl.src | 30
dbaccess/source/ui/control/VertSplitView.cxx | 7
dbaccess/source/ui/control/charsetlistbox.cxx | 10
dbaccess/source/ui/control/curledit.cxx | 9
dbaccess/source/ui/control/dbtreelistbox.cxx | 85 --
dbaccess/source/ui/control/listviewitems.cxx | 4
dbaccess/source/ui/control/makefile.mk | 78 -
dbaccess/source/ui/control/marktree.cxx | 17
dbaccess/source/ui/control/opendoccontrols.cxx | 48 -
dbaccess/source/ui/control/sqledit.cxx | 3
dbaccess/source/ui/control/statusbarontroller.cxx | 5
dbaccess/source/ui/control/tabletree.cxx | 107 --
dbaccess/source/ui/control/tabletree.src | 9
dbaccess/source/ui/control/toolboxcontroller.cxx | 58 -
dbaccess/source/ui/control/undosqledit.cxx | 6
dbaccess/source/ui/control/undosqledit.src | 33
dbaccess/source/ui/dlg/AdabasStat.cxx | 62 -
dbaccess/source/ui/dlg/AdabasStat.hxx | 16
dbaccess/source/ui/dlg/AdabasStat.src | 32
dbaccess/source/ui/dlg/AutoControls.src | 11
dbaccess/source/ui/dlg/CollectionView.cxx | 63 -
dbaccess/source/ui/dlg/CollectionView.src | 38
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 51 -
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 12
dbaccess/source/ui/dlg/ConnectionPage.cxx | 96 --
dbaccess/source/ui/dlg/ConnectionPage.hxx | 11
dbaccess/source/ui/dlg/ConnectionPage.src | 10
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 7
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 21
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 67 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 6
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 89 +-
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 26
dbaccess/source/ui/dlg/DriverSettings.cxx | 3
dbaccess/source/ui/dlg/DriverSettings.hxx | 4
dbaccess/source/ui/dlg/RelationDlg.cxx | 37
dbaccess/source/ui/dlg/RelationDlg.src | 9
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 14
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 77 -
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 20
dbaccess/source/ui/dlg/UserAdmin.cxx | 45 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 21
dbaccess/source/ui/dlg/UserAdmin.src | 35
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 13
dbaccess/source/ui/dlg/UserAdminDlg.src | 9
dbaccess/source/ui/dlg/admincontrols.cxx | 5
dbaccess/source/ui/dlg/admincontrols.hxx | 3
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/adminpages.hxx | 16
dbaccess/source/ui/dlg/adodatalinks.cxx | 5
dbaccess/source/ui/dlg/adodatalinks.hxx | 6
dbaccess/source/ui/dlg/adtabdlg.cxx | 27
dbaccess/source/ui/dlg/adtabdlg.src | 5
dbaccess/source/ui/dlg/advancedsettings.cxx | 5
dbaccess/source/ui/dlg/advancedsettings.hxx | 3
dbaccess/source/ui/dlg/dbadmin.cxx | 8
dbaccess/source/ui/dlg/dbadmin.src | 7
dbaccess/source/ui/dlg/dbadmin2.src | 12
dbaccess/source/ui/dlg/dbadminsetup.hrc | 1
dbaccess/source/ui/dlg/dbadminsetup.src | 39
dbaccess/source/ui/dlg/dbfindex.cxx | 45 -
dbaccess/source/ui/dlg/dbfindex.hxx | 14
dbaccess/source/ui/dlg/dbfindex.src | 67 -
dbaccess/source/ui/dlg/dbwiz.cxx | 45 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 94 --
dbaccess/source/ui/dlg/detailpages.cxx | 39
dbaccess/source/ui/dlg/detailpages.hxx | 21
dbaccess/source/ui/dlg/directsql.cxx | 26
dbaccess/source/ui/dlg/directsql.src | 3
dbaccess/source/ui/dlg/dlgattr.cxx | 52 -
dbaccess/source/ui/dlg/dlgattr.src | 35
dbaccess/source/ui/dlg/dlgsave.cxx | 44 -
dbaccess/source/ui/dlg/dlgsave.src | 3
dbaccess/source/ui/dlg/dlgsize.cxx | 10
dbaccess/source/ui/dlg/dlgsize.src | 33
dbaccess/source/ui/dlg/dsnItem.hxx | 2
dbaccess/source/ui/dlg/dsselect.cxx | 49 -
dbaccess/source/ui/dlg/dsselect.hxx | 2
dbaccess/source/ui/dlg/dsselect.src | 6
dbaccess/source/ui/dlg/finteraction.cxx | 11
dbaccess/source/ui/dlg/finteraction.hxx | 6
dbaccess/source/ui/dlg/generalpage.cxx | 16
dbaccess/source/ui/dlg/generalpage.hxx | 13
dbaccess/source/ui/dlg/indexdialog.cxx | 83 --
dbaccess/source/ui/dlg/indexdialog.src | 14
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 19
dbaccess/source/ui/dlg/makefile.mk | 154 ---
dbaccess/source/ui/dlg/odbcconfig.cxx | 41 -
dbaccess/source/ui/dlg/odbcconfig.hxx | 6
dbaccess/source/ui/dlg/optionalboolitem.cxx | 3
dbaccess/source/ui/dlg/optionalboolitem.hxx | 3
dbaccess/source/ui/dlg/paramdialog.cxx | 49 -
dbaccess/source/ui/dlg/paramdialog.src | 4
dbaccess/source/ui/dlg/queryfilter.cxx | 70 -
dbaccess/source/ui/dlg/queryfilter.src | 23
dbaccess/source/ui/dlg/queryorder.cxx | 36
dbaccess/source/ui/dlg/queryorder.src | 39
dbaccess/source/ui/dlg/sqlmessage.cxx | 79 -
dbaccess/source/ui/dlg/sqlmessage.src | 25
dbaccess/source/ui/dlg/tablespage.cxx | 79 -
dbaccess/source/ui/dlg/tablespage.hxx | 16
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 3
dbaccess/source/ui/dlg/textconnectionsettings.src | 2
dbaccess/source/ui/imagelists/dbimagelists.src | 107 --
dbaccess/source/ui/imagelists/makefile.mk | 49 -
dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 5
dbaccess/source/ui/inc/AppElementType.hxx | 2
dbaccess/source/ui/inc/CollectionView.hxx | 14
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 11
dbaccess/source/ui/inc/ConnectionLine.hxx | 11
dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 9
dbaccess/source/ui/inc/ConnectionLineData.hxx | 21
dbaccess/source/ui/inc/DExport.hxx | 9
dbaccess/source/ui/inc/FieldControls.hxx | 12
dbaccess/source/ui/inc/FieldDescControl.hxx | 12
dbaccess/source/ui/inc/FieldDescriptions.hxx | 14
dbaccess/source/ui/inc/GeneralUndo.hxx | 6
dbaccess/source/ui/inc/HtmlReader.hxx | 14
dbaccess/source/ui/inc/IClipBoardTest.hxx | 5
dbaccess/source/ui/inc/IItemSetHelper.hxx | 8
dbaccess/source/ui/inc/IUpdateHelper.hxx | 2
dbaccess/source/ui/inc/JAccess.hxx | 7
dbaccess/source/ui/inc/JoinController.hxx | 6
dbaccess/source/ui/inc/JoinDesignView.hxx | 8
dbaccess/source/ui/inc/JoinExchange.hxx | 12
dbaccess/source/ui/inc/JoinTableView.hxx | 17
dbaccess/source/ui/inc/QEnumTypes.hxx | 2
dbaccess/source/ui/inc/QueryDesignView.hxx | 16
dbaccess/source/ui/inc/QueryTableView.hxx | 8
dbaccess/source/ui/inc/QueryTextView.hxx | 6
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 2
dbaccess/source/ui/inc/RTableConnectionData.hxx | 10
dbaccess/source/ui/inc/RefFunctor.hxx | 16
dbaccess/source/ui/inc/RelControliFace.hxx | 5
dbaccess/source/ui/inc/RelationControl.hxx | 9
dbaccess/source/ui/inc/RelationController.hxx | 6
dbaccess/source/ui/inc/RelationDesignView.hxx | 10
dbaccess/source/ui/inc/RelationDlg.hxx | 19
dbaccess/source/ui/inc/RelationTableView.hxx | 2
dbaccess/source/ui/inc/RtfReader.hxx | 8
dbaccess/source/ui/inc/ScrollHelper.hxx | 8
dbaccess/source/ui/inc/SqlNameEdit.hxx | 6
dbaccess/source/ui/inc/TableConnection.hxx | 16
dbaccess/source/ui/inc/TableConnectionData.hxx | 15
dbaccess/source/ui/inc/TableController.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 20
dbaccess/source/ui/inc/TableDesignControl.hxx | 10
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 12
dbaccess/source/ui/inc/TableDesignView.hxx | 12
dbaccess/source/ui/inc/TableFieldDescription.hxx | 18
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 15
dbaccess/source/ui/inc/TableRow.hxx | 15
dbaccess/source/ui/inc/TableRowExchange.hxx | 8
dbaccess/source/ui/inc/TableWindow.hxx | 2
dbaccess/source/ui/inc/TableWindowAccess.hxx | 9
dbaccess/source/ui/inc/TableWindowData.hxx | 4
dbaccess/source/ui/inc/TableWindowListBox.hxx | 2
dbaccess/source/ui/inc/TableWindowTitle.hxx | 4
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 10
dbaccess/source/ui/inc/TokenWriter.hxx | 16
dbaccess/source/ui/inc/TypeInfo.hxx | 10
dbaccess/source/ui/inc/UITools.hxx | 22
dbaccess/source/ui/inc/UserAdminDlg.hxx | 13
dbaccess/source/ui/inc/VertSplitView.hxx | 4
dbaccess/source/ui/inc/WCPage.hxx | 16
dbaccess/source/ui/inc/WColumnSelect.hxx | 8
dbaccess/source/ui/inc/WCopyTable.hxx | 3
dbaccess/source/ui/inc/WExtendPages.hxx | 4
dbaccess/source/ui/inc/WNameMatch.hxx | 14
dbaccess/source/ui/inc/WTabPage.hxx | 6
dbaccess/source/ui/inc/WTypeSelect.hxx | 2
dbaccess/source/ui/inc/adtabdlg.hxx | 19
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 3
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 4
dbaccess/source/ui/inc/browserids.hxx | 7
dbaccess/source/ui/inc/brwctrlr.hxx | 4
dbaccess/source/ui/inc/brwview.hxx | 12
dbaccess/source/ui/inc/callbacks.hxx | 8
dbaccess/source/ui/inc/charsetlistbox.hxx | 3
dbaccess/source/ui/inc/charsets.hxx | 10
dbaccess/source/ui/inc/commontypes.hxx | 6
dbaccess/source/ui/inc/curledit.hxx | 8
dbaccess/source/ui/inc/databaseobjectview.hxx | 26
dbaccess/source/ui/inc/datasourceconnector.hxx | 10
dbaccess/source/ui/inc/datasourcemap.hxx | 14
dbaccess/source/ui/inc/dbadmin.hxx | 13
dbaccess/source/ui/inc/dbexchange.hxx | 18
dbaccess/source/ui/inc/dbtreelistbox.hxx | 3
dbaccess/source/ui/inc/dbu_resource.hrc | 63 -
dbaccess/source/ui/inc/dbwiz.hxx | 16
dbaccess/source/ui/inc/dbwizsetup.hxx | 20
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 10
dbaccess/source/ui/inc/directsql.hxx | 24
dbaccess/source/ui/inc/dlgattr.hxx | 8
dbaccess/source/ui/inc/dlgsave.hxx | 10
dbaccess/source/ui/inc/dlgsize.hxx | 10
dbaccess/source/ui/inc/dsitems.hxx | 2
dbaccess/source/ui/inc/dsmeta.hxx | 3
dbaccess/source/ui/inc/exsrcbrw.hxx | 3
dbaccess/source/ui/inc/formadapter.hxx | 78 -
dbaccess/source/ui/inc/imageprovider.hxx | 48 -
dbaccess/source/ui/inc/indexcollection.hxx | 10
dbaccess/source/ui/inc/indexdialog.hxx | 30
dbaccess/source/ui/inc/indexes.hxx | 6
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 10
dbaccess/source/ui/inc/linkeddocuments.hxx | 22
dbaccess/source/ui/inc/listviewitems.hxx | 4
dbaccess/source/ui/inc/localresaccess.hxx | 6
dbaccess/source/ui/inc/makefile.mk | 43 -
dbaccess/source/ui/inc/marktree.hxx | 4
dbaccess/source/ui/inc/moduledbu.hxx | 7
dbaccess/source/ui/inc/objectnamecheck.hxx | 3
dbaccess/source/ui/inc/opendoccontrols.hxx | 8
dbaccess/source/ui/inc/paramdialog.hxx | 30
dbaccess/source/ui/inc/propertysetitem.hxx | 6
dbaccess/source/ui/inc/propertystorage.hxx | 3
dbaccess/source/ui/inc/querycontainerwindow.hxx | 14
dbaccess/source/ui/inc/querycontroller.hxx | 2
dbaccess/source/ui/inc/queryfilter.hxx | 18
dbaccess/source/ui/inc/queryorder.hxx | 12
dbaccess/source/ui/inc/queryview.hxx | 5
dbaccess/source/ui/inc/sbagrid.hrc | 18
dbaccess/source/ui/inc/sbagrid.hxx | 24
dbaccess/source/ui/inc/sbamultiplex.hxx | 54 -
dbaccess/source/ui/inc/sqledit.hxx | 2
dbaccess/source/ui/inc/sqlmessage.hxx | 10
dbaccess/source/ui/inc/statusbarontroller.hxx | 12
dbaccess/source/ui/inc/stringlistitem.hxx | 8
dbaccess/source/ui/inc/tabletree.hxx | 16
dbaccess/source/ui/inc/textconnectionsettings.hxx | 3
dbaccess/source/ui/inc/toolboxcontroller.hxx | 14
dbaccess/source/ui/inc/undosqledit.hxx | 6
dbaccess/source/ui/inc/unoadmin.hxx | 10
dbaccess/source/ui/inc/unodatbr.hxx | 51 -
dbaccess/source/ui/inc/unosqlmessage.hxx | 6
dbaccess/source/ui/misc/DExport.cxx | 20
dbaccess/source/ui/misc/HtmlReader.cxx | 21
dbaccess/source/ui/misc/ModuleHelper.cxx | 4
dbaccess/source/ui/misc/RowSetDrop.cxx | 18
dbaccess/source/ui/misc/RtfReader.cxx | 12
dbaccess/source/ui/misc/TableCopyHelper.cxx | 87 --
dbaccess/source/ui/misc/TokenWriter.cxx | 128 ---
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 35
dbaccess/source/ui/misc/UITools.cxx | 299 +------
dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 2
dbaccess/source/ui/misc/WCPage.cxx | 43 -
dbaccess/source/ui/misc/WColumnSelect.cxx | 46 -
dbaccess/source/ui/misc/WCopyTable.cxx | 43 -
dbaccess/source/ui/misc/WExtendPages.cxx | 10
dbaccess/source/ui/misc/WNameMatch.cxx | 64 -
dbaccess/source/ui/misc/WTypeSelect.cxx | 39
dbaccess/source/ui/misc/WizardPages.src | 94 --
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 10
dbaccess/source/ui/misc/charsets.cxx | 26
dbaccess/source/ui/misc/controllerframe.cxx | 10
dbaccess/source/ui/misc/databaseobjectview.cxx | 8
dbaccess/source/ui/misc/datasourceconnector.cxx | 46 -
dbaccess/source/ui/misc/dbaundomanager.cxx | 5
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/misc/dbumiscres.src | 8
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 30
dbaccess/source/ui/misc/dsmeta.cxx | 7
dbaccess/source/ui/misc/imageprovider.cxx | 62 -
dbaccess/source/ui/misc/indexcollection.cxx | 52 -
dbaccess/source/ui/misc/linkeddocuments.cxx | 113 --
dbaccess/source/ui/misc/makefile.mk | 88 --
dbaccess/source/ui/misc/moduledbu.cxx | 10
dbaccess/source/ui/misc/propertysetitem.cxx | 4
dbaccess/source/ui/misc/propertystorage.cxx | 7
dbaccess/source/ui/misc/singledoccontroller.cxx | 4
dbaccess/source/ui/misc/stringlistitem.cxx | 4
dbaccess/source/ui/misc/uiservices.cxx | 15
dbaccess/source/ui/querydesign/ConnectionData.hxx | 63 -
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 22
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 27
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 8
dbaccess/source/ui/querydesign/JAccess.cxx | 20
dbaccess/source/ui/querydesign/JoinController.cxx | 88 --
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 46 -
dbaccess/source/ui/querydesign/JoinExchange.cxx | 13
dbaccess/source/ui/querydesign/JoinTableView.cxx | 78 -
dbaccess/source/ui/querydesign/QTableConnection.cxx | 20
dbaccess/source/ui/querydesign/QTableConnection.hxx | 9
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 13
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 14
dbaccess/source/ui/querydesign/QTableWindow.cxx | 63 -
dbaccess/source/ui/querydesign/QTableWindow.hxx | 10
dbaccess/source/ui/querydesign/QTableWindowData.cxx | 6
dbaccess/source/ui/querydesign/QTableWindowData.hxx | 8
dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx | 4
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 8
dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 193 +---
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 8
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 8
dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx | 6
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 17
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx | 4
dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 22
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTableView.cxx | 97 --
dbaccess/source/ui/querydesign/QueryTextView.cxx | 32
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 23
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 181 +---
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 23
dbaccess/source/ui/querydesign/TableConnection.cxx | 14
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 16
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 12
dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 6
dbaccess/source/ui/querydesign/TableFieldInfo.hxx | 6
dbaccess/source/ui/querydesign/TableWindow.cxx | 51 -
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 35
dbaccess/source/ui/querydesign/TableWindowData.cxx | 7
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 37
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 42 -
dbaccess/source/ui/querydesign/makefile.mk | 89 --
dbaccess/source/ui/querydesign/query.src | 41 -
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 39
dbaccess/source/ui/querydesign/querycontroller.cxx | 140 +--
dbaccess/source/ui/querydesign/querydlg.cxx | 34
dbaccess/source/ui/querydesign/querydlg.hxx | 16
dbaccess/source/ui/querydesign/querydlg.src | 6
dbaccess/source/ui/querydesign/queryview.cxx | 8
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 13
dbaccess/source/ui/relationdesign/RTableConnection.hxx | 6
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 10
dbaccess/source/ui/relationdesign/RTableWindow.hxx | 4
dbaccess/source/ui/relationdesign/RelationController.cxx | 27
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 42 -
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 29
dbaccess/source/ui/relationdesign/makefile.mk | 58 -
dbaccess/source/ui/relationdesign/relation.src | 59 -
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 29
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 6
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 27
dbaccess/source/ui/tabledesign/TEditControl.cxx | 107 --
dbaccess/source/ui/tabledesign/TEditControl.hxx | 14
dbaccess/source/ui/tabledesign/TableController.cxx | 48 -
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 25
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 11
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 29
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 29
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 4
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 25
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 10
dbaccess/source/ui/tabledesign/TableRow.cxx | 12
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 17
dbaccess/source/ui/tabledesign/TableUndo.cxx | 23
dbaccess/source/ui/tabledesign/TableUndo.hxx | 10
dbaccess/source/ui/tabledesign/makefile.mk | 65 -
dbaccess/source/ui/tabledesign/table.src | 117 ++
dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 8
dbaccess/source/ui/uno/AdabasSettingsDlg.hxx | 2
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 3
dbaccess/source/ui/uno/ColumnControl.cxx | 15
dbaccess/source/ui/uno/ColumnControl.hxx | 7
dbaccess/source/ui/uno/ColumnModel.cxx | 24
dbaccess/source/ui/uno/ColumnModel.hxx | 25
dbaccess/source/ui/uno/ColumnPeer.cxx | 23
dbaccess/source/ui/uno/ColumnPeer.hxx | 10
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 8
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 18
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2
dbaccess/source/ui/uno/TableFilterDlg.cxx | 8
dbaccess/source/ui/uno/TableFilterDlg.hxx | 2
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 8
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2
dbaccess/source/ui/uno/admindlg.cxx | 8
dbaccess/source/ui/uno/admindlg.hxx | 2
dbaccess/source/ui/uno/composerdialogs.cxx | 26
dbaccess/source/ui/uno/composerdialogs.hxx | 18
dbaccess/source/ui/uno/copytablewizard.cxx | 19
dbaccess/source/ui/uno/copytablewizard.src | 5
dbaccess/source/ui/uno/dbinteraction.cxx | 76 -
dbaccess/source/ui/uno/dbinteraction.hxx | 6
dbaccess/source/ui/uno/dbinteraction.src | 2
dbaccess/source/ui/uno/makefile.mk | 76 -
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 2
dbaccess/source/ui/uno/unoDirectSql.cxx | 22
dbaccess/source/ui/uno/unoDirectSql.hxx | 16
dbaccess/source/ui/uno/unoadmin.cxx | 26
dbaccess/source/ui/uno/unosqlmessage.cxx | 20
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 4
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 4
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 4
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 4
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 4
dbaccess/util/hidother.src | 2
dbaccess/util/makefile.mk | 261 ------
dbaccess/win32/source/odbcconfig/makefile.mk | 54 -
dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 2
reportdesign/AllLangResTarget_rpt.mk | 95 +-
reportdesign/Library_rpt.mk | 220 ++---
reportdesign/Library_rptui.mk | 229 ++---
reportdesign/Library_rptxml.mk | 193 ++--
reportdesign/Makefile | 4
reportdesign/Module_reportdesign.mk | 92 +-
reportdesign/Package_uiconfig.mk | 92 +-
reportdesign/inc/ModuleHelper.hxx | 2
reportdesign/inc/PropertyForward.hxx | 2
reportdesign/inc/ReportDefinition.hxx | 4
reportdesign/inc/ReportHelperDefines.hxx | 2
reportdesign/inc/ReportVisitor.hxx | 2
reportdesign/inc/RptDef.hxx | 3
reportdesign/inc/RptModel.hxx | 4
reportdesign/inc/RptObject.hxx | 12
reportdesign/inc/RptPage.hxx | 6
reportdesign/inc/RptResId.hrc | 16
reportdesign/inc/UndoActions.hxx | 2
reportdesign/inc/UndoEnv.hxx | 2
reportdesign/inc/conditionalexpression.hxx | 3
reportdesign/inc/dllapi.h | 2
reportdesign/inc/pch/precompiled_reportdesign.cxx | 2
reportdesign/inc/pch/precompiled_reportdesign.hxx | 4
reportdesign/inc/reportformula.hxx | 5
reportdesign/prj/build.lst | 3
reportdesign/prj/makefile.mk | 40
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 68 -
reportdesign/source/core/api/FixedLine.cxx | 11
reportdesign/source/core/api/FixedText.cxx | 12
reportdesign/source/core/api/FormatCondition.cxx | 3
reportdesign/source/core/api/FormattedField.cxx | 10
reportdesign/source/core/api/Function.cxx | 5
reportdesign/source/core/api/Functions.cxx | 7
reportdesign/source/core/api/Group.cxx | 17
reportdesign/source/core/api/Groups.cxx | 9
reportdesign/source/core/api/ImageControl.cxx | 5
reportdesign/source/core/api/ReportComponent.cxx | 5
reportdesign/source/core/api/ReportControlModel.cxx | 3
reportdesign/source/core/api/ReportDefinition.cxx | 117 --
reportdesign/source/core/api/ReportEngineJFree.cxx | 7
reportdesign/source/core/api/ReportVisitor.cxx | 3
reportdesign/source/core/api/Section.cxx | 41 -
reportdesign/source/core/api/Shape.cxx | 14
reportdesign/source/core/api/Tools.cxx | 3
reportdesign/source/core/api/services.cxx | 3
reportdesign/source/core/inc/FixedLine.hxx | 2
reportdesign/source/core/inc/FixedText.hxx | 2
reportdesign/source/core/inc/FormatCondition.hxx | 2
reportdesign/source/core/inc/FormattedField.hxx | 2
reportdesign/source/core/inc/Function.hxx | 4
reportdesign/source/core/inc/Functions.hxx | 2
reportdesign/source/core/inc/Group.hxx | 3
reportdesign/source/core/inc/Groups.hxx | 2
reportdesign/source/core/inc/ImageControl.hxx | 2
reportdesign/source/core/inc/ReportComponent.hxx | 2
reportdesign/source/core/inc/ReportControlModel.hxx | 2
reportdesign/source/core/inc/ReportDrawPage.hxx | 2
reportdesign/source/core/inc/ReportEngineJFree.hxx | 3
reportdesign/source/core/inc/ReportHelperImpl.hxx | 2
reportdesign/source/core/inc/ReportUndoFactory.hxx | 2
reportdesign/source/core/inc/RptObjectListener.hxx | 3
reportdesign/source/core/inc/Section.hxx | 3
reportdesign/source/core/inc/Shape.hxx | 2
reportdesign/source/core/inc/Tools.hxx | 9
reportdesign/source/core/inc/conditionupdater.hxx | 3
reportdesign/source/core/inc/core_resource.hxx | 2
reportdesign/source/core/misc/conditionalexpression.cxx | 15
reportdesign/source/core/misc/conditionupdater.cxx | 5
reportdesign/source/core/misc/reportformula.cxx | 4
reportdesign/source/core/resource/core_resource.cxx | 7
reportdesign/source/core/resource/strings.src | 15
reportdesign/source/core/sdr/ModuleHelper.cxx | 8
reportdesign/source/core/sdr/PropertyForward.cxx | 11
reportdesign/source/core/sdr/ReportDrawPage.cxx | 4
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 3
reportdesign/source/core/sdr/RptModel.cxx | 18
reportdesign/source/core/sdr/RptObject.cxx | 54 -
reportdesign/source/core/sdr/RptObjectListener.cxx | 10
reportdesign/source/core/sdr/RptPage.cxx | 37
reportdesign/source/core/sdr/UndoActions.cxx | 14
reportdesign/source/core/sdr/UndoEnv.cxx | 21
reportdesign/source/core/sdr/formatnormalizer.cxx | 13
reportdesign/source/core/sdr/formatnormalizer.hxx | 3
reportdesign/source/filter/xml/dbloader2.cxx | 8
reportdesign/source/filter/xml/dbloader2.hxx | 5
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 3
reportdesign/source/filter/xml/xmlAutoStyle.hxx | 2
reportdesign/source/filter/xml/xmlCell.cxx | 8
reportdesign/source/filter/xml/xmlCell.hxx | 3
reportdesign/source/filter/xml/xmlColumn.cxx | 9
reportdesign/source/filter/xml/xmlColumn.hxx | 3
reportdesign/source/filter/xml/xmlComponent.cxx | 9
reportdesign/source/filter/xml/xmlComponent.hxx | 5
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 7
reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 3
reportdesign/source/filter/xml/xmlControlProperty.cxx | 15
reportdesign/source/filter/xml/xmlControlProperty.hxx | 3
reportdesign/source/filter/xml/xmlEnums.hxx | 3
reportdesign/source/filter/xml/xmlExport.cxx | 115 --
reportdesign/source/filter/xml/xmlExport.hxx | 3
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 44 -
reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx | 3
reportdesign/source/filter/xml/xmlFixedContent.cxx | 7
reportdesign/source/filter/xml/xmlFixedContent.hxx | 6
reportdesign/source/filter/xml/xmlFormatCondition.cxx | 9
reportdesign/source/filter/xml/xmlFormatCondition.hxx | 3
reportdesign/source/filter/xml/xmlFormattedField.cxx | 5
reportdesign/source/filter/xml/xmlFormattedField.hxx | 3
reportdesign/source/filter/xml/xmlFunction.cxx | 7
reportdesign/source/filter/xml/xmlFunction.hxx | 5
reportdesign/source/filter/xml/xmlGroup.cxx | 7
reportdesign/source/filter/xml/xmlGroup.hxx | 5
reportdesign/source/filter/xml/xmlHelper.cxx | 27
reportdesign/source/filter/xml/xmlHelper.hxx | 2
reportdesign/source/filter/xml/xmlImage.cxx | 5
reportdesign/source/filter/xml/xmlImage.hxx | 5
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 48 -
reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 3
reportdesign/source/filter/xml/xmlMasterFields.cxx | 3
reportdesign/source/filter/xml/xmlMasterFields.hxx | 3
reportdesign/source/filter/xml/xmlPropertyHandler.cxx | 2
reportdesign/source/filter/xml/xmlPropertyHandler.hxx | 2
reportdesign/source/filter/xml/xmlReport.cxx | 5
reportdesign/source/filter/xml/xmlReport.hxx | 3
reportdesign/source/filter/xml/xmlReportElement.cxx | 5
reportdesign/source/filter/xml/xmlReportElement.hxx | 3
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 5
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 3
reportdesign/source/filter/xml/xmlRow.cxx | 9
reportdesign/source/filter/xml/xmlRow.hxx | 3
reportdesign/source/filter/xml/xmlSection.cxx | 13
reportdesign/source/filter/xml/xmlSection.hxx | 3
reportdesign/source/filter/xml/xmlStyleImport.cxx | 16
reportdesign/source/filter/xml/xmlStyleImport.hxx | 7
reportdesign/source/filter/xml/xmlSubDocument.cxx | 10
reportdesign/source/filter/xml/xmlSubDocument.hxx | 3
reportdesign/source/filter/xml/xmlTable.cxx | 17
reportdesign/source/filter/xml/xmlTable.hxx | 3
reportdesign/source/filter/xml/xmlfilter.cxx | 99 --
reportdesign/source/filter/xml/xmlfilter.hxx | 3
reportdesign/source/filter/xml/xmlservices.cxx | 4
reportdesign/source/inc/GroupProperties.hxx | 3
reportdesign/source/inc/constasciistring.hxx | 3
reportdesign/source/shared/corestrings.cxx | 2
reportdesign/source/shared/stringconstants.cxx | 3
reportdesign/source/shared/uistrings.cxx | 3
reportdesign/source/shared/xmlstrings.cxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 18
reportdesign/source/ui/dlg/CondFormat.cxx | 7
reportdesign/source/ui/dlg/CondFormat.hrc | 4
reportdesign/source/ui/dlg/CondFormat.src | 100 --
reportdesign/source/ui/dlg/Condition.cxx | 25
reportdesign/source/ui/dlg/Condition.hxx | 6
reportdesign/source/ui/dlg/DateTime.cxx | 25
reportdesign/source/ui/dlg/DateTime.src | 14
reportdesign/source/ui/dlg/Formula.cxx | 7
reportdesign/source/ui/dlg/GroupExchange.cxx | 3
reportdesign/source/ui/dlg/GroupExchange.hxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 192 +---
reportdesign/source/ui/dlg/GroupsSorting.hrc | 10
reportdesign/source/ui/dlg/GroupsSorting.src | 182 ----
reportdesign/source/ui/dlg/Navigator.cxx | 69 -
reportdesign/source/ui/dlg/Navigator.src | 13
reportdesign/source/ui/dlg/PageNumber.cxx | 21
reportdesign/source/ui/dlg/PageNumber.src | 2
reportdesign/source/ui/dlg/dlgpage.cxx | 13
reportdesign/source/ui/dlg/dlgpage.src | 4
reportdesign/source/ui/inc/AddField.hxx | 6
reportdesign/source/ui/inc/ColorChanger.hxx | 2
reportdesign/source/ui/inc/ColorListener.hxx | 2
reportdesign/source/ui/inc/ColumnInfo.hxx | 6
reportdesign/source/ui/inc/CondFormat.hxx | 3
reportdesign/source/ui/inc/DataProviderHandler.hxx | 3
reportdesign/source/ui/inc/DateTime.hxx | 10
reportdesign/source/ui/inc/DefaultInspection.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 8
reportdesign/source/ui/inc/EndMarker.hxx | 2
reportdesign/source/ui/inc/FixedTextColor.hxx | 7
reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx | 4
reportdesign/source/ui/inc/Formula.hxx | 2
reportdesign/source/ui/inc/FunctionHelper.hxx | 3
reportdesign/source/ui/inc/GeometryHandler.hxx | 3
reportdesign/source/ui/inc/GroupsSorting.hxx | 33
reportdesign/source/ui/inc/IReportControllerObserver.hxx | 2
reportdesign/source/ui/inc/InsertFunctions.hxx | 4
reportdesign/source/ui/inc/MarkedSection.hxx | 3
reportdesign/source/ui/inc/Navigator.hxx | 3
reportdesign/source/ui/inc/PageNumber.hxx | 9
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 3
reportdesign/source/ui/inc/ReportController.hxx | 2
reportdesign/source/ui/inc/ReportControllerObserver.hxx | 11
reportdesign/source/ui/inc/ReportDefines.hxx | 3
reportdesign/source/ui/inc/ReportRuler.hxx | 3
reportdesign/source/ui/inc/ReportSection.hxx | 2
reportdesign/source/ui/inc/ReportWindow.hxx | 2
reportdesign/source/ui/inc/RptUndo.hxx | 3
reportdesign/source/ui/inc/ScrollHelper.hxx | 3
reportdesign/source/ui/inc/SectionView.hxx | 3
reportdesign/source/ui/inc/SectionWindow.hxx | 2
reportdesign/source/ui/inc/StartMarker.hxx | 4
reportdesign/source/ui/inc/UITools.hxx | 4
reportdesign/source/ui/inc/ViewsWindow.hxx | 4
reportdesign/source/ui/inc/dlgedclip.hxx | 3
reportdesign/source/ui/inc/dlgedfac.hxx | 2
reportdesign/source/ui/inc/dlgedfunc.hxx | 3
reportdesign/source/ui/inc/dlgpage.hxx | 3
reportdesign/source/ui/inc/metadata.hxx | 4
reportdesign/source/ui/inc/propbrw.hxx | 3
reportdesign/source/ui/inc/statusbarcontroller.hxx | 2
reportdesign/source/ui/inc/toolboxcontroller.hxx | 2
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 24
reportdesign/source/ui/inspection/DefaultInspection.cxx | 10
reportdesign/source/ui/inspection/GeometryHandler.cxx | 49 -
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 5
reportdesign/source/ui/inspection/metadata.cxx | 17
reportdesign/source/ui/misc/ColorListener.cxx | 9
reportdesign/source/ui/misc/FunctionHelper.cxx | 16
reportdesign/source/ui/misc/RptUndo.cxx | 18
reportdesign/source/ui/misc/UITools.cxx | 55 -
reportdesign/source/ui/misc/rptuiservices.cxx | 4
reportdesign/source/ui/misc/statusbarcontroller.cxx | 21
reportdesign/source/ui/misc/toolboxcontroller.cxx | 30
reportdesign/source/ui/report/DesignView.cxx | 32
reportdesign/source/ui/report/EndMarker.cxx | 3
reportdesign/source/ui/report/FixedTextColor.cxx | 73 -
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 6
reportdesign/source/ui/report/ReportController.cxx | 214 ++---
reportdesign/source/ui/report/ReportControllerObserver.cxx | 47 -
reportdesign/source/ui/report/ReportRuler.cxx | 3
reportdesign/source/ui/report/ReportSection.cxx | 95 +-
reportdesign/source/ui/report/ReportWindow.cxx | 9
reportdesign/source/ui/report/ScrollHelper.cxx | 5
reportdesign/source/ui/report/SectionView.cxx | 8
reportdesign/source/ui/report/SectionWindow.cxx | 22
reportdesign/source/ui/report/StartMarker.cxx | 36
reportdesign/source/ui/report/ViewsWindow.cxx | 197 ----
reportdesign/source/ui/report/dlgedclip.cxx | 3
reportdesign/source/ui/report/dlgedfac.cxx | 7
reportdesign/source/ui/report/dlgedfunc.cxx | 197 ----
reportdesign/source/ui/report/propbrw.cxx | 46 -
reportdesign/source/ui/report/report.src | 48 -
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 4
reportdesign/util/dll.pmk | 31
1012 files changed, 8617 insertions(+), 20130 deletions(-)
New commits:
commit c5a87fa8d45112b9e7c9df773104aeaa13392b14
Merge: a05678c... 10037f7...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:52:21 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
dbaccess/AllLangResTarget_adabasui.mk
dbaccess/AllLangResTarget_dba.mk
dbaccess/AllLangResTarget_dbmm.mk
dbaccess/AllLangResTarget_sdbt.mk
dbaccess/Executable_odbcconfig.mk
dbaccess/JunitTest_dbaccess_unoapi.mk
dbaccess/Library_adabasui.mk
dbaccess/Library_dba.mk
dbaccess/Library_dbaxml.mk
dbaccess/Library_dbmm.mk
dbaccess/Library_sdbt.mk
dbaccess/Makefile
dbaccess/Module_dbaccess.mk
dbaccess/Package_inc.mk
dbaccess/Package_uiconfig.mk
dbaccess/prj/build.lst
dbaccess/qa/unoapi/Test.java
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/filter/xml/xmlAutoStyle.cxx
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlComponent.cxx
dbaccess/source/filter/xml/xmlConnectionData.cxx
dbaccess/source/filter/xml/xmlConnectionResource.cxx
dbaccess/source/filter/xml/xmlDataSource.cxx
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
dbaccess/source/filter/xml/xmlDocuments.cxx
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
dbaccess/source/filter/xml/xmlHelper.cxx
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
dbaccess/source/filter/xml/xmlLogin.cxx
dbaccess/source/filter/xml/xmlQuery.cxx
dbaccess/source/filter/xml/xmlServerDatabase.cxx
dbaccess/source/filter/xml/xmlTable.cxx
dbaccess/source/filter/xml/xmlTableFilterList.cxx
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/AppSwapWindow.cxx
dbaccess/source/ui/app/AppTitleWindow.cxx
dbaccess/source/ui/app/AppView.cxx
dbaccess/source/ui/browser/AsyncronousLink.cxx
dbaccess/source/ui/browser/genericcontroller.cxx
dbaccess/source/ui/control/ColumnControlWindow.cxx
dbaccess/source/ui/control/RelationControl.cxx
dbaccess/source/ui/control/SqlNameEdit.cxx
dbaccess/source/ui/control/TableGrantCtrl.cxx
dbaccess/source/ui/control/VertSplitView.cxx
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
dbaccess/source/ui/dlg/RelationDlg.cxx
dbaccess/source/ui/dlg/TextConnectionHelper.cxx
dbaccess/source/ui/dlg/detailpages.cxx
dbaccess/source/ui/dlg/dlgsize.cxx
dbaccess/source/ui/dlg/queryorder.cxx
dbaccess/source/ui/dlg/tablespage.cxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WExtendPages.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WTypeSelect.cxx
dbaccess/source/ui/querydesign/ConnectionLine.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
dbaccess/source/ui/querydesign/JAccess.cxx
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/JoinDesignView.cxx
dbaccess/source/ui/querydesign/JoinExchange.cxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/QTableConnection.cxx
dbaccess/source/ui/querydesign/QTableConnectionData.cxx
dbaccess/source/ui/querydesign/QTableWindow.cxx
dbaccess/source/ui/querydesign/QTableWindowData.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
dbaccess/source/ui/querydesign/QueryTextView.cxx
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnection.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
dbaccess/source/ui/querydesign/TableWindowData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/querydesign/TableWindowTitle.cxx
dbaccess/source/ui/querydesign/querydlg.cxx
dbaccess/source/ui/querydesign/queryview.cxx
dbaccess/source/ui/relationdesign/RTableConnection.cxx
dbaccess/source/ui/relationdesign/RelationDesignView.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
dbaccess/source/ui/tabledesign/TableDesignView.cxx
dbaccess/source/ui/tabledesign/TableFieldControl.cxx
dbaccess/source/ui/tabledesign/TableRow.cxx
dbaccess/source/ui/tabledesign/TableRowExchange.cxx
dbaccess/source/ui/tabledesign/TableUndo.cxx
dbaccess/source/ui/uno/ColumnControl.cxx
dbaccess/source/ui/uno/ColumnPeer.cxx
reportdesign/AllLangResTarget_rpt.mk
reportdesign/AllLangResTarget_rptui.mk
reportdesign/Library_rpt.mk
reportdesign/Library_rptui.mk
reportdesign/Library_rptxml.mk
reportdesign/Module_reportdesign.mk
reportdesign/Package_uiconfig.mk
reportdesign/Package_xml.mk
reportdesign/prj/build.lst
reportdesign/prj/makefile.mk
diff --cc dbaccess/JunitTest_dbaccess_unoapi.mk
index 24bbc88,1492977..f51d382
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@@ -36,19 -35,15 +35,19 @@@ $(eval $(call gb_JunitTest_set_defs,dba
))
$(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
+ $(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_sourcefiles,dbaccess_unoapi,\
+ dbaccess/qa/unoapi/Test \
+))
+
$(eval $(call gb_JunitTest_add_classes,dbaccess_unoapi,\
- org.openoffice.dbaccess.qa.unoapi.Test \
+ org.openoffice.test.UnoApiTest \
))
# vim: set noet sw=4 ts=4:
diff --cc dbaccess/Library_adabasui.mk
index 16cefaa,ee5ae6a..0000000
deleted file mode 100644,100644
--- a/dbaccess/Library_adabasui.mk
+++ /dev/null
diff --cc dbaccess/Library_dba.mk
index dd6d101,fdd5754..368eaa1
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@@ -1,47 -1,51 +1,50 @@@
- #*************************************************************************
+ # Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ # 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/
#
- # 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 at 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).
- #
- # You should have received a copy of the GNU Lesser General Public License
- # version 3 along with OpenOffice.org. If not, see
- # <http://www.openoffice.org/license.html>
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
+ # Alternatively, the contents of this file may be used under the terms of
+ # either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ # the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ # instead of those above.
$(eval $(call gb_Library_Library,dba))
- $(eval $(call gb_Library_add_package_headers,dba,dbaccess_inc))
- $(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
- $(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
+ $(eval $(call gb_Library_add_package_headers,dba,\
+ dbaccess_inc \
+ ))
+
+ $(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess))
$(eval $(call gb_Library_set_include,dba,\
- -I$(SRCDIR)/dbaccess/inc \
- -I$(SRCDIR)/dbaccess/source/core/inc \
- -I$(SRCDIR)/dbaccess/source/inc \
- -I$(SRCDIR)/dbaccess/inc/pch \
- $$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
+ -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,dba,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,dba,\
- -DOOO_DLLIMPLEMENTATION_DBA \
+ -DOOO_DLLIMPLEMENTATION_DBA \
))
$(eval $(call gb_Library_add_linked_libs,dba,\
diff --cc dbaccess/Module_dbaccess.mk
index 2f41e13,7042c49..51fe77b
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@@ -28,31 -28,24 +28,25 @@@
$(eval $(call gb_Module_Module,dbaccess))
$(eval $(call gb_Module_add_targets,dbaccess,\
- AllLangResTarget_adabasui \
- AllLangResTarget_dba \
- AllLangResTarget_dbmm \
- AllLangResTarget_dbui \
- AllLangResTarget_sdbt \
- Library_adabasui \
- Library_dba \
- Library_dbaxml \
- Library_dbmm \
- Library_dbui \
- Library_sdbt \
- Package_inc \
- Package_uiconfig \
- Package_xml \
- ))
-
- ifeq ($(GUI),WNT)
- $(eval $(call gb_Module_add_targets,dbaccess,\
- Executable_odbcconfig \
++ $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
+ AllLangResTarget_adabasui \
+ AllLangResTarget_dba \
+ AllLangResTarget_dbmm \
+ AllLangResTarget_dbu \
+ AllLangResTarget_sdbt \
- $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
+ Library_adabasui \
+ Library_dba \
+ Library_dbaxml \
+ Library_dbmm \
+ Library_dbu \
+ Library_sdbt \
+ Package_inc \
+ Package_uiconfig \
))
- endif
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
+ JunitTest_dbaccess_complex \
- JunitTest_dbaccess_unoapi \
+ JunitTest_dbaccess_unoapi \
))
# vim: set noet ts=4 sw=4:
diff --cc dbaccess/Package_inc.mk
index 753fd9c,659e954..7ea77cd
--- a/dbaccess/Package_inc.mk
+++ b/dbaccess/Package_inc.mk
@@@ -27,13 -27,15 +27,15 @@@
$(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/dbaundomanager.hxx ,dbaundomanager.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/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/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 --cc dbaccess/source/core/dataaccess/databasecontext.cxx
index e584553,1461525..87a2b44
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@@ -182,8 -173,7 +173,7 @@@ namespace dbacces
void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException)
{
}
- // .............................................................................
-
++
void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException)
{
}
diff --cc dbaccess/source/filter/xml/xmlAutoStyle.cxx
index bf22883,50c72a1..8685f68
--- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
@@@ -26,22 -27,12 +27,12 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLAUTOSTYLE_HXX
#include "xmlAutoStyle.hxx"
- #endif
- #ifndef DBA_XMLHELPER_HXX
#include "xmlHelper.hxx"
- #endif
- #ifndef DBA_XMLEXPORT_HXX
#include "xmlExport.hxx"
- #endif
- #ifndef _XMLOFF_FAMILIES_HXX_
#include <xmloff/families.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
using namespace ::com::sun::star::uno;
diff --cc dbaccess/source/filter/xml/xmlColumn.cxx
index bca24ac,e2beb26..4a09216
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@@ -26,50 -27,22 +27,22 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLCOLUMN_HXX
#include "xmlColumn.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLUCONV_HXX
#include <xmloff/xmluconv.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_
#include <com/sun/star/sdbcx/XAppend.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
#include <com/sun/star/container/XChild.hpp>
- #ifndef DBA_XMLSTYLEIMPORT_HXX
#include "xmlStyleImport.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlComponent.cxx
index 0828989,f2cbf64..59a9a15
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@@ -26,40 -27,18 +27,18 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLCOMPONENT_HXX
#include "xmlComponent.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlConnectionData.cxx
index 0252a05,1da225c..0edb8a9
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@@ -26,28 -27,14 +27,14 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED
#include "xmlConnectionData.hxx"
- #endif
- #ifndef DBA_XMLLOGIN_HXX
#include "xmlLogin.hxx"
- #endif
- #ifndef DBA_XMLTABLEFILTERLIST_HXX
#include "xmlTableFilterList.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
#include "xmlEnums.hxx"
#include "xmlDatabaseDescription.hxx"
#include "xmlConnectionResource.hxx"
diff --cc dbaccess/source/filter/xml/xmlConnectionResource.cxx
index db3ddd1,005455d..53c40ee
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
#include "xmlConnectionResource.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlDataSource.cxx
index 93134c4,8344fa8..13018ed
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@@ -26,49 -27,21 +27,21 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDATASOURCE_HXX
#include "xmlDataSource.hxx"
- #endif
- #ifndef DBA_XMLLOGIN_HXX
#include "xmlLogin.hxx"
- #endif
- #ifndef DBA_XMLTABLEFILTERLIST_HXX
#include "xmlTableFilterList.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCEINFO_HXX
#include "xmlDataSourceInfo.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCESETTINGS_HXX
#include "xmlDataSourceSettings.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCESETTING_HXX
#include "xmlDataSourceSetting.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
#include "xmlConnectionData.hxx"
namespace dbaxml
diff --cc dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index 6e978e8,5c0b4c9..bfd5f54
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@@ -26,37 -27,17 +27,17 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDATASOURCEINFO_HXX
#include "xmlDataSourceInfo.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCE_HXX
#include "xmlDataSource.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
#include <vector>
namespace dbaxml
diff --cc dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 336c332,37e07bd..c460aca
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@@ -26,37 -27,17 +27,17 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDATASOURCESETTING_HXX
#include "xmlDataSourceSetting.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCE_HXX
#include "xmlDataSource.hxx"
- #endif
- #ifndef _XMLOFF_XMLUCONV_HXX
#include <xmloff/xmluconv.hxx>
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index 99c0db9,93547a4..d14425f
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@@ -26,37 -27,17 +27,17 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDATASOURCESETTINGS_HXX
#include "xmlDataSourceSettings.hxx"
- #endif
- #ifndef DBA_XMLDATASOURCESETTING_HXX
#include "xmlDataSourceSetting.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
#include <vector>
diff --cc dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index 42cdc5a,b01f7b4..7ef8256
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@@ -26,25 -27,13 +27,13 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
#include "xmlDatabaseDescription.hxx"
- #endif
- #ifndef DBA_XMLLOGIN_HXX
#include "xmlLogin.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
#include "xmlEnums.hxx"
#include "xmlFileBasedDatabase.hxx"
#include "xmlServerDatabase.hxx"
diff --cc dbaccess/source/filter/xml/xmlDocuments.cxx
index 74715f9,3e65218..32ddca6
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@@ -26,40 -27,18 +27,18 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLDOCUMENTS_HXX
#include "xmlDocuments.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef DBA_XMLQUERY_HXX
#include "xmlQuery.hxx"
- #endif
- #ifndef DBA_XMLTABLE_HXX
#include "xmlTable.hxx"
- #endif
- #ifndef DBA_XMLCOMPONENT_HXX
#include "xmlComponent.hxx"
- #endif
- #ifndef DBA_XMLHIERARCHYCOLLECTION_HXX
#include "xmlHierarchyCollection.hxx"
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 2f6e150,4958633..53b6cca
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
#include "xmlFileBasedDatabase.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
#include <comphelper/sequence.hxx>
#include <svl/filenotation.hxx>
#include <unotools/pathoptions.hxx>
diff --cc dbaccess/source/filter/xml/xmlHelper.cxx
index 7688a92,bc11046..5f6a5b5
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@@ -26,40 -27,18 +27,18 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLHELPER_HXX
#include "xmlHelper.hxx"
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_
#include <com/sun/star/awt/TextAlign.hpp>
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef _XMLOFF_CONTEXTID_HXX_
#include <xmloff/contextid.hxx>
- #endif
- #ifndef _XMLOFF_XMLCONSTANTSPROPERTYHANDLER_HXX
#include <xmloff/XMLConstantsPropertyHandler.hxx>
- #endif
- #ifndef _XMLOFF_XMLEMENT_HXX
#include <xmloff/xmlement.hxx>
- #endif
- #ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_
#include <com/sun/star/awt/TextAlign.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 7e4b8c6,974e06f..69b012c
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@@ -26,46 -27,20 +27,20 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLHIERARCHYCOLLECTION_HXX
#include "xmlHierarchyCollection.hxx"
- #endif
- #ifndef DBA_XMLCOMPONENT_HXX
#include "xmlComponent.hxx"
- #endif
- #ifndef DBA_XMLQUERY_HXX
#include "xmlQuery.hxx"
- #endif
- #ifndef DBA_XMLCOLUMN_HXX
#include "xmlColumn.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
diff --cc dbaccess/source/filter/xml/xmlLogin.cxx
index 17d7a42,6925878..a61d65e
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLLOGIN_HXX
#include "xmlLogin.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <vector>
diff --cc dbaccess/source/filter/xml/xmlQuery.cxx
index b9b23d2,5ad5894..12a5e2a
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@@ -26,40 -27,18 +27,18 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLQUERY_HXX
#include "xmlQuery.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlServerDatabase.cxx
index c699977,77e786f..8cafb35
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED
#include "xmlServerDatabase.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlStyleImport.cxx
index f7d7f4c,feeb8f5..47b279b
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@@ -26,60 -27,25 +27,25 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLSTYLEIMPORT_HXX
#include "xmlStyleImport.hxx"
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_XMLIMPPR_HXX
#include <xmloff/xmlimppr.hxx>
- #endif
- #ifndef _XMLOFF_FAMILIES_HXX_
#include <xmloff/families.hxx>
- #endif
- #ifndef _XMLOFF_XMLNUMFI_HXX
#include <xmloff/xmlnumfi.hxx>
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_HPP_
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_
#include <com/sun/star/table/BorderLine.hpp>
- #endif
- #ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
- #endif
- #ifndef _XMLOFF_XMLPROPERTYSETCONTEXT_HXX
#include <xmloff/xmlprcon.hxx>
- #endif
- #ifndef _XMLOFF_XMLUCONV_HXX
#include <xmloff/xmluconv.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef DBA_XMLFILTER_HXX
+ #include <osl/diagnose.h>
#include "xmlfilter.hxx"
- #endif
- #ifndef DBA_XMLHELPER_HXX
#include "xmlHelper.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
#define XML_LINE_LEFT 0
diff --cc dbaccess/source/filter/xml/xmlTable.cxx
index d9088e3,2ed0a35..dc5cc36
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@@ -26,49 -27,21 +27,21 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLTABLE_HXX
#include "xmlTable.hxx"
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef DBA_XMLSTYLEIMPORT_HXX
#include "xmlStyleImport.hxx"
- #endif
- #ifndef DBA_XMLHIERARCHYCOLLECTION_HXX
#include "xmlHierarchyCollection.hxx"
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _UCBHELPER_CONTENT_HXX
#include <ucbhelper/content.hxx>
- #endif
- #ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
- #endif
- #ifndef _COMPHELPER_NAMECONTAINER_HXX_
#include <comphelper/namecontainer.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlTableFilterList.cxx
index d5943dd,94915d0..15eecb5
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@@ -26,43 -27,19 +27,19 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLTABLEFILTERLIST_HXX
#include "xmlTableFilterList.hxx"
- #endif
- #ifndef DBA_XMLTABLEFILTERPATTERN_HXX
#include "xmlTableFilterPattern.hxx"
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _XMLOFF_XMLIMP_HXX
#include <xmloff/xmlimp.hxx>
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
index 3e3f860,b4c62f3..fabbeed
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
@@@ -26,16 -27,10 +27,10 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef DBA_XMLTABLEFILTERPATTERN_HXX
#include "xmlTableFilterPattern.hxx"
- #endif
- #ifndef DBA_XMLTABLEFILTERLIST_HXX
#include "xmlTableFilterList.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/filter/xml/xmlfilter.cxx
index cf9e0ca,8857c55..83f704d
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@@ -26,92 -27,36 +27,36 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_
#include <com/sun/star/packages/zip/ZipIOException.hpp>
- #endif
- #ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_
#include <com/sun/star/embed/ElementModes.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
- #endif
- #ifndef DBA_XMLFILTER_HXX
#include "xmlfilter.hxx"
- #endif
- #ifndef _FLT_REGHELPER_HXX_
#include "flt_reghelper.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
- #endif
- #ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
- #endif
- #ifndef _XMLOFF_XMLNMSPE_HXX
#include <xmloff/xmlnmspe.hxx>
- #endif
- #ifndef _XMLOFF_XMLSCRIPTI_HXX
#include <xmloff/xmlscripti.hxx>
- #endif
- #ifndef _XMLOFF_XMLTOKEN_HXX
#include <xmloff/xmltoken.hxx>
- #endif
- #ifndef _XMLOFF_TEXTIMP_HXX_
#include <xmloff/txtimp.hxx>
- #endif
- #ifndef _XMLOFF_NMSPMAP_HXX
#include <xmloff/nmspmap.hxx>
- #endif
- #ifndef _RTL_LOGFILE_HXX_
#include <rtl/logfile.hxx>
- #endif
- #ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_
#include <com/sun/star/xml/sax/InputSource.hpp>
- #endif
- #ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_
#include <com/sun/star/xml/sax/XParser.hpp>
- #endif
- #ifndef _XMLOFF_PROGRESSBARHELPER_HXX
#include <xmloff/ProgressBarHelper.hxx>
- #endif
- #ifndef _SFXDOCFILE_HXX //autogen wg. SfxMedium
#include <sfx2/docfile.hxx>
- #endif
- #ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_
#include <com/sun/star/io/XInputStream.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_
#include <com/sun/star/uno/XNamingService.hpp>
- #endif
- #ifndef DBA_XMLDATABASE_HXX
#include "xmlDatabase.hxx"
- #endif
- #ifndef DBA_XMLENUMS_HXX
#include "xmlEnums.hxx"
- #endif
- #ifndef _URLOBJ_HXX //autogen wg. INetURLObject
#include <tools/urlobj.hxx>
- #endif
- #ifndef DBACCESS_SHARED_XMLSTRINGS_HRC
#include "xmlstrings.hrc"
- #endif
- #ifndef _XMLOFF_DOCUMENTSETTINGSCONTEXT_HXX
#include <xmloff/DocumentSettingsContext.hxx>
- #endif
- #ifndef DBA_XMLSTYLEIMPORT_HXX
#include "xmlStyleImport.hxx"
- #endif
- #ifndef _XMLOFF_XMLUCONV_HXX
#include <xmloff/xmluconv.hxx>
- #endif
- #ifndef DBA_XMLHELPER_HXX
#include "xmlHelper.hxx"
- #endif
- #ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_
#include <com/sun/star/util/XModifiable.hpp>
- #endif
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
diff --cc dbaccess/source/filter/xml/xmlservices.cxx
index f40717a,a3410c4..3330201
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@@ -26,17 -27,11 +27,11 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef _CPPUHELPER_FACTORY_HXX_
#include <cppuhelper/factory.hxx>
- #endif
- #ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
- #endif
- #ifndef _FLT_REGHELPER_HXX_
#include "flt_reghelper.hxx"
- #endif
/********************************************************************************************/
diff --cc dbaccess/source/shared/flt_reghelper.cxx
index 261052c,bbe5063..55c5e3d
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ b/dbaccess/source/shared/flt_reghelper.cxx
@@@ -26,18 -27,12 +27,12 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbaxml.hxx"
- #ifndef _FLT_REGHELPER_HXX_
#include "flt_reghelper.hxx"
- #endif
- #ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
- #endif
- #ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
- #endif
namespace dbaxml
{
diff --cc dbaccess/source/ui/app/AppControllerDnD.cxx
index e656449,854e2b6..3359261
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@@ -26,198 -27,72 +27,72 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPCONTROLLER_HXX
#include "AppController.hxx"
- #endif
- #ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
- #endif
- #ifndef _COMPHELPER_PROPERTY_HXX_
#include <comphelper/property.hxx>
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_
#include <com/sun/star/sdbcx/XAppend.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_
#include <com/sun/star/uno/XNamingService.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_
#include <com/sun/star/sdbc/XDataSource.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
#include <com/sun/star/frame/XStorable.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
#include <com/sun/star/container/XChild.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_
#include <com/sun/star/container/XHierarchicalNameContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
#include <com/sun/star/sdbc/DataType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_
#include <com/sun/star/sdb/CommandType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XBOOKMARKSSUPPLIER_HPP_
#include <com/sun/star/sdb/XBookmarksSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
#include <com/sun/star/sdb/SQLContext.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_
#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_
#include <com/sun/star/sdbcx/XDrop.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
- #endif
- #ifndef _UNOTOOLS_UCBHELPER_HXX
#include <unotools/ucbhelper.hxx>
- #endif
- #ifndef DBAUI_DLGSAVE_HXX
#include "dlgsave.hxx"
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
- #ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
- #endif
- #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
- #endif
- #ifndef _CPPUHELPER_EXC_HLP_HXX_
#include <cppuhelper/exc_hlp.hxx>
- #endif
- #ifndef _DBHELPER_DBEXCEPTION_HXX_
#include <connectivity/dbexception.hxx>
- #endif
- #ifndef _SV_WAITOBJ_HXX
#include <vcl/waitobj.hxx>
- #endif
- #ifndef _RTL_USTRBUF_HXX_
#include <rtl/ustrbuf.hxx>
- #endif
- #ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
- #endif
- #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
#include <svx/dataaccessdescriptor.hxx>
- #endif
- #ifndef SVX_DBAOBJECTEX_HXX
#include <svx/dbaobjectex.hxx>
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef _DBAU_REGHELPER_HXX_
#include "dbu_reghelper.hxx"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef _SV_MENU_HXX
#include <vcl/menu.hxx>
- #endif
- #ifndef _COMPHELPER_UNO3_HXX_
#include <comphelper/uno3.hxx>
- #endif
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef _SVLBOXITM_HXX
#include <svtools/svlbitm.hxx>
- #endif
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
- #ifndef DBAUI_APPDETAILVIEW_HXX
#include "AppDetailView.hxx"
- #endif
- #ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
#include "linkeddocuments.hxx"
- #endif
- #ifndef _SV_LSTBOX_HXX
#include <vcl/lstbox.hxx>
- #endif
- #ifndef _DBHELPER_DBEXCEPTION_HXX_
#include <connectivity/dbexception.hxx>
- #endif
- #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
- #endif
- #ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
- #endif
- #ifndef _STRING_HXX
#include <tools/string.hxx>
- #endif
- #ifndef DBAUI_DBEXCHANGE_HXX
#include "dbexchange.hxx"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
#include <algorithm>
- #ifndef _SVTREEBOX_HXX
#include <svtools/svtreebx.hxx>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XREPORTDOCUMENTSSUPPLIER_HPP_
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XFORMDOCUMENTSSUPPLIER_HPP_
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
- #endif
- #ifndef _FILEDLGHELPER_HXX
#include <sfx2/filedlghelper.hxx>
- #endif
- #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
#include <unotools/pathoptions.hxx>
- #endif
- #ifndef _SFX_DOCFILT_HACK_HXX
#include <sfx2/docfilt.hxx>
- #endif
- #ifndef _SVT_FILEVIEW_HXX
#include <svtools/fileview.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef DBACCESS_SOURCE_UI_MISC_DEFAULTOBJECTNAMECHECK_HXX
+ #include <osl/diagnose.h>
#include "defaultobjectnamecheck.hxx"
- #endif
- #ifndef _VOS_MUTEX_HXX_
- #include <vos/mutex.hxx>
- #endif
+ #include <osl/mutex.hxx>
#include "subcomponentmanager.hxx"
//........................................................................
diff --cc dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 24f443d,c488a0c..a71ae69
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@@ -26,138 -27,52 +27,52 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPDETAILPAGEHELPER_HXX
#include "AppDetailPageHelper.hxx"
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
- #endif
- #ifndef _DBAUI_TABLETREE_HXX_
#include "tabletree.hxx"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef DBAUI_DBTREELISTBOX_HXX
#include "dbtreelistbox.hxx"
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_
#include <com/sun/star/frame/XLayoutManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _COM_SUN_STAR_AWT_XTABCONTROLLER_HPP_
#include <com/sun/star/awt/XTabController.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
#include <com/sun/star/sdbc/XConnection.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
#include <com/sun/star/frame/XComponentLoader.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XFRAMES_HPP_
#include <com/sun/star/frame/XFrames.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XFRAMESSUPPLIER_HPP_
#include <com/sun/star/frame/XFramesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
#include <com/sun/star/awt/XWindow.hpp>
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
- #ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UCB_XCOMMANDPROCESSOR_HPP_
#include <com/sun/star/ucb/XCommandProcessor.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UCB_COMMAND_HPP_
#include <com/sun/star/ucb/Command.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_
#include <com/sun/star/form/XLoadable.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
#include <com/sun/star/container/XChild.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_
#include <com/sun/star/container/XContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_
#include <com/sun/star/sdb/CommandType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_
#include <com/sun/star/util/XCloseable.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_APPLICATION_XDATABASEDOCUMENTUI_HPP_
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
- #endif
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
- #ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef _DBACCESS_UI_CALLBACKS_HXX_
#include "callbacks.hxx"
- #endif
- #ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _DBACCESS_SLOTID_HRC_
#include "dbaccess_slotid.hrc"
- #endif
- #ifndef DBACCESS_DATABASE_OBJECT_VIEW_HXX
#include "databaseobjectview.hxx"
- #endif
- #ifndef DBACCESS_IMAGEPROVIDER_HXX
#include "imageprovider.hxx"
- #endif
- #ifndef _SV_WAITOBJ_HXX
#include <vcl/waitobj.hxx>
- #endif
- #ifndef _STREAM_HXX
#include <tools/stream.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef _RTL_USTRBUF_HXX_
#include <rtl/ustrbuf.hxx>
- #endif
#include "IApplicationController.hxx"
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --cc dbaccess/source/ui/app/AppDetailView.cxx
index 29f0b8b,21fe3ca..ce41d98
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@@ -26,76 -27,30 +27,30 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPDETAILVIEW_HXX
#include "AppDetailView.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
+ #include <osl/diagnose.h>
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
- #endif
- #ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_
#include <com/sun/star/ui/XImageManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_
#include <com/sun/star/ui/ImageType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HPP_
#include <com/sun/star/graphic/XGraphic.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UTIL_URL_HPP_
#include <com/sun/star/util/URL.hpp>
- #endif
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
- #ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
- #endif
- #ifndef _SV_MNEMONIC_HXX
#include <vcl/mnemonic.hxx>
- #endif
- #ifndef _SV_MNEMONIC_HXX
#include <vcl/mnemonic.hxx>
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef DBAUI_APPDETAILPAGEHELPER_HXX
#include "AppDetailPageHelper.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef _DBACCESS_UI_CALLBACKS_HXX_
#include "callbacks.hxx"
- #endif
- #ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
- #ifndef _SVTOOLS_LOCALRESACCESS_HXX_
#include <svtools/localresaccess.hxx>
- #endif
#include <algorithm>
#include "dbtreelistbox.hxx"
#include "IApplicationController.hxx"
diff --cc dbaccess/source/ui/app/AppIconControl.cxx
index ce99efe,3c3689f..3d0ba60
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@@ -26,31 -27,15 +27,15 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPICONCONTROL_HXX
#include "AppIconControl.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef _IMAGE_HXX //autogen
#include <vcl/image.hxx>
- #endif
- #ifndef _DBACCESS_UI_CALLBACKS_HXX_
#include "callbacks.hxx"
- #endif
- #ifndef DBAUI_APPELEMENTTYPE_HXX
#include "AppElementType.hxx"
- #endif
#include <memory>
using namespace ::dbaui;
diff --cc dbaccess/source/ui/app/AppSwapWindow.cxx
index 0a6fe8e,164fa5f..ca30021
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPSWAPWINDOW_HXX
#include "AppSwapWindow.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
- #endif
- #ifndef _SV_SYSWIN_HXX
#include <vcl/syswin.hxx>
- #endif
- #ifndef _SV_MENU_HXX
#include <vcl/menu.hxx>
- #endif
- #ifndef _SV_MNEMONIC_HXX
#include <vcl/mnemonic.hxx>
- #endif
#include "IApplicationController.hxx"
#include <memory>
diff --cc dbaccess/source/ui/app/AppTitleWindow.cxx
index 4a39029,8109927..e8ec8b3
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@@ -26,20 -27,12 +27,12 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_TITLE_WINDOW_HXX
#include "AppTitleWindow.hxx"
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
#include "memory"
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
namespace dbaui
{
diff --cc dbaccess/source/ui/app/AppView.cxx
index 34f8e71,50001c2..fd488c6
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@@ -26,85 -27,33 +27,33 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_APPVIEW_HXX
#include "AppView.hxx"
- #endif
- #ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _SV_TOOLBOX_HXX
#include <vcl/toolbox.hxx>
- #endif
- #ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
- #endif
- #ifndef _SV_WAITOBJ_HXX
#include <vcl/waitobj.hxx>
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
- #ifndef _COM_SUN_STAR_DATATRANSFER_CLIPBOARD_XCLIPBOARD_HPP_
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
- #endif
- #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
#include <unotools/syslocale.hxx>
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef DBAUI_APPDETAILVIEW_HXX
#include "AppDetailView.hxx"
- #endif
- #ifndef _DBAUI_TABLETREE_HXX_
#include "tabletree.hxx"
- #endif
- #ifndef DBAUI_APPSWAPWINDOW_HXX
#include "AppSwapWindow.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef DBAUI_APPSWAPWINDOW_HXX
#include "AppSwapWindow.hxx"
- #endif
- #ifndef DBAUI_TITLE_WINDOW_HXX
#include "AppTitleWindow.hxx"
- #endif
- #ifndef _DBAUI_DSNTYPES_HXX_
#include "dsntypes.hxx"
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
#include <unotools/pathoptions.hxx>
- #endif
#include "IApplicationController.hxx"
using namespace ::dbaui;
diff --cc dbaccess/source/ui/browser/AsyncronousLink.cxx
index 02ffb72,9e61509..7bb147e
--- a/dbaccess/source/ui/browser/AsyncronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx
@@@ -26,16 -27,10 +27,10 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_ASYNCRONOUSLINK_HXX
#include "AsyncronousLink.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
//==================================================================
//= OAsyncronousLink
diff --cc dbaccess/source/ui/browser/brwview.cxx
index c437a43,e237036..6d18c80
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@@ -26,44 -27,21 +27,21 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _SBA_BWRCTRLR_HXX
#include "brwctrlr.hxx"
- #endif
- #ifndef _SBX_BRWVIEW_HXX
#include "brwview.hxx"
- #endif
- #ifndef _SBA_GRID_HXX
#include "sbagrid.hxx"
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
- #ifndef _SV_SPLIT_HXX
#include <vcl/split.hxx>
- #endif
- #ifndef DBACCESS_UI_DBTREEVIEW_HXX
#include "dbtreeview.hxx"
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _DBU_BRW_HRC_
#include "dbu_brw.hrc"
- #endif
- #ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_
#include <com/sun/star/form/XLoadable.hpp>
- #endif
- #ifndef _COM_SUN_STAR_AWT_XCONTROLCONTAINER_HPP_
#include <com/sun/star/awt/XControlContainer.hpp>
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
+ #include <osl/diagnose.h>
using namespace dbaui;
diff --cc dbaccess/source/ui/browser/dataview.cxx
index 7468f8e,7be5d58..ce408d2
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@@ -26,36 -27,18 +27,18 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_DATAVIEW_HXX
#include "dataview.hxx"
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
#include <comphelper/namedvaluecollection.hxx>
- #ifndef _SFXAPP_HXX //autogen wg. SFX_APP
#include <sfx2/app.hxx>
- #endif
- #ifndef _SFXIMGMGR_HXX
#include <sfx2/imgmgr.hxx>
- #endif
- #ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
- #endif
- #ifndef _SVTOOLS_IMGDEF_HXX
#include <svtools/imgdef.hxx>
- #endif
#include <tools/diagnose_ex.h>
//.........................................................................
diff --cc dbaccess/source/ui/browser/dbtreemodel.cxx
index 83adfff,e2a94aa..669e537
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@@ -26,17 -27,11 +27,11 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_DBTREEMODEL_HXX
#include "dbtreemodel.hxx"
- #endif
- #ifndef _DBU_RESOURCE_HRC_
#include "dbu_resource.hrc"
- #endif
- #ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
- #endif
namespace dbaui
{
diff --cc dbaccess/source/ui/browser/dbtreeview.cxx
index f83fe40,967df21..a910eeb
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@@ -26,20 -27,12 +27,12 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBACCESS_UI_DBTREEVIEW_HXX
#include "dbtreeview.hxx"
- #endif
- #ifndef _SVTREEBOX_HXX
#include <svtools/svtreebx.hxx>
- #endif
- #ifndef DBAUI_DBTREELISTBOX_HXX
#include "dbtreelistbox.hxx"
- #endif
- #ifndef DBAUI_DBTREEMODEL_HXX
#include "dbtreemodel.hxx"
- #endif
#include "dbaccess_helpid.hrc"
// .........................................................................
diff --cc dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 3314a4a,605c26e..d44e21c
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@@ -26,35 -27,17 +27,17 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _SBA_UNODATBR_HXX_
#include "unodatbr.hxx"
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
- #ifndef DBACCESS_IMAGEPROVIDER_HXX
#include "imageprovider.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef DBACCESS_UI_DBTREEVIEW_HXX
+ #include <osl/diagnose.h>
#include "dbtreeview.hxx"
- #endif
- #ifndef DBAUI_DBTREELISTBOX_HXX
#include "dbtreelistbox.hxx"
- #endif
- #ifndef _DBU_BRW_HRC_
#include "dbu_brw.hrc"
- #endif
- #ifndef DBAUI_DBTREEMODEL_HXX
#include "dbtreemodel.hxx"
- #endif
using namespace ::com::sun::star::frame;
using namespace ::dbtools;
diff --cc dbaccess/source/ui/browser/exsrcbrw.cxx
index f79662d,4738545..8fcd726
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@@ -26,41 -27,19 +27,19 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _SBA_EXTCTRLR_HXX
#include "exsrcbrw.hxx"
- #endif
- #ifndef _COM_SUN_STAR_FORM_FORMCOMPONENTTYPE_HPP_
#include <com/sun/star/form/FormComponentType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
#include <com/sun/star/util/XURLTransformer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FORM_XGRIDCOLUMNFACTORY_HPP_
#include <com/sun/star/form/XGridColumnFactory.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_
#include <com/sun/star/form/XLoadable.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
- #endif
- #ifndef _SBA_FORMADAPTER_HXX
#include "formadapter.hxx"
- #endif
- #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _DBU_REGHELPER_HXX_
#include "dbu_reghelper.hxx"
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
diff --cc dbaccess/source/ui/browser/formadapter.cxx
index 9bf2933,75062e1..5a1dd20
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@@ -26,38 -27,19 +27,19 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _SBA_FORMADAPTER_HXX
#include "formadapter.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX //autogen
#include <tools/debug.hxx>
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
+ #include <osl/diagnose.h>
#include <comphelper/types.hxx>
- #endif
- #ifndef _COMPHELPER_ENUMHELPER_HXX_
#include <comphelper/enumhelper.hxx>
- #endif
- #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #endif
- #ifndef _STRING_HXX
#include <tools/string.hxx>
- #endif
- #ifndef _DBU_BRW_HRC_
#include "dbu_brw.hrc"
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
- #endif
- #ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
- #endif
using namespace dbaui;
using namespace ::com::sun::star::uno;
diff --cc dbaccess/source/ui/browser/genericcontroller.cxx
index bea7d2f,28fa67f..92e3f8b
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@@ -26,107 -27,45 +27,45 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_GENERICCONTROLLER_HXX
#include "genericcontroller.hxx"
- #endif
- #ifndef _COMPHELPER_UNO3_HXX_
#include <comphelper/uno3.hxx>
- #endif
- #ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
#include <toolkit/awt/vclxwindow.hxx>
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
- #ifndef DBAUI_DATAVIEW_HXX
#include "dataview.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
+ #include <osl/diagnose.h>
#include "dbustrings.hrc"
- #endif
- #ifndef _VCL_STDTEXT_HXX
#include <vcl/stdtext.hxx>
- #endif
- #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
- #endif
#include <framework/titlehelper.hxx>
- #ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
- #endif
- #ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_
#include <com/sun/star/sdbc/XDataSource.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
#include <com/sun/star/sdb/SQLContext.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_XCOMPLETEDCONNECTION_HPP_
#include <com/sun/star/sdb/XCompletedConnection.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
#include <com/sun/star/task/XInteractionHandler.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UTIL_XCLOSEABLE_HPP_
#include <com/sun/star/util/XCloseable.hpp>
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef _DBAUI_COMMON_TYPES_HXX_
#include "commontypes.hxx"
- #endif
- #ifndef _SV_WAITOBJ_HXX
+ #include <sal/macros.h>
#include <vcl/waitobj.hxx>
- #endif
- #ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
- #endif
- #ifndef SVTOOLS_URIHELPER_HXX
#include <svl/urihelper.hxx>
- #endif
- #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_
#include "datasourceconnector.hxx"
- #endif
- #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
#include <unotools/moduleoptions.hxx>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_STATUS_VISIBILITY_HPP_
#include <com/sun/star/frame/status/Visibility.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_
#include <com/sun/star/util/XModifiable.hpp>
- #endif
- #ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
- #endif
- #ifndef _RTL_LOGFILE_HXX_
#include <rtl/logfile.hxx>
- #endif
#include <algorithm>
- #include <hash_map>
+ #include <o3tl/compat_functional.hxx>
+ #include <boost/unordered_map.hpp>
#include <cppuhelper/implbase1.hxx>
#include <limits>
diff --cc dbaccess/source/ui/browser/sbagrid.cxx
index 7f6047f,dc1582a..2ecb7f7
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@@ -26,15 -27,11 +27,11 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBACCESS_SBA_GRID_HRC
#include "sbagrid.hrc"
- #endif
- #ifndef _SVX_SVXIDS_HRC
#include <svx/svxids.hrc>
- #endif
#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
diff --cc dbaccess/source/ui/browser/sbamultiplex.cxx
index b10f566,b637035..9586a10
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@@ -26,11 -27,9 +27,9 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _SBA_MULTIPLEX_HXX
#include "sbamultiplex.hxx"
- #endif
using namespace dbaui;
//==================================================================
diff --cc dbaccess/source/ui/control/ColumnControlWindow.cxx
index 3835e18,14024f9..a040b4e
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@@ -26,25 -27,13 +27,13 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_COLUMNCONTROLWINDOW_HXX
#include "ColumnControlWindow.hxx"
- #endif
- #ifndef DBAUI_FIELDCONTROLS_HXX
#include "FieldControls.hxx"
- #endif
- #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
#include <unotools/syslocale.hxx>
- #endif
- #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef _DBU_RESOURCE_HRC_
#include "dbu_resource.hrc"
- #endif
using namespace ::dbaui;
diff --cc dbaccess/source/ui/control/RelationControl.cxx
index abc960d,e18bc79..f78ef05
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@@ -26,59 -27,24 +27,24 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_RELATIONCONTROL_HXX
#include "RelationControl.hxx"
- #endif
- #ifndef DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC
#include "RelationControl.hrc"
- #endif
- #ifndef _SVTOOLS_EDITBROWSEBOX_HXX_
#include <svtools/editbrowsebox.hxx>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef DBAUI_TABLECONNECTIONDATA_HXX
#include "TableConnectionData.hxx"
- #endif
- #ifndef DBAUI_TABLECONNECTION_HXX
#include "TableConnection.hxx"
- #endif
- #ifndef DBAUI_TABLEWINDOW_HXX
#include "TableWindow.hxx"
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
- #endif
- #ifndef DBAUI_RELCONTROLIFACE_HXX
#include "RelControliFace.hxx"
- #endif
- #ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
- #endif
- #ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
+ #include <osl/diagnose.h>
#include <algorithm>
diff --cc dbaccess/source/ui/control/ScrollHelper.cxx
index 34bee21,2299e47..43763f0
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@@ -26,14 -27,10 +27,10 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_SCROLLHELPER_HXX
#include "ScrollHelper.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
#define LISTBOX_SCROLLING_AREA 12
namespace dbaui
diff --cc dbaccess/source/ui/control/SqlNameEdit.cxx
index efed4d8,8e05e67..07e1430
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@@ -26,10 -27,8 +27,8 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_SQLNAMEEDIT_HXX
#include "SqlNameEdit.hxx"
- #endif
namespace dbaui
{
//------------------------------------------------------------------
diff --cc dbaccess/source/ui/control/TableGrantCtrl.cxx
index 6a1a613,8be7e57..8b4f81b
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@@ -26,34 -27,16 +27,16 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_TABLEGRANTCONTROL_HXX
#include "TableGrantCtrl.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_PRIVILEGE_HPP_
#include <com/sun/star/sdbcx/Privilege.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_PRIVILEGEOBJECT_HPP_
#include <com/sun/star/sdbcx/PrivilegeObject.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XUSERSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XAUTHORIZABLE_HPP_
#include <com/sun/star/sdbcx/XAuthorizable.hpp>
- #endif
- #ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::container;
diff --cc dbaccess/source/ui/control/VertSplitView.cxx
index 9d7666e,c3eed83..1d40357
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@@ -26,14 -27,10 +27,10 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_VERTSPLITVIEW_HXX
#include "VertSplitView.hxx"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
#define SPLITTER_WIDTH 80
diff --cc dbaccess/source/ui/control/curledit.cxx
index deda4d1,49f5850..c6f076b
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@@ -26,14 -27,11 +27,11 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _DBAUI_CURLEDIT_HXX_
#include "curledit.hxx"
- #endif
- #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
- #endif
+ #include <osl/diagnose.h>
//.........................................................................
namespace dbaui
diff --cc dbaccess/source/ui/control/dbtreelistbox.cxx
index ad67547,15cd745..4bce0d3
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@@ -26,58 -27,26 +27,26 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_DBTREELISTBOX_HXX
#include "dbtreelistbox.hxx"
- #endif
- #ifndef _DBU_RESOURCE_HRC_
#include "dbu_resource.hrc"
- #endif
- #ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
- #endif
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
- #ifndef _DBACCESS_UI_CALLBACKS_HXX_
#include "callbacks.hxx"
- #endif
- #ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURELISTENER_HDL_
#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hdl>
- #endif
- #ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURERECOGNIZER_HPP_
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XCONTEXTMENUINTERCEPTOR_HPP_
#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
- #endif
#include <com/sun/star/frame/XFrame.hpp>
- #ifndef _COM_SUN_STAR_UTIL_URL_HPP_
#include <com/sun/star/util/URL.hpp>
- #endif
- #ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
- #endif
- #ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_
#include <cppuhelper/interfacecontainer.hxx>
- #endif
- #ifndef _SV_HELP_HXX
#include <vcl/help.hxx>
- #endif
- #ifndef _DBAUI_TABLETREE_HRC_
#include "tabletree.hrc"
- #endif
- #ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
- #endif
- #ifndef __FRAMEWORK_HELPER_ACTIONTRIGGERHELPER_HXX_
#include <framework/actiontriggerhelper.hxx>
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
#include <framework/imageproducer.hxx>
#include <vcl/svapp.hxx>
#include <memory>
diff --cc dbaccess/source/ui/control/listviewitems.cxx
index c6b2ac8,ab37eae..760c614
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@@ -26,11 -27,9 +27,9 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
//........................................................................
namespace dbaui
{
diff --cc dbaccess/source/ui/control/marktree.cxx
index 4f761b2,a80a337..587a28b
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@@ -26,17 -27,11 +27,11 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _DBAUI_MARKTREE_HXX_
#include "marktree.hxx"
- #endif
- #ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
- #endif
- #ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
- #endif
//.........................................................................
namespace dbaui
diff --cc dbaccess/source/ui/control/opendoccontrols.cxx
index e389a10,e02b7c0..dc88dfb
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@@ -26,60 -27,29 +27,29 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
#include "opendoccontrols.hxx"
- #endif
/** === begin UNO includes === **/
- #ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
#include <com/sun/star/uno/Sequence.hxx>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
- #endif
- #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #endif
- #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HPP_
#include <com/sun/star/graphic/XGraphic.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_
#include <com/sun/star/ui/XImageManager.hpp>
- #endif
/** === end UNO includes === **/
- #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
- #endif
- #ifndef _SV_GRAPH_HXX
#include <vcl/graph.hxx>
- #endif
- #ifndef _SV_HELP_HXX
#include <vcl/help.hxx>
- #endif
- #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
#include <unotools/historyoptions.hxx>
- #endif
- #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_
#include <comphelper/sequenceashashmap.hxx>
- #endif
- #ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
- #endif
- #ifndef SVTOOLS_FILENOTATION_HXX
#include <svl/filenotation.hxx>
- #endif
+ #include <osl/diagnose.h>
//........................................................................
namespace dbaui
diff --cc dbaccess/source/ui/control/statusbarontroller.cxx
index ab4ba92,ddf46a3..3f72056
--- a/dbaccess/source/ui/control/statusbarontroller.cxx
+++ b/dbaccess/source/ui/control/statusbarontroller.cxx
@@@ -26,11 -27,9 +27,9 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
#include "statusbarontroller.hxx"
- #ifndef _DBU_REGHELPER_HXX_
#include "dbu_reghelper.hxx"
- #endif
extern "C" void SAL_CALL createRegistryInfo_OStatusbarController()
{
diff --cc dbaccess/source/ui/control/tabletree.cxx
index 8249bb3,c32b2b1..ef3f889
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@@ -26,74 -27,31 +27,31 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _DBAUI_TABLETREE_HXX_
#include "tabletree.hxx"
- #endif
- #ifndef _DBAUI_TABLETREE_HRC_
#include "tabletree.hrc"
- #endif
- #ifndef DBACCESS_IMAGEPROVIDER_HXX
#include "imageprovider.hxx"
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
- #ifndef _DBU_CONTROL_HRC_
#include "dbu_control.hrc"
- #endif
- #ifndef _SV_MENU_HXX
#include <vcl/menu.hxx>
- #endif
- #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_
#include <com/sun/star/sdb/application/DatabaseObject.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECTFOLDER_HPP_
#include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_
#include <com/sun/star/sdbc/XDriverAccess.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XDATADEFINITIONSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
#include <com/sun/star/sdb/SQLContext.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
#include <com/sun/star/sdbc/XRow.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef _DBAUI_COMMON_TYPES_HXX_
#include "commontypes.hxx"
- #endif
- #ifndef _DBAUI_LISTVIEWITEMS_HXX_
#include "listviewitems.hxx"
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef _RTL_USTRBUF_HXX_
+ #include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
- #endif
#include <connectivity/dbmetadata.hxx>
#include <algorithm>
diff --cc dbaccess/source/ui/control/toolboxcontroller.cxx
index 40feaf0,180e318..2c5d84b
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@@ -26,67 -27,27 +27,27 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBACCESS_TOOLBOXCONTROLLER_HXX
#include "toolboxcontroller.hxx"
- #endif
- #ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_
#include <com/sun/star/ui/ImageType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
- #ifndef _SV_MENU_HXX
#include <vcl/menu.hxx>
- #endif
- #ifndef _COM_SUN_STAR_UI_XUICONFIGURATIONMANAGER_HPP_
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XMODULEUICONFIGURATIONMANAGERSUPPLIER_HPP_
#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_XIMAGEMANAGER_HPP_
#include <com/sun/star/ui/XImageManager.hpp>
- #endif
- #ifndef _COM_SUN_STAR_UI_IMAGETYPE_HPP_
#include <com/sun/star/ui/ImageType.hpp>
- #endif
- #ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHIC_HPP_
#include <com/sun/star/graphic/XGraphic.hpp>
- #endif
- #ifndef _SV_SVAPP_HXX //autogen
#include <vcl/svapp.hxx>
- #endif
- #ifndef _SV_TOOLBOX_HXX
#include <vcl/toolbox.hxx>
- #endif
- #ifndef _DBU_RESOURCE_HRC_
#include "dbu_resource.hrc"
- #endif
- #ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
#include <svtools/miscopt.hxx>
- #endif
- #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
#include <unotools/moduleoptions.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef INCLUDED_SVTOOLS_MENUOPTIONS_HXX
#include <svtools/menuoptions.hxx>
- #endif
- #ifndef _VOS_MUTEX_HXX_
- #include <vos/mutex.hxx>
- #endif
- #ifndef _DBU_REGHELPER_HXX_
+ #include <osl/mutex.hxx>
#include "dbu_reghelper.hxx"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
extern "C" void SAL_CALL createRegistryInfo_OToolboxController()
diff --cc dbaccess/source/ui/control/undosqledit.cxx
index c72bb11,ae527a9..d69acc0
--- a/dbaccess/source/ui/control/undosqledit.cxx
+++ b/dbaccess/source/ui/control/undosqledit.cxx
@@@ -26,14 -27,10 +27,10 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_GENERALUNDO_HXX
#include "undosqledit.hxx"
- #endif
- #ifndef DBAUI_SQLEDIT_HXX
#include "sqledit.hxx"
- #endif
namespace dbaui
{
diff --cc dbaccess/source/ui/dlg/AdabasStat.cxx
index 07bccff,af03c78..6f29f46
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@@ -26,53 -27,23 +27,23 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef _TOOLS_DEBUG_HXX
- #include <tools/debug.hxx>
- #endif
- #ifndef _CPPUHELPER_EXC_HLP_HXX_
#include <cppuhelper/exc_hlp.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef _DBAUI_ADASTAT_HXX_
+ #include <osl/diagnose.h>
#include "AdabasStat.hxx"
- #endif
- #ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_
#include <com/sun/star/sdbc/XStatement.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
#include <com/sun/star/sdbc/XRow.hpp>
- #endif
- #ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
#include <com/sun/star/sdbc/XResultSet.hpp>
- #endif
- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
- #endif
- #ifndef DBAUI_ADABASSTAT_HRC
#include "AdabasStat.hrc"
- #endif
- #ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
- #endif
- #ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
- #endif
- #ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
- #endif
- #ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
- #endif
- #ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
- #endif
using namespace dbaui;
DBG_NAME(OAdabasStatistics)
diff --cc dbaccess/source/ui/dlg/CollectionView.cxx
index 3203535,e10396c..a6f0c82
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@@ -26,91 -27,35 +27,35 @@@
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_dbaccess.hxx"
+#include "precompiled_dbui.hxx"
- #ifndef DBAUI_COLLECTIONVIEW_HXX
#include "CollectionView.hxx"
- #endif
- #ifndef DBAUI_COLLECTIONVIEW_HRC
#include "CollectionView.hrc"
- #endif
- #ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
- #endif
- #ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
- #endif
- #ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
- #endif
- #ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
- #endif
- #ifndef _COMPHELPER_INTERACTION_HXX_
#include <comphelper/interaction.hxx>
- #endif
- #ifndef _CPPUHELPER_EXC_HLP_HXX_
#include <cppuhelper/exc_hlp.hxx>
- #endif
- #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/helper/vclunohelper.hxx>
- #endif
- #ifndef SVT_QUERYFOLDER_HXX
#include <svtools/QueryFolderName.hxx>
- #endif
- #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
- #endif
- #ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list