sb131: merged in re/DEV300_next towards DEV300_m94

65 files changed, 295 insertions, 617 deletions

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 5de2c497c031..a2a324f11469 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -200,7 +200,8 @@ void OKeySet::initColumns()
 void OKeySet::findTableColumnsMatching_throw(   const Any& i_aTable,
                                                 const ::rtl::OUString& i_rUpdateTableName,
                                                 const Reference<XDatabaseMetaData>& i_xMeta,
-                                                const Reference<XNameAccess>& i_xQueryColumns)
+                                                const Reference<XNameAccess>& i_xQueryColumns,
+                                                ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames)
 {
     // first ask the database itself for the best columns which can be used
     Sequence< ::rtl::OUString> aBestColumnNames;
@@ -242,17 +243,17 @@ void OKeySet::findTableColumnsMatching_throw(   const Any& i_aTable,
         sUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation );
     }
 
-    ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sUpdateTableName,(*m_pKeyColumnNames),true);
+    ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sUpdateTableName,(*o_pKeyColumnNames),true);
     ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sUpdateTableName,(*m_pColumnNames),true);
     ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sUpdateTableName,(*m_pParameterNames),true);
 
-    if ( m_pKeyColumnNames->empty() )
+    if ( o_pKeyColumnNames->empty() )
     {
         ::dbtools::throwGenericSQLException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Could not find any key column." ) ), *this );
     }
 
-    for (   SelectColumnsMetaData::const_iterator keyColumn = m_pKeyColumnNames->begin();
-            keyColumn != m_pKeyColumnNames->end();
+    for (   SelectColumnsMetaData::const_iterator keyColumn = o_pKeyColumnNames->begin();
+            keyColumn != o_pKeyColumnNames->end();
             ++keyColumn
         )
     {
@@ -298,7 +299,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
     Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
     Reference<XColumnsSupplier> xQueryColSup(m_xComposer,UNO_QUERY);
     const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
-    findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns);
+    findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
 
     // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
     // without extra varaible to be set
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 1266c271040a..ecb56d7c88b4 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -145,7 +145,8 @@ namespace dbaccess
         void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable,
                                              const ::rtl::OUString& i_rUpdateTableName,
                                              const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta,
-                                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns);
+                                             const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns,
+                                             ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames);
         ::rtl::OUStringBuffer createKeyFilter();
         void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
         void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 99bbc17f1f0f..837824751f0f 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -124,6 +124,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
     initColumns();
 
     Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
+    bool bCase = (xMeta.is() && xMeta->storesMixedCaseQuotedIdentifiers()) ? true : false;
     Reference<XColumnsSupplier> xQueryColSup(m_xComposer,UNO_QUERY);
     const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
     const Reference<XTablesSupplier> xTabSup(m_xComposer,UNO_QUERY);
@@ -133,7 +134,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
     const ::rtl::OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength();
     for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter)
     {
-        findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns);
+        ::std::auto_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase));
+        findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns,pKeyColumNames);
+        m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end());
     }
 
     // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index be9984938e01..e4e468b13779 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -188,7 +188,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
                 }
                 catch(const Exception&)
                 {
-                    DBG_UNHANDLED_EXCEPTION();
+                    // DBG_UNHANDLED_EXCEPTION();
                 }
                 m_pCacheSet = NULL;
                 m_xCacheSet.clear();
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index 9742dcdfec71..757c181c48cf 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 );
@@ -445,7 +453,7 @@ String STR_INVALID_NUMBER_ARGS
 };
 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
 {
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 79cd4f02c8d1..d2a97b995ffc 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -372,7 +372,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/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index afad4e3a2d7c..1ecac8e25604 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -753,23 +753,24 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0;
+    USHORT nImageId = 0, nImageIdH = 0;
+    rtl::OString sHelpId;
     ImageProvider aImageProvider;
     Image aFolderImage, aFolderImageHC;
     switch( _eType )
     {
         case E_FORM:
-            nHelpId = HID_APP_FORM_TREE;
+            sHelpId = HID_APP_FORM_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
             break;
         case E_REPORT:
-            nHelpId = HID_APP_REPORT_TREE;
+            sHelpId = HID_APP_REPORT_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
             break;
         case E_QUERY:
-            nHelpId = HID_APP_QUERY_TREE;
+            sHelpId = HID_APP_QUERY_TREE;
             aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
             aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
             break;
@@ -780,7 +781,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 
     if ( !m_pLists[_eType] )
     {
-        m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC );
+        m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC );
     }
 
     if ( m_pLists[_eType] )
