Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (76 commits)
  masterfix DEV300: #i10000# usage of L10N build_type
  removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
  hr75: #i116747#: remove obsolete copyright notices
  gnumake3: remove comphelper version; fix including extract.hxx
  removetooltypes01: #i112600# Replace missing tools types replacement
  removetooltypes01: #i112600# remove tooltypes from reportdesign
  removetooltypes01: #i112600# remove tooltypes from dbaccess
  undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase)
  undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only
  undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT
  gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory
  dba34b: #109956# notify column value in correct order
  dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow
  undoapi: assert unknown slots in ImplInvalidateFeature
  dba34b: #i110907# check if design handle event
  dba34b: #i109956# notify column values when row is refreshed
  dba34b: #i115753# add test again
  undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
  undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller
  undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come.
  ...

Conflicts:
	dbaccess/inc/IEnvironment.hxx
	dbaccess/inc/dataview.hxx
	dbaccess/qa/complex/dbaccess/RowSet.java
	dbaccess/source/core/api/CacheSet.cxx
	dbaccess/source/core/api/KeySet.hxx
	dbaccess/source/core/api/OptimisticSet.hxx
	dbaccess/source/core/api/RowSet.cxx
	dbaccess/source/core/api/RowSetCache.cxx
	dbaccess/source/ext/adabas/Acomponentmodule.cxx
	dbaccess/source/ext/adabas/Aservices.cxx
	dbaccess/source/filter/migration/cfgimport.cxx
	dbaccess/source/filter/migration/cfgimport.hxx
	dbaccess/source/filter/migration/cfgservices.cxx
	dbaccess/source/filter/migration/makefile.mk
	dbaccess/source/inc/cfg_reghelper.hxx
	dbaccess/source/sdbtools/misc/sdbt_services.cxx
	dbaccess/source/shared/cfg_reghelper.cxx
	dbaccess/source/shared/cfgstrings.cxx
	dbaccess/source/shared/registrationhelper.cxx
	dbaccess/source/ui/app/AppController.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/AppSwapWindow.cxx
	dbaccess/source/ui/browser/brwctrlr.cxx
	dbaccess/source/ui/browser/dataview.cxx
	dbaccess/source/ui/browser/unodatbr.cxx
	dbaccess/source/ui/control/dbtreelistbox.cxx
	dbaccess/source/ui/control/opendoccontrols.cxx
	dbaccess/source/ui/control/tabletree.cxx
	dbaccess/source/ui/dlg/ConnectionHelper.cxx
	dbaccess/source/ui/dlg/ConnectionPage.src
	dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
	dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
	dbaccess/source/ui/dlg/ExtensionNotPresent.src
	dbaccess/source/ui/dlg/TablesSingleDlg.cxx
	dbaccess/source/ui/dlg/adodatalinks.hxx
	dbaccess/source/ui/dlg/dbadmin2.src
	dbaccess/source/ui/dlg/dbadminsetup.src
	dbaccess/source/ui/dlg/dlgattr.cxx
	dbaccess/source/ui/dlg/dlgsize.src
	dbaccess/source/ui/dlg/makefile.mk
	dbaccess/source/ui/dlg/sqlmessage.cxx
	dbaccess/source/ui/inc/ExtensionNotPresent.hxx
	dbaccess/source/ui/inc/TokenWriter.hxx
	dbaccess/source/ui/inc/imageprovider.hxx
	dbaccess/source/ui/misc/DExport.cxx
	dbaccess/source/ui/misc/HtmlReader.cxx
	dbaccess/source/ui/misc/RowSetDrop.cxx
	dbaccess/source/ui/misc/RtfReader.cxx
	dbaccess/source/ui/misc/TokenWriter.cxx
	dbaccess/source/ui/misc/imageprovider.cxx
	dbaccess/source/ui/misc/linkeddocuments.cxx
	dbaccess/source/ui/misc/singledoccontroller.cxx
	dbaccess/source/ui/querydesign/ConnectionData.hxx
	dbaccess/source/ui/querydesign/JoinTableView.cxx
	dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
	dbaccess/source/ui/querydesign/TableConnectionData.cxx
	dbaccess/source/ui/querydesign/TableWindowListBox.cxx
	dbaccess/source/ui/relationdesign/RelationController.cxx
	dbaccess/source/ui/relationdesign/RelationTableView.cxx
	dbaccess/source/ui/tabledesign/table.src
	reportdesign/inc/RptPage.hxx
	reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
	reportdesign/source/core/api/ReportDefinition.cxx
	reportdesign/source/core/sdr/ReportUndoFactory.cxx
	reportdesign/source/core/sdr/UndoEnv.cxx
	reportdesign/source/filter/xml/xmlservices.cxx
	reportdesign/source/ui/dlg/GroupsSorting.cxx
	reportdesign/source/ui/dlg/Navigator.cxx
	reportdesign/source/ui/inspection/metadata.cxx
	reportdesign/source/ui/misc/RptUndo.cxx
	reportdesign/source/ui/misc/UITools.cxx
	reportdesign/source/ui/misc/rptuiservices.cxx
	reportdesign/source/ui/report/DesignView.cxx
	reportdesign/source/ui/report/FixedTextColor.cxx
	reportdesign/source/ui/report/ReportController.cxx
	reportdesign/source/ui/report/ReportSection.cxx
	reportdesign/source/ui/report/SectionView.cxx
	reportdesign/source/ui/report/SectionWindow.cxx
	reportdesign/source/ui/report/StartMarker.cxx
	reportdesign/source/ui/report/ViewsWindow.cxx
	reportdesign/source/ui/report/dlgedfunc.cxx
	reportdesign/source/ui/report/report.src

