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
author: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-06 22:03:09 -0600
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-06 22:03:09 -0600
commit: 615f67cedb7873d8cfd1a5a71210c2200ffca8d5 (patch)
tree: 7520f6f398820b3b4a177792468d8512799f29b0 /dbaccess/source
parent: fb2038e67257fb410f96bfa0ef6302275696c688 (diff)
parent: cc50d78db9bdee61353f4b4ee335166adeccf2cc (diff)
115 files changed, 631 insertions, 560 deletions
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 444169cf9..f44de46f5 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -55,7 +55,10 @@ ORowSetColumn::ORowSetColumn(	const Reference < XResultSetMetaData >& _xMetaData
 
 ::cppu::IPropertyArrayHelper* ORowSetColumn::createArrayHelper( ) const
 {
-    BEGIN_PROPERTY_SEQUENCE(21)
+    const sal_Int32 nDerivedProperties = 21;
+    Sequence< Property> aDerivedProperties( nDerivedProperties );
+    Property* pDesc = aDerivedProperties.getArray();
+    sal_Int32 nPos = 0;
 
     DECL_PROP1( CATALOGNAME,                ::rtl::OUString,    READONLY );
     DECL_PROP1( DISPLAYSIZE,                sal_Int32,          READONLY );
@@ -78,13 +81,12 @@ ORowSetColumn::ORowSetColumn(	const Reference < XResultSetMetaData >& _xMetaData
     DECL_PROP1( TYPE,                       sal_Int32,          READONLY );
     DECL_PROP1( TYPENAME,                   ::rtl::OUString,    READONLY );
     DECL_PROP2( VALUE,                      Any,                READONLY, BOUND );
-
-    END_PROPERTY_SEQUENCE()
+    OSL_ENSURE( nPos == nDerivedProperties, "ORowSetColumn::createArrayHelper: inconsistency!" );
 
     Sequence< Property > aRegisteredProperties;
     describeProperties( aRegisteredProperties );
 
-    return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), sal_False );
+    return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDerivedProperties, aRegisteredProperties ), sal_False );
 }
 
 ::cppu::IPropertyArrayHelper& ORowSetColumn::getInfoHelper()
@@ -98,6 +100,6 @@ void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
     if ( nHandle != PROPERTY_ID_VALUE )
         ORowSetDataColumn::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 }
-
 }   // namespace dbaccess
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index f2c84a3b2..f16a046e5 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -38,7 +38,7 @@ namespace dbaccess
     class ORowSetColumn;
     class ORowSetColumn :public ORowSetDataColumn
                         ,public ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >
-
+                            
     {
     public:
         ORowSetColumn(	const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
@@ -57,5 +57,4 @@ namespace dbaccess
 }
 
 #endif // DBACCESS_CORE_API_CROWSETCOLUMN_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index 9e6bfe87d..8d7c8723c 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -77,7 +77,10 @@ ORowSetDataColumn::~ORowSetDataColumn()
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* ORowSetDataColumn::createArrayHelper( ) const
 {
-    BEGIN_PROPERTY_SEQUENCE(21)
+    const sal_Int32 nDerivedProperties = 21;
+    Sequence< Property> aDerivedProperties( nDerivedProperties );
+    Property* pDesc = aDerivedProperties.getArray();
+    sal_Int32 nPos = 0;
 
     DECL_PROP1( CATALOGNAME,                ::rtl::OUString,    READONLY );
     DECL_PROP1( DISPLAYSIZE,                sal_Int32,          READONLY );
@@ -100,13 +103,12 @@ ORowSetDataColumn::~ORowSetDataColumn()
     DECL_PROP1( TYPE,                       sal_Int32,          READONLY );
     DECL_PROP1( TYPENAME,                   ::rtl::OUString,    READONLY );
     DECL_PROP1( VALUE,                      Any,                BOUND );
-
-    END_PROPERTY_SEQUENCE()
+    OSL_ENSURE( nPos == nDerivedProperties, "ORowSetDataColumn::createArrayHelper: inconsistency!" );
 
     Sequence< Property > aRegisteredProperties;
     describeProperties( aRegisteredProperties );
 
-    return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), sal_False );
+    return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDerivedProperties, aRegisteredProperties ), sal_False );
 }
 
 // cppu::OPropertySetHelper
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 6521f944c..ac3c610d5 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -89,7 +89,7 @@ OCacheSet::OCacheSet()
     return sQuote;
 }
 
-void OCacheSet::construct(	const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/)
+void OCacheSet::construct(	const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) 
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" );
     OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet");
@@ -211,7 +211,7 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti
 }
 
 void OCacheSet::fillParameters( const ORowSetRow& _rRow
-                                        ,const connectivity::OSQLTable& _xTable
+                                        ,const connectivity::OSQLTable& _xTable 
                                         ,::rtl::OUStringBuffer& _sCondition
                                         ,::rtl::OUStringBuffer& _sParameter
                                         ,::std::list< sal_Int32>& _rOrgValues)
@@ -698,3 +698,4 @@ void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const
 {
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 966ec2280..4644b9e69 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -219,7 +219,7 @@ void OKeySet::findTableColumnsMatching_throw(   const Any& i_aTable,
 }
 ::rtl::OUStringBuffer OKeySet::createKeyFilter()
 {
-    static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
+    static ::rtl::OUString aAnd		= ::rtl::OUString::createFromAscii(" AND ");
     const ::rtl::OUString aQuote	= getIdentifierQuoteString();
     ::rtl::OUStringBuffer aFilter;
     static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
@@ -582,10 +582,11 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection );
 
     // now create end execute the prepared statement
+    
     ::rtl::OUString sEmpty;
     executeUpdate(_rInsertRow ,_rOrginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions);
 }
-
+// -----------------------------------------------------------------------------
 void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions)
 {
     // now create end execute the prepared statement
@@ -856,7 +857,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
             connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaEnd;
             OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first);
             if ( aUpdateFind == m_aUpdatedParameter.end() )
-            {
+            {	
                 aParaIter = m_aParameterValueForCache.get().begin();
                 aParaEnd = m_aParameterValueForCache.get().end();
             }
@@ -865,7 +866,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
                 aParaIter = aUpdateFind->second.get().begin();
                 aParaEnd = aUpdateFind->second.get().end();
             }
-
+            
             for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
             {
                 ::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() );
@@ -1612,11 +1613,11 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
                         SelectColumnDescription aColDesc( nPos, nType,nScale,nNullable != sdbc::ColumnValue::NO_NULLS, sColumnDefault );
                         aColDesc.sRealName = sRealName;
                         aColDesc.sTableName = sTableName;
-                        o_rColumnNames[sName.makeStringAndClear()] = aColDesc;
+                        o_rColumnNames[sName.makeStringAndClear()] = aColDesc;                        
                     }
                     else
                         o_rColumnNames[sRealName] = SelectColumnDescription( nPos, nType,nScale,nNullable != sdbc::ColumnValue::NO_NULLS, sColumnDefault );
-
+                    
                     break;
                 }
             }
@@ -1645,4 +1646,6 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select
             break;
     }
 }
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index a439fb22e..1a7c0e7d5 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -33,6 +33,7 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <memory>
+#include <memory>
 #include <map>
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index d007cdd77..dd8ca5825 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index f12afb9f6..5807f684c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -136,7 +136,6 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet()
 
 namespace dbaccess
 {
-
 Reference< XInterface > ORowSet_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
 {
     return *(new ORowSet(_rxFactory));
@@ -909,7 +908,7 @@ void SAL_CALL ORowSet::insertRow(  ) throw(SQLException, RuntimeException)
 
         // - rowChanged
         notifyAllListenersRowChanged(aGuard,aEvt);
-
+        
         if ( !aBookmarks.empty() )
         {
             RowsChangeEvent aUpEvt(*this,RowChangeAction::UPDATE,aBookmarks.size(),Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()));
@@ -961,7 +960,7 @@ void SAL_CALL ORowSet::updateRow(  ) throw(SQLException, RuntimeException)
         ::std::vector< Any > aBookmarks;
         m_pCache->updateRow(m_aCurrentRow.operator ->(),aBookmarks);
         if ( !aBookmarks.empty() )
-            aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size());
+            aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()); 
         aEvt.Rows += aBookmarks.size();
         m_aBookmark		= m_pCache->getBookmark();
         m_aCurrentRow	= m_pCache->m_aMatrixIter;
@@ -1925,6 +1924,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
                     if(!xColumn.is())
                     {
                         // no column found so we could look at the position i
+                        //bReFetchName = sal_True;
+                        //sColumnLabel = ::rtl::OUString();
                         Reference<XIndexAccess> xIndexAccess(m_xColumns,UNO_QUERY);
                         if(xIndexAccess.is() && i <= xIndexAccess->getCount())
                         {
@@ -2633,7 +2634,6 @@ void SAL_CALL ORowSet::clearWarnings(  ) throw (SQLException, RuntimeException)
 {
     m_aWarnings.clearWarnings();
 }
-
 void ORowSet::doCancelModification( )
 {
     if ( isModification() )
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 492302f15..d48070249 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1290,7 +1290,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
     }
     DBG_TRACE2("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
 }
-
+// -------------------------------------------------------------------------
 void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rOldValue)
 {
     OSL_ENSURE(_nPos < (sal_Int32)m_aDataColumns.size(),"nPos is invalid!");
@@ -1502,7 +1502,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
     if ( m_pRowSet->isModification( ORowSetBase::GrantNotifierAccess() ) )
         m_pRowSet->doCancelModification( ORowSetBase::GrantNotifierAccess() );
 }
-
+// -----------------------------------------------------------------------------
 ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector::Vector& i_aRow )
     :m_pImpl(new ORowSetNotifierImpl)
     ,m_pRowSet( _pRowSet )
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index f795ce75c..5dad2030e 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -42,6 +42,7 @@
 #include "core_resource.hxx"
 #include "dbastrings.hrc"
 
+/** === begin UNO includes === **/
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
@@ -50,6 +51,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
+/** === end UNO includes === **/
 
 #include <comphelper/extract.hxx>
 #include <comphelper/property.hxx>
@@ -1267,7 +1269,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector
     m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable);
     // refetch the whole row
     (*m_aMatrixIter) = NULL;
-
+    
     if ( moveToBookmark(aBookmark) )
     {
         // update the cached values
@@ -1611,12 +1613,11 @@ sal_Bool ORowSetCache::fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix:
     }
     return _bCheck;
 }
-
 bool ORowSetCache::isResultSetChanged() const
 {
     return m_pCacheSet->isResultSetChanged();
 }
-
+// -----------------------------------------------------------------------------
 void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet)
 {
     m_xMetaData.set(Reference< XResultSetMetaDataSupplier >(_xDriverSet,UNO_QUERY)->getMetaData());
@@ -1626,7 +1627,7 @@ void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet)
     m_nRowCount = 0;
     reFillMatrix(m_nStartPos+1,m_nEndPos+1);
 }
-
+// -----------------------------------------------------------------------------
 void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow
                                            ,::std::vector<sal_Int32>& o_ChangedColumns)
 {
@@ -1640,7 +1641,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_
                 break;
             }
         }
-
+        
         if ( aIter == m_pMatrix->end() )
         {
             m_pCacheSet->fillMissingValues(io_aRow);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 8af1be229..2632fefbd 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1591,6 +1591,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
         aSQL.append( ::dbtools::quoteName( aQuote, aName ) );
     }
 
+    
     if ( aValue.hasValue() )
     {
         if(  !m_xTypeConverter.is() )
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index 085f99ecf..0eb657366 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/awt/FontWidth.hpp>
 
 
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index c0db66370..ab27049e4 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -90,6 +90,7 @@ void OTableColumnDescriptor::impl_registerProperties()
     OColumnSettings::registerProperties( *this );
 }
 
+//--------------------------------------------------------------------------
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor )
 
 // ::com::sun::star::lang::XServiceInfo
@@ -142,6 +143,7 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >&
 //============================================================
 DBG_NAME(OTableColumn);
 