@@ -878,10 +879,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 // -----------------------------------------------------------------------------
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC )
+DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC )
 {
     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, _rImageHC );
 }
 
@@ -890,7 +891,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 5ade6b687949..9f3cadc56a44 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -190,7 +190,7 @@ namespace dbaui
             @return
                 The new tree.
         */
-        DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
+        DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC );
 
         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 9908134b8e1c..dbe9ad112458 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -193,7 +193,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 5626db6dc157..460a4d1bc399 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -111,7 +111,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 2dec9005f847..4af2bdb70521 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";
                     };
@@ -394,7 +378,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;
@@ -404,7 +387,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;
@@ -414,7 +396,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;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5935baafa2c0..b81b073a56bf 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -1387,9 +1387,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 747a2d7ac8cf..476fcf683b3f 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -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/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index c2c8affcd4a8..c5c2a084b64a 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1070,9 +1070,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));
 
@@ -1089,7 +1089,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);
@@ -1097,7 +1097,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 14bbe171c613..ca94faeb56f8 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -338,18 +338,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:
                 //  ?????????
@@ -367,7 +367,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 6664a96e3ec0..bc7d5d7d6364 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -140,6 +140,8 @@ void DBTreeListBox::init()
     SetNodeDefaultImages( );
 
     EnableContextMenuHandling();
+
+    SetStyle( GetStyle() | WB_QUICK_SEARCH );
 }
 //------------------------------------------------------------------------
 DBTreeListBox::~DBTreeListBox()
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index ff29ac12383d..37bf187b6c90 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 425e713094f3..258eec3a2acf 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.src b/dbaccess/source/ui/dlg/CollectionView.src
index 018893384dab..86ac75a0d9e9 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -64,6 +64,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 ) ;
@@ -71,6 +72,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 ) ;
@@ -93,6 +95,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 ;
@@ -107,6 +110,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/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b2607ebc9f98..a1a146cd7b4b 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -220,6 +220,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 8ead374bdef4..33b70033b0f0 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 ) ;
@@ -55,7 +56,7 @@ TabPage PAGE_CONNECTION
     };
 
 
