Merge remote branch 'staging/ooo/dev300_m98_fixed' into integration/dev300_m98integration/dev300_m98

* staging/ooo/dev300_m98_fixed: (242 commits)
  vcl117: #i115686# remove old unused style setting
  vcl117: removed obsolete header
  sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
  dba33k: #i114026# check if key columns from all tables are involved
  CWS changehid: generate former auto hids into src files
  dba34a: #i112617#
  dba34a: if there exists a data source registration from the previous test run, revoke it
  dba34a: #i31275# allow 'select as you type' aka 'quick selection' for tree list boxes (SvLBox derivees, to be precise), and enable this for Base main window, and the stylist
  dba34a: #i97111# make the 'Test Connection' button big enough to display all its text
  dba34a: #i114698# allow for property change notifications for properties which do not exist as real property, but as attribute only
  dba34a: #i114671#
  dba33j: unxmacxi.pro: WaE
  dba33j: GCC WaE
  dba33j: i114026: findTableColumnsMatching_throw: take the update-table's name as parameter, to catch the cases where the name is an alias
  dba34a: GCC WaE
  dba34a: WaE
  dba33j: #i114627# do not let the SubComponentManager manage reports executed for data display
  dba33j: #i114438#
  dba33j: #i114438#
  dba34a: #i113475# SRB->ORB
  ...