+// -------------------------------------------------------------------------
 OTableColumn::OTableColumn( const ::rtl::OUString& _rName )
     :OTableColumnDescriptor( false /* do not act as descriptor */ )
 {
@@ -156,16 +158,19 @@ OTableColumn::~OTableColumn()
 
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
 
+//------------------------------------------------------------------------------
 rtl::OUString OTableColumn::getImplementationName(  ) throw (RuntimeException)
 {
     return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumn"));
 }
 
+//------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper()
 {
     return *OTableColumn_PBase::getArrayHelper();
 }
 
+//------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OTableColumn::createArrayHelper( ) const
 {
     return OTableColumnDescriptor::createArrayHelper();
@@ -176,6 +181,7 @@ rtl::OUString OTableColumn::getImplementationName(  ) throw (RuntimeException)
 // =========================================================================
 DBG_NAME( OQueryColumn );
 
+// -------------------------------------------------------------------------
 OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection,const ::rtl::OUString i_sLabel )
     :OTableColumnDescriptor( false /* do not act as descriptor */ )
     ,m_sLabel(i_sLabel)
@@ -282,6 +288,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
 
 IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
 
+//--------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL OQueryColumn::getImplementationName(  ) throw(RuntimeException)
 {
     return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.dbaccess.OQueryColumn" ) );
@@ -297,6 +304,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
     return OTableColumnDescriptor::createArrayHelper();
 }
 
+//--------------------------------------------------------------------------
 void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
 {
     OTableColumnDescriptor::getFastPropertyValue( _rValue, _nHandle );
@@ -369,6 +377,7 @@ OColumnWrapper::~OColumnWrapper()
     return sPropName;
 }
 
+//------------------------------------------------------------------------------
 void OColumnWrapper::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
     // derived classes are free to either use the OPropertyContainer(Helper) mechanisms for properties,
@@ -437,6 +446,7 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X
 }
 
 // com::sun::star::lang::XTypeProvider
+//--------------------------------------------------------------------------
 IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper )
 
 // ::com::sun::star::lang::XServiceInfo
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 9bf2e3400..5cd5502bc 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -50,6 +50,7 @@
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
+#include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include "querycomposer.hxx"
 #include "HelperCollections.hxx"
 #include "composertools.hxx"
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index f5fdd7590..3a753d4d9 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -576,6 +576,7 @@ void OConnection::impl_fillTableFilter()
     }
 }
 
+// -----------------------------------------------------------------------------
 void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::refresh" );
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 7b6e9acec..6b1e3c267 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -109,7 +109,6 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseContext()
 
 namespace dbaccess
 {
-
         typedef ::cppu::WeakImplHelper1 <   XTerminateListener
                                         >   DatabaseDocumentLoader_Base;
         class DatabaseDocumentLoader : public DatabaseDocumentLoader_Base
@@ -544,46 +543,55 @@ void ODatabaseContext::revokeObject(const rtl::OUString& _rName) throw( Exceptio
     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
 }
 
+//------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
 {
     return m_xDatabaseRegistrations->hasRegisteredDatabase( _Name );
 }
 
+//------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException)
 {
     return m_xDatabaseRegistrations->getRegistrationNames();
 }
 
+//------------------------------------------------------------------------------
 ::rtl::OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
 {
     return m_xDatabaseRegistrations->getDatabaseLocation( _Name );
 }
 
+//------------------------------------------------------------------------------
 void SAL_CALL ODatabaseContext::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
 {
     m_xDatabaseRegistrations->registerDatabaseLocation( _Name, _Location );
 }
 
+//------------------------------------------------------------------------------
 void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
 {
     m_xDatabaseRegistrations->revokeDatabaseLocation( _Name );
 }
 
+//------------------------------------------------------------------------------
 void SAL_CALL ODatabaseContext::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
 {
     m_xDatabaseRegistrations->changeDatabaseLocation( _Name, _NewLocation );
 }
 
+//------------------------------------------------------------------------------
 ::sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
 {
     return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( _Name );
 }
 
+//------------------------------------------------------------------------------
 void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
 {
     m_xDatabaseRegistrations->addDatabaseRegistrationsListener( _Listener );
 }
 
+//------------------------------------------------------------------------------
 void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException)
 {
     m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( _Listener );
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 7a7e6c7be..a19eec46f 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index c866902b9..be1932ee8 100644..100755
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -1413,6 +1413,5 @@ Reference< XInterface > ODatabaseSource::getThis() const
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getThis" );
     return *const_cast< ODatabaseSource* >( this );
 }
-
 }	// namespace dbaccess
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index 77745302a..c4e3bb14f 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@ -107,4 +107,26 @@
 
 #define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 67 )
 
+#define RID_STR_NO_DELETE_BEFORE_AFTER			( RID_CORE_STRINGS_START + 49 )
+#define RID_STR_NO_DELETE_INSERT_ROW			( RID_CORE_STRINGS_START + 50 )
+#define RID_STR_RESULT_IS_READONLY				( RID_CORE_STRINGS_START + 51 )
+#define RID_STR_NO_DELETE_PRIVILEGE				( RID_CORE_STRINGS_START + 52 )
+#define RID_STR_ROW_ALREADY_DELETED				( RID_CORE_STRINGS_START + 53 )
+#define RID_STR_UPDATE_FAILED					( RID_CORE_STRINGS_START + 54 )
+
+#define RID_STR_INVALID_INDEX					( RID_CORE_STRINGS_START + 55 )
+#define RID_STR_NO_INSERT_PRIVILEGE				( RID_CORE_STRINGS_START + 56 )
+#define RID_STR_INTERNAL_ERROR					( RID_CORE_STRINGS_START + 57 )
+#define RID_STR_EXPRESSION1						( RID_CORE_STRINGS_START + 58 )
+#define RID_STR_NO_SQL_COMMAND					( RID_CORE_STRINGS_START + 59 )
+#define RID_STR_INVALID_CURSOR_STATE			( RID_CORE_STRINGS_START + 60 )
+#define RID_STR_CURSOR_BEFORE_OR_AFTER			( RID_CORE_STRINGS_START + 61 )
+#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER		( RID_CORE_STRINGS_START + 62 )
+#define RID_STR_NO_BOOKMARK_DELETED				( RID_CORE_STRINGS_START + 63 )
+#define RID_STR_NO_EMBEDDING					( RID_CORE_STRINGS_START + 64 )
+#define RID_STR_CONNECTION_REQUEST				( RID_CORE_STRINGS_START + 65 )
+#define RID_STR_MISSING_EXTENSION				( RID_CORE_STRINGS_START + 66 )
+
+#define RID_NO_SUCH_DATA_SOURCE                 ( RID_CORE_STRINGS_START + 67 )
+
 #endif // _DBA_CORE_RESOURCE_HRC_
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index d22684395..7b33c2a0a 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -95,28 +95,6 @@ extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironmen
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" OOO_DLLPUBLIC_DBA sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        return ::dba::DbaModule::getInstance().writeComponentInfos(
-            static_cast< XMultiServiceFactory* >( pServiceManager ),
-            static_cast< XRegistryKey* >( pRegistryKey ) )
-            && cppu::component_writeInfoHelper(pServiceManager, pRegistryKey, dba::entries);
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ENSURE( false, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !" );
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index c431f2cd2..89f9373b3 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -272,7 +272,6 @@ String RID_NO_SUCH_DATA_SOURCE
 {
     Text [ en-US ] = "Error accessing data source '$name$':\n$error$";
 };
-
 String RID_STR_NO_SUB_FOLDER
 {
     Text [ en-US ] = "There exists no folder named \"$folder$\".";
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index a1d147e58..dae67418d 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -239,54 +239,6 @@ namespace COMPMOD_NAMESPACE
     }
 
     //--------------------------------------------------------------------------
-    sal_Bool OModule::writeComponentInfos(
-            const Reference< XMultiServiceFactory >& /*_rxServiceManager*/,
-            const Reference< XRegistryKey >& _rxRootKey)
-    {
-        OSL_ENSURE(_rxRootKey.is(), "OModule::writeComponentInfos : invalid argument !");
-
-        if (!s_pImplementationNames)
-        {
-            OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
-            return sal_True;
-        }
-        OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
-            "OModule::writeComponentInfos : inconsistent state (the pointers) !");
-        OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                    &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
-            "OModule::writeComponentInfos : inconsistent state !");
-
-        sal_Int32 nLen = s_pImplementationNames->getLength();
-        const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
-        const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
-
-        ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
-        for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
-        {
-            ::rtl::OUString aMainKeyName(sRootKey);
-            aMainKeyName += *pImplName;
-            aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-            try
-            {
-                Reference< XRegistryKey >  xNewKey( _rxRootKey->createKey(aMainKeyName) );
-
-                const ::rtl::OUString* pService = pServices->getConstArray();
-                for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService)
-                    xNewKey->createKey(*pService);
-            }
-            catch(Exception&)
-            {
-                OSL_ASSERT("OModule::writeComponentInfos : something went wrong while creating the keys !");
-                return sal_False;
-            }
-        }
-
-        return sal_True;
-    }
-
-    //--------------------------------------------------------------------------
     Reference< XInterface > OModule::getComponentFactory(
         const ::rtl::OUString& _rImplementationName,
         const Reference< XMultiServiceFactory >& _rxServiceManager)
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index d0c93c5b0..e3a7dd684 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -122,21 +122,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
         static void revokeComponent(
             const ::rtl::OUString& _rImplementationName);
 