-    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
@@ -91,6 +92,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 ) ;
@@ -98,6 +100,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";
@@ -129,6 +132,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 ) ;
@@ -137,6 +141,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 c340e3576f34..cfc3deda1149 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -844,6 +844,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/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
deleted file mode 100644
index 49d4182d9ef8..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ /dev/null
@@ -1,218 +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.
- *
- ************************************************************************/
-#include "precompiled_dbaccess.hxx"
-
-#include "dbaccess_helpid.hrc"
-#include "dbu_resource.hrc"
-#include "ExtensionNotPresent.hrc"
-#include "ExtensionNotPresent.hxx"
-#include "moduledbu.hxx"
-#include "UITools.hxx"
-
-/** === begin UNO includes === **/
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-/** === end UNO includes === **/
-
-#include <connectivity/dbconversion.hxx>
-#include <unotools/syslocale.hxx>
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
-#include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
-#include <unotools/confignode.hxx>
-#include <vcl/msgbox.hxx>
-
-
-namespace dbaui
-{
-using namespace ::com::sun::star;
-using namespace ::comphelper;
-
-#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
-
-DBG_NAME( dbu_OExtensionNotPresentDialog )
-//========================================================================
-// class OExtensionNotPresentDialog
-//========================================================================
-    OExtensionNotPresentDialog::OExtensionNotPresentDialog( Window* _pParent, uno::Reference< lang::XMultiServiceFactory > _xORB)
-            : ModalDialog( _pParent, ModuleRes(RID_EXTENSION_NOT_PRESENT_DLG) )
-              ,m_aFI_WARNING(this, ModuleRes(FI_WARNING))
-              ,m_aFT_TEXT(this, ModuleRes(FT_TEXT       ) )
-              ,m_aPB_DOWNLOAD(this,     ModuleRes(PB_DOWNLOAD))
-              ,m_aPB_CANCEL(this,   ModuleRes(PB_CANCEL))
-            ,m_xMultiServiceFactory(_xORB)
-{
-    DBG_CTOR( dbu_OExtensionNotPresentDialog, NULL);
-
-    try
-    {
-        SvtSysLocale aSysLocale;
-        m_nLocale = aSysLocale.GetLocaleData().getLocale();
-    }
-    catch(uno::Exception&)
-    {
-    }
-
-    // set a ClickHandler for the 'Download' button
-    m_aPB_DOWNLOAD.SetClickHdl( LINK( this, OExtensionNotPresentDialog, Download_Click ) );
-
-    // get message string out of the resource
-    String sText =          String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) );
-    // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) );
-    String sExtensionName = getFromConfigurationExtension("Name");
-    sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName);
-
-    m_aFT_TEXT.SetText(sText);
-
-    // calulate the size of the text field
-    Rectangle aPrimaryRect( Point(0,0), m_aFT_TEXT.GetSizePixel() );
-    Rectangle aSuggestedRect( GetTextRect( aPrimaryRect, sText, TEXT_DRAW_MULTILINE | TEXT_DRAW_LEFT ) );
-
-    Size aTempSize = LogicToPixel( Size(LEFT_PADDING + RIGHT_PADDING, 1), MAP_APPFONT); // real pixel size of LEFT and RIGHT_PADDING
-    sal_Int32 nWidthWithoutFixedText = aTempSize.getWidth() ;
-    sal_Int32 nHeightWithoutFixedText = GetSizePixel().getHeight() - m_aFT_TEXT.GetSizePixel().getHeight();
-
-    Size aNewSize = aSuggestedRect.GetSize();
-    m_aFT_TEXT.SetSizePixel( aNewSize );
-    sal_Int32 nNewWidth  = nWidthWithoutFixedText  + aSuggestedRect.GetWidth();
-    sal_Int32 nNewHeight = nHeightWithoutFixedText + aSuggestedRect.GetHeight();
-
-    // set new window width & height
-    Size aDialogWindowSize = GetSizePixel();
-    aDialogWindowSize.setWidth(  nNewWidth );
-    aDialogWindowSize.setHeight( nNewHeight );
-    SetSizePixel(aDialogWindowSize);
-
-    // move Action items
-    sal_Int32 nWindowWidth = GetSizePixel().getWidth();
-    sal_Int32 nWindowHeight = GetSizePixel().getHeight();
-
-    Size aButtonSize = LogicToPixel( Size(BUTTON_WIDTH, BUTTON_HEIGHT), MAP_APPFONT); // real pixel size of a button
-
-    Point aNewPos = m_aPB_DOWNLOAD.GetPosPixel();
-    aNewPos.setX(nWindowWidth / 2 - m_aPB_DOWNLOAD.GetSizePixel().getWidth() - 8);
-    aNewPos.setY(nWindowHeight - aButtonSize.getHeight() - 5);
-    m_aPB_DOWNLOAD.SetPosPixel(aNewPos );
-
-    aNewPos = m_aPB_CANCEL.GetPosPixel();
-    aNewPos.setX(nWindowWidth / 2 + 8);
-    aNewPos.setY(nWindowHeight - aButtonSize.getHeight() - 5);
-    m_aPB_CANCEL.SetPosPixel(aNewPos );
-
-    m_aFI_WARNING.SetImage(WarningBox::GetStandardImage());
-
-    // set an image in high contrast
-    // m_aFI_WARNING.SetModeImage(Image(BMP_EXCEPTION_WARNING_SCH), BMP_COLOR_HIGHCONTRAST);
-
-    // to resize images
-    // WinBits aBits = m_aFI_WARNING.GetStyle();
-    // aBits |= WB_SCALE;
-    // m_aFI_WARNING.SetStyle(aBits);
-    //
-    // Size aImageSize = m_aFI_WARNING.GetSizePixel();
-    // (void) aImageSize;
-    // m_aFI_WARNING.Resize();
-
-
-    Resize();
-    FreeResource();
-}
-
-//------------------------------------------------------------------------
-OExtensionNotPresentDialog::~OExtensionNotPresentDialog()
-{
-    DBG_DTOR( dbu_OExtensionNotPresentDialog, NULL);
-}
-// -----------------------------------------------------------------------------
-short OExtensionNotPresentDialog::Execute()
-{
-    DBG_CHKTHIS( dbu_OExtensionNotPresentDialog,NULL);
-    short nRet = ModalDialog::Execute();
-    // RET_OK
-    // RET_NO
-    return nRet;
-}
-
-//------------------------------------------------------------------------------
-
-uno::Reference< com::sun::star::system::XSystemShellExecute > OExtensionNotPresentDialog::getShellExecuter() const
-{
-    uno::Reference<com::sun::star::system::XSystemShellExecute> xExecuter( m_xMultiServiceFactory->createInstance( UNISTRING( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY_THROW);
-    return xExecuter;
-}
-// -----------------------------------------------------------------------------
-rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OUString const& _sPropertyName) const
-{
-    // get the URL to open in a browser from Configuration
-    static const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/Extension" ) );
-
-    ::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xMultiServiceFactory, sConfigName ) );
-
-    rtl::OUString aValue;
-    aConfiguration.getNodeValue( _sPropertyName ) >>= aValue;
-    return aValue;
-}
-
-// -----------------------------------------------------------------------------
-rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OString const& _sPropertyName) const
-{
-    return getFromConfigurationExtension(rtl::OStringToOUString( _sPropertyName, RTL_TEXTENCODING_UTF8) );
-}
-
-// -----------------------------------------------------------------------------
-// handle the click on the download button
-IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG )
-{
-    try
-    {
-        EndDialog( TRUE );
-
-        rtl::OUString suDownloadURL = getFromConfigurationExtension("DownloadURL");
-        if (suDownloadURL.getLength() == 0)
-        {
-            // fallback
-            suDownloadURL = UNISTRING("http://extensions.services.openoffice.org");
-        }
-
-        // open such URL in a browser
-        uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() );
-        xShellExecute->execute( suDownloadURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
-    }
-    catch( const uno::Exception& )
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }
-    return 0;
-}
-
-// =============================================================================
-} // rptui
-// =============================================================================
-
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
deleted file mode 100644
index 69794e3a76bc..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ /dev/null
@@ -1,48 +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 PAGE_WIDTH           ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING)
-#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/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
deleted file mode 100644
index 9507c4256360..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ /dev/null
@@ -1,89 +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.
- *
- ************************************************************************/
-#include "ExtensionNotPresent.hrc"
-#include "dbaccess_helpid.hrc"
-#include "dbu_resource.hrc"
-#include <svx/globlmn.hrc>
-#include <svx/svxids.hrc>
-
-
-String RID_STR_EXTENSION_NOT_PRESENT
-{
-    // #i96130# use hard coded name
-    Text [ en-US ] = "To open a report you require the extension Sun™ Report Builder.\n\nClick 'Download...' to download and install the extension.";
-    // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension.";
-};
-// To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
-// String RID_STR_EXTENSION_NAME
-// {
-//  Text = "Sun(TM) Report Builder";
-// };
-
-ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
-    Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ;
-    HelpId = HID_EXTENSION_NOT_PRESENT_DLG;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-
-    // most of the calulated values here are overridden by the ExtensionNotPresent ctor itself.
-    FixedImage FI_WARNING
-    {
-        Pos = MAP_APPFONT (CELL_PADDING / 2, CELL_PADDING) ;
-        Size = (32, 32);
-        Fixed=BMP_EXCEPTION_WARNING;
-    };
-
-
-    FixedText FT_TEXT
-    {
-        Pos                 = MAP_APPFONT ( 32 , CELL_PADDING ) ;
-        Size                = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ;
-        // Border = TRUE ;
-        // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
-    };
-
-    PushButton PB_DOWNLOAD
-    {
-        Pos = MAP_APPFONT ( DLG_WIDTH / 2 - (CELL_PADDING/2) - BUTTON_WIDTH, ACTION_LINE_START ) ;
-        Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-        DefButton = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Download..." ;
-    };
-
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( DLG_WIDTH / 2 + (CELL_PADDING/2), ACTION_LINE_START) ;
-        Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-    };
-};
-
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 68399ca52619..81e183e4b77b 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -36,6 +36,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 4a12a0dd13ea..352963b21272 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -34,9 +34,6 @@
 #ifndef _DBAUI_DBADMINIMPL_HXX_
 #include "DbAdminImpl.hxx"
 #endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