Conflicts:
	dbaccess/inc/ToolBoxHelper.hxx
	dbaccess/inc/dbaccess_helpid.hrc
	dbaccess/prj/build.lst
	dbaccess/qa/complex/dbaccess/ApplicationController.java
	dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
	dbaccess/qa/complex/dbaccess/DataSource.java
	dbaccess/qa/complex/dbaccess/DatabaseDocument.java
	dbaccess/qa/complex/dbaccess/Query.java
	dbaccess/qa/complex/dbaccess/RowSet.java
	dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
	dbaccess/qa/complex/dbaccess/TestCase.java
	dbaccess/qa/complex/dbaccess/UISettings.java
	dbaccess/qa/complex/dbaccess/makefile.mk
	dbaccess/source/core/api/BookmarkSet.cxx
	dbaccess/source/core/api/BookmarkSet.hxx
	dbaccess/source/core/api/CIndexColumn.hxx
	dbaccess/source/core/api/CIndexes.cxx
	dbaccess/source/core/api/CIndexes.hxx
	dbaccess/source/core/api/CRowSetColumn.cxx
	dbaccess/source/core/api/CRowSetColumn.hxx
	dbaccess/source/core/api/CRowSetDataColumn.cxx
	dbaccess/source/core/api/CRowSetDataColumn.hxx
	dbaccess/source/core/api/CacheSet.cxx
	dbaccess/source/core/api/CacheSet.hxx
	dbaccess/source/core/api/FilteredContainer.cxx
	dbaccess/source/core/api/HelperCollections.cxx
	dbaccess/source/core/api/HelperCollections.hxx
	dbaccess/source/core/api/KeySet.cxx
	dbaccess/source/core/api/KeySet.hxx
	dbaccess/source/core/api/OptimisticSet.cxx
	dbaccess/source/core/api/OptimisticSet.hxx
	dbaccess/source/core/api/PrivateRow.cxx
	dbaccess/source/core/api/PrivateRow.hxx
	dbaccess/source/core/api/RowSet.cxx
	dbaccess/source/core/api/RowSet.hxx
	dbaccess/source/core/api/RowSetBase.cxx
	dbaccess/source/core/api/RowSetBase.hxx
	dbaccess/source/core/api/RowSetCache.cxx
	dbaccess/source/core/api/RowSetCache.hxx
	dbaccess/source/core/api/RowSetCacheIterator.cxx
	dbaccess/source/core/api/RowSetCacheIterator.hxx
	dbaccess/source/core/api/RowSetRow.hxx
	dbaccess/source/core/api/SingleSelectQueryComposer.cxx
	dbaccess/source/core/api/StaticSet.cxx
	dbaccess/source/core/api/StaticSet.hxx
	dbaccess/source/core/api/TableDeco.cxx
	dbaccess/source/core/api/View.cxx
	dbaccess/source/core/api/WrappedResultSet.cxx
	dbaccess/source/core/api/WrappedResultSet.hxx
	dbaccess/source/core/api/callablestatement.cxx
	dbaccess/source/core/api/column.cxx
	dbaccess/source/core/api/columnsettings.cxx
	dbaccess/source/core/api/datacolumn.cxx
	dbaccess/source/core/api/datacolumn.hxx
	dbaccess/source/core/api/datasettings.cxx
	dbaccess/source/core/api/definitioncolumn.cxx
	dbaccess/source/core/api/makefile.mk
	dbaccess/source/core/api/preparedstatement.cxx
	dbaccess/source/core/api/query.cxx
	dbaccess/source/core/api/query.hxx
	dbaccess/source/core/api/querycomposer.cxx
	dbaccess/source/core/api/querycontainer.cxx
	dbaccess/source/core/api/querydescriptor.cxx
	dbaccess/source/core/api/querydescriptor.hxx
	dbaccess/source/core/api/resultcolumn.cxx
	dbaccess/source/core/api/resultcolumn.hxx
	dbaccess/source/core/api/resultset.cxx
	dbaccess/source/core/api/resultset.hxx
	dbaccess/source/core/api/statement.cxx
	dbaccess/source/core/api/table.cxx
	dbaccess/source/core/api/tablecontainer.cxx
	dbaccess/source/core/api/viewcontainer.cxx
	dbaccess/source/core/dataaccess/ComponentDefinition.cxx
	dbaccess/source/core/dataaccess/ComponentDefinition.hxx
	dbaccess/source/core/dataaccess/ContentHelper.cxx
	dbaccess/source/core/dataaccess/ModelImpl.cxx
	dbaccess/source/core/dataaccess/ModelImpl.hxx
	dbaccess/source/core/dataaccess/SharedConnection.cxx
	dbaccess/source/core/dataaccess/SharedConnection.hxx
	dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
	dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
	dbaccess/source/core/dataaccess/commandcontainer.cxx
	dbaccess/source/core/dataaccess/commandcontainer.hxx
	dbaccess/source/core/dataaccess/commanddefinition.cxx
	dbaccess/source/core/dataaccess/commanddefinition.hxx
	dbaccess/source/core/dataaccess/connection.cxx
	dbaccess/source/core/dataaccess/connection.hxx
	dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
	dbaccess/source/core/dataaccess/databasecontext.cxx
	dbaccess/source/core/dataaccess/databasecontext.hxx
	dbaccess/source/core/dataaccess/databasedocument.cxx
	dbaccess/source/core/dataaccess/databasedocument.hxx
	dbaccess/source/core/dataaccess/databaseregistrations.cxx
	dbaccess/source/core/dataaccess/databaseregistrations.hxx
	dbaccess/source/core/dataaccess/datasource.cxx
	dbaccess/source/core/dataaccess/datasource.hxx
	dbaccess/source/core/dataaccess/definitioncontainer.cxx
	dbaccess/source/core/dataaccess/documentcontainer.cxx
	dbaccess/source/core/dataaccess/documentcontainer.hxx
	dbaccess/source/core/dataaccess/documentdefinition.cxx
	dbaccess/source/core/dataaccess/documentdefinition.hxx
	dbaccess/source/core/dataaccess/documenteventexecutor.cxx
	dbaccess/source/core/dataaccess/documenteventexecutor.hxx
	dbaccess/source/core/dataaccess/documenteventnotifier.cxx
	dbaccess/source/core/dataaccess/documenteventnotifier.hxx
	dbaccess/source/core/dataaccess/documentevents.cxx
	dbaccess/source/core/dataaccess/documentevents.hxx
	dbaccess/source/core/dataaccess/intercept.cxx
	dbaccess/source/core/dataaccess/intercept.hxx
	dbaccess/source/core/dataaccess/makefile.mk
	dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
	dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
	dbaccess/source/core/dataaccess/myucp_resultset.cxx
	dbaccess/source/core/dataaccess/myucp_resultset.hxx
	dbaccess/source/core/inc/ContainerListener.hxx
	dbaccess/source/core/inc/ContainerMediator.hxx
	dbaccess/source/core/inc/ContentHelper.hxx
	dbaccess/source/core/inc/DatabaseDataProvider.hxx
	dbaccess/source/core/inc/FilteredContainer.hxx
	dbaccess/source/core/inc/PropertyForward.hxx
	dbaccess/source/core/inc/RefreshListener.hxx
	dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
	dbaccess/source/core/inc/TableDeco.hxx
	dbaccess/source/core/inc/View.hxx
	dbaccess/source/core/inc/callablestatement.hxx
	dbaccess/source/core/inc/column.hxx
	dbaccess/source/core/inc/columnsettings.hxx
	dbaccess/source/core/inc/commandbase.hxx
	dbaccess/source/core/inc/composertools.hxx
	dbaccess/source/core/inc/containerapprove.hxx
	dbaccess/source/core/inc/core_resource.hrc
	dbaccess/source/core/inc/core_resource.hxx
	dbaccess/source/core/inc/datasettings.hxx
	dbaccess/source/core/inc/dbamiscres.hrc
	dbaccess/source/core/inc/definitioncolumn.hxx
	dbaccess/source/core/inc/definitioncontainer.hxx
	dbaccess/source/core/inc/module_dba.hxx
	dbaccess/source/core/inc/object.hxx
	dbaccess/source/core/inc/objectnameapproval.hxx
	dbaccess/source/core/inc/preparedstatement.hxx
	dbaccess/source/core/inc/querycomposer.hxx
	dbaccess/source/core/inc/querycontainer.hxx
	dbaccess/source/core/inc/sdbcoretools.hxx
	dbaccess/source/core/inc/statement.hxx
	dbaccess/source/core/inc/table.hxx
	dbaccess/source/core/inc/tablecontainer.hxx
	dbaccess/source/core/inc/userinformation.hxx
	dbaccess/source/core/inc/veto.hxx
	dbaccess/source/core/inc/viewcontainer.hxx
	dbaccess/source/core/misc/DatabaseDataProvider.cxx
	dbaccess/source/core/recovery/settingsimport.cxx
	dbaccess/source/core/recovery/settingsimport.hxx
	dbaccess/source/core/recovery/storagestream.cxx
	dbaccess/source/core/recovery/storagestream.hxx
	dbaccess/source/core/recovery/storagetextstream.cxx
	dbaccess/source/core/recovery/storagetextstream.hxx
	dbaccess/source/core/recovery/storagexmlstream.cxx
	dbaccess/source/core/recovery/storagexmlstream.hxx
	dbaccess/source/core/recovery/subcomponentrecovery.cxx
	dbaccess/source/core/recovery/subcomponentrecovery.hxx
	dbaccess/source/core/recovery/subcomponents.hxx
	dbaccess/source/core/resource/strings.src
	dbaccess/source/ext/adabas/Acomponentmodule.cxx
	dbaccess/source/ext/adabas/AdabasNewDb.src
	dbaccess/source/ext/macromigration/macromigration.src
	dbaccess/source/filter/migration/makefile.mk
	dbaccess/source/filter/xml/makefile.mk
	dbaccess/source/filter/xml/xmlColumn.cxx
	dbaccess/source/filter/xml/xmlExport.cxx
	dbaccess/source/inc/OAuthenticationContinuation.hxx
	dbaccess/source/inc/stringconstants.hrc
	dbaccess/source/inc/stringconstants.inc
	dbaccess/source/sdbtools/resource/sdbt_strings.src
	dbaccess/source/shared/registrationhelper.cxx
	dbaccess/source/ui/app/AppController.cxx
	dbaccess/source/ui/app/AppControllerGen.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.cxx
	dbaccess/source/ui/app/AppDetailPageHelper.hxx
	dbaccess/source/ui/app/AppDetailView.cxx
	dbaccess/source/ui/app/AppIconControl.cxx
	dbaccess/source/ui/app/app.src
	dbaccess/source/ui/browser/bcommon.src
	dbaccess/source/ui/browser/brwctrlr.cxx
	dbaccess/source/ui/browser/dsEntriesNoExp.cxx
	dbaccess/source/ui/browser/exsrcbrw.cxx
	dbaccess/source/ui/browser/sbabrw.src
	dbaccess/source/ui/browser/sbagrid.cxx
	dbaccess/source/ui/browser/sbagrid.src
	dbaccess/source/ui/browser/unodatbr.cxx
	dbaccess/source/ui/control/TableGrantCtrl.src
	dbaccess/source/ui/control/dbtreelistbox.cxx
	dbaccess/source/ui/control/opendoccontrols.cxx
	dbaccess/source/ui/control/tabletree.cxx
	dbaccess/source/ui/control/tabletree.src
	dbaccess/source/ui/control/toolboxcontroller.cxx
	dbaccess/source/ui/control/undosqledit.src
	dbaccess/source/ui/dlg/AdabasStat.src
	dbaccess/source/ui/dlg/AutoControls.src
	dbaccess/source/ui/dlg/CollectionView.cxx
	dbaccess/source/ui/dlg/CollectionView.src
	dbaccess/source/ui/dlg/ConnectionHelper.cxx
	dbaccess/source/ui/dlg/ConnectionPage.src
	dbaccess/source/ui/dlg/DbAdminImpl.cxx
	dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
	dbaccess/source/ui/dlg/ExtensionNotPresent.src
	dbaccess/source/ui/dlg/RelationDlg.src
	dbaccess/source/ui/dlg/TablesSingleDlg.cxx
	dbaccess/source/ui/dlg/UserAdmin.src
	dbaccess/source/ui/dlg/UserAdminDlg.src
	dbaccess/source/ui/dlg/adtabdlg.cxx
	dbaccess/source/ui/dlg/adtabdlg.src
	dbaccess/source/ui/dlg/advancedsettings.cxx
	dbaccess/source/ui/dlg/dbadmin.src
	dbaccess/source/ui/dlg/dbadmin2.src
	dbaccess/source/ui/dlg/dbadminsetup.src
	dbaccess/source/ui/dlg/dbfindex.cxx
	dbaccess/source/ui/dlg/dbfindex.src
	dbaccess/source/ui/dlg/directsql.src
	dbaccess/source/ui/dlg/dlgattr.src
	dbaccess/source/ui/dlg/dlgsave.src
	dbaccess/source/ui/dlg/dlgsize.src
	dbaccess/source/ui/dlg/dsselect.src
	dbaccess/source/ui/dlg/indexdialog.src
	dbaccess/source/ui/dlg/indexfieldscontrol.cxx
	dbaccess/source/ui/dlg/makefile.mk
	dbaccess/source/ui/dlg/optionalboolitem.cxx
	dbaccess/source/ui/dlg/optionalboolitem.hxx
	dbaccess/source/ui/dlg/paramdialog.src
	dbaccess/source/ui/dlg/queryfilter.src
	dbaccess/source/ui/dlg/queryorder.src
	dbaccess/source/ui/dlg/sqlmessage.src
	dbaccess/source/ui/dlg/textconnectionsettings.src
	dbaccess/source/ui/imagelists/dbimagelists.src
	dbaccess/source/ui/inc/ExtensionNotPresent.hxx
	dbaccess/source/ui/inc/TableConnectionData.hxx
	dbaccess/source/ui/inc/dbu_resource.hrc
	dbaccess/source/ui/inc/dsmeta.hxx
	dbaccess/source/ui/inc/sbagrid.hxx
	dbaccess/source/ui/inc/unodatbr.hxx
	dbaccess/source/ui/misc/TableCopyHelper.cxx
	dbaccess/source/ui/misc/TokenWriter.cxx
	dbaccess/source/ui/misc/ToolBoxHelper.cxx
	dbaccess/source/ui/misc/WCopyTable.cxx
	dbaccess/source/ui/misc/WNameMatch.cxx
	dbaccess/source/ui/misc/WizardPages.src
	dbaccess/source/ui/misc/dbumiscres.src
	dbaccess/source/ui/querydesign/JoinController.cxx
	dbaccess/source/ui/querydesign/QueryDesignView.cxx
	dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
	dbaccess/source/ui/querydesign/TableFieldDescription.cxx
	dbaccess/source/ui/querydesign/TableWindow.cxx
	dbaccess/source/ui/querydesign/query.src
	dbaccess/source/ui/querydesign/querydlg.src
	dbaccess/source/ui/relationdesign/relation.src
	dbaccess/source/ui/tabledesign/TEditControl.cxx
	dbaccess/source/ui/tabledesign/TableController.cxx
	dbaccess/source/ui/tabledesign/table.src
	dbaccess/source/ui/uno/copytablewizard.cxx
	dbaccess/source/ui/uno/copytablewizard.src
	dbaccess/source/ui/uno/dbinteraction.cxx
	dbaccess/source/ui/uno/dbinteraction.src
	dbaccess/util/hidother.src
	reportdesign/inc/RptResId.hrc
	reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
	reportdesign/source/core/resource/strings.src
	reportdesign/source/filter/xml/xmlExport.cxx
	reportdesign/source/filter/xml/xmlGroup.cxx
	reportdesign/source/filter/xml/xmlHelper.cxx
	reportdesign/source/filter/xml/xmlservices.cxx
	reportdesign/source/ui/dlg/AddField.cxx
	reportdesign/source/ui/dlg/CondFormat.hrc
	reportdesign/source/ui/dlg/CondFormat.src
	reportdesign/source/ui/dlg/Condition.cxx
	reportdesign/source/ui/dlg/DateTime.src
	reportdesign/source/ui/dlg/GroupsSorting.cxx
	reportdesign/source/ui/dlg/GroupsSorting.src
	reportdesign/source/ui/dlg/Navigator.cxx
	reportdesign/source/ui/dlg/Navigator.src
	reportdesign/source/ui/inc/DesignView.hxx
	reportdesign/source/ui/inc/GroupsSorting.hxx
	reportdesign/source/ui/misc/UITools.cxx
	reportdesign/source/ui/misc/rptuiservices.cxx
	reportdesign/source/ui/report/DesignView.cxx
	reportdesign/source/ui/report/ReportController.cxx
	reportdesign/source/ui/report/ReportSection.cxx
	reportdesign/source/ui/report/ViewsWindow.cxx
	reportdesign/source/ui/report/report.src

1 files changed, 2 insertions, 2 deletions

diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index e66e0bf21..624338ea1 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -31,11 +31,11 @@
 
 #include "commontypes.hxx"
 
-#if defined(WIN) || defined(WNT) || defined (UNX) || defined (OS2)
+#if defined(WNT) || defined (UNX) || defined (OS2)
 #define HAVE_ODBC_SUPPORT
 #endif
 
-#if ( defined(WIN) || defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
+#if ( defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
 #define HAVE_ODBC_ADMINISTRATION
 #endif