5 files changed, 244 insertions, 26 deletions

diff --git a/dbaccess/util/dba.component b/dbaccess/util/dba.component
new file mode 100644
index 000000000000..b25768dbfab6
--- /dev/null
+++ b/dbaccess/util/dba.component
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.chart2.data.DatabaseDataProvider">
+    <service name="com.sun.star.chart2.data.DatabaseDataProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.DataAccessDescriptorFactory">
+    <service name="com.sun.star.sdb.DataAccessDescriptorFactory"/>
+    <singleton name="com.sun.star.sdb.DataAccessDescriptorFactory"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.OCommandDefinition">
+    <service name="com.sun.star.sdb.CommandDefinition"/>
+    <service name="com.sun.star.sdb.QueryDefinition"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.OComponentDefinition">
+    <service name="com.sun.star.sdb.TableDefinition"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseContext">
+    <service name="com.sun.star.sdb.DatabaseContext"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseDocument">
+    <service name="com.sun.star.document.OfficeDocument"/>
+    <service name="com.sun.star.sdb.OfficeDatabaseDocument"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ODatabaseSource">
+    <service name="com.sun.star.sdb.DataSource"/>
+    <service name="com.sun.star.sdb.DocumentDataSource"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dba.ORowSet">
+    <service name="com.sun.star.sdb.ResultSet"/>
+    <service name="com.sun.star.sdb.RowSet"/>
+    <service name="com.sun.star.sdbc.ResultSet"/>
+    <service name="com.sun.star.sdbc.RowSet"/>
+    <service name="com.sun.star.sdbcx.ResultSet"/>
+  </implementation>
+</component>
diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component
new file mode 100644
index 000000000000..ce0dc45cf0be
--- /dev/null
+++ b/dbaccess/util/dbu.component
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.dbaccess.DatabaseInteractionHandler">
+    <service name="com.sun.star.sdb.DatabaseInteractionHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbaccess.LegacyInteractionHandler">
+    <service name="com.sun.star.sdb.InteractionHandler"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.dbaccess.OTextConnectionSettingsDialog">
+    <service name="com.sun.star.sdb.TextConnectionSettings"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.OColumnControl">
+    <service name="com.sun.star.sdb.ColumnDescriptorControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.OColumnControlModel">
+    <service name="com.sun.star.sdb.ColumnDescriptorControlModel"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.dbu.SbaXGridControl">
+    <service name="com.sun.star.form.control.GridControl"/>
+    <service name="com.sun.star.form.control.InteractionGridControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdb.DirectSQLDialog">
+    <service name="org.openoffice.comp.dbu.DirectSqlDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.sdb.ApplicationStatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.sdb.ApplicationToolboxController">
+    <service name="com.sun.star.frame.ToolboxController"/>
+  </implementation>
+  <implementation name="com.sun.star.uno.comp.sdb.RowsetFilterDialog">
+    <service name="com.sun.star.sdb.FilterDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.uno.comp.sdb.RowsetOrderDialog">
+    <service name="com.sun.star.sdb.OrderDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.CopyTableWizard">
+    <service name="com.sun.star.sdb.application.CopyTableWizard"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.DBContentLoader">
+    <service name="com.sun.star.frame.FrameLoader"/>
+    <service name="com.sun.star.sdb.ContentLoader"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OAdvancedSettingsDialog">
+    <service name="com.sun.star.sdb.AdvancedDatabaseSettingsDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OApplicationController">
+    <service name="com.sun.star.sdb.application.DefaultViewController"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODBTypeWizDialog">
+    <service name="com.sun.star.sdb.DataSourceTypeChangeDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODBTypeWizDialogSetup">
+    <service name="com.sun.star.sdb.DatabaseWizardDialog"/>
+  </implementation>
+  <implementation
+      name="org.openoffice.comp.dbu.ODatasourceAdministrationDialog">
+    <service name="com.sun.star.sdb.DatasourceAdministrationDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ODatasourceBrowser">
+    <service name="com.sun.star.sdb.DataSourceBrowser"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OFormGridView">
+    <service name="com.sun.star.sdb.FormGridView"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OQueryDesign">
+    <service name="com.sun.star.sdb.QueryDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.ORelationDesign">
+    <service name="com.sun.star.sdb.RelationDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OSQLMessageDialog">
+    <service name="com.sun.star.sdb.ErrorMessageDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OTableDesign">
+    <service name="com.sun.star.sdb.TableDesign"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OTableFilterDialog">
+    <service name="com.sun.star.sdb.TableFilterDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OUserSettingsDialog">
+    <service name="com.sun.star.sdb.UserAdministrationDialog"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbu.OViewDesign">
+    <service name="com.sun.star.sdb.ViewDesign"/>
+  </implementation>
+</component>
diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src
index bc49f49b87e6..094b4fbfecd0 100644
--- a/dbaccess/util/hidother.src
+++ b/dbaccess/util/hidother.src
@@ -26,10 +26,6 @@
 ************************************************************************/
 
 #include "../inc/dbaccess_helpid.hrc"