-#include "dbaccess_helpid.hrc"
-#endif
 #ifndef _DBAUI_TABLESPAGE_HXX_
 #include "tablespage.hxx"
 #endif
@@ -51,6 +48,8 @@
 #include "propertysetitem.hxx"
 #endif
 
+#include "dbu_dlg.hrc"
+
 //.........................................................................
 namespace dbaui
 {
@@ -69,7 +68,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 2cab4f9e89f0..8d88dcf8f1ce 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -159,6 +159,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 ) ;
@@ -173,6 +174,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 ) ;
@@ -186,6 +188,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/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 8e5b61dc9076..d19052525a76 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -313,7 +313,6 @@ namespace dbaui
         SetControlFontWeight(m_pFT_HeaderText);
     }
 
-
     //=========================================================================
     //= LayoutHelper
     //=========================================================================
@@ -331,6 +330,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 32ba0064a824..be6b923c2997 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -288,6 +288,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/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index a4914cd45cc5..4ef32efcc7ac 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -377,7 +377,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 af1d861a0faa..7a36bddb378f 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";
@@ -69,6 +71,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 4c5a7d924d33..f37c67148e18 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 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index c4457c62eec0..1d8744f07b53 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -196,6 +196,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" ;
@@ -210,6 +211,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;
@@ -218,6 +220,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;
@@ -419,6 +422,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
 