-        /** write the registration information of all known components
-            <p>writes the registration information of all components which are currently registered into the
-            specified registry.<p/>
-            <p>Usually used from within component_writeInfo.<p/>
-            @param	_rxServiceManager
-                        the service manager
-            @param	_rRootKey
-                        the registry key under which the information will be stored
-            @return
-                        sal_True if the registration of all implementations was successfull, sal_False otherwise
-        */
-        static sal_Bool writeComponentInfos(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
-
         /** creates a Factory for the component with the given implementation name.
             <p>Usually used from within component_getFactory.<p/>
             @param	_rxServiceManager
diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx
index b530783cc..09ed34f6e 100644
--- a/dbaccess/source/ext/adabas/Aservices.cxx
+++ b/dbaccess/source/ext/adabas/Aservices.cxx
@@ -69,27 +69,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return OModule::writeComponentInfos(
-            static_cast<XMultiServiceFactory*>(pServiceManager),
-            static_cast<XRegistryKey*>(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ASSERT("DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/ext/adabas/adabasui.component b/dbaccess/source/ext/adabas/adabasui.component
new file mode 100644
index 000000000..e547a0cff
--- /dev/null
+++ b/dbaccess/source/ext/adabas/adabasui.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="org.openoffice.comp.adabasui.AdabasCreateDialog">
+    <service name="com.sun.star.sdb.AdabasCreationDialog"/>
+  </implementation>
+</component>
diff --git a/dbaccess/source/ext/adabas/adabasui.dxp b/dbaccess/source/ext/adabas/adabasui.dxp
index db9c0a52f..926e49f5f 100644
--- a/dbaccess/source/ext/adabas/adabasui.dxp
+++ b/dbaccess/source/ext/adabas/adabasui.dxp
@@ -1,4 +1,3 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 
diff --git a/dbaccess/source/ext/adabas/exports.dxp b/dbaccess/source/ext/adabas/exports.dxp
index 9630d7e06..f0e1c6993 100644
--- a/dbaccess/source/ext/adabas/exports.dxp
+++ b/dbaccess/source/ext/adabas/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk
index e23310ac9..8dbbe7abc 100644
--- a/dbaccess/source/ext/adabas/makefile.mk
+++ b/dbaccess/source/ext/adabas/makefile.mk
@@ -91,3 +91,10 @@ RESLIB1SRSFILES=$(RES1FILELIST)
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/adabasui.component
+
+$(MISC)/adabasui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        adabasui.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt adabasui.component
diff --git a/dbaccess/source/ext/macromigration/dbmm.component b/dbaccess/source/ext/macromigration/dbmm.component
new file mode 100644
index 000000000..a74e94510
--- /dev/null
+++ b/dbaccess/source/ext/macromigration/dbmm.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.macromigration.MacroMigrationDialogService">
+    <service name="com.sun.star.sdb.application.MacroMigrationWizard"/>
+  </implementation>
+</component>
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index b00ce0392..efff61aa6 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -31,6 +31,7 @@
 // -----------------------------------------------------------------------------
 ModalDialog DLG_MACRO_MIGRATION
 {
+    HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
     OutputSize = TRUE ;
     Moveable = TRUE;
     Closeable = TRUE ;
@@ -65,6 +66,7 @@ ModalDialog DLG_MACRO_MIGRATION
 
 TabPage TP_PREPARE
 {
+    HelpID = "dbaccess:TabPage:TP_PREPARE";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -115,6 +117,7 @@ TabPage TP_PREPARE
 
 TabPage TP_SAVE_DBDOC_AS
 {
+    HelpID = "dbaccess:TabPage:TP_SAVE_DBDOC_AS";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -152,6 +155,7 @@ TabPage TP_SAVE_DBDOC_AS
 
     ComboBox ED_SAVE_AS_LOCATION
     {
+        HelpID = "dbaccess:ComboBox:TP_SAVE_DBDOC_AS:ED_SAVE_AS_LOCATION";
         Pos = MAP_APPFONT(  TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED,
                             CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
         Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN,
@@ -163,6 +167,7 @@ TabPage TP_SAVE_DBDOC_AS
 
     PushButton PB_BROWSE_SAVE_AS_LOCATION
     {
+        HelpID = "dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION";
         Pos = MAP_APPFONT(  TAB_PAGE_WIDTH - BUTTON_WIDTH - TAB_PAGE_CONTENT_MARGIN,
                             CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + INPUT_HEIGHT + SPACING_RELATED );
         Size = MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT );
@@ -189,6 +194,7 @@ TabPage TP_SAVE_DBDOC_AS
 
 TabPage TP_MIGRATE
 {
+    HelpID = "dbaccess:TabPage:TP_MIGRATE";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -302,6 +308,7 @@ TabPage TP_MIGRATE
 
 TabPage TP_SUMMARY
 {
+    HelpID = "dbaccess:TabPage:TP_SUMMARY";
     Pos = MAP_APPFONT( 40, 130 );
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
 
@@ -325,6 +332,7 @@ TabPage TP_SUMMARY
 
     MultiLineEdit ED_CHANGES
     {
+        HelpID = "dbaccess:MultiLineEdit:TP_SUMMARY:ED_CHANGES";
         Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED );
         Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
                             TAB_PAGE_HEIGHT - ( CONTENT_POS_X + FIXED_TEXT_HEIGHT + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN );
@@ -444,12 +452,10 @@ String STR_INVALID_NUMBER_ARGS
 {
     Text [ en-US ] = "Invalid number of initialization arguments. Expected 1.";
 };
-
 String STR_NO_DATABASE
 {
-    Text [ en-US ] = "No database document found in the initializatin arguments.";
+    Text [ en-US ] = "No database document found in the initialization arguments.";
 };
-
 String STR_NOT_READONLY
 {
     Text [ en-US ] = "Not applicable to read-only documents.";
diff --git a/dbaccess/source/ext/macromigration/makefile.mk b/dbaccess/source/ext/macromigration/makefile.mk
index 41898091c..b71330f17 100644
--- a/dbaccess/source/ext/macromigration/makefile.mk
+++ b/dbaccess/source/ext/macromigration/makefile.mk
@@ -99,3 +99,11 @@ RESLIB1SRSFILES=$(RES1FILELIST)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/dbmm.component
+
+$(MISC)/dbmm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbmm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbmm.component
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index c9e917dbf..0965b93ec 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -373,7 +373,7 @@ namespace dbmm
                 break;
 
             case ERR_NEW_STYLE_REPORT:
-                pAsciiErrorDescription = "#doc# could not be processed, since you don't have the Sun Report Builder (TM) extension installed.";
+                pAsciiErrorDescription = "#doc# could not be processed, since you don't have the Oracle Report Builder (TM) extension installed.";
                 aAsciiParameterNames.push_back( "#doc#" );
                 break;
 
diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx
index a2591ff70..bf3c0f6d6 100644
--- a/dbaccess/source/filter/migration/cfgservices.cxx
+++ b/dbaccess/source/filter/migration/cfgservices.cxx
@@ -69,27 +69,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return ::dbacfg::OModuleRegistration::writeComponentInfos(
-            static_cast<XMultiServiceFactory*>(pServiceManager),
-            static_cast<XRegistryKey*>(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/filter/migration/dbacfg.component b/dbaccess/source/filter/migration/dbacfg.component
new file mode 100644
index 000000000..65e92d0f5
--- /dev/null
+++ b/dbaccess/source/filter/migration/dbacfg.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.sdb.DataSourceMigration">
+    <service name="com.sun.star.sdb.DataSourceMigration"/>
+  </implementation>
+</component>
diff --git a/dbaccess/source/filter/migration/makefile.mk b/dbaccess/source/filter/migration/makefile.mk
index 9d4b95035..1fde72a06 100644
--- a/dbaccess/source/filter/migration/makefile.mk
+++ b/dbaccess/source/filter/migration/makefile.mk
@@ -71,3 +71,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/dbacfg.component
+
+$(MISC)/dbacfg.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbacfg.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbacfg.component
diff --git a/dbaccess/source/filter/xml/dbaxml.component b/dbaccess/source/filter/xml/dbaxml.component
new file mode 100644
index 000000000..23b3a5c1a
--- /dev/null
+++ b/dbaccess/source/filter/xml/dbaxml.component
@@ -0,0 +1,49 @@
+<?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.sdb.DBExportFilter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdb.DBFilter">
+    <service name="com.sun.star.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdb.XMLFullExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdb.XMLSettingsExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbflt.DBContentLoader2">
+    <service name="com.sun.star.frame.FrameLoader"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.dbflt.DBTypeDetection">
+    <service name="com.sun.star.document.ExtendedTypeDetection"/>
+  </implementation>
+</component>
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk
index 3f3b02195..33ff074b8 100644
--- a/dbaccess/source/filter/xml/makefile.mk
+++ b/dbaccess/source/filter/xml/makefile.mk
@@ -111,3 +111,11 @@ DEF1NAME=$(SHL1TARGET)
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
+
+ALLTAR : $(MISC)/dbaxml.component
+
+$(MISC)/dbaxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbaxml.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbaxml.component
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index e2beb266a..78da1cf6e 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -101,6 +101,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport
             case XML_TOK_COLUMN_DEFAULT_VALUE:
                 if ( sValue.getLength() && sType.getLength() )
                     m_aDefaultValue <<= sValue;
+                //    SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
                 break;
             case XML_TOK_COLUMN_VISIBLE:
                 m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false"));
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 8836532b9..76ddf139e 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -79,28 +79,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        writeDBLoaderInfo2(pRegistryKey);
-        return ::dbaxml::OModuleRegistration::writeComponentInfos(
-            static_cast<XMultiServiceFactory*>(pServiceManager),
-            static_cast<XRegistryKey*>(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index f53e7da95..343e0ef71 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -74,16 +74,6 @@ public:
     static void revokeComponent(
         const ::rtl::OUString& _rImplementationName);
 
-    /** writes the registration information of all components which are currently registered into the specified registry.
-        Usually used from within component_writeInfo.
-        @param		_rxServiceManager	the service manager
-        @param		_rRootKey			the registry key under which the information will be stored
-        @return							sal_True if the registration of all implementations was successfull, sal_False otherwise
-    */
-    static sal_Bool writeComponentInfos(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
-
     /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory.
         @param		_rxServiceManager		a pointer to an XMultiServiceFactory interface as got in component_getFactory
         @param		_pImplementationName	the implementation name of the component
diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 06bfebaf2..9767bd190 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -65,27 +65,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey) 
-    try 
-    {
-        return ::sdbtools::SdbtModule::getInstance().writeComponentInfos(
-            static_cast<XMultiServiceFactory*>(pServiceManager),
-            static_cast<XRegistryKey*>(pRegistryKey));
-    }
-    catch (const InvalidRegistryException& )
-    {
-        OSL_ASSERT("sdbt::component_writeInfo: could not create a registry key (InvalidRegistryException) !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index 67717440c..289ea3b55 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -117,54 +117,6 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio
 }
 
 //--------------------------------------------------------------------------
-sal_Bool OModuleRegistration::writeComponentInfos(
-        const uno::Reference< lang::XMultiServiceFactory >& /*_rxServiceManager*/,
-        const uno::Reference< registry::XRegistryKey >& _rxRootKey)
-{
-    OSL_ENSURE(_rxRootKey.is(), "OModuleRegistration::writeComponentInfos : invalid argument !");
-
-    if (!s_pImplementationNames)
-    {
-        OSL_ENSURE(sal_False, "OModuleRegistration::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
-        return sal_True;
-    }
-    OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
-        "OModuleRegistration::writeComponentInfos : inconsistent state (the pointers) !");
-    OSL_ENSURE(	(s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
-                &&	(s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
-                &&	(s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
-        "OModuleRegistration::writeComponentInfos : inconsistent state !");
-
-    sal_Int32 nLen = s_pImplementationNames->getLength();
-    const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray();
-    const uno::Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray();
-
-    ::rtl::OUString sRootKey("/", 1, RTL_TEXTENCODING_ASCII_US);
-    for (sal_Int32 i=0; i<nLen; ++i, ++pImplName, ++pServices)
-    {
-        ::rtl::OUString aMainKeyName(sRootKey);
-        aMainKeyName += *pImplName;
-        aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-        try
-        {
-            uno::Reference< registry::XRegistryKey >  xNewKey( _rxRootKey->createKey(aMainKeyName) );
-
-            const ::rtl::OUString* pService = pServices->getConstArray();
-            for (sal_Int32 j=0; j<pServices->getLength(); ++j, ++pService)
-                xNewKey->createKey(*pService);
-        }
-        catch(uno::Exception const&)
-        {
-            OSL_ENSURE(sal_False, "OModuleRegistration::writeComponentInfos : something went wrong while creating the keys !");
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-//--------------------------------------------------------------------------
 uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory(
     const ::rtl::OUString& _rImplementationName,
     const uno::Reference< lang::XMultiServiceFactory >& _rxServiceManager)
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index df0987676..b7a40aac5 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -664,21 +664,22 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    USHORT nHelpId = 0, nImageId = 0;
+    USHORT nImageId = 0;
+    rtl::OString sHelpId;
     ImageProvider aImageProvider;
     Image aFolderImage;
     switch( _eType )
     {
         case E_FORM:
-            nHelpId = HID_APP_FORM_TREE;
+            sHelpId = HID_APP_FORM_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM );
             break;
         case E_REPORT:
-            nHelpId = HID_APP_REPORT_TREE;
+            sHelpId = HID_APP_REPORT_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT );
             break;
         case E_QUERY:
-            nHelpId = HID_APP_QUERY_TREE;
+            sHelpId = HID_APP_QUERY_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
             break;
         default:
@@ -688,7 +689,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 
     if ( !m_pLists[_eType] )
     {
-        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage );
+        m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage );
     }
 
     if ( m_pLists[_eType] )
@@ -782,10 +783,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage)
 {
     DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
-    pTreeView->SetHelpId(_nHelpId);
+    pTreeView->SetHelpId( _sHelpId );
     return createTree( pTreeView, _rImage );
 }
 
@@ -794,7 +795,7 @@ DBTreeListBox* OAppDetailPageHelper::createTree( DBTreeListBox* _pTreeView, cons
 {
     WaitObject aWaitCursor(this);
 
-    _pTreeView->SetWindowBits(WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
+    _pTreeView->SetStyle(_pTreeView->GetStyle() | WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
     _pTreeView->GetModel()->SetSortMode(SortAscending);
     _pTreeView->EnableCheckButton( NULL ); // do not show any buttons
     _pTreeView->SetSelectionMode(MULTIPLE_SELECTION);
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f52dc7b10..aa3991d52 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -160,7 +160,7 @@ namespace dbaui
             @return
                 The new tree.
         */
-        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage );
+        DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage);
 
         DECL_LINK( OnEntryDoubleClick,			SvTreeListBox* );
         DECL_LINK( OnEntrySelChange,			void* );
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 4623aaa99..1d2f60691 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -148,7 +148,7 @@ void OCreationList::SelectSearchEntry( const void* _pEntry )
 }
 
 // -----------------------------------------------------------------------------
-void OCreationList::ExecuteSearchEntry( const void* _pEntry )
+void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
 {
     SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
     DBG_ASSERT( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" );
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index fd984c86f..10a625cba 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -86,7 +86,7 @@ namespace dbaui
 
         // IMnemonicEntryList
         virtual void        SelectSearchEntry( const void* _pEntry );
-        virtual void        ExecuteSearchEntry( const void* _pEntry );
+        virtual void        ExecuteSearchEntry( const void* _pEntry ) const;
 
     private:
         void    onSelected( SvLBoxEntry* _pEntry ) const;
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 7480e22b2..a545633ab 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW
         MenuItem
         {
             Identifier = SID_APP_NEW_FORM;
-            HelpId = SID_APP_NEW_FORM;
             Command = ".uno:DBNewForm";
             Text [ en-US ] = "Form..." ;
         };
         MenuItem
         {
             Identifier = SID_APP_NEW_REPORT;
-            HelpId = SID_APP_NEW_REPORT;
             Command = ".uno:DBNewReport";
             Text [ en-US ] = "Report..." ;
         };
@@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW
         MenuItem
         {
             Identifier = SID_DB_NEW_VIEW_SQL;
-            HelpId = SID_DB_NEW_VIEW_SQL;
             Command = ".uno:DBNewViewSQL";
             Text [ en-US ] = "View (Simple)..." ;
         };
@@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_DB_APP_PASTE_SPECIAL;
-            HelpID = SID_DB_APP_PASTE_SPECIAL ;
             Text[ en-US ] = "Paste Special...";
             Command = ".uno:PasteSpecial";
         };
@@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_DB_APP_DELETE;
-            HelpID = SID_DB_APP_DELETE ;
             Text[ en-US ] = "Delete";
             Command = ".uno:DBDelete";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_RENAME;
-            HelpID = SID_DB_APP_RENAME ;
             Text[ en-US ] = "Rename";
             Command = ".uno:DBRename";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_EDIT;
-            HelpID = SID_DB_APP_EDIT ;
             Text[ en-US ] = "Edit";
             Command = ".uno:DBEdit";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_EDIT_SQL_VIEW;
-            HelpID = SID_DB_APP_EDIT_SQL_VIEW ;
             Text [ en-US ] = "Edit in SQL View...";
             Command = ".uno:DBEditSqlView";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_OPEN;
-            HelpID = SID_DB_APP_OPEN ;
             Text[ en-US ] = "Open";
             Command = ".uno:DBOpen";
         };
         MenuItem
         {
             Identifier = SID_DB_APP_CONVERTTOVIEW;
-            HelpID = SID_DB_APP_CONVERTTOVIEW ;
             Text[ en-US ] = "Create as View";
             Command = ".uno:DBConvertToView";
         };
@@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_APP_NEW_REPORT_PRE_SEL;
-            HelpId = SID_APP_NEW_REPORT_PRE_SEL;
             Command = ".uno:DBNewReportWithPreSelection";
             Text [ en-US ] = "Report..." ;
         };
         MenuItem
         {
             Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ;
-            HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
             Text[ en-US ] = "Report Wizard...";
 
             Command = ".uno:DBNewReportAutoPilotWithPreSelection";
@@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT
         MenuItem
         {
             Identifier = SID_SELECTALL;
-            HelpID = SID_SELECTALL ;
             Text[ en-US ] = "Select All";
             Command = ".uno:SelectAll";
         };
@@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSPROPS;
-                        HelpID = SID_DB_APP_DSPROPS ;
                         Text[ en-US ] = "Properties";
                         Command = ".uno:DBDSProperties";
                     };
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSCONNECTION_TYPE;
-                        HelpID = SID_DB_APP_DSCONNECTION_TYPE ;
                         Text[ en-US ] = "Connection Type";
                         Command = ".uno:DBDSConnectionType";
                     };
                     MenuItem
                     {
                         Identifier = SID_DB_APP_DSADVANCED_SETTINGS;
-                        HelpID = SID_DB_APP_DSADVANCED_SETTINGS ;
                         Text[ en-US ] = "Advanced Settings";
                         Command = ".uno:DBDSAdvancedSettings";
                     };
@@ -410,7 +394,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_DISABLE_PREVIEW;
-            HelpId = SID_DB_APP_DISABLE_PREVIEW;
             Text[ en-US ] = "None";
             Command = ".uno:DBDisablePreview";
             Checkable = TRUE;
@@ -420,7 +403,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
-            HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW;
             Text[ en-US ] = "Document Information";
             Command = ".uno:DBShowDocInfoPreview";
             Checkable = TRUE;
@@ -430,7 +412,6 @@ Menu RID_MENU_APP_PREVIEW
         MenuItem
         {
             Identifier = SID_DB_APP_VIEW_DOC_PREVIEW;
-            HelpId = SID_DB_APP_VIEW_DOC_PREVIEW;
             Text[ en-US ] = "Document";
             Command = ".uno:DBShowDocPreview";
             Checkable = TRUE;
@@ -485,12 +466,10 @@ String RID_STR_EMBEDDED_DATABASE
 {
     Text [ en-US ] = "Embedded database";
 };
-
 String RID_STR_NO_DIFF_CAT
 {
     Text [ en-US ] = "You cannot select different categories.";
 };
-
 String RID_STR_UNSUPPORTED_OBJECT_TYPE
 {
     Text [ en-US ] = "Unsupported object type found ($type$).";
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index b0a6a2e3d..8e4db12ff 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -1319,9 +1319,9 @@ void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL
     openHelpAgent( aURL );
 }
 
-void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId)
+void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId)
 {
-    openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _nHelpId ) );
+    openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) );
 }
 
 void OGenericUnoController::openHelpAgent( const URL& _rURL )
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 2a748cc01..9feb8ba73 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -42,14 +42,14 @@ QueryBox QUERY_BRW_SAVEMODIFIED
 {
     Buttons = WB_YES_NO_CANCEL ;
     DefButton = WB_DEF_YES ;
-    /* ### ACHTUNG: Neuer Text in Resource? Soll der ge�nderte Datensatz gespeichert werden? : Soll der ge�nderte Datensatz gespeichert werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Soll der ge�nderte Datensatz gespeichert werden? : Soll der ge�nderte Datensatz gespeichert werden? */
     Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ;
 };
 
 QueryBox QUERY_BRW_DELETE_ROWS
 {
     Buttons = WB_YES_NO ;
-    /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gel�scht werden? : Sollen die selektierten Daten gel�scht werden? */
+    /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gel�scht werden? : Sollen die selektierten Daten gel�scht werden? */
     Message [ en-US ] = "Do you want to delete the selected data?" ;
 };
 