-#include "../inc/dbaccess_slotid.hrc"
-#ifndef _SBASLTID_HRC
-#include <svx/svxids.hrc>
-#endif
 
 hidspecial HID_DLG_FILTERCRIT                           { HelpId = HID_DLG_FILTERCRIT; };
 hidspecial HID_DLG_ORDERCRIT                            { HelpId = HID_DLG_ORDERCRIT; };
@@ -148,8 +144,11 @@ hidspecial HID_TABDESIGN_TYPECELL                       { HelpId = HID_TABDESIGN
 hidspecial HID_TABDESIGN_COMMENTCELL                    { HelpId = HID_TABDESIGN_COMMENTCELL; };
 hidspecial HID_TABDESIGN_HELPTEXT                       { HelpId = HID_TABDESIGN_HELPTEXT; };
 
+/*
 hidspecial SID_TABLEDESIGN_INSERTROWS                   { HelpId = SID_TABLEDESIGN_INSERTROWS; };
 hidspecial SID_TABLEDESIGN_TABED_PRIMARYKEY             { HelpId = SID_TABLEDESIGN_TABED_PRIMARYKEY; };
+*/
+
 hidspecial HID_TLB_TABLEDESIGN                          { HelpId = HID_TLB_TABLEDESIGN; };
 hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME               { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; };
 hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL             { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; };
@@ -169,7 +168,6 @@ hidspecial HID_BROWSER_TABLE_CREATE_DESIGN              { HelpId = HID_BROWSER_T
 hidspecial HID_BROWSER_TABLE_EDIT                       { HelpId = HID_BROWSER_TABLE_EDIT; };
 hidspecial HID_BROWSER_TABLE_DELETE                     { HelpId = HID_BROWSER_TABLE_DELETE; };
 hidspecial HID_SQLERROR_EXCHAIN_ERRORS                  { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; };
-hidspecial HID_DBACCESS_START                           { HelpId = HID_DBACCESS_START; };
 hidspecial HID_SQLERROR_EXCHAIN_TEXT                    { HelpId = HID_SQLERROR_EXCHAIN_TEXT; };
 hidspecial HID_TAB_WIZ_COLUMN_SELECT                    { HelpId = HID_TAB_WIZ_COLUMN_SELECT; };
 hidspecial HID_TAB_WIZ_TYPE_SELECT                      { HelpId = HID_TAB_WIZ_TYPE_SELECT; };
@@ -254,11 +252,13 @@ hidspecial HID_DLG_REL_CASC_UPD_DEFAULT                 { HelpId = HID_DLG_REL_C
 hidspecial HID_BROWSER_SAVE_RECORD                      { HelpId = HID_BROWSER_SAVE_RECORD ; };
 hidspecial HID_BROWSER_UNDO_RECORD                      { HelpId = HID_BROWSER_UNDO_RECORD ; };
 
+/*
 // missing pre processor for helpids so we have to include them here
 hidspecial SID_RELATION_ADD_RELATION                    { HelpId = SID_RELATION_ADD_RELATION ; };
 hidspecial SID_FM_NATIVESQL                             { HelpId = SID_FM_NATIVESQL ; };
 hidspecial SID_FM_ADDTABLE                              { HelpId = SID_FM_ADDTABLE ; };
 hidspecial SID_FM_EXECUTE                               { HelpId = SID_FM_EXECUTE ; };
+*/
 
 hidspecial HID_DSADMIN_SQL92CHECK                       { HelpId = HID_DSADMIN_SQL92CHECK ; };
 hidspecial HID_DSADMIN_AUTOINCREMENTVALUE               { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; };
@@ -301,7 +301,6 @@ hidspecial UID_APP_VIEW_VERT_SPLIT                      { HelpId = UID_APP_VIEW_
 hidspecial UID_APP_VIEW_BORDER_WIN                      { HelpId = UID_APP_VIEW_BORDER_WIN ; };
 hidspecial HID_APP_CREATION_LIST                        { HelpId = HID_APP_CREATION_LIST ; };
 hidspecial UID_APP_SWAP_VIEW                            { HelpId = UID_APP_SWAP_VIEW ; };
-hidspecial UID_DLG_TABLE_FILTER                         { HelpId = UID_DLG_TABLE_FILTER ; };
 hidspecial HID_APP_SWAP_ICONCONTROL                     { HelpId = HID_APP_SWAP_ICONCONTROL ; };
 
 hidspecial HID_DSADMIN_APPENDTABLEALIAS                 { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; };
@@ -350,13 +349,13 @@ hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE     { HelpId = HID_P
 hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION             { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; };
 hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION             { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; };
 
+/*
 hidspecial SID_INDEXDESIGN { HelpId = SID_INDEXDESIGN; };
 hidspecial SID_DOCUMENT_DATA_SOURCE { HelpId = SID_DOCUMENT_DATA_SOURCE; };
 hidspecial SID_DB_NEW { HelpId = SID_DB_NEW; };
 hidspecial SID_DB_APP_DISABLE_PREVIEW { HelpId = SID_DB_APP_DISABLE_PREVIEW; };
 hidspecial SID_DB_APP_DSCONNECTION_TYPE { HelpId = SID_DB_APP_DSCONNECTION_TYPE; };
 hidspecial SID_DB_APP_DSADVANCED_SETTINGS { HelpId = SID_DB_APP_DSADVANCED_SETTINGS; };
-
 hidspecial SID_DB_APP_VIEW_DOCINFO_PREVIEW { HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW; };
 hidspecial SID_DB_APP_VIEW_DOC_PREVIEW { HelpId = SID_DB_APP_VIEW_DOC_PREVIEW; };
 hidspecial SID_DB_APP_VIEW_TABLES { HelpId = SID_DB_APP_VIEW_TABLES; };
@@ -369,38 +368,31 @@ hidspecial SID_DB_APP_TABLEFILTER { HelpId = SID_DB_APP_TABLEFILTER; };
 hidspecial SID_DB_APP_CLOSECONNECTION { HelpId = SID_DB_APP_CLOSECONNECTION; };
 hidspecial SID_DB_APP_DSPROPS { HelpId = SID_DB_APP_DSPROPS; };
 hidspecial SID_DB_APP_DBADMIN { HelpId = SID_DB_APP_DBADMIN; };
-
 hidspecial SID_DB_APP_CONVERTTOVIEW { HelpId = SID_DB_APP_CONVERTTOVIEW; };
 hidspecial SID_DB_APP_REFRESH_TABLES { HelpId = SID_DB_APP_REFRESH_TABLES; };
 hidspecial SID_DB_APP_VIEW_REPORTS { HelpId = SID_DB_APP_VIEW_REPORTS; };
 hidspecial SID_DB_APP_DSEXPORT { HelpId = SID_DB_APP_DSEXPORT; };
-
 hidspecial SID_DB_APP_TABLE_DELETE { HelpId = SID_DB_APP_TABLE_DELETE; };
 hidspecial SID_DB_APP_TABLE_RENAME { HelpId = SID_DB_APP_TABLE_RENAME; };
 hidspecial SID_DB_APP_TABLE_EDIT { HelpId = SID_DB_APP_TABLE_EDIT; };
 hidspecial SID_DB_APP_TABLE_OPEN { HelpId = SID_DB_APP_TABLE_OPEN; };
-
 hidspecial SID_DB_APP_QUERY_DELETE { HelpId = SID_DB_APP_QUERY_DELETE; };
 hidspecial SID_DB_APP_QUERY_RENAME { HelpId = SID_DB_APP_QUERY_RENAME; };
 hidspecial SID_DB_APP_QUERY_EDIT { HelpId = SID_DB_APP_QUERY_EDIT; };
 hidspecial SID_DB_APP_QUERY_OPEN { HelpId = SID_DB_APP_QUERY_OPEN; };
-
 hidspecial SID_DB_APP_FORM_DELETE { HelpId = SID_DB_APP_FORM_DELETE; };
 hidspecial SID_DB_APP_FORM_RENAME { HelpId = SID_DB_APP_FORM_RENAME; };
 hidspecial SID_DB_APP_FORM_EDIT { HelpId = SID_DB_APP_FORM_EDIT; };
 hidspecial SID_DB_APP_FORM_OPEN { HelpId = SID_DB_APP_FORM_OPEN; };
-
 hidspecial SID_DB_APP_REPORT_DELETE { HelpId = SID_DB_APP_REPORT_DELETE; };
 hidspecial SID_DB_APP_REPORT_RENAME { HelpId = SID_DB_APP_REPORT_RENAME; };
 hidspecial SID_DB_APP_REPORT_EDIT { HelpId = SID_DB_APP_REPORT_EDIT; };
 hidspecial SID_DB_APP_REPORT_OPEN { HelpId = SID_DB_APP_REPORT_OPEN; };
-
 hidspecial SID_DB_APP_DELETE { HelpId = SID_DB_APP_DELETE; };
 hidspecial SID_DB_APP_RENAME { HelpId = SID_DB_APP_RENAME; };
 hidspecial SID_DB_APP_EDIT { HelpId = SID_DB_APP_EDIT; };
 hidspecial SID_DB_APP_EDIT_SQL_VIEW { HelpId = SID_DB_APP_EDIT_SQL_VIEW; };
 hidspecial SID_DB_APP_OPEN { HelpId = SID_DB_APP_OPEN; };
-
 hidspecial SID_BROWSER_CLEAR_QUERY { HelpId = SID_BROWSER_CLEAR_QUERY; };
 hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION; };
 hidspecial SID_QUERY_VIEW_FUNCTIONS { HelpId = SID_QUERY_VIEW_FUNCTIONS; };
@@ -410,58 +402,47 @@ hidspecial SID_QUERY_DISTINCT_VALUES { HelpId = SID_QUERY_DISTINCT_VALUES; };
 hidspecial SID_FORM_CREATE_REPWIZ_PRE_SEL { HelpId = SID_FORM_CREATE_REPWIZ_PRE_SEL; };
 hidspecial SID_REPORT_CREATE_REPWIZ_PRE_SEL { HelpId = SID_REPORT_CREATE_REPWIZ_PRE_SEL; };
 hidspecial SID_APP_NEW_REPORT_PRE_SEL { HelpId = SID_APP_NEW_REPORT_PRE_SEL; };
-
 hidspecial SID_APP_NEW_FOLDER { HelpId = SID_APP_NEW_FOLDER; };
 hidspecial SID_APP_NEW_FORM { HelpId = SID_APP_NEW_FORM; };
 hidspecial SID_DB_APP_PASTE_SPECIAL { HelpId = SID_DB_APP_PASTE_SPECIAL; };
 hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW; };
-
 hidspecial SID_DB_APP_STATUS_TYPE { HelpId = SID_DB_APP_STATUS_TYPE; };
 hidspecial SID_DB_APP_STATUS_DBNAME { HelpId = SID_DB_APP_STATUS_DBNAME; };
 hidspecial SID_DB_APP_STATUS_USERNAME { HelpId = SID_DB_APP_STATUS_USERNAME; };
 hidspecial SID_DB_APP_STATUS_HOSTNAME { HelpId = SID_DB_APP_STATUS_HOSTNAME; };
-
 hidspecial SID_DB_APP_SENDREPORTASMAIL { HelpId = SID_DB_APP_SENDREPORTASMAIL; };
 hidspecial SID_DB_APP_SENDREPORTTOWRITER { HelpId = SID_DB_APP_SENDREPORTTOWRITER; };
 hidspecial SID_DB_NEW_VIEW_SQL { HelpId = SID_DB_NEW_VIEW_SQL; };
+*/
 
 hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE           { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE           { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; };
-
 hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES             { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES             { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES           { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION               { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; };
-
 hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR             { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR              { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR           { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; };
 hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR         { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; };
-
 hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION       { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; };
 hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION       { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; };
-
 hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER                 { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; };
 hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN                     { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; };
 hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER                 { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; };
 hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL                     { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; };
 hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION         { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; };
-
 hidspecial HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME               { HelpId = HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME ; };
 hidspecial HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME               { HelpId = HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME ; };
-
 hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC            { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; };
 hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC            { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; };
-
 hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME             { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; };
 hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER         { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; };
 hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT               { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; };
 hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS              { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; };
 hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS          { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; };
-
 hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL                    { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; };
 hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL                    { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; };
-
 hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME                { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; };
 hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER            { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; };
 hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT                  { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; };
@@ -487,7 +468,11 @@ hidspecial HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD                      { He
 hidspecial HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS                        { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ; };
 hidspecial HID_DSADMIN_USESSL_LDAP                                          { HelpId = HID_DSADMIN_USESSL_LDAP ; };
 hidspecial HID_DSADMIN_DOSLINEENDS                                          { HelpId = HID_DSADMIN_DOSLINEENDS ; };
+
+/*
 hidspecial SID_DB_QUERY_PREVIEW                                             { HelpId = SID_DB_QUERY_PREVIEW ; };
+*/
+
 hidspecial HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE                          { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE ; };
 hidspecial HID_PAGE_DBWIZARD_USERDEFINED_BROWSE                             { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_BROWSE ; };
 hidspecial HID_DLG_DATABASE_WIZARD                                          { HelpId = HID_DLG_DATABASE_WIZARD ; };
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index ee38f81411fb..3202f0ba5fa0 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -240,3 +240,23 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
 .ENDIF
 
 .ENDIF
+
+ALLTAR : $(MISC)/dba.component $(MISC)/dbu.component $(MISC)/sdbt.component
+
+$(MISC)/dba.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dba.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dba.component
+
+$(MISC)/dbu.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbu.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbu.component
+
+$(MISC)/sdbt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdbt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdbt.component
diff --git a/dbaccess/util/sdbt.component b/dbaccess/util/sdbt.component
new file mode 100644
index 000000000000..0038c0cad27f
--- /dev/null
+++ b/dbaccess/util/sdbt.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.dbaccess.ConnectionTools">
+    <service name="com.sun.star.sdb.tools.ConnectionTools"/>
+  </implementation>
+</component>