@@ -434,6 +438,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 ;
@@ -451,6 +456,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 ;
@@ -473,6 +479,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 ) ;
@@ -486,6 +493,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) ;
@@ -495,6 +503,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";
@@ -502,6 +511,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...";
@@ -517,6 +527,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 ) ;
@@ -527,6 +538,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 ) ;
@@ -545,6 +557,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 ) ;
@@ -553,6 +566,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 ) ;
@@ -564,6 +578,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 ) ;
@@ -585,6 +600,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 ) ;
@@ -592,6 +608,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";
@@ -602,6 +619,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 ) ;
@@ -621,6 +639,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 ) ;
@@ -629,6 +648,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 ) ;
@@ -744,6 +764,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 ) ;
@@ -759,6 +780,7 @@ TabPage PAGE_USERDRIVER
 
     NumericField NF_PORTNUMBER
     {
+        HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER";
         TabStop = TRUE ;
         Border = TRUE ;
         NoThousandSep = TRUE;
@@ -775,6 +797,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 50b796541872..76cfebb8dcb0 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,41 +62,6 @@ 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
 #define WIN_X           220
@@ -109,6 +69,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 
 ModalDialog DLG_DOMAINPASSWORD
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -125,6 +86,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 7b0dbe011342..5fc9cdc12f23 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -151,6 +151,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 ) ;
@@ -197,6 +198,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" ;
@@ -209,6 +211,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 ) ;
@@ -267,6 +270,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 ) ;
@@ -343,6 +347,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 ) ;
@@ -370,11 +375,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 ) ;
@@ -400,6 +406,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 ) ;
@@ -416,12 +423,13 @@ 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
     {
@@ -440,7 +448,7 @@ TabPage PAGE_DBWIZARD_TEXT
     };
 
 
-    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)
  };
 
@@ -448,6 +456,7 @@ TabPage PAGE_DBWIZARD_TEXT
 
 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 ) ;
@@ -464,13 +473,14 @@ 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)
 // FT_MSACCESS_MDB_FILE
 };
 
 
 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 ) ;
@@ -512,6 +522,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 ) ;
@@ -527,12 +538,13 @@ 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 ) ;
@@ -547,13 +559,14 @@ 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 ) ;
@@ -568,23 +581,25 @@ 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 ) ;
@@ -599,14 +614,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 ) ;
@@ -632,12 +648,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 ) ;
@@ -654,7 +671,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
     };
 
 