@@ -190,14 +190,12 @@ Menu RID_MENU_REFRESH_DATA
         MenuItem
         {
             MID_SBA_QRY_REFRESH
-            HelpId = SID_FM_REFRESH ;
             Command = ".uno:Refresh";
         };
         MenuItem
         {
             Identifier = ID_BROWSER_REFRESH_REBUILD;
             Command = ".uno:DBRebuildData";
-            HelpId = HID_BROWSER_REFRESH_REBUILDVIEW;
             Text [ en-US ] = "Rebuild";
         };
     };
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index ff04d82ad..cf80d714b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
@@ -368,7 +368,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
         xDatabaseRegistrations->addDatabaseRegistrationsListener( this );
 
         // the collator for the string compares
-        m_xCollator = Reference< XCollator >( getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator")) ), UNO_QUERY_THROW );
+        m_xCollator = Reference< XCollator >( getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.i18n.Collator" ) ), UNO_QUERY_THROW );
         m_xCollator->loadDefaultCollator( Application::GetSettings().GetLocale(), 0 );
     }
     catch(Exception&)
@@ -2083,6 +2083,8 @@ SvLBoxEntry* SbaTableQueryBrowser::implAppendEntry( SvLBoxEntry* _pParent, const
     m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage );
 
     return pNewEntry;
+
+    return pNewEntry;
 }
 
 //------------------------------------------------------------------------------
@@ -3763,7 +3765,6 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis
     implAddDatasource( _Event.Name, SharedConnection() );
 }
 
-
 // .........................................................................
 }	// namespace dbaui
 // .........................................................................
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index f85af16ec..fffbf564a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1068,9 +1068,9 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
     }
 }
 // -----------------------------------------------------------------------------
-void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler)
+void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler)
 {
-    _pControl->SetHelpId(_nHelpId);
+    _pControl->SetHelpId(_sHelpId);
     if ( _bAddChangeHandler )
         ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl));
 
@@ -1087,7 +1087,7 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes)
     return pFixedText;
 }
 // -----------------------------------------------------------------------------
-OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId)
+OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId)
 {
     OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
     pControl->SetDecimalDigits(0);
@@ -1095,7 +1095,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s
     pControl->SetMax(0x7FFFFFFF);	// soll draussen geaendert werden, wenn noetig
     pControl->SetStrictFormat(TRUE);
 
-    InitializeControl(pControl,_nHelpId,false);
+    InitializeControl(pControl,_sHelpId,false);
 
     return pControl;
 }
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 85e7cb2f8..9dd3734b3 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -305,18 +305,18 @@ namespace dbaui
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         
-        ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
+        rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL );
 
         Reference< XPropertySet> xDef;
         switch ( getColumnIdent(nColumnId) )
         {
             case SOURCE_COLUMN:
                 xDef	= m_xSourceDef;
-                nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
+                sHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
                 break;
             case DEST_COLUMN:
                 xDef	= m_xDestDef;
-                nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
+                sHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
                 break;
             default:
                 //  ?????????
@@ -334,7 +334,7 @@ namespace dbaui
                 m_pListCell->SelectEntry( sName );
             }
 
-            m_pListCell->SetHelpId(nHelpId);
+            m_pListCell->SetHelpId(sHelpId);
         }
     }
 
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 5f7bad9a4..5e29eda20 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -109,6 +109,8 @@ void DBTreeListBox::init()
     SetNodeDefaultImages( );
 
     EnableContextMenuHandling();
+
+    SetStyle( GetStyle() | WB_QUICK_SEARCH );
 }
 //------------------------------------------------------------------------
 DBTreeListBox::~DBTreeListBox()
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index f8c03ee45..c050b2608 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 685faf364..7b2bfaefe 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index 939b736e9..bb083ade5 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_ADABASSTAT
 {
+    HelpID = "dbaccess:ModalDialog:DLG_ADABASSTAT";
     OutputSize	= TRUE ;
     Moveable	= TRUE ;
     Closeable	= TRUE ;
@@ -59,6 +60,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_SYSDEVSPACE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 14 ) ;
         Size		= MAP_APPFONT ( 128 , 12 ) ;
@@ -75,6 +77,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_TRANSACTIONLOG
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 31 ) ;
         Size		= MAP_APPFONT ( 128 , 12 ) ;
@@ -91,6 +94,7 @@ ModalDialog DLG_ADABASSTAT
 
     ListBox LB_DATADEVS
     {
+        HelpID = "dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 48 ) ;
         Size		= MAP_APPFONT ( 128 , 42 ) ;
@@ -115,6 +119,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_SIZE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 109 ) ;
         Size		= MAP_APPFONT ( 60 , 12 ) ;
@@ -131,6 +136,7 @@ ModalDialog DLG_ADABASSTAT
 
     Edit ET_FREESIZE
     {
+        HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE";
         Border		= TRUE ;
         Pos			= MAP_APPFONT ( 120 , 126 ) ;
         Size		= MAP_APPFONT ( 60 , 12 ) ;
@@ -147,6 +153,7 @@ ModalDialog DLG_ADABASSTAT
 
     NumericField ET_MEMORYUSING
     {
+        HelpID = "dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( 120 , 144 ) ;
         Size				= MAP_APPFONT ( 60 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 5ec09c3ae..3d837e2e4 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
@@ -126,7 +126,7 @@
 // -------------------------------------------------------------------------------------------------
 
 
-#define  AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID)                 		                \
+#define  AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2)                 		                \
     FixedText FT_AUTOBROWSEURL {                                            			            \
         Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ;                          	 		                \
         Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ;       	 	        \
@@ -147,7 +147,7 @@
     {                                                                              	                \
          Pos = MAP_APPFONT ( AUTOPAGE_X  - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ;	\
          Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;                             	        \
-          HelpId = (AUTO_HID + 1);                                                        	        \
+          HelpId = AUTO_HID2;                                                        	        \
         TabStop = TRUE ;                                                           		            \
          Text[ en-US ]  = "Browse";                                                                  \
     };
@@ -214,7 +214,9 @@
 
 // --------------------------------------------------------------------------------------------------
 
-
+// MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the
+// AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the
+// also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText
 #define AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID)                                                     \
     FixedText FT_AUTOPORTNUMBER                                                                     \
     {                                                                                               \
@@ -235,7 +237,6 @@
                                                                                                     \
     FixedText FT_AUTOPORTNUMBERDEFAULT                                                              \
     {                                                                                               \
-        HelpId = AUTO_HID + 1 ;                      								                \
         Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2)  ;           	                \
         Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
         Text[ en-US ]   = "" ;                                                                      \
@@ -445,9 +446,9 @@
 
 // --------------------------------------------------------------------------------------------------
 
-#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID)         	   				\
+#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2)         	   				\
     AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT)													\
-    AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID)
+    AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2)
 
 
 // --------------------------------------------------------------------------------------------------
@@ -455,7 +456,7 @@
 
 // --------------------------------------------------------------------------------------------------
 
-#define	AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID)                                   \
+#define	AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2)                                   \
                                                                                       \
     FixedText FT_AUTOJDBCDRIVERCLASS                                                  \
      {                                                                                 \
@@ -479,7 +480,7 @@
         Pos = MAP_APPFONT ( WIZARD_PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ;   \
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;                                                       \
          Size = MAP_APPFONT (50, 14); 													                            \
-         HelpId = AUTO_HID + 1;                                                    		                \
+         HelpId = AUTO_HID2;                                                    		                \
         Text[ en-US ]  = "Test class" ;                                                                             \
     };
 
@@ -502,13 +503,13 @@
     };                                                                                              
 
 
-#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID )											\
+#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 )											\
     AUTO_WIZARDHELPTEXT( 6 )                                                            \
     AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID )                \
-    AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1)            									\
-    AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 )                  							\
+    AUTO_HOSTCONTROLGROUP(96, AUTO_HID2)            									\
+    AUTO_PORTCONTROLGROUP(113, AUTO_HID3 )                  							\
     AUTO_SOCKETCONTROLGROUP(129)                                                        \