-    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.src b/dbaccess/source/ui/dlg/dbfindex.src
index ad401102601d..83ce7090c195 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -93,6 +93,7 @@ Image IMG_ALL_RIGHT_H
 
 ModalDialog DLG_DBASE_INDEXES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -125,6 +126,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 ) ;
@@ -146,6 +148,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 ) ;
@@ -160,6 +163,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 ) ;
@@ -168,6 +172,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 ;
@@ -187,6 +192,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 ;
@@ -206,6 +212,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 ;
@@ -225,6 +232,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 230fe4dac320..cdde8fca5ed6 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 d550704b85f8..802f88d0869a 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 ade6f3ff1222..128241d211e0 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -62,6 +62,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 ) ;
@@ -75,6 +76,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 ;
@@ -117,6 +119,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 ) ;
@@ -130,6 +133,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 8eff7fffe6c4..f6fca187ba58 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 ae8f80d6c616..e4102b9c6f84 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 ) ;
@@ -132,6 +133,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;
@@ -154,6 +156,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 270741d00857..ca0d3ab8cde7 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/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 3993096f8847..f654f5627808 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 ) ;
@@ -52,6 +53,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;
@@ -65,6 +67,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 ) ;
@@ -72,6 +75,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 2b1ef6e6baf5..a92110a6eefd 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -53,6 +53,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 ) ;
@@ -61,6 +62,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 ) ;
@@ -71,6 +73,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 ) ;
@@ -78,6 +81,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 ) ;
@@ -93,6 +97,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 ) ;
@@ -101,6 +106,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 ) ;
@@ -111,6 +117,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 ) ;
@@ -118,6 +125,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 ) ;
@@ -133,6 +141,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 ) ;
@@ -141,6 +150,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 ) ;
@@ -151,6 +161,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 ) ;
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 2f2f85a797a0..a0806f41988c 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 ) ;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f7600fd137ed..f19f65313a0d 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -77,6 +77,8 @@
 #include "moduledbu.hxx"
 #endif
 
+#include <tools/urlobj.hxx>
+
 #define BUTTONID_MORE   BUTTONID_RETRY + 1
 
 #define DIALOG_WIDTH    220
@@ -399,7 +401,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( );
@@ -689,11 +691,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 af3d53f785dd..f409477267f9 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -73,6 +73,7 @@ Image BMP_EXCEPTION_INFO_SCH
 
 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 a48b08de740d..6523e0f17cd6 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -162,7 +162,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 cca76e7f65a3..b34a056076a8 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/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
deleted file mode 100644
index 0c64214d4c37..000000000000
--- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
+++ /dev/null
@@ -1,101 +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_HXX
-#define DBU_EXTENSIONNOTPRESENT_HXX
-
-#ifndef _DIALOG_HXX //autogen
-#include <vcl/dialog.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
-#include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _SV_FIELD_HXX
-#include <vcl/field.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
-#include <vcl/button.hxx>
-#endif
-#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_
-#include <com/sun/star/report/XReportDefinition.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
-#include <com/sun/star/lang/Locale.hpp>
-#endif
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/system/XSystemShellExecute.hpp>
-
-namespace dbaui
-{
-
-/*************************************************************************
-|*
-|* Groups and Sorting dialog
-|*
-\************************************************************************/
-class OExtensionNotPresentDialog :  public ModalDialog
-{
-    FixedImage                              m_aFI_WARNING;
-    FixedText                               m_aFT_TEXT;
-
-    PushButton                              m_aPB_DOWNLOAD;
-    CancelButton                            m_aPB_CANCEL;
-
-    ::com::sun::star::lang::Locale          m_nLocale;
-    com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory;
-
-    /** returns the format string.
-    */
-    // ::rtl::OUString getFormatString(::sal_Int16 _nNumberFormatIndex);
-
-    DECL_LINK(Download_Click,PushButton*);
-
-    // not CopyCTOR, no self assignment
-    OExtensionNotPresentDialog(const OExtensionNotPresentDialog&);
-    void operator =(const OExtensionNotPresentDialog&);
-
-    // get some values out of the configuration
-    rtl::OUString getFromConfigurationExtension(rtl::OUString const& _sPropertyName) const;
-    rtl::OUString getFromConfigurationExtension(rtl::OString const& _sPropertyName) const; // syntactic sugar
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::system::XSystemShellExecute > getShellExecuter() const;
-
-public:
-    OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > );
-    virtual ~OExtensionNotPresentDialog();
-    virtual short   Execute();
-
-    inline String getText() const { return m_aFT_TEXT.GetText(); }
-};
-// =============================================================================
-} // namespace rptui
-// =============================================================================
-#endif // DBU_EXTENSIONNOTPRESENT_HXX
-
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index f71d33792c99..05a507969765 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -159,9 +159,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/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index df7208aba9b7..daa8756751cf 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -337,7 +337,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 7e1b7df0d100..b107a0014dbb 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 be49adc0e518..730235b207ad 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 142da37eb892..77180a01ac05 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1498,13 +1498,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/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index d54a056f863e..803554a0094f 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -92,8 +92,8 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_CTRL_RIGHT.SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl));
     m_CTRL_RIGHT.EnableCheckButton( NULL );
 