-    AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) 
+    AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5) 
 
 
 // --------------------------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 2b8ab81e8..40d395995 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index fb9d9c68d..bdb50859a 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -62,6 +62,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_NEWFOLDER
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS -  RELATED_CONTROLS - 2*IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_UP
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -91,6 +93,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     Edit ED_EXPLORERFILE_FILENAME
     {
+        HelpID = "dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50 , WIN_Y - 3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS - 2*UNRELATED_CONTROLS - 50 , EDIT_HEIGHT ) ;
         Border = TRUE ;
@@ -105,6 +108,7 @@ ModalDialog DLG_COLLECTION_VIEW
 
     PushButton BTN_EXPLORERFILE_SAVE
     {
+        HelpID = "dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE";
         Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
         DefButton = TRUE ;
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b1d0971a8..81dd14c27 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -69,7 +69,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
-#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
+#if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 7293cce9b..b60c13f79 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -72,7 +72,7 @@
 #include <tools/urlobj.hxx>
 #include <sfx2/docfilt.hxx>
 #include "dsnItem.hxx"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
@@ -135,6 +135,8 @@ namespace dbaui
         m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
 
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aTestConnection );
     }
 
     // -----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 61515a258..63c400b0a 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -42,6 +42,7 @@
 //.........................................................................
 TabPage PAGE_CONNECTION
 {
+    HelpID = "dbaccess:TabPage:PAGE_CONNECTION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -54,7 +55,7 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "General";
     };
 
-    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
+    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN)
 
     FixedText FT_NO_ADDITIONAL_SETTINGS
     {
@@ -88,6 +89,7 @@ TabPage PAGE_CONNECTION
 
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -96,6 +98,7 @@ TabPage PAGE_CONNECTION
 
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -128,6 +131,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -2 ) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -136,6 +140,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTCONNECTION
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION";
         Pos = MAP_APPFONT ( PAGE_X  - 75 - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
         Size = MAP_APPFONT ( 75 , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 2bc095442..60723e872 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -791,6 +791,8 @@ DBG_NAME(OAuthentificationPageSetup)
         m_aCBPasswordRequired.SetClickHdl(getControlModifiedLink());
            m_aPBTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aPBTestConnection );
     }
 
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 23d805355..23d805355 100644..100755
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
deleted file mode 100644
index 17b4d148f..000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef DBU_EXTENSIONNOTPRESENT_HRC
-#define DBU_EXTENSIONNOTPRESENT_HRC
-
-#define FT_TEXT                     (1) 
-#define FI_WARNING                  (2) 
-#define PB_DOWNLOAD					(10)
-#define PB_CANCEL					(11)
-
-#define FIXEDTEXT_HEIGHT	 8
-#define CELL_PADDING         8
-#define BUTTON_HEIGHT		14
-#define BUTTON_WIDTH		55
-#define BROWSER_HEIGHT		75
-#define LEFT_PADDING        32 /* size for the icon */
-#define RIGHT_PADDING       16
-#define DLG_WIDTH			( 250 )
-#define ACTION_LINE_START   (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 )
-#define DLG_HEIGHT			(ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING)
-
-
-#endif /* DBU_EXTENSIONNOTPRESENT_HRC */
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 908cbab62..90602e37c 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -35,6 +35,7 @@
 
 ModalDialog DLG_REL_PROPERTIES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_REL_PROPERTIES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 186 , 205 ) ;
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index ebdc2519b..4726c9de2 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -31,13 +31,14 @@
 
 #include "TablesSingleDlg.hxx"
 #include "DbAdminImpl.hxx"
-#include "dbaccess_helpid.hrc"
 #include "tablespage.hxx"
 #include <vcl/msgbox.hxx>
 #include "dsitems.hxx"
 
 #include "propertysetitem.hxx"
 
+#include "dbu_dlg.hrc"
+
 //.........................................................................
 namespace dbaui
 {
@@ -56,7 +57,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
             ,SfxItemSet* _pItems
             ,const Reference< XMultiServiceFactory >& _rxORB
             ,const ::com::sun::star::uno::Any& _aDataSourceName)
-    :SfxSingleTabDialog(pParent,UID_DLG_TABLE_FILTER,_pItems)
+    :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
     ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
     ,m_bStopExecution(sal_False)
     ,m_pOutSet(_pItems)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index a92a894ee..cd7364e34 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -157,6 +157,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_OLDPASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -171,6 +172,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 34 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -184,6 +186,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD_REPEAT
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 51 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index 5509820d1..5b07b4309 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -48,7 +48,6 @@ TabDialog DLG_DATABASE_USERADMIN
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     String STR_PAGETITLE_USERADMIN
     {
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 5213bda4c..5213bda4c 100644..100755
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 83484c92d..60b1f40d9 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -314,7 +314,6 @@ namespace dbaui
         SetControlFontWeight(m_pFT_HeaderText);
     }
 
-
     //=========================================================================
     //= LayoutHelper
     //=========================================================================
@@ -332,6 +331,24 @@ namespace dbaui
         _rControl.SetPosPixel( aControlPos );
     }
 
+    //-------------------------------------------------------------------------
+    void LayoutHelper::fitSizeRightAligned( PushButton& io_button )
+    {
+        const Point aOldPos = io_button.GetPosPixel();
+        const Size aOldSize = io_button.GetSizePixel();
+        const Size aMinSize( io_button.CalcMinimumSize() );
+        if ( aMinSize.Width() > aOldSize.Width() )
+        {
+            io_button.SetPosSizePixel(
+                aOldPos.X() + aOldSize.Width() - aMinSize.Width(),
+                0,
+                aMinSize.Width(),
+                0,
+                WINDOW_POSSIZE_X | WINDOW_POSSIZE_WIDTH
+            );
+        }
+    }
+
 //.........................................................................
 }	// namespace dbaui
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 32cfc4d94..7e3f45126 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -277,6 +277,10 @@ namespace dbaui
                             const ControlRelation _eRelation,
                             const long _nIndentAppFont
                         );
+        /** fits the button size to be large enough to contain the buttons text
+        */
+        static void fitSizeRightAligned( PushButton& io_button );
+            // why is CalcMinimumSize not a virtual method of ::Window?
     };
 
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 21f806db6..5595d4110 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_dbaccess.hxx"
 
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 08616e60e..fd0b4b750 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -375,7 +375,7 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
 
     //////////////////////////////////////////////////////////////////////
     m_aTableList.EnableInplaceEditing( FALSE );
-    m_aTableList.SetWindowBits(WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL );
+    m_aTableList.SetStyle(m_aTableList.GetStyle() | WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL );
     m_aTableList.EnableCheckButton( NULL ); // do not show any buttons
     m_aTableList.SetSelectionMode( SINGLE_SELECTION );
     m_aTableList.notifyHiContrastChanged();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index ecff324d7..deb914dd8 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -38,7 +38,7 @@ ModelessDialog DLG_JOIN_TABADD
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = DLG_JOIN_TABADD ;
+    HelpID = HID_DLG_JOIN_TABADD ;
     Size = MAP_APPFONT ( 178 , 147 ) ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -46,6 +46,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_TABLES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES";
         Pos = MAP_APPFONT( 6, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Tables";
@@ -53,6 +54,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_QUERIES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES";
         Pos = MAP_APPFONT( 62, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Queries";
@@ -70,6 +72,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     PushButton PB_ADDTABLE
     {
+        HelpID = "dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE";
         Pos = MAP_APPFONT ( 123 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index a4eb47133..50162f1cc 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -253,6 +253,7 @@
 
 TabPage PAGE_GENERATED_VALUES
 {
+    HelpID = "dbaccess:TabPage:PAGE_GENERATED_VALUES";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
@@ -311,6 +312,7 @@ TabPage PAGE_GENERATED_VALUES
 
 TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
 {
+    HelpID = "dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
@@ -349,7 +351,6 @@ TabDialog DLG_DATABASE_ADVANCED
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     
     String STR_GENERATED_VALUE
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 5a956eb27..0cadd0578 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -112,7 +112,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
 
     //.........................................................................
@@ -146,7 +145,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     Text [ en-US ] = "Database properties" ;
 };
@@ -195,6 +193,7 @@ TabPage PAGE_GENERAL
 
     RadioButton RB_OPENEXISTINGDOC
     {
+        HelpID = "dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC";
         Pos = MAP_APPFONT (START_X + 6 , 97 );
         Size = MAP_APPFONT ( 206 , 8 ) ;
         Text [ en-US ]  = "Open an existing database ~file" ;
@@ -209,6 +208,7 @@ TabPage PAGE_GENERAL
 
     ListBox LB_DOCUMENTLIST
     {
+        HelpID = "dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 121 );
         Size = MAP_APPFONT( 120, 14 );
         DropDown = TRUE;
@@ -217,6 +217,7 @@ TabPage PAGE_GENERAL
 
     PushButton PB_OPENDOCUMENT
     {
+        HelpID = "dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 139 );
         Size = MAP_APPFONT( 50, 16 );
         OutputSize = TRUE;
@@ -418,6 +419,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
 
@@ -433,6 +435,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_CACHE_SIZE
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE";
         Pos				= MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ;
         Size			= MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border			= TRUE ;
@@ -450,6 +453,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_DATA_INCREMENT
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT";
         Pos				= MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ;
         Size			= MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border			= TRUE ;
@@ -472,6 +476,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLUSERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -485,6 +490,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLPASSWORD
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT) ;
@@ -494,6 +500,7 @@ TabPage PAGE_ADABAS
 
     CheckBox CB_SHUTDB
     {
+        HelpID = "dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB";
         Pos = MAP_APPFONT ( 6 , 6*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT ) ;
         Size = MAP_APPFONT ( 248 , CHECKBOX_HEIGHT ) ;
         Text[ en-US ] = "~Shut down service when closing %PRODUCTNAME";
@@ -501,6 +508,7 @@ TabPage PAGE_ADABAS
 
     PushButton PB_STAT
     {
+        HelpID = "dbaccess:PushButton:PAGE_ADABAS:PB_STAT";
         Pos					= MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ;
         Size				= MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "E~xtended...";
@@ -516,6 +524,7 @@ TabPage PAGE_ADABAS
 
 TabPage PAGE_MYSQL_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -526,6 +535,7 @@ TabPage PAGE_MYSQL_ODBC
 
 TabPage PAGE_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -544,6 +554,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -552,6 +563,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -563,6 +575,7 @@ TabPage PAGE_MYSQL_JDBC
 
 TabPage PAGE_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -584,6 +597,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_NATIVE:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT - 1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -591,6 +605,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_MYSQL_NATIVE:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 5*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 4*EDIT_HEIGHT ) ;
         Size = MAP_APPFONT ( 105, CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -601,6 +616,7 @@ TabPage PAGE_MYSQL_NATIVE
 
 TabPage PAGE_ORACLE_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -620,6 +636,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 ) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -628,6 +645,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - BUTTON_HEIGHT ) / 2 ) ;
@@ -743,6 +761,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS -1 ) ;
@@ -758,6 +777,7 @@ TabPage PAGE_USERDRIVER
 
     NumericField NF_PORTNUMBER
     {
+        HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER";
         TabStop = TRUE ;
         Border = TRUE ;
         NoThousandSep = TRUE;
@@ -774,6 +794,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_OPTIONS
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS";
         Border = TRUE ;
         TabStop = TRUE ;
     };
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 5d6ce5494..c7afa2119 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -52,11 +52,6 @@ String STR_ENTER_CONNECTION_PASSWORD
     Text [ en-US ] = "A password is needed to connect to the data source \"$name$\".";
 };
 
-String STR_QUERY_DROP_ALL
-{
-    Text[ en-US ] = "Do you want to delete all selected items?";
-};
-
 String STR_ASK_FOR_DIRECTORY_CREATION
 {
     Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?";
@@ -67,45 +62,10 @@ String STR_COULD_NOT_CREATE_DIRECTORY
     Text [ en-US ] = "The directory $name$ could not be created.";
 };
 
-String STR_ADDRESSBOOK_SYSTEM
-{
-    Text[ en-US ] = "Windows address book";
-};
-
-String STR_ADDRESSBOOK_OUTLOOK
-{
-    Text[ en-US ] = "MS Outlook";
-};
-
-String STR_ADDRESSBOOK_MOZILLA
-{
-    Text[ en-US ] = "Mozilla address book";
-};
-
-String STR_ADDRESSBOOK_THUNDERBIRD
-{
-    Text[ en-US ] = "Thunderbird address book";
-};
 
-String STR_ADDRESSBOOK_EVOLUTION
-{
-    Text[ en-US ] = "Evolution address book";
-};
 
-String STR_ADDRESSBOOK_LDAP
-{
-    Text[ en-US ] = "LDAP address book";
-};
 
-String STR_HINT_READONLY_CONNECTION
-{
-    Text [ en-US ] = "(Connection is read-only)";
-};
 
-String STR_HINT_CONNECTION_NOT_CAPABLE
-{
-    Text [ en-US ] = "(Not supported by this connection)";
-};
 
 #define EDIT_SIZE_X		50
 #define FT_SIZE_X		90
@@ -114,6 +74,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 
 ModalDialog DLG_DOMAINPASSWORD
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -130,6 +91,7 @@ ModalDialog DLG_DOMAINPASSWORD
 
     Edit ET_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index f1351216d..f8f8dac62 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -56,7 +56,6 @@ ModalDialog DLG_DATABASE_WIZARD
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
 
     String STR_DBWIZARDTITLE
@@ -150,6 +149,7 @@ String STR_DATABASEDEFAULTNAME
 
 TabPage PAGE_DBWIZARD_MYSQL_INTRO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -195,6 +195,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
     };
     RadioButton RB_CONNECTVIANATIVE
     {
+        HelpID = "dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE";
         Pos = MAP_APPFONT (START_X + 6 , 115 )  ;
         Size = MAP_APPFONT ( 205 , 9 ) ;
         Text[ en-US ] = "Connect directly" ;
@@ -206,6 +207,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
 
 TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_AUTHENTIFICATION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -262,6 +264,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 
 TabPage PAGE_DBWIZARD_FINAL
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_FINAL";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -335,6 +338,7 @@ TabPage PAGE_DBWIZARD_FINAL
 
 TabPage PAGE_DBWIZARD_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -361,11 +365,12 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
         Text[ en-US ] = "Default: 3306";
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS)
 };
 
 TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0, 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -391,6 +396,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 
 TabPage PAGE_DBWIZARD_DBASE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -406,11 +412,12 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
 };
 
 TabPage PAGE_DBWIZARD_TEXT
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT";
     String STR_TEXT_HEADERTEXT
     {
         Text[ en-US ]   = "Set up a connection to text files" ;
@@ -425,12 +432,13 @@ TabPage PAGE_DBWIZARD_TEXT
         Text[ en-US ]  = "Path to text files";
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
 TabPage PAGE_DBWIZARD_MSACCESS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -446,11 +454,12 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
 };
 
 TabPage PAGE_DBWIZARD_LDAP
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -490,6 +499,7 @@ TabPage PAGE_DBWIZARD_LDAP
 
 TabPage PAGE_DBWIZARD_ADABAS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -504,11 +514,12 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME)
 };
 
 TabPage PAGE_DBWIZARD_ADO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -523,12 +534,13 @@ TabPage PAGE_DBWIZARD_ADO
         Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