-    m_CTRL_LEFT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
-    m_CTRL_RIGHT.SetWindowBits( WB_FORCE_MAKEVISIBLE );
+    m_CTRL_LEFT.SetStyle( m_CTRL_LEFT.GetStyle() | WB_FORCE_MAKEVISIBLE );
+    m_CTRL_RIGHT.SetStyle( m_CTRL_RIGHT.GetStyle() | WB_FORCE_MAKEVISIBLE );
 
     m_sSourceText   = m_FT_TABLE_LEFT.GetText();
     m_sSourceText.AppendAscii("\n");
@@ -405,7 +405,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId )
 {
     SetDragDropMode( 0 );
     EnableInplaceEditing( sal_False );
-    SetWindowBits(WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
+    SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
     SetSelectionMode( SINGLE_SELECTION );
 }
 //------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f33c82abecb7..fa72a03269cc 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -70,6 +70,8 @@
 #include "FieldControls.hxx"
 #endif
 
+#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 9871c3f7d810..d9c9772d2a41 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" ;
 
@@ -91,12 +93,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>";
@@ -130,6 +134,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 ) ;
@@ -142,6 +147,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 ;
@@ -161,6 +167,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;
@@ -181,6 +188,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 ;
@@ -200,6 +208,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 ;
@@ -220,6 +229,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 ) ;
@@ -245,6 +255,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 ) ;
@@ -264,6 +275,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;
@@ -286,6 +298,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 ) ;
@@ -294,6 +307,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 ;
@@ -308,7 +322,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" ;
         };
@@ -319,6 +333,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 ) ;
 
@@ -360,6 +375,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;
@@ -380,6 +396,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;
@@ -399,6 +416,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;
@@ -419,6 +437,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 ;
@@ -439,6 +458,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 ;
@@ -447,6 +467,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 552a076147d5..22bc80670cf6 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/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 7bded25d5a7d..66b6eec9465c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2700,7 +2700,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();
@@ -2709,10 +2709,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()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index e4fd3471fd97..3d215a81f4c8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -261,7 +261,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 687df3159186..730cbb4ed780 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 f64cabd58653..4d3cdb6652a9 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -107,6 +107,8 @@
 #endif
 #include "dsntypes.hxx"
 
+#include "dbaccess_slotid.hrc"
+
 using namespace ::dbaui;
 using namespace ::comphelper;
 using namespace ::svt;
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index e2a73292ec8d..0f1168f97c8f 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -175,7 +175,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
     MenuItem
     {
         Identifier = SID_TABLEDESIGN_INSERTROWS ;
-        HelpID = SID_TABLEDESIGN_INSERTROWS ;
+        HelpID = HID_TABLEDESIGN_INSERTROWS ;
         Text [ en-US ] = "Insert Rows" ;
         };
     MenuItem
@@ -185,7 +185,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
     MenuItem
     {
         Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
-        HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ;
+        HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ;
         Checkable = TRUE ;
         Text [ en-US ] = "Primary Key" ;
         };