+    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
 };
 
 
 TabPage PAGE_DBWIZARD_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -543,21 +555,23 @@ TabPage PAGE_DBWIZARD_ODBC
         Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE)
 };
 
 TabPage PAGE_DBWIZARD_USERDEFINED
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_USERDEFINED";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
 };
 
 TabPage PAGE_DBWIZARD_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -572,14 +586,15 @@ TabPage PAGE_DBWIZARD_JDBC
         Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL)
-    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL)
+    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS)
 };
 
 
 
 TabPage PAGE_DBWIZARD_ORACLE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -603,12 +618,13 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
 };
 
 
 TabPage PAGE_DBWIZARD_SPREADSHEET
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -623,7 +639,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
         Text[ en-US ] = "~Location and file name" ;
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 0b0b88c91..a22e81535 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * 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
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 47c72d114..c6a03ff9b 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_DBASE_INDEXES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ComboBox CB_TABLES
     {
+        HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 62 , 5 ) ;
@@ -90,6 +92,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_TABLEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
@@ -104,6 +107,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_FREEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 120 , 44 ) ;
@@ -112,6 +116,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADD
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD";
         Pos = MAP_APPFONT ( 94 , 60 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -131,6 +136,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADDALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL";
         Pos = MAP_APPFONT ( 94 , 77 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -150,6 +156,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVE
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE";
         Pos = MAP_APPFONT ( 94 , 98 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -169,6 +176,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVEALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL";
         Pos = MAP_APPFONT ( 94, 114 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index f81201c41..c5beb0a0c 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -40,6 +40,7 @@
 
 ModalDialog DLG_DIRECTSQL
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DIRECTSQL";
     OutputSize	= TRUE ;
     Moveable	= TRUE ;
     Closeable	= TRUE ;
@@ -60,6 +61,7 @@ ModalDialog DLG_DIRECTSQL
     };
     MultiLineEdit ME_SQL
     {
+        HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL";
         Pos = MAP_APPFONT( 7, 26 );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 80 );
         SVLook = TRUE;
@@ -69,6 +71,7 @@ ModalDialog DLG_DIRECTSQL
     };
     PushButton PB_EXECUTE
     {
+        HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE";
         Pos = MAP_APPFONT( WINDOW_SIZE_X - BUTTON_SIZE_X - 7, 109 );
         Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "Execute";
@@ -82,6 +85,7 @@ ModalDialog DLG_DIRECTSQL
     };
     ListBox LB_HISTORY
     {
+        HelpID = "dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY";
         Pos = MAP_APPFONT( 7, 121 + BUTTON_SIZE_Y + 3 );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 14 );
         SvLook = TRUE;
@@ -96,6 +100,7 @@ ModalDialog DLG_DIRECTSQL
     };
     MultiLineEdit ME_STATUS
     {
+        HelpID = "dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS";
         Pos = MAP_APPFONT( 7, 153 + BUTTON_SIZE_Y );
         Size = MAP_APPFONT( WINDOW_SIZE_X - 14, 41 );
         Border = TRUE;
@@ -114,6 +119,7 @@ ModalDialog DLG_DIRECTSQL
     };
     PushButton PB_CLOSE
     {
+        HelpID = "dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE";
         Pos = MAP_APPFONT( WINDOW_SIZE_X - 7 - BUTTON_SIZE_X, 207 + BUTTON_SIZE_Y );
         Size = MAP_APPFONT( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         Text [ en-US ] = "Close";
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index 20688a784..6276093df 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -61,6 +61,7 @@ ModalDialog DLG_SAVE_AS
     };
     ComboBox ET_CATALOG
     {
+        HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 25 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
@@ -77,6 +78,7 @@ ModalDialog DLG_SAVE_AS
     };
     ComboBox ET_SCHEMA
     {
+        HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 42 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
@@ -92,6 +94,7 @@ ModalDialog DLG_SAVE_AS
     };
     Edit ET_TITLE
     {
+        HelpID = "dbaccess:Edit:DLG_SAVE_AS:ET_TITLE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 77 , 59 ) ;
         Size = MAP_APPFONT ( 89 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index 875ee79b9..453d755da 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -56,6 +56,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD";
         Pos = MAP_APPFONT ( 36 , 25 ) ;
         Size = MAP_APPFONT ( 62 , 12 ) ;
         TabStop = TRUE ;
@@ -111,6 +113,7 @@ ModalDialog DLG_COLWIDTH
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -124,6 +127,7 @@ ModalDialog DLG_COLWIDTH
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "dbaccess:CheckBox:DLG_COLWIDTH:CB_STANDARD";
         Pos = MAP_APPFONT ( 36 , 25 ) ;
         Size = MAP_APPFONT ( 62 , 12 ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 8c59a26d1..d6a885555 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -35,6 +35,7 @@
 
 ModalDialog DLG_DATASOURCE_SELECTION
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DATASOURCE_SELECTION";
     OutputSize = TRUE ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -50,6 +51,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     ListBox LB_DATASOURCE
     {
+        HelpID = "dbaccess:ListBox:DLG_DATASOURCE_SELECTION:LB_DATASOURCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 6 , 19 ) ;
         Size = MAP_APPFONT ( 154 , 94 ) ;
@@ -79,6 +81,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     PushButton PB_MANAGE
     {
+        HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_MANAGE";
         Pos = MAP_APPFONT ( 166 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -88,6 +91,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
     };
     PushButton PB_CREATE
     {
+        HelpID = "dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_CREATE";
         Pos = MAP_APPFONT ( 166 , 99 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 0d8aa0884..d77706f5e 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -47,6 +47,7 @@
 
 ModalDialog DLG_INDEXDESIGN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -131,6 +132,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     CheckBox CB_UNIQUE
     {
+        HelpID = "dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE";
         Pos = MAP_APPFONT ( LIST_WIDTH + 16, 34 ) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ;
         SVLook = TRUE;
@@ -153,6 +155,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     PushButton PB_CLOSE
     {
+        HelpID = "dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE";
         Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ;
         Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         SVLook = TRUE;
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 4f0058a03..8fa615d28 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -137,8 +137,6 @@ SLOFILES+=		$(SLO)$/adodatalinks.obj
 .ENDIF
 
 # --- Targets ----------------------------------
-#LOCALIZE_ME=AutoControls_tmpl.hrc
-
 .INCLUDE : target.mk
 
 $(SLO)$/ConnectionHelper.obj : $(LOCALIZE_ME_DEST)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index b4115cac3..e6a86588b 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -55,7 +55,7 @@
 
 #ifdef HAVE_ODBC_SUPPORT
 
-#if defined(WIN) || defined(OS2)
+#if defined(OS2)
 #define ODBC_LIBRARY	"ODBC.DLL"
 #define ODBC_UI_LIBRARY	"ODBCINST.DLL"
 #endif
@@ -77,7 +77,7 @@
 
 // just to go with calling convention of windows
 // so don't touch this
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define SQL_API __stdcall
 // At least under some circumstances, the below #include <odbc/sqlext.h> re-
 // defines SQL_API to an empty string, leading to a compiler warning on MSC; to
@@ -87,7 +87,7 @@
 #pragma warning(push)
 #pragma warning(disable: 4005)
 #endif
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 
 #if defined(OS2)
 #define ALLREADY_HAVE_OS2_TYPES
@@ -100,13 +100,13 @@
 #include <odbc/sqlext.h>
 #endif
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
 #undef SQL_API
 #define SQL_API __stdcall
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 // from here on you can do what you want to
 
 #if defined(OS2)
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
 
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 10affc622..5840ae57b 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_PARAMETERS
 {
+    HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ;
@@ -51,6 +52,7 @@ ModalDialog DLG_PARAMETERS
     };
     ListBox LB_ALLPARAMS
     {
+        HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS";
         Pos = MAP_APPFONT ( 7 , 12 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ;
         Border = TRUE;
@@ -64,6 +66,7 @@ ModalDialog DLG_PARAMETERS
     };
     Edit ET_PARAM
     {
+        HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ;
@@ -71,6 +74,7 @@ ModalDialog DLG_PARAMETERS
     };
     PushButton BT_TRAVELNEXT
     {
+        HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT";
         Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4 + 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index 600193208..d7dc79d31 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -44,6 +44,7 @@ ModalDialog DLG_FILTERCRIT
     HelpId = HID_DLG_FILTERCRIT ;
     ListBox LB_WHEREFIELD1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -52,6 +53,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 25 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -62,6 +64,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE1
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -69,6 +72,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 41 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -83,6 +87,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -91,6 +96,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 41 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -101,6 +107,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE2
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -108,6 +115,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 57 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -122,6 +130,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -130,6 +139,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 57 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -140,6 +150,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE3
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -170,7 +181,7 @@ ModalDialog DLG_FILTERCRIT
     {
         Pos = MAP_APPFONT ( 15 , 14 ) ;
         Size = MAP_APPFONT ( 40 , 8 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
+        /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
         Center = TRUE ;
         Text [ en-US ] = "Operator" ;
     };
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index fe7504225..271d0541c 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -42,6 +42,7 @@ ModalDialog DLG_ORDERCRIT
     Closeable = TRUE ;
     ListBox LB_ORDERFIELD1
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -51,6 +52,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE1
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
@@ -65,6 +67,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERFIELD2
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -74,6 +77,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE2
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
@@ -88,6 +92,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERFIELD3
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 59 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 72 ) ;
@@ -97,6 +102,7 @@ ModalDialog DLG_ORDERCRIT
     };
     ListBox LB_ORDERVALUE3
     {
+        HelpID = "dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 123 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 36 ) ;
@@ -133,7 +139,7 @@ ModalDialog DLG_ORDERCRIT
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT ( 46 , 8 ) ;
-        /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
+        /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
         Text [ en-US ] = "Operator" ;
     };
     FixedText FT_ORDERDIR
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 22bb46041..57f3fcbe3 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -46,6 +46,8 @@
 #include "UITools.hxx"
 #include "moduledbu.hxx"
 
+#include <tools/urlobj.hxx>
+
 #define BUTTONID_MORE	BUTTONID_RETRY + 1
 
 #define DIALOG_WIDTH    220
@@ -355,7 +357,7 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi
     m_aExceptionList.SetSelectionMode(SINGLE_SELECTION);
     m_aExceptionList.SetDragDropMode(0);
     m_aExceptionList.EnableInplaceEditing(sal_False);
-    m_aExceptionList.SetWindowBits(WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
+    m_aExceptionList.SetStyle(m_aExceptionList.GetStyle() | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL);
 
     m_aExceptionList.SetSelectHdl(LINK(this, OExceptionChainDialog, OnExceptionSelected));
     m_aExceptionList.SetNodeDefaultImages( );
@@ -644,11 +646,14 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle )
     {
         lcl_addButton( *this, BUTTON_HELP, false );
 
-        SmartId aHelpId( m_sHelpURL );
-        if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 )
-            aHelpId = SmartId( m_sHelpURL.copy( 4 ).toInt32() );
+        rtl::OUString aTmp;
+        INetURLObject aHID( m_sHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+              aTmp = aHID.GetURLPath();
+        else
+            aTmp = m_sHelpURL;
 
-        SetSmartHelpId( aHelpId );
+        SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) );
     }
 }
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index 979fdd370..94b2e394d 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -56,6 +56,7 @@ Image BMP_EXCEPTION_INFO
 
 ModalDialog DLG_SQLEXCEPTIONCHAIN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN";
     Moveable = TRUE ;
     Closeable = TRUE ;
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 99857a2c8..92b610b3d 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -101,7 +101,7 @@ DBG_NAME(OTableSubscriptionPage)
         m_aTablesList.SetSelectionMode( MULTIPLE_SELECTION );
         m_aTablesList.SetDragDropMode( 0 );
         m_aTablesList.EnableInplaceEditing( sal_False );
-        m_aTablesList.SetWindowBits(WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
+        m_aTablesList.SetStyle(m_aTablesList.GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
 
         m_aTablesList.Clear();
 
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src
index cca76e7f6..b34a05607 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.src
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.src
@@ -34,6 +34,7 @@
 
 ModalDialog DLG_TEXT_CONNECTION_SETTINGS
 {
+    HelpID = "dbaccess:ModalDialog:DLG_TEXT_CONNECTION_SETTINGS";
     Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT );
     OutputSize = TRUE ;
 
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index d6677b141..4f3a568f5 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -150,9 +150,9 @@ namespace dbaui
 
         sal_Bool			isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
         void                Contruct();
-        OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId);
+        OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId);
         FixedText*          CreateText(USHORT _nTextRes);
-        void                InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler);
+        void                InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler);
 
     protected:
         inline  void    setRightAligned()       { m_bRightAligned = true; }
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 1438d5bda..cacbc81ce 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -44,6 +44,11 @@ namespace comphelper
     class NamedValueCollection;
 }
 
+namespace comphelper
+{
+    class NamedValueCollection;
+}
+
 class Window;
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 3b573f1f8..096d11ad1 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -318,7 +318,7 @@ namespace dbaui
         @return
             The URL for the help agent to dispatch.
     */
-    ::com::sun::star::util::URL	createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId);
+    ::com::sun::star::util::URL	createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId);
 
     /** set the evaluation flag at the number formatter
         @param	_rxFormatter
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index f403caafd..1335a6c10 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -64,24 +64,24 @@
 #define STR_ADABAS_ERROR_SYSTEMTABLES		RID_STR_DLG_START + 6
 #define STR_ERROR_PASSWORDS_NOT_IDENTICAL	RID_STR_DLG_START + 7
 #define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME	RID_STR_DLG_START + 8
-#define STR_DATASOURCE_DEFAULTNAME			RID_STR_DLG_START + 9
-#define STR_ERR_EMPTY_DSN_NAME				RID_STR_DLG_START + 10
+    // FREE
+    // FREE
 #define STR_ERR_USE_CONNECT_TO				RID_STR_DLG_START + 11
 #define STR_ALREADYEXISTOVERWRITE			RID_STR_DLG_START + 12
-#define STR_QUERY_DROP_ALL					RID_STR_DLG_START + 13
+    // FREE
 #define STR_INDEX_NAME_ALREADY_USED			RID_STR_DLG_START + 14
 #define STR_ASK_FOR_DIRECTORY_CREATION		RID_STR_DLG_START + 15
 #define STR_COULD_NOT_CREATE_DIRECTORY		RID_STR_DLG_START + 16
-#define STR_ADDRESSBOOK_SYSTEM				RID_STR_DLG_START + 17
-#define STR_ADDRESSBOOK_MOZILLA				RID_STR_DLG_START + 18
-#define STR_ADDRESSBOOK_EVOLUTION			RID_STR_DLG_START + 19
     // FREE
-#define STR_ADDRESSBOOK_LDAP				RID_STR_DLG_START + 21
-#define STR_ADDRESSBOOK_OUTLOOK				RID_STR_DLG_START + 22
+    // FREE
+    // FREE
+    // FREE
+    // FREE
+    // FREE
 #define STR_COMMAND_EXECUTED_SUCCESSFULLY	RID_STR_DLG_START + 23
 #define STR_DIRECTSQL_CONNECTIONLOST		RID_STR_DLG_START + 24
-#define STR_HINT_READONLY_CONNECTION		RID_STR_DLG_START + 25
-#define STR_HINT_CONNECTION_NOT_CAPABLE		RID_STR_DLG_START + 26
+    // FREE
+    // FREE
 #define STR_USERADMIN_NOT_AVAILABLE			RID_STR_DLG_START + 27
 #define STR_TAB_INDEX_SORTORDER				RID_STR_DLG_START + 28
 #define STR_TAB_INDEX_FIELD					RID_STR_DLG_START + 29
@@ -110,7 +110,7 @@
 #define STR_NO_ADABASE_DATASOURCES	        RID_STR_DLG_START + 55
 #define STR_NO_ADDITIONAL_SETTINGS	        RID_STR_DLG_START + 56
 #define STR_HOSTNAME                        RID_STR_DLG_START + 57
-#define STR_ADDRESSBOOK_THUNDERBIRD			RID_STR_DLG_START + 58
+    // FREE
 #define STR_MOZILLA_PROFILE_NAME            RID_STR_DLG_START + 59
 #define STR_THUNDERBIRD_PROFILE_NAME        RID_STR_DLG_START + 60
 #define STR_EXPLAN_STRINGCONVERSION_ERROR   RID_STR_DLG_START + 61
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index b1b542c03..5881a4f29 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -118,7 +118,7 @@
 #define DLG_DATABASE_WIZARD     		RID_DIALOG_START + 29
 #define RID_EXTENSION_NOT_PRESENT_DLG   RID_DIALOG_START + 30
 #define DLG_TEXT_CONNECTION_SETTINGS    RID_DIALOG_START + 31
-
+#define DLG_TABLE_FILTER                RID_DIALOG_START + 32                 
 //========================================================================
 // tab pages
 
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index d58751330..861682eda 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1306,13 +1306,13 @@ namespace
 } // annonymous
 // .........................................................................
 // -----------------------------------------------------------------------------
-::com::sun::star::util::URL	createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId)
+::com::sun::star::util::URL	createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId)
 {
     ::com::sun::star::util::URL aURL;
     aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) );
     aURL.Complete += _sModuleName;
     aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) );
-    aURL.Complete += ::rtl::OUString::valueOf(_nHelpId);
+    aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8);
 
     ::rtl::OUString sAnchor;
     ::rtl::OUString sTempURL = aURL.Complete;
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index de188edc4..9094982c6 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -43,6 +43,8 @@
 #include "sqlmessage.hxx"
 #include "FieldControls.hxx"
 
+#include "dbaccess_slotid.hrc"
+
 using namespace ::dbaui;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 39e7fbe06..9910a99d9 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -35,6 +35,7 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
+#include "dbaccess_slotid.hrc"  
 
 #define WINDOW_SIZE_X   276
 #define WINDOW_SIZE_Y	185
@@ -67,6 +68,7 @@ String STR_WIZ_NAME_MATCHING_TITEL
 
 ModalDialog WIZ_RTFCOPYTABLE
 {
+    HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE";
 
     Text [ en-US ] = "Copy RTF Table" ;
 
@@ -90,12 +92,14 @@ ModalDialog WIZ_RTFCOPYTABLE
     };
     PushButton PB_PREV
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV";
         TabStop				= TRUE ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "< ~Back";
     };
     PushButton PB_NEXT
     {
+        HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT";
         TabStop				= TRUE ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         Text [ en-US ] = "~Next>";
@@ -128,6 +132,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     MultiListBox LB_ORG_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -140,6 +145,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -159,6 +165,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_RH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE;
@@ -179,6 +186,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMN_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -198,6 +206,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
     };
     ImageButton IB_COLUMNS_LH
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH";
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ;
         Size				= MAP_APPFONT ( 20 , 14 ) ;
         TabStop				= TRUE ;
@@ -218,6 +227,7 @@ TabPage TAB_WIZ_COLUMN_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES";
         Border				= TRUE ;
         Pos                 = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ;
         Size                = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
@@ -243,6 +253,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     MultiListBox LB_NEW_COLUMN_NAMES
     {
+        HelpID = "dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES";
         Border				= TRUE ;
         Pos					= MAP_APPFONT ( 6 , 6 ) ;
         Size				= MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ;
@@ -262,6 +273,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     TabPage CONTROL_CONTAINER
     {
+        HelpID = "dbaccess:TabPage:CONTROL_CONTAINER";
         Pos					= MAP_APPFONT ( 102 , WINDOW_BORDER_Y  ) ;
         Size				= MAP_APPFONT ( WINDOW_SIZE_X -  111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 );
         SVLook              = TRUE;
@@ -284,6 +296,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     NumericField ET_AUTO
     {
+        HelpID = "dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO";
         Border				= TRUE ;
         Pos                 = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ;
         Size				= MAP_APPFONT ( 40 , 12 ) ;
@@ -292,6 +305,7 @@ TabPage TAB_WIZ_TYPE_SELECT
 
     PushButton PB_AUTO
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ;
         Size				= MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
         TabStop				= TRUE ;
@@ -306,7 +320,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
         MenuItem
         {
             Identifier		= SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-            HelpID			= SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+            HelpID			= HID_TABLEDESIGN_TABED_PRIMARYKEY ;
             Checkable		= TRUE ;
             Text [ en-US ] = "Primary Key" ;
         };
@@ -318,6 +332,7 @@ Menu RID_SBA_RTF_PKEYPOPUP
  //==================================================================
 TabPage TAB_WIZ_NAME_MATCHING
 {
+    HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING";
     SVLook	= TRUE ;
     Size	= MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
 
@@ -359,6 +374,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     ImageButton IB_COLUMN_UP
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP";
         Pos                 = MAP_APPFONT ( 19 ,  45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -379,6 +395,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN";
         Pos                 = MAP_APPFONT ( 19 ,  63 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -398,6 +415,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_UP_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE;
@@ -418,6 +436,7 @@ TabPage TAB_WIZ_NAME_MATCHING
     };
     ImageButton IB_COLUMN_DOWN_RIGHT
     {
+        HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT";
         Pos                 = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ;
         Size                = MAP_APPFONT ( 14 , 14 ) ;
         TabStop				= TRUE ;
@@ -438,6 +457,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_ALL
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL";
         Pos                 = MAP_APPFONT ( 6, 83) ;
         Size				= MAP_APPFONT ( 40 , 14 ) ;
         TabStop				= TRUE ;
@@ -446,6 +466,7 @@ TabPage TAB_WIZ_NAME_MATCHING
 
     PushButton PB_NONE
     {
+        HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE";
         Pos                 = MAP_APPFONT ( 6, 103) ;
         Size				= MAP_APPFONT ( 40 , 14 ) ;
         TabStop				= TRUE ;
@@ -485,12 +506,14 @@ TabPage TAB_WIZ_COPYTABLE
     };
     RadioButton RB_DEFDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA";
         Pos                 = MAP_APPFONT ( 12 , 35 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "De~finition and data" ;
     };
     RadioButton RB_DEF
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF";
         Pos                 = MAP_APPFONT ( 12, 49 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Def~inition" ;
@@ -498,6 +521,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_VIEW
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW";
         Pos                 = MAP_APPFONT ( 12, 63 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "A~s table view";
@@ -505,6 +529,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     RadioButton RB_APPENDDATA
     {
+        HelpID = "dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA";
         Pos                 = MAP_APPFONT ( 12, 77 ) ;
         Size				= MAP_APPFONT ( 73 , 10 ) ;
         Text [ en-US ] = "Append ~data" ;
@@ -512,6 +537,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_USEHEADERLINE
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_USEHEADERLINE";
         Pos                 = MAP_APPFONT ( 12, 93 ) ;
         Size				= MAP_APPFONT ( WINDOW_SIZE_X - 18, 10 ) ;
         Text [ en-US ] = "Use first ~line as column names" ;
@@ -519,6 +545,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     CheckBox CB_PRIMARY_COLUMN
     {
+        HelpID = "dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN";
         Pos                 = MAP_APPFONT ( 12, 107 ) ;
         Size				= MAP_APPFONT ( 90 , 10 ) ;
         Text [ en-US ] = "Crea~te primary key";
@@ -532,6 +559,7 @@ TabPage TAB_WIZ_COPYTABLE
 
     Edit ET_KEYNAME
     {
+        HelpID = "dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME";
         Pos                 = MAP_APPFONT ( 80, 120 ) ;
         Size				= MAP_APPFONT ( 65 , 12 ) ;
         TabStop				= TRUE ;
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index ae5979c0a..974b36e68 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -96,5 +96,5 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
 String RID_STR_EXTENSION_NOT_PRESENT
 {
     // #i96130# use hard coded name
-    Text [ en-US ] = "The report, \"$file$\", requires the extension Sun Report Builder.";
+    Text [ en-US ] = "The report, \"$file$\", requires the extension Oracle Report Builder.";
 };
diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx
index e014d6e8e..dfba568a1 100644
--- a/dbaccess/source/ui/misc/uiservices.cxx
+++ b/dbaccess/source/ui/misc/uiservices.cxx
@@ -118,28 +118,6 @@ extern "C" DBACCESS_DLLPUBLIC void SAL_CALL component_getImplementationEnvironme
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" DBACCESS_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
-                void* pServiceManager,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        writeDBLoaderInfo(pRegistryKey);
-        return ::dbaui::OModuleRegistration::writeComponentInfos(
-            static_cast<XMultiServiceFactory*>(pServiceManager),
-            static_cast<XRegistryKey*>(pRegistryKey));
-    }
-    catch (InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "DBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" DBACCESS_DLLPUBLIC void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index ab8975065..4e04790ad 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -549,7 +549,7 @@ namespace
         else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term)	&&			// AND/OR-Verknuepfung:
                  pNode->count() == 3)
         {
-            // nur AND Verkn�pfung zulassen
+            // nur AND Verkn�pfung zulassen
             if (!SQL_ISTOKEN(pNode->getChild(1),AND))
                 eErrorCode = eIllegalJoinCondition;
             else if ( eOk == (eErrorCode = InsertJoinConnection(_pView,pNode->getChild(0), _eJoinType,pLeftTable,pRightTable)) )
@@ -840,7 +840,7 @@ namespace
                             }
                         }
                     }
-                    // nur einmal f�r jedes Feld
+                    // nur einmal f�r jedes Feld
                     else if ( !i && pEntryField->isCondition() )
                     {
                         if (!aWhereStr.getLength())			// noch keine Kriterien
@@ -1864,7 +1864,7 @@ namespace
         if ( !checkJoinConditions(_pView,pNode->getChild(0)) || !checkJoinConditions(_pView,pRightTableRef))
             return sal_False;
 
-        // named column join wird sp�ter vieleicht noch implementiert
+        // named column join wird sp�ter vieleicht noch implementiert
         // SQL_ISRULE(pNode->getChild(4),named_columns_join)
         EJoinType eJoinType = INNER_JOIN;
         bool bNatural = false;
@@ -2136,7 +2136,7 @@ namespace
             return eNoSelectStatement;
 
         ::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection
-        sal_Bool bFirstField = sal_True;	// bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden
+        sal_Bool bFirstField = sal_True;	// bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden
 
         SqlParseError eErrorCode = eOk;
 
@@ -2194,6 +2194,11 @@ namespace
                                                             _pView->getLocale(),
                                                             static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()),
                                                             &rController.getParser().getContext());
+                        //pColumnRef->parseNodeToStr(	aColumns,
+                        //							xConnection,
+                        //							&rController.getParser().getContext(),
+                        //							sal_True,
+                        //							sal_True); // quote is to true because we need quoted elements inside the function
 
                         sal_Int32 nFunctionType = FKT_NONE;
                         ::connectivity::OSQLParseNode* pParamRef = NULL;
@@ -3211,6 +3216,7 @@ void OQueryDesignView::fillFunctionInfo(  const ::connectivity::OSQLParseNode* p
     aInfo->SetField(sFieldName);
     aInfo->SetTabWindow(NULL);
 }
+
 // -----------------------------------------------------------------------------
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index e0993e972..08a5e38ac 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -217,7 +217,7 @@ void OSelectionBrowseBox::initialize()
         m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
         m_aFunctionStrings += sGroup;
         
-        // Diese Funktionen stehen nur unter CORE zur Verf�gung
+        // Diese Funktionen stehen nur unter CORE zur Verf�gung
         if ( lcl_SupportsCoreSQLGrammar(xConnection) )
         {
             xub_StrLen nCount	= m_aFunctionStrings.GetTokenCount();
@@ -1068,7 +1068,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                 {
                     strOldCellContents = pEntry->GetFunction();
                     sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos();
-                    // Diese Funktionen stehen nur unter CORE zur Verf�gung
+                    // Diese Funktionen stehen nur unter CORE zur Verf�gung
                     String sFunctionName		= m_pFunctionCell->GetEntry(nPos);
                     String sGroupFunctionName	= m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
                     sal_Bool bGroupBy = sal_False;
@@ -1352,7 +1352,7 @@ void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId )
 //------------------------------------------------------------------------------
 void OSelectionBrowseBox::adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol )
 {
-    // wenn ein Header selectiert wird, mu� die selection angezeigt werden, sonst nicht)
+    // wenn ein Header selectiert wird, mu� die selection angezeigt werden, sonst nicht)
     if ( _bClickedOntoHeader )
     {
         if (0 == GetSelectColumnCount() )
@@ -2648,7 +2648,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window
     _pControl->EnableInput(bEnable);
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId)
+void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId)
 {
     m_pTextCell->SetText(_sText);
     m_pTextCell->ClearModifyFlag();
@@ -2657,10 +2657,10 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c
     
     enableControl(_rEntry,m_pTextCell);
 
-    if (m_pTextCell->GetHelpId() != _nHelpId)
+    if (m_pTextCell->GetHelpId() != _sHelpId)
         // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen
         m_pTextCell->SetHelpText(String());
-    m_pTextCell->SetHelpId(_nHelpId);
+    m_pTextCell->SetHelpId(_sHelpId);
 }
 // -----------------------------------------------------------------------------
 void OSelectionBrowseBox::invalidateUndoRedo()
@@ -2754,7 +2754,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef& _pEntry)
     Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
     if ( xConnection.is() )
     {
-        // Diese Funktionen stehen nur unter CORE zur Verf�gung
+        // Diese Funktionen stehen nur unter CORE zur Verf�gung
         if ( lcl_SupportsCoreSQLGrammar(xConnection) )
         {
             // if we have an asterix, no other function than count is allowed
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 6b01ccb6c..a6c23cf14 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -245,7 +245,7 @@ namespace dbaui
         void			appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow);
         OTableFields&	getFields() const;
         void			enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl);
-        void			setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId);
+        void			setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId);
         void			invalidateUndoRedo();
         OTableFieldDescRef getEntry(OTableFields::size_type _nPos);
 
diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src
index 0da839f7b..6a10478d1 100644
--- a/dbaccess/source/ui/querydesign/querydlg.src
+++ b/dbaccess/source/ui/querydesign/querydlg.src
@@ -82,6 +82,7 @@ ModalDialog DLG_QRY_JOIN
         };
         CheckBox CB_NATURAL
         {
+            HelpID = "dbaccess:CheckBox:DLG_QRY_JOIN:CB_NATURAL";
             Pos = MAP_APPFONT ( 101 , 31 ) ;
             Size = MAP_APPFONT ( 89 , 8 ) ;
 
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 4f4dedb21..7c1587ad8 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -55,6 +55,9 @@
 #include "FieldDescControl.hxx"
 #include "TableFieldControl.hxx"
 #include "dsntypes.hxx"
+#include "dsntypes.hxx"
+
+#include "dbaccess_slotid.hrc"
 
 using namespace ::dbaui;
 using namespace ::comphelper;
@@ -1527,7 +1530,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
     Reference<XPropertySet> xTable = rController.getTable();
     //////////////////////////////////////////////////////////////
     // Key darf nicht veraendert werden
-    // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgef�hrt
+    // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgef�hrt
 
     if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
         return sal_False;
@@ -1549,7 +1552,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ )
         {
             //////////////////////////////////////////////////////////////
             // Wenn Feldtyp Memo oder Image, kein PrimKey
-            // oder wenn Spalten nicht gedroped werden k�nnen und das Required Flag ist nicht gesetzt
+            // oder wenn Spalten nicht gedroped werden k�nnen und das Required Flag ist nicht gesetzt
             // oder wenn eine ::com::sun::star::sdbcx::View vorhanden ist und das Required Flag nicht gesetzt ist
             TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo();
             if(     pTypeInfo->nSearchType == ColumnSearch::NONE
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 9e3805ceb..0e0549ec6 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -1594,6 +1594,14 @@ sal_Int32 OTableController::getFirstEmptyRowPosition()
         nRet = m_vRowList.size();
         m_vRowList.push_back( pTabEdRow);        
     }
+    if ( nRet == -1 )
+    {
+        bool bReadRow = !isAddAllowed();
+        ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
+        pTabEdRow->SetReadOnly(bReadRow);
+        nRet = m_vRowList.size();
+        m_vRowList.push_back( pTabEdRow);        
+    }
     return nRet;
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index bffb9404d..3dd3d0b59 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -111,17 +111,14 @@ String STR_TAB_FIELD_LENGTH
 {
     Text [ en-US ] = "Field length" ;
 };
-
 String STR_TAB_HELP_TEXT
 {
     Text [ en-US ] = "Description" ;
 };
-
 String STR_COLUMN_DESCRIPTION
 {
     Text [ en-US ] = "Column Description" ;
 };
-
 String STR_TAB_FIELD_NULLABLE
 {
     Text [ en-US ] = "Input required" ;
@@ -171,38 +168,38 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
 {
     ItemList =
     {
-        MenuItem
-        {
-            ITEM_EDIT_CUT
-        };
-        MenuItem
-        {
-            ITEM_EDIT_COPY
-        };
-        MenuItem
-        {
-            ITEM_EDIT_PASTE
-        };
-        MenuItem
-        {
-            ITEM_EDIT_DELETE
-        };
-        MenuItem
-        {
-            Identifier = SID_TABLEDESIGN_INSERTROWS ;
-            HelpID = SID_TABLEDESIGN_INSERTROWS ;
-            Text [ en-US ] = "Insert Rows" ;
-        };
-        MenuItem
-        {
-            Separator = TRUE ;
+    MenuItem
+    {
+        ITEM_EDIT_CUT
+    };
+    MenuItem
+    {
+        ITEM_EDIT_COPY
+    };
+    MenuItem
+    {
+        ITEM_EDIT_PASTE
+    };
+    MenuItem
+    {
+        ITEM_EDIT_DELETE
+    };
+    MenuItem
+    {
+        Identifier = SID_TABLEDESIGN_INSERTROWS ;
+        HelpID = HID_TABLEDESIGN_INSERTROWS ;
+        Text [ en-US ] = "Insert Rows" ;
         };
-        MenuItem
-        {
-            Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-            HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-            Checkable = TRUE ;
-            Text [ en-US ] = "Primary Key" ;
+    MenuItem
+    {
+        Separator = TRUE ;
+    };
+    MenuItem
+    {
+        Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+        HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ;
+        Checkable = TRUE ;
+        Text [ en-US ] = "Primary Key" ;
         };
     };
 };
diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src
index a0dd16eab..fc6d00804 100644
--- a/dbaccess/source/ui/uno/copytablewizard.src
+++ b/dbaccess/source/ui/uno/copytablewizard.src
@@ -66,17 +66,14 @@ String STR_CTW_ERROR_DURING_INITIALIZATION
 {
     Text [ en-US ] = "An error occurred during initialization.";
 };
-
 String STR_CTW_ERROR_UNSUPPORTED_SETTING
 {
     Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$.";
 };
-
 String STR_CTW_ERROR_NO_QUERY
 {
     Text [ en-US ] = "To copy a query, your connection must be able to provide queries.";
 };
-
 String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER
 {
     Text [ en-US ] = "The given interaction handler is invalid.";
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index f0fbb2d03..f0fbb2d03 100644..100755
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
author	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-06 22:03:09 -0600
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-06 22:03:09 -0600
commit	615f67cedb7873d8cfd1a5a71210c2200ffca8d5 (patch)
tree	7520f6f398820b3b4a177792468d8512799f29b0 /dbaccess/source
parent	fb2038e67257fb410f96bfa0ef6302275696c688 (diff)
parent	cc50d78db9bdee61353f4b4ee335166adeccf2cc (diff)