Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (76 commits) masterfix DEV300: #i10000# usage of L10N build_type removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw hr75: #i116747#: remove obsolete copyright notices gnumake3: remove comphelper version; fix including extract.hxx removetooltypes01: #i112600# Replace missing tools types replacement removetooltypes01: #i112600# remove tooltypes from reportdesign removetooltypes01: #i112600# remove tooltypes from dbaccess undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase) undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory dba34b: #109956# notify column value in correct order dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow undoapi: assert unknown slots in ImplInvalidateFeature dba34b: #i110907# check if design handle event dba34b: #i109956# notify column values when row is refreshed dba34b: #i115753# add test again undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ... undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come. ... Conflicts: dbaccess/inc/IEnvironment.hxx dbaccess/inc/dataview.hxx dbaccess/qa/complex/dbaccess/RowSet.java dbaccess/source/core/api/CacheSet.cxx dbaccess/source/core/api/KeySet.hxx dbaccess/source/core/api/OptimisticSet.hxx dbaccess/source/core/api/RowSet.cxx dbaccess/source/core/api/RowSetCache.cxx dbaccess/source/ext/adabas/Acomponentmodule.cxx dbaccess/source/ext/adabas/Aservices.cxx dbaccess/source/filter/migration/cfgimport.cxx dbaccess/source/filter/migration/cfgimport.hxx dbaccess/source/filter/migration/cfgservices.cxx dbaccess/source/filter/migration/makefile.mk dbaccess/source/inc/cfg_reghelper.hxx dbaccess/source/sdbtools/misc/sdbt_services.cxx dbaccess/source/shared/cfg_reghelper.cxx dbaccess/source/shared/cfgstrings.cxx dbaccess/source/shared/registrationhelper.cxx dbaccess/source/ui/app/AppController.cxx dbaccess/source/ui/app/AppDetailPageHelper.cxx dbaccess/source/ui/app/AppDetailPageHelper.hxx dbaccess/source/ui/app/AppDetailView.cxx dbaccess/source/ui/app/AppIconControl.cxx dbaccess/source/ui/app/AppSwapWindow.cxx dbaccess/source/ui/browser/brwctrlr.cxx dbaccess/source/ui/browser/dataview.cxx dbaccess/source/ui/browser/unodatbr.cxx dbaccess/source/ui/control/dbtreelistbox.cxx dbaccess/source/ui/control/opendoccontrols.cxx dbaccess/source/ui/control/tabletree.cxx dbaccess/source/ui/dlg/ConnectionHelper.cxx dbaccess/source/ui/dlg/ConnectionPage.src dbaccess/source/ui/dlg/ExtensionNotPresent.cxx dbaccess/source/ui/dlg/ExtensionNotPresent.hrc dbaccess/source/ui/dlg/ExtensionNotPresent.src dbaccess/source/ui/dlg/TablesSingleDlg.cxx dbaccess/source/ui/dlg/adodatalinks.hxx dbaccess/source/ui/dlg/dbadmin2.src dbaccess/source/ui/dlg/dbadminsetup.src dbaccess/source/ui/dlg/dlgattr.cxx dbaccess/source/ui/dlg/dlgsize.src dbaccess/source/ui/dlg/makefile.mk dbaccess/source/ui/dlg/sqlmessage.cxx dbaccess/source/ui/inc/ExtensionNotPresent.hxx dbaccess/source/ui/inc/TokenWriter.hxx dbaccess/source/ui/inc/imageprovider.hxx dbaccess/source/ui/misc/DExport.cxx dbaccess/source/ui/misc/HtmlReader.cxx dbaccess/source/ui/misc/RowSetDrop.cxx dbaccess/source/ui/misc/RtfReader.cxx dbaccess/source/ui/misc/TokenWriter.cxx dbaccess/source/ui/misc/imageprovider.cxx dbaccess/source/ui/misc/linkeddocuments.cxx dbaccess/source/ui/misc/singledoccontroller.cxx dbaccess/source/ui/querydesign/ConnectionData.hxx dbaccess/source/ui/querydesign/JoinTableView.cxx dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx dbaccess/source/ui/querydesign/TableConnectionData.cxx dbaccess/source/ui/querydesign/TableWindowListBox.cxx dbaccess/source/ui/relationdesign/RelationController.cxx dbaccess/source/ui/relationdesign/RelationTableView.cxx dbaccess/source/ui/tabledesign/table.src reportdesign/inc/RptPage.hxx reportdesign/qa/complex/reportdesign/ReportDesignerTest.java reportdesign/source/core/api/ReportDefinition.cxx reportdesign/source/core/sdr/ReportUndoFactory.cxx reportdesign/source/core/sdr/UndoEnv.cxx reportdesign/source/filter/xml/xmlservices.cxx reportdesign/source/ui/dlg/GroupsSorting.cxx reportdesign/source/ui/dlg/Navigator.cxx reportdesign/source/ui/inspection/metadata.cxx reportdesign/source/ui/misc/RptUndo.cxx reportdesign/source/ui/misc/UITools.cxx reportdesign/source/ui/misc/rptuiservices.cxx reportdesign/source/ui/report/DesignView.cxx reportdesign/source/ui/report/FixedTextColor.cxx reportdesign/source/ui/report/ReportController.cxx reportdesign/source/ui/report/ReportSection.cxx reportdesign/source/ui/report/SectionView.cxx reportdesign/source/ui/report/SectionWindow.cxx reportdesign/source/ui/report/StartMarker.cxx reportdesign/source/ui/report/ViewsWindow.cxx reportdesign/source/ui/report/dlgedfunc.cxx reportdesign/source/ui/report/report.src
author: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 23:17:51 -0600
committer: Norbert Thiebaud <nthiebaud@gmail.com> 2011-03-09 23:17:51 -0600
commit: 256f6ca67d03b875e8e6a355a6cf5130ea7404a3 (patch)
tree: c1916add744093d07466b54d6af832cd87891d8e /dbaccess/source/ui/dlg
parent: f71ad82e60bebde81ebb193dcd16305ca339cc1a (diff)
parent: dee1ea70160df84946cf9040281de42945faf65a (diff)
68 files changed, 393 insertions, 566 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx
index 26f6d9537086..25710d04abfc 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@ -119,8 +119,8 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
                     double nUsedPages = xRow->getInt(1) / 256;
                     double nFreePages = xRow->getInt(2) / 256;
 
-                    m_ET_SIZE.SetText(::rtl::OUString::valueOf((INT32)nUsedPages));
-                    m_ET_FREESIZE.SetText(::rtl::OUString::valueOf((INT32)nFreePages));
+                    m_ET_SIZE.SetText(::rtl::OUString::valueOf((sal_Int32)nUsedPages));
+                    m_ET_FREESIZE.SetText(::rtl::OUString::valueOf((sal_Int32)nFreePages));
                     m_ET_MEMORYUSING.SetValue(static_cast<sal_Int32>(((nUsedPages-nFreePages)/nUsedPages)*100));
                 }
                 else
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index 418729d4564e..476750f7b531 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.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index f250dad416cb..89e3a8d8439a 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -213,7 +213,7 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG )
                     return 0;
             }
             m_aName.SetText(sName);
-            EndDialog( TRUE );
+            EndDialog( sal_True );
         }
     }
     catch( const Exception& )
@@ -300,7 +300,7 @@ IMPL_LINK( OCollectionView, Dbl_Click_FileView, SvtFileView*, EMPTYARG )
 // -----------------------------------------------------------------------------
 void OCollectionView::initCurrentPath()
 {
-    BOOL bEnable = FALSE;
+    sal_Bool bEnable = sal_False;
     try
     {
         if ( m_xContent.is() )
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 0d26722a7033..e431a6502e81 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -62,6 +62,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_NEWFOLDER
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER";
         TabStop = FALSE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS -  RELATED_CONTROLS - 2*IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     ImageButton BTN_EXPLORERFILE_UP
     {
+        HelpID = "dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - IMG_SIZE, UNRELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
@@ -91,6 +93,7 @@ ModalDialog DLG_COLLECTION_VIEW
     };
     Edit ED_EXPLORERFILE_FILENAME
     {
+        HelpID = "dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + 50 , WIN_Y - 3*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT - EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( WIN_X - RELATED_CONTROLS - 2*UNRELATED_CONTROLS - 50 , EDIT_HEIGHT ) ;
         Border = TRUE ;
@@ -105,6 +108,7 @@ ModalDialog DLG_COLLECTION_VIEW
 
     PushButton BTN_EXPLORERFILE_SAVE
     {
+        HelpID = "dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE";
         Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
         DefButton = TRUE ;
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 51838459da45..a82c26a13161 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -70,7 +70,7 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
-#if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
+#if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
@@ -142,7 +142,7 @@ DBG_NAME(OConnectionHelper)
         m_aConnectionURL.Show();
         m_aConnectionURL.ShowPrefix( ::dbaccess::DST_JDBC == m_pCollection->determineType(m_eType) );
 
-        BOOL bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType );
+        sal_Bool bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType );
         m_aPB_Connection.Show( bEnableBrowseButton );
 
         SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index d4d210482ce2..63cac64f6095 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -71,7 +71,7 @@
 #include <tools/urlobj.hxx>
 #include <sfx2/docfilt.hxx>
 #include "dsnItem.hxx"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
 
@@ -133,6 +133,8 @@ namespace dbaui
         m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
 
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aTestConnection );
     }
 
     // -----------------------------------------------------------------------
@@ -257,7 +259,7 @@ namespace dbaui
             String sUrl = pUrlItem->GetValue();
             setURL( sUrl );
 
-            const BOOL bEnableJDBC = m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC;
+            const sal_Bool bEnableJDBC = m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC;
             if ( !pJdbcDrvItem->GetValue().Len() )
             {
                 String sDefaultJdbcDriverName = m_pCollection->getJavaDriverClass(m_eType);
@@ -347,7 +349,7 @@ namespace dbaui
         {
         }
 
-        USHORT nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
         aMsg.Execute();
         return 0L;
@@ -356,7 +358,7 @@ namespace dbaui
     bool OConnectionTabPage::checkTestConnection()
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
-        BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
+        sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
         if ( m_pCollection->determineType(m_eType) ==  ::dbaccess::DST_JDBC )
             bEnableTestConnection = bEnableTestConnection && (m_aJavaDriver.GetText().Len() != 0);
         m_aTestConnection.Enable(bEnableTestConnection);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 140ea6792efc..bd0034a22a91 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -74,7 +74,7 @@ namespace dbaui
 
     public:
         static  SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
-        virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 61515a2589a8..63c400b0a77a 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -42,6 +42,7 @@
 //.........................................................................
 TabPage PAGE_CONNECTION
 {
+    HelpID = "dbaccess:TabPage:PAGE_CONNECTION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -54,7 +55,7 @@ TabPage PAGE_CONNECTION
         Text[ en-US ] = "General";
     };
 
-    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
+    AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN)
 
     FixedText FT_NO_ADDITIONAL_SETTINGS
     {
@@ -88,6 +89,7 @@ TabPage PAGE_CONNECTION
 
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -96,6 +98,7 @@ TabPage PAGE_CONNECTION
 
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
         Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -128,6 +131,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -2 ) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -136,6 +140,7 @@ TabPage PAGE_CONNECTION
 
     PushButton PB_TESTCONNECTION
     {
+        HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION";
         Pos = MAP_APPFONT ( PAGE_X  - 75 - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
         Size = MAP_APPFONT ( 75 , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index a311acd6d8cf..6ee4c808aeb5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -133,7 +133,7 @@ namespace dbaui
     //= OConnectionTabPageSetup
     //========================================================================
     DBG_NAME(OConnectionTabPageSetup)
-    OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, USHORT _rId, const SfxItemSet& _rCoreAttrs, USHORT _nHelpTextResId, USHORT _nHeaderResId, USHORT _nUrlResId)
+    OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId)
         :OConnectionHelper(pParent, ModuleRes(_rId), _rCoreAttrs)
         ,m_bUserGrabFocus(sal_True)
         ,m_aFT_HelpText(this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index e5ad2d732f93..0fd31cf58101 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -69,7 +69,7 @@ namespace dbaui
         static  OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
 
-        virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         virtual void        implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual sal_Bool    commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
@@ -87,7 +87,7 @@ namespace dbaui
 
 
     protected:
-        OConnectionTabPageSetup(Window* pParent, USHORT _rId, const SfxItemSet& _rCoreAttrs, USHORT _nHelpTextResId, USHORT _nHeaderResId, USHORT _nUrlResId);
+        OConnectionTabPageSetup(Window* pParent, sal_uInt16 _rId, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId);
         virtual bool checkTestConnection();
             // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
         virtual ~OConnectionTabPageSetup();
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index aef7cdce199a..83506495c575 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -333,7 +333,7 @@ DBG_NAME(OMySQLIntroPageSetup)
 
 
     // -----------------------------------------------------------------------
-    BOOL OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
+    sal_Bool OMySQLIntroPageSetup::FillItemSet(SfxItemSet& /*_rSet*/)
     {
         OSL_ENSURE(sal_False,"Who called me?! Please ask oj for more information.");
         return sal_True;
@@ -421,7 +421,7 @@ DBG_NAME(OMySQLIntroPageSetup)
     //========================================================================
     //= OMySQLJDBCConnectionPageSetup
     //========================================================================
-    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId)
+    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId)
         :OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs)
         ,m_aFTHelpText          (this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
         ,m_aFTDatabasename      (this, ModuleRes(FT_AUTODATABASENAME))
@@ -579,7 +579,7 @@ DBG_NAME(OMySQLIntroPageSetup)
         {
         }
 
-        USHORT nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
         aMsg.Execute();
         return 0L;
@@ -674,7 +674,7 @@ DBG_NAME(OMySQLIntroPageSetup)
     bool OJDBCConnectionPageSetup::checkTestConnection()
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
-        BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
+        sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
         bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
         return bEnableTestConnection;
     }
@@ -698,7 +698,7 @@ DBG_NAME(OMySQLIntroPageSetup)
         {
         }
 
-        USHORT nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
         aMsg.Execute();
         return 0L;
@@ -791,6 +791,8 @@ DBG_NAME(OAuthentificationPageSetup)
         m_aCBPasswordRequired.SetClickHdl(getControlModifiedLink());
            m_aPBTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
         FreeResource();
+
+        LayoutHelper::fitSizeRightAligned( m_aPBTestConnection );
     }
 
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 48c0931b946e..00fe40ffbce1 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -56,7 +56,7 @@ namespace dbaui
     class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -77,7 +77,7 @@ namespace dbaui
     class OTextConnectionPageSetup : public OConnectionTabPageSetup
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
            static   OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
@@ -101,7 +101,7 @@ namespace dbaui
     class OLDAPConnectionPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
         virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
@@ -144,7 +144,7 @@ namespace dbaui
         virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
         virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
 
-        virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
         virtual Link getControlModifiedLink();
@@ -160,18 +160,18 @@ namespace dbaui
     {
     public:
         OGeneralSpecialJDBCConnectionPageSetup(   Window* pParent
-                                        , USHORT _nResId
+                                        , sal_uInt16 _nResId
                                         , const SfxItemSet& _rCoreAttrs
-                                        , USHORT _nPortId
-                                        , USHORT _nDefaultPortResId
-                                        , USHORT _nHelpTextResId
-                                        , USHORT _nHeaderTextResId
-                                        , USHORT _nDriverClassId );
+                                        , sal_uInt16 _nPortId
+                                        , sal_uInt16 _nDefaultPortResId
+                                        , sal_uInt16 _nHelpTextResId
+                                        , sal_uInt16 _nHeaderTextResId
+                                        , sal_uInt16 _nDriverClassId );
     static  OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
     static  OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
 
     protected:
-        virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -194,7 +194,7 @@ namespace dbaui
         PushButton          m_aPBTestJavaDriver;
 
         String              m_sDefaultJdbcDriverName;
-        USHORT              m_nPortId;
+        sal_uInt16              m_nPortId;
     };
 
 
@@ -210,7 +210,7 @@ namespace dbaui
     protected:
         virtual bool checkTestConnection();
 
-        virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -250,7 +250,7 @@ namespace dbaui
 
 
     protected:
-        virtual BOOL FillItemSet(SfxItemSet& _rSet);
+        virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -277,7 +277,7 @@ namespace dbaui
     class OAuthentificationPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
         static  OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
         OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
 
@@ -304,7 +304,7 @@ namespace dbaui
     class OFinalDBPageSetup : public OGenericAdministrationPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
            static   OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
 
         FixedText   m_aFTFinalHeader;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 6a067dbbfafc..da3bb881d30d 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -108,7 +108,7 @@ using namespace com::sun::star::frame;
 //-------------------------------------------------------------------------
 namespace
 {
-    sal_Bool implCheckItemType( SfxItemSet& _rSet, const USHORT _nId, const TypeId _nExpectedItemType )
+    sal_Bool implCheckItemType( SfxItemSet& _rSet, const sal_uInt16 _nId, const TypeId _nExpectedItemType )
     {
         sal_Bool bCorrectType = sal_False;
 
@@ -726,7 +726,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
             ++aDirect
         )
     {
-        const SfxPoolItem* pCurrentItem = _rSource.GetItem((USHORT)aDirect->first);
+        const SfxPoolItem* pCurrentItem = _rSource.GetItem((sal_uInt16)aDirect->first);
         if (pCurrentItem)
         {
             sal_Int16 nAttributes = PropertyAttribute::READONLY;
@@ -785,7 +785,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
     ::std::vector< sal_Int32>::iterator aDetailsEnd = aDetailIds.end();
     for (::std::vector< sal_Int32>::iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter)
     {
-        const SfxPoolItem* pCurrent = _rSource.GetItem((USHORT)*aIter);
+        const SfxPoolItem* pCurrent = _rSource.GetItem((sal_uInt16)*aIter);
         aTranslation = m_aIndirectPropTranslator.find(*aIter);
         if ( pCurrent && (m_aIndirectPropTranslator.end() != aTranslation) )
         {
@@ -1118,7 +1118,7 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
     ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
     OSL_ENSURE(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
 
-    USHORT nPortNumberId    = 0;
+    sal_uInt16 nPortNumberId    = 0;
     sal_Int32 nPortNumber   = -1;
     String sNewHostName;
     String sUrlPart;
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 23390d34bba2..2408297e20cf 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -78,7 +78,7 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR
         }
     }
 #endif
-    typedef ::std::pair<USHORT, ::rtl::OUString> TProperties;
+    typedef ::std::pair<sal_uInt16, ::rtl::OUString> TProperties;
     TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowDeleted")))
                             ,TProperties(DSID_CHARSET,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")))
                             ,TProperties(DSID_FIELDDELIMITER,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter")))
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
deleted file mode 100644
index 9aa06d59e1d3..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 <svtools/langhelp.hxx>
-#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 = 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());
-
-    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.libreoffice.org");
-        }
-
-        // open such URL in a browser
-        localizeWebserviceURI(suDownloadURL);
-        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
-// =============================================================================
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
deleted file mode 100644
index 712193982075..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef DBU_EXTENSIONNOTPRESENT_HRC
-#define DBU_EXTENSIONNOTPRESENT_HRC
-
-#define FT_TEXT                     (1)
-#define FI_WARNING                  (2)
-#define PB_DOWNLOAD                 (10)
-#define PB_CANCEL                   (11)
-
-#define FIXEDTEXT_HEIGHT     8
-#define CELL_PADDING         8
-#define BUTTON_HEIGHT       14
-#define BUTTON_WIDTH        55
-#define BROWSER_HEIGHT      75
-#define LEFT_PADDING        32 /* size for the icon */
-#define RIGHT_PADDING       16
-#define DLG_WIDTH           ( 250 )
-#define ACTION_LINE_START   (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 )
-#define DLG_HEIGHT          (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING)
-
-
-#endif /* DBU_EXTENSIONNOTPRESENT_HRC */
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
deleted file mode 100644
index b224714cd482..000000000000
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ /dev/null
@@ -1,81 +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.";
-};
-
-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) ) ;
-        // 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.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 947bec14a021..7618e732fd1a 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -63,7 +63,7 @@ DBG_NAME(ORelationDialog)
 //========================================================================
 ORelationDialog::ORelationDialog( OJoinTableView* pParent,
                                  const TTableConnectionData::value_type& pConnectionData,
-                                 BOOL bAllowTableSelect )
+                                 sal_Bool bAllowTableSelect )
     :ModalDialog( pParent, ModuleRes(DLG_REL_PROPERTIES) )
     ,m_pTableMap(pParent->GetTabWinMap())
 
@@ -83,7 +83,7 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
     ,aPB_HELP( this, ModuleRes( PB_HELP ) )
 
     ,m_pOrigConnData( pConnectionData )
-    ,m_bTriedOneUpdate(FALSE)
+    ,m_bTriedOneUpdate(sal_False)
 {
     DBG_CTOR(ORelationDialog,NULL);
 
@@ -121,18 +121,18 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
     {
     case KeyRule::NO_ACTION:
     case KeyRule::RESTRICT:
-        aRB_NoCascUpd.Check( TRUE );
+        aRB_NoCascUpd.Check( sal_True );
         break;
 
     case KeyRule::CASCADE:
-        aRB_CascUpd.Check( TRUE );
+        aRB_CascUpd.Check( sal_True );
         break;
 
     case KeyRule::SET_NULL:
-        aRB_CascUpdNull.Check( TRUE );
+        aRB_CascUpdNull.Check( sal_True );
         break;
     case KeyRule::SET_DEFAULT:
-        aRB_CascUpdDefault.Check( TRUE );
+        aRB_CascUpdDefault.Check( sal_True );
         break;
     }
 
@@ -141,18 +141,18 @@ void ORelationDialog::Init(const TTableConnectionData::value_type& _pConnectionD
     {
     case KeyRule::NO_ACTION:
     case KeyRule::RESTRICT:
-        aRB_NoCascDel.Check( TRUE );
+        aRB_NoCascDel.Check( sal_True );
         break;
 
     case KeyRule::CASCADE:
-        aRB_CascDel.Check( TRUE );
+        aRB_CascDel.Check( sal_True );
         break;
 
     case KeyRule::SET_NULL:
-        aRB_CascDelNull.Check( TRUE );
+        aRB_CascDelNull.Check( sal_True );
         break;
     case KeyRule::SET_DEFAULT:
-        aRB_CascDelDefault.Check( TRUE );
+        aRB_CascDelDefault.Check( sal_True );
         break;
     }
 }
@@ -171,7 +171,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
 {
     //////////////////////////////////////////////////////////////////////
     // RadioButtons auslesen
-    UINT16 nAttrib = 0;
+    sal_uInt16 nAttrib = 0;
 
     // Delete Rules
     if( aRB_NoCascDel.IsChecked() )
@@ -200,7 +200,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
 
     m_pTableControl->SaveModified();
 
-    //// wenn die ComboBoxen fuer die Tabellenauswahl enabled sind (Constructor mit bAllowTableSelect==TRUE), dann muss ich in die
+    //// wenn die ComboBoxen fuer die Tabellenauswahl enabled sind (Constructor mit bAllowTableSelect==sal_True), dann muss ich in die
     //// Connection auch die Tabellennamen stecken
     //m_pConnData->SetSourceWinName(m_pTableControl->getSourceWinName());
     //m_pConnData->SetDestWinName(m_pTableControl->getDestWinName());
@@ -227,7 +227,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
         DBG_UNHANDLED_EXCEPTION();
     }
 
-    m_bTriedOneUpdate = TRUE;
+    m_bTriedOneUpdate = sal_True;
     // this means that the original connection may be lost (if m_pConnData was not a newly created but an
     // existent conn to be modified), which we reflect by returning RET_NO (see ::Execute)
 
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 908cbab62c92..90602e37c4a9 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -35,6 +35,7 @@
 
 ModalDialog DLG_REL_PROPERTIES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_REL_PROPERTIES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 186 , 205 ) ;
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index fe392d82cbe0..17fcf7861e51 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -31,13 +31,14 @@
 
 #include "TablesSingleDlg.hxx"
 #include "DbAdminImpl.hxx"
-#include "dbaccess_helpid.hrc"
 #include "tablespage.hxx"
 #include <vcl/msgbox.hxx>
 #include "dsitems.hxx"
 
 #include "propertysetitem.hxx"
 
+#include "dbu_dlg.hrc"
+
 //.........................................................................
 namespace dbaui
 {
@@ -56,7 +57,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent
             ,SfxItemSet* _pItems
             ,const Reference< XMultiServiceFactory >& _rxORB
             ,const ::com::sun::star::uno::Any& _aDataSourceName)
-    :SfxSingleTabDialog(pParent,UID_DLG_TABLE_FILTER,_pItems)
+    :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
     ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
     ,m_bStopExecution(sal_False)
     ,m_pOutSet(_pItems)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 34a42a048931..74c8c1ed8098 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -157,6 +157,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_OLDPASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -171,6 +172,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 34 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
@@ -184,6 +186,7 @@ ModalDialog DLG_PASSWORD
     };
     Edit ED_PASSWORD_REPEAT
     {
+        HelpID = "dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 51 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 5e7e28158777..2ef473cef14d 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -134,7 +134,7 @@ DBG_NAME(OUserAdminDlg)
         return nRet;
     }
     //-------------------------------------------------------------------------
-    void OUserAdminDlg::PageCreated(USHORT _nId, SfxTabPage& _rPage)
+    void OUserAdminDlg::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
     {
         // register ourself as modified listener
         static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB());
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index 5509820d1828..5b07b43093b5 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -48,7 +48,6 @@ TabDialog DLG_DATABASE_USERADMIN
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     String STR_PAGETITLE_USERADMIN
     {
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index cfdc2dd3842f..2a27a78ed32a 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -79,7 +79,7 @@ namespace dbaui
     private:
         const String    m_sDisabledText;
               String    m_sUserText;
-              BOOL      m_bLastKnownEnabledState;
+              sal_Bool      m_bLastKnownEnabledState;
     };
 
     //--------------------------------------------------------------------
@@ -151,7 +151,7 @@ namespace dbaui
     //====================================================================
     //--------------------------------------------------------------------
     MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink )
-        :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( FALSE ) )
+        :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( sal_False ) )
         ,m_aDatabaseNameLabel   ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) )
         ,m_aDatabaseName        ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) )
         ,m_aHostPortRadio       ( this, ModuleRes( RB_MYSQL_HOST_PORT ) )
@@ -219,7 +219,7 @@ namespace dbaui
     }
 
     //--------------------------------------------------------------------
-    BOOL MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet )
+    sal_Bool MySQLNativeSettings::FillItemSet( SfxItemSet& _rSet )
     {
         sal_Bool bChangedSomething = sal_False;
 
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index cd3246cdc332..83353be4b8d0 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -70,7 +70,7 @@ namespace dbaui
         void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
         void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
 
-        BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         void implInitControls( const SfxItemSet& _rSet );
 
         bool canAdvance() const;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index acfc272d2e7e..2bf12cf82740 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -215,7 +215,7 @@ namespace dbaui
         return true;
     }
     // -----------------------------------------------------------------------
-    void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue )
+    void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, sal_Bool& _bChangedSomething, bool _bRevertValue )
     {
         if ( (_pCheckBox != NULL ) && ( _pCheckBox->GetState() != _pCheckBox->GetSavedValue() ) )
         {
@@ -237,16 +237,16 @@ namespace dbaui
         }
     }
     // -----------------------------------------------------------------------
-    void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething)
+    void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething)
     {
         if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().ToInt32()) )
         {
-            _rSet.Put(SfxInt32Item(_nID, static_cast<INT32>(_pEdit->GetValue())));
+            _rSet.Put(SfxInt32Item(_nID, static_cast<sal_Int32>(_pEdit->GetValue())));
             _bChangedSomething = sal_True;
         }
     }
     // -----------------------------------------------------------------------
-    void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething)
+    void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething)
     {
         if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) )
         {
@@ -305,7 +305,7 @@ namespace dbaui
         return 0L;
     }
 
-    void OGenericAdministrationPage::SetHeaderText( USHORT _nFTResId, USHORT _StringResId)
+    void OGenericAdministrationPage::SetHeaderText( sal_uInt16 _nFTResId, sal_uInt16 _StringResId)
     {
         delete(m_pFT_HeaderText);
         m_pFT_HeaderText = new FixedText(this, ModuleRes(_nFTResId));
@@ -314,7 +314,6 @@ namespace dbaui
         SetControlFontWeight(m_pFT_HeaderText);
     }
 
-
     //=========================================================================
     //= LayoutHelper
     //=========================================================================
@@ -332,6 +331,24 @@ namespace dbaui
         _rControl.SetPosPixel( aControlPos );
     }
 
+    //-------------------------------------------------------------------------
+    void LayoutHelper::fitSizeRightAligned( PushButton& io_button )
+    {
+        const Point aOldPos = io_button.GetPosPixel();
+        const Size aOldSize = io_button.GetSizePixel();
+        const Size aMinSize( io_button.CalcMinimumSize() );
+        if ( aMinSize.Width() > aOldSize.Width() )
+        {
+            io_button.SetPosSizePixel(
+                aOldPos.X() + aOldSize.Width() - aMinSize.Width(),
+                0,
+                aMinSize.Width(),
+                0,
+                WINDOW_POSSIZE_X | WINDOW_POSSIZE_WIDTH
+            );
+        }
+    }
+
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 95a6f63d01ec..51fd7f025965 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -216,7 +216,7 @@ namespace dbaui
             @param _bRevertValue
                 set to <TRUE/> if the display value should be reverted before putting it into the set
         */
-        static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false);
+        static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false);
 
         /** fills the int value into the item set when the value changed.
             @param  _rSet
@@ -228,7 +228,7 @@ namespace dbaui
             @param  _bChangedSomething
                 <TRUE/> if something changed otherwise <FALSE/>
         */
-        static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething);
+        static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething);
 
         /** fills the String value into the item set when the value changed.
             @param  _rSet
@@ -240,12 +240,12 @@ namespace dbaui
             @param  _bChangedSomething
                 <TRUE/> if something changed otherwise <FALSE/>
         */
-        static void fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething);
+        static void fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething);
 
     protected:
         // used to set the right Pane header of a wizard to bold
         void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = WEIGHT_BOLD);
-        void SetHeaderText( USHORT _nFTResId, USHORT _StringResId);
+        void SetHeaderText( sal_uInt16 _nFTResId, sal_uInt16 _StringResId);
 
         /** This link be used for controls where the tabpage does not need to take any special action when the control
             is modified. The implementation just calls callModifiedHdl.
@@ -277,6 +277,10 @@ namespace dbaui
                             const ControlRelation _eRelation,
                             const long _nIndentAppFont
                         );
+        /** fits the button size to be large enough to contain the buttons text
+        */
+        static void fitSizeRightAligned( PushButton& io_button );
+            // why is CalcMinimumSize not a virtual method of ::Window?
     };
 
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index a0f0365fb22b..9af7714a1cdc 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_dbaccess.hxx"
 
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #pragma warning(disable: 4917)
@@ -174,7 +174,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
 
     // Prompt for connection information.
     hr = dlPrompt->PromptEdit((IDispatch **)&piTmpConnection,&pbSuccess);
-    if( SUCCEEDED( hr ) && FALSE == pbSuccess ) //if user press cancel then FALSE == pbSuccess
+    if( SUCCEEDED( hr ) && sal_False == pbSuccess ) //if user press cancel then sal_False == pbSuccess
     {
         piTmpConnection->Release( );
         dlPrompt->Release( );
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 3c0ca82d77fa..540e26982039 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -374,15 +374,15 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
     m_aQueryList.SetSelectHdl( LINK( this, OAddTableDlg, TableListSelectHdl ) );
 
     //////////////////////////////////////////////////////////////////////
-    m_aTableList.EnableInplaceEditing( FALSE );
-    m_aTableList.SetWindowBits(WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL );
+    m_aTableList.EnableInplaceEditing( sal_False );
+    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();
     m_aTableList.suppressEmptyFolders();
 
     //////////////////////////////////////////////////////////////////////
-    m_aQueryList.EnableInplaceEditing( FALSE );
+    m_aQueryList.EnableInplaceEditing( sal_False );
     m_aQueryList.SetSelectionMode( SINGLE_SELECTION );
 
     //////////////////////////////////////////////////////////////////////
@@ -419,15 +419,15 @@ void OAddTableDlg::impl_switchTo( ObjectList _eList )
     switch ( _eList )
     {
     case Tables:
-        m_aTableList.Show( TRUE );  m_aCaseTables.Check( TRUE );
-        m_aQueryList.Show( FALSE ); m_aCaseQueries.Check( FALSE );
+        m_aTableList.Show( sal_True );  m_aCaseTables.Check( sal_True );
+        m_aQueryList.Show( sal_False ); m_aCaseQueries.Check( sal_False );
         m_pCurrentList.reset( new TableListFacade( m_aTableList, m_rContext.getConnection() ) );
         m_aTableList.GrabFocus();
         break;
 
     case Queries:
-        m_aTableList.Show( FALSE ); m_aCaseTables.Check( FALSE );
-        m_aQueryList.Show( TRUE );  m_aCaseQueries.Check( TRUE );
+        m_aTableList.Show( sal_False ); m_aCaseTables.Check( sal_False );
+        m_aQueryList.Show( sal_True );  m_aCaseQueries.Check( sal_True );
         m_pCurrentList.reset( new QueryListFacade( m_aQueryList, m_rContext.getConnection() ) );
         m_aQueryList.GrabFocus();
         break;
@@ -501,7 +501,7 @@ IMPL_LINK( OAddTableDlg, OnTypeSelected, void*, /*EMPTY_ARG*/ )
 }
 
 //------------------------------------------------------------------------------
-BOOL OAddTableDlg::Close()
+sal_Bool OAddTableDlg::Close()
 {
     m_rContext.onWindowClosing( this );
     return ModelessDialog::Close();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index ecff324d7ec9..deb914dd831d 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -38,7 +38,7 @@ ModelessDialog DLG_JOIN_TABADD
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    HelpID = DLG_JOIN_TABADD ;
+    HelpID = HID_DLG_JOIN_TABADD ;
     Size = MAP_APPFONT ( 178 , 147 ) ;
     Moveable = TRUE ;
     Closeable = TRUE ;
@@ -46,6 +46,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_TABLES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES";
         Pos = MAP_APPFONT( 6, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Tables";
@@ -53,6 +54,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     RadioButton RB_CASE_QUERIES
     {
+        HelpID = "dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES";
         Pos = MAP_APPFONT( 62, 6 );
         Size = MAP_APPFONT( 50, 8 );
         Text [ en-US ] = "Queries";
@@ -70,6 +72,7 @@ ModelessDialog DLG_JOIN_TABADD
 
     PushButton PB_ADDTABLE
     {
+        HelpID = "dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE";
         Pos = MAP_APPFONT ( 123 , 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index f64231b60dc2..d7dec225f1a8 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -70,9 +70,9 @@ namespace dbaui
     struct BooleanSettingDesc
     {
         CheckBox**  ppControl;          // the dialog's control which displays this setting
-        USHORT      nControlResId;      // the resource ID to load the control from
-        USHORT      nItemId;            // the ID of the item (in an SfxItemSet) which corresponds to this setting
-        bool        bInvertedDisplay;   // true if and only if the checkbox is checked when the item is FALSE, and vice versa
+        sal_uInt16      nControlResId;      // the resource ID to load the control from
+        sal_uInt16      nItemId;            // the ID of the item (in an SfxItemSet) which corresponds to this setting
+        bool        bInvertedDisplay;   // true if and only if the checkbox is checked when the item is sal_False, and vice versa
     };
 
     //========================================================================
@@ -98,9 +98,12 @@ namespace dbaui
         ,m_pPrimaryKeySupport(NULL)
         ,m_pBooleanComparisonModeLabel( NULL )
         ,m_pBooleanComparisonMode( NULL )
+        ,m_pMaxRowScanLabel( NULL )
+        ,m_pMaxRowScan( NULL )
         ,m_aControlDependencies()
         ,m_aBooleanSettings()
         ,m_bHasBooleanComparisonMode( _rDSMeta.getFeatureSet().has( DSID_BOOLEANCOMPARISON ) )
+        ,m_bHasMaxRowScan( _rDSMeta.getFeatureSet().has( DSID_MAX_ROW_SCAN ) )
     {
         impl_initBooleanSettings();
 
@@ -111,17 +114,17 @@ namespace dbaui
                 ++setting
              )
         {
-            USHORT nItemId = setting->nItemId;
+            sal_uInt16 nItemId = setting->nItemId;
             if ( rFeatures.has( nItemId ) )
             {
-                USHORT nResourceId = setting->nControlResId;
+                sal_uInt16 nResourceId = setting->nControlResId;
                 (*setting->ppControl) = new CheckBox( this, ModuleRes( nResourceId ) );
                 (*setting->ppControl)->SetClickHdl( getControlModifiedLink() );
 
                 // check whether this must be a tristate check box
                 const SfxPoolItem& rItem = _rCoreAttrs.Get( nItemId );
                 if ( rItem.ISA( OptionalBoolItem ) )
-                    (*setting->ppControl)->EnableTriState( TRUE );
+                    (*setting->ppControl)->EnableTriState( sal_True );
             }
         }
 
@@ -165,6 +168,21 @@ namespace dbaui
             m_pBooleanComparisonModeLabel->SetPosPixel( Point( aLabelPos.X(), aLabelPos.Y() - nMoveUp ) );
             m_pBooleanComparisonMode->SetPosPixel( Point( aControlPos.X(), aControlPos.Y() - nMoveUp ) );
         }
+        // create the controls for the max row scan
+        if ( m_bHasMaxRowScan )
+        {
+            m_pMaxRowScanLabel = new FixedText( this, ModuleRes( FT_MAXROWSCAN ) );
+            m_pMaxRowScan = new NumericField( this, ModuleRes( NF_MAXROWSCAN ) );
+            m_pMaxRowScan->SetModifyHdl(getControlModifiedLink());
+            m_pMaxRowScan->SetUseThousandSep(sal_False);
+
+            Point aLabelPos( m_pMaxRowScanLabel->GetPosPixel() );
+            Point aControlPos( m_pMaxRowScan->GetPosPixel() );
+            long nMoveUp = aControlPos.Y() - aPos.Y();
+
+            m_pMaxRowScanLabel->SetPosPixel( Point( aLabelPos.X(), aLabelPos.Y() - nMoveUp ) );
+            m_pMaxRowScan->SetPosPixel( Point( aControlPos.X(), aControlPos.Y() - nMoveUp ) );
+        }
 
         FreeResource();
     }
@@ -191,6 +209,8 @@ namespace dbaui
         DELETEZ( m_pPrimaryKeySupport );
         DELETEZ( m_pBooleanComparisonModeLabel );
         DELETEZ( m_pBooleanComparisonMode );
+        DELETEZ( m_pMaxRowScanLabel );
+        DELETEZ( m_pMaxRowScan );
     }
 
     // -----------------------------------------------------------------------
@@ -231,6 +251,10 @@ namespace dbaui
         {
             _rControlList.push_back( new ODisableWrapper< FixedText >( m_pBooleanComparisonModeLabel ) );
         }
+        if ( m_bHasMaxRowScan )
+        {
+            _rControlList.push_back( new ODisableWrapper< FixedText >( m_pMaxRowScanLabel ) );
+        }
     }
 
     // -----------------------------------------------------------------------
@@ -249,6 +273,8 @@ namespace dbaui
 
         if ( m_bHasBooleanComparisonMode )
             _rControlList.push_back( new OSaveValueWrapper< ListBox >( m_pBooleanComparisonMode ) );
+        if ( m_bHasMaxRowScan )
+            _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pMaxRowScan));
     }
 
     // -----------------------------------------------------------------------
@@ -293,7 +319,7 @@ namespace dbaui
             }
             else
             {
-                BOOL bValue = *aValue;
+                sal_Bool bValue = *aValue;
                 if ( setting->bInvertedDisplay )
                     bValue = !bValue;
                 (*setting->ppControl)->Check( bValue );
@@ -304,7 +330,13 @@ namespace dbaui
         if ( m_bHasBooleanComparisonMode )
         {
             SFX_ITEMSET_GET( _rSet, pBooleanComparison, SfxInt32Item, DSID_BOOLEANCOMPARISON, sal_True );
-            m_pBooleanComparisonMode->SelectEntryPos( static_cast< USHORT >( pBooleanComparison->GetValue() ) );
+            m_pBooleanComparisonMode->SelectEntryPos( static_cast< sal_uInt16 >( pBooleanComparison->GetValue() ) );
+        }
+
+        if ( m_bHasMaxRowScan )
+        {
+            SFX_ITEMSET_GET(_rSet, pMaxRowScan, SfxInt32Item, DSID_MAX_ROW_SCAN, sal_True);
+            m_pMaxRowScan->SetValue(pMaxRowScan->GetValue());
         }
 
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
@@ -335,6 +367,10 @@ namespace dbaui
                 bChangedSomething = sal_True;
             }
         }
+        if ( m_bHasMaxRowScan )
+        {
+            fillInt32(_rSet,m_pMaxRowScan,DSID_MAX_ROW_SCAN,bChangedSomething);
+        }
         return bChangedSomething;
     }
 
@@ -487,7 +523,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    void AdvancedSettingsDialog::PageCreated(USHORT _nId, SfxTabPage& _rPage)
+    void AdvancedSettingsDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
     {
         // register ourself as modified listener
         static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB());
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc
index 8abc5d8810d2..193fdf5f3853 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hrc
+++ b/dbaccess/source/ui/dlg/advancedsettings.hrc
@@ -69,7 +69,9 @@
 #define FT_AUTOINCREMENTVALUE   1
 #define FT_RETRIEVE_AUTO        2
 #define FT_BOOLEANCOMPARISON    3
+#define FT_MAXROWSCAN           4
 
 #define LB_BOOLEANCOMPARISON    1
+#define NF_MAXROWSCAN           1
 
 #endif // DBAUI_ADVANCEDSETTINGS_HRC
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index f4c6e75e4f3f..6a6ae93f9f8e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -38,6 +38,7 @@
 #include <svtools/dialogcontrolling.hxx>
 
 #include <vcl/lstbox.hxx>
+#include <vcl/field.hxx>
 
 #include <vector>
 
@@ -77,15 +78,19 @@ namespace dbaui
         FixedText*          m_pBooleanComparisonModeLabel;
         ListBox*            m_pBooleanComparisonMode;
 
+        FixedText*          m_pMaxRowScanLabel;
+        NumericField*       m_pMaxRowScan;
+
         ::svt::ControlDependencyManager
                             m_aControlDependencies;
 
         BooleanSettingDescs m_aBooleanSettings;
 
         bool                m_bHasBooleanComparisonMode;
+        bool                m_bHasMaxRowScan;
 
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
 
@@ -123,7 +128,7 @@ namespace dbaui
                     m_aControlDependencies;
 
     public:
-        virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index 4c5a7d924d33..9a2dc467d586 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -249,10 +249,29 @@
         WORKAROUND                                                                  \
     };                                                                              \
 
+#define AUTO_MAXROWSCAN(AUTO_Y)                                              \
+    FixedText FT_MAXROWSCAN                                                  \
+    {                                                                               \
+        Pos     = MAP_APPFONT ( START_X , AUTO_Y + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) ;   \
+        Size    = MAP_APPFONT ( 100 , CHECKBOX_HEIGHT );                            \
+        Text [ en-US ] = "Rows to scan column types";                               \
+    };                                                                              \
+    NumericField NF_MAXROWSCAN                                                      \
+    {                                                                               \
+        Pos     = MAP_APPFONT ( START_X + 100, AUTO_Y ) ;                           \
+        Size    = MAP_APPFONT ( 60 , EDIT_HEIGHT ) ;                                \
+        TabStop = TRUE ;                                                            \
+        NoThousandSep = TRUE;                                                       \
+        Border = TRUE;                                                              \
+        HelpId = HID_DSADMIN_MAXROWSCAN;                                            \
+    };                                                                              \
+
+
 //-------------------------------------------------------------------------
 
 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 +330,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 ) ;
@@ -332,6 +352,7 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
     AUTO_ESCAPE_DATETIME(      14*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 14*CHECKBOX_HEIGHT + RELATED_CONTROLS )
     AUTO_PRIMARY_KEY_SUPPORT(  15*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS )
     AUTO_BOOLEANCOMPARISON(    16*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 14*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
+    AUTO_MAXROWSCAN(           17*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 14*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
 };
 
 //-------------------------------------------------------------------------
@@ -349,7 +370,6 @@ TabDialog DLG_DATABASE_ADVANCED
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
 
     String STR_GENERATED_VALUE
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 9b23a33cb20e..510b1864eb0b 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -109,7 +109,7 @@ short ODbAdminDialog::Ok()
 }
 
 //-------------------------------------------------------------------------
-void ODbAdminDialog::PageCreated(USHORT _nId, SfxTabPage& _rPage)
+void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage)
 {
     // register ourself as modified listener
     static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory(m_pImpl->getORB());
@@ -124,7 +124,7 @@ void ODbAdminDialog::PageCreated(USHORT _nId, SfxTabPage& _rPage)
 }
 
 // -----------------------------------------------------------------------------
-void ODbAdminDialog::addDetailPage(USHORT _nPageId, USHORT _nTextId, CreateTabPage _pCreateFunc)
+void ODbAdminDialog::addDetailPage(sal_uInt16 _nPageId, sal_uInt16 _nTextId, CreateTabPage _pCreateFunc)
 {
     // open our own resource block, as the page titles are strings local to this block
     LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
@@ -409,6 +409,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
     *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True);
     *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String());
     *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT );
+    *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100);
 
     // create the pool
     static SfxItemInfo const aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] =
@@ -471,6 +472,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
         {0,0},
         {0,0},
         {0,0},
+        {0,0},
         {0,0}
     };
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index e0fb99ac299a..e5eae80b5406 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -112,7 +112,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
 
     //.........................................................................
@@ -146,7 +145,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
     Text [ en-US ] = "Database properties" ;
 };
@@ -195,6 +193,7 @@ TabPage PAGE_GENERAL
 
     RadioButton RB_OPENEXISTINGDOC
     {
+        HelpID = "dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC";
         Pos = MAP_APPFONT (START_X + 6 , 97 );
         Size = MAP_APPFONT ( 206 , 8 ) ;
         Text [ en-US ]  = "Open an existing database ~file" ;
@@ -209,6 +208,7 @@ TabPage PAGE_GENERAL
 
     ListBox LB_DOCUMENTLIST
     {
+        HelpID = "dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 121 );
         Size = MAP_APPFONT( 120, 14 );
         DropDown = TRUE;
@@ -217,6 +217,7 @@ TabPage PAGE_GENERAL
 
     PushButton PB_OPENDOCUMENT
     {
+        HelpID = "dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT";
         Pos = MAP_APPFONT( START_X + INDENTED_X + INDENT_BELOW_RADIO, 139 );
         Size = MAP_APPFONT( 50, 16 );
         OutputSize = TRUE;
@@ -418,6 +419,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
 
@@ -433,6 +435,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_CACHE_SIZE
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE";
         Pos             = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ;
         Size            = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border          = TRUE ;
@@ -450,6 +453,7 @@ TabPage PAGE_ADABAS
     };
     NumericField NF_DATA_INCREMENT
     {
+        HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT";
         Pos             = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ;
         Size            = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
         Border          = TRUE ;
@@ -472,6 +476,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLUSERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -485,6 +490,7 @@ TabPage PAGE_ADABAS
     };
     Edit ET_CTRLPASSWORD
     {
+        HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT-1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT) ;
@@ -494,6 +500,7 @@ TabPage PAGE_ADABAS
 
     CheckBox CB_SHUTDB
     {
+        HelpID = "dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB";
         Pos = MAP_APPFONT ( 6 , 6*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT ) ;
         Size = MAP_APPFONT ( 248 , CHECKBOX_HEIGHT ) ;
         Text[ en-US ] = "~Shut down service when closing %PRODUCTNAME";
@@ -501,6 +508,7 @@ TabPage PAGE_ADABAS
 
     PushButton PB_STAT
     {
+        HelpID = "dbaccess:PushButton:PAGE_ADABAS:PB_STAT";
         Pos                 = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ;
         Size                = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         Text[ en-US ] = "E~xtended...";
@@ -516,6 +524,7 @@ TabPage PAGE_ADABAS
 
 TabPage PAGE_MYSQL_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -526,6 +535,7 @@ TabPage PAGE_MYSQL_ODBC
 
 TabPage PAGE_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -544,6 +554,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -552,6 +563,7 @@ TabPage PAGE_MYSQL_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
@@ -563,6 +575,7 @@ TabPage PAGE_MYSQL_JDBC
 
 TabPage PAGE_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -584,6 +597,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     Edit ET_USERNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_MYSQL_NATIVE:ET_USERNAME";
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 4*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 3*EDIT_HEIGHT - 1 ) ;
         Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
@@ -591,6 +605,7 @@ TabPage PAGE_MYSQL_NATIVE
     };
     CheckBox CB_PASSWORD_REQUIRED
     {
+        HelpID = "dbaccess:CheckBox:PAGE_MYSQL_NATIVE:CB_PASSWORD_REQUIRED";
         Pos = MAP_APPFONT ( EDIT_X, 4*UNRELATED_CONTROLS + 5*RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 4*EDIT_HEIGHT ) ;
         Size = MAP_APPFONT ( 105, CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Password required";
@@ -601,6 +616,7 @@ TabPage PAGE_MYSQL_NATIVE
 
 TabPage PAGE_ORACLE_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
@@ -620,6 +636,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     Edit ET_JDBCDRIVERCLASS
     {
+        HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS";
         Pos = MAP_APPFONT ( EDIT_X,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 ) ;
         Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
@@ -628,6 +645,7 @@ TabPage PAGE_ORACLE_JDBC
     };
     PushButton PB_TESTDRIVERCLASS
     {
+        HelpID = "dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS";
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS,
                             4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - BUTTON_HEIGHT ) / 2 ) ;
@@ -743,6 +761,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_HOSTNAME
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME";
         TabStop = TRUE ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS -1 ) ;
@@ -758,6 +777,7 @@ TabPage PAGE_USERDRIVER
 
     NumericField NF_PORTNUMBER
     {
+        HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER";
         TabStop = TRUE ;
         Border = TRUE ;
         NoThousandSep = TRUE;
@@ -774,6 +794,7 @@ TabPage PAGE_USERDRIVER
     };
     Edit ET_OPTIONS
     {
+        HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS";
         Border = TRUE ;
         TabStop = TRUE ;
     };
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 0c0bd3a48504..44ef3f024e3a 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -52,11 +52,6 @@ String STR_ENTER_CONNECTION_PASSWORD
     Text [ en-US ] = "A password is needed to connect to the data source \"$name$\".";
 };
 
-String STR_QUERY_DROP_ALL
-{
-    Text[ en-US ] = "Do you want to delete all selected items?";
-};
-
 String STR_ASK_FOR_DIRECTORY_CREATION
 {
     Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?";
@@ -67,45 +62,10 @@ String STR_COULD_NOT_CREATE_DIRECTORY
     Text [ en-US ] = "The directory $name$ could not be created.";
 };
 
-String STR_ADDRESSBOOK_SYSTEM
-{
-    Text[ en-US ] = "Windows address book";
-};
-
-String STR_ADDRESSBOOK_OUTLOOK
-{
-    Text[ en-US ] = "MS Outlook";
-};
-
-String STR_ADDRESSBOOK_MOZILLA
-{
-    Text[ en-US ] = "Mozilla address book";
-};
-
-String STR_ADDRESSBOOK_THUNDERBIRD
-{
-    Text[ en-US ] = "Thunderbird address book";
-};
 
-String STR_ADDRESSBOOK_EVOLUTION
-{
-    Text[ en-US ] = "Evolution address book";
-};
 
-String STR_ADDRESSBOOK_LDAP
-{
-    Text[ en-US ] = "LDAP address book";
-};
 
-String STR_HINT_READONLY_CONNECTION
-{
-    Text [ en-US ] = "(Connection is read-only)";
-};
 
-String STR_HINT_CONNECTION_NOT_CAPABLE
-{
-    Text [ en-US ] = "(Not supported by this connection)";
-};
 
 #define EDIT_SIZE_X     50
 #define FT_SIZE_X       90
@@ -114,6 +74,7 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 
 ModalDialog DLG_DOMAINPASSWORD
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
     Border = TRUE ;
     Moveable = TRUE ;
     OutputSize = TRUE ;
@@ -130,6 +91,7 @@ ModalDialog DLG_DOMAINPASSWORD
 
     Edit ET_PASSWORD
     {
+        HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
         Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 8e0cd31b521e..ea4341914e82 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -56,7 +56,6 @@ ModalDialog DLG_DATABASE_WIZARD
     {
         OutputSize = TRUE ;
         HelpId = HID_DSADMIN_TABCONTROL;
-        SingleLine=TRUE;
     };
 
     String STR_DBWIZARDTITLE
@@ -150,6 +149,7 @@ String STR_DATABASEDEFAULTNAME
 
 TabPage PAGE_DBWIZARD_MYSQL_INTRO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -195,6 +195,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
     };
     RadioButton RB_CONNECTVIANATIVE
     {
+        HelpID = "dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE";
         Pos = MAP_APPFONT (START_X + 6 , 115 )  ;
         Size = MAP_APPFONT ( 205 , 9 ) ;
         Text[ en-US ] = "Connect directly" ;
@@ -206,6 +207,7 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO
 
 TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_AUTHENTIFICATION";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -262,6 +264,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
 
 TabPage PAGE_DBWIZARD_FINAL
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_FINAL";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -335,6 +338,7 @@ TabPage PAGE_DBWIZARD_FINAL
 
 TabPage PAGE_DBWIZARD_MYSQL_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -361,11 +365,12 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC
         Text[ en-US ] = "Default: 3306";
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS)
 };
 
 TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_NATIVE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0, 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -391,6 +396,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
 
 TabPage PAGE_DBWIZARD_DBASE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_DBASE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -406,11 +412,12 @@ TabPage PAGE_DBWIZARD_DBASE
         Text[ en-US ]  = "Select the folder where the dBASE files are stored." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+     AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
 };
 
 TabPage PAGE_DBWIZARD_TEXT
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT";
     String STR_TEXT_HEADERTEXT
     {
         Text[ en-US ]   = "Set up a connection to text files" ;
@@ -425,12 +432,13 @@ TabPage PAGE_DBWIZARD_TEXT
         Text[ en-US ]  = "Path to text files";
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE)
     AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
  };
 
 TabPage PAGE_DBWIZARD_MSACCESS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -446,11 +454,12 @@ TabPage PAGE_DBWIZARD_MSACCESS
         Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
 };
 
 TabPage PAGE_DBWIZARD_LDAP
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -490,6 +499,7 @@ TabPage PAGE_DBWIZARD_LDAP
 
 TabPage PAGE_DBWIZARD_ADABAS
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -504,11 +514,12 @@ TabPage PAGE_DBWIZARD_ADABAS
         Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME)
 };
 
 TabPage PAGE_DBWIZARD_ADO
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -523,12 +534,13 @@ TabPage PAGE_DBWIZARD_ADO
         Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
+    AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
 };
 
 
 TabPage PAGE_DBWIZARD_ODBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ODBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -543,21 +555,23 @@ TabPage PAGE_DBWIZARD_ODBC
         Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE)
 };
 
 TabPage PAGE_DBWIZARD_USERDEFINED
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_USERDEFINED";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
     Hide = TRUE ;
 
-    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
+    AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
 };
 
 TabPage PAGE_DBWIZARD_JDBC
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -572,14 +586,15 @@ TabPage PAGE_DBWIZARD_JDBC
         Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL)
-    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS)
+    AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL)
+    AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS)
 };
 
 
 
 TabPage PAGE_DBWIZARD_ORACLE
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ORACLE";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -603,12 +618,13 @@ TabPage PAGE_DBWIZARD_ORACLE
         Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ;
     };
 
-    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME)
+    AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
 };
 
 
 TabPage PAGE_DBWIZARD_SPREADSHEET
 {
+    HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET";
     SVLook = TRUE ;
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@ -623,7 +639,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET
         Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
     };
 
-    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
+    AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH )
 
     String STR_SPREADSHEETPATH{
         Text[ en-US ] = "~Location and file name" ;
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 59b1f0f66f1e..c10b2362027b 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -126,7 +126,7 @@ protected:
     String              m_aDSN;
     TableInfoList       m_aTableInfoList;
     TableIndexList      m_aFreeIndexList;
-    BOOL                m_bCaseSensitiv;
+    sal_Bool                m_bCaseSensitiv;
 
     void        Init();
     void        SetCtrls();
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 8c253554ffde..ca8b6e4a3622 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_DBASE_INDEXES
 {
+    HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
@@ -69,6 +70,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ComboBox CB_TABLES
     {
+        HelpID = "dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 62 , 5 ) ;
@@ -90,6 +92,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_TABLEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 12 , 44 ) ;
@@ -104,6 +107,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ListBox LB_FREEINDEXES
     {
+        HelpID = "dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES";
         Border = TRUE ;
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 120 , 44 ) ;
@@ -112,6 +116,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADD
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD";
         Pos = MAP_APPFONT ( 94 , 60 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -131,6 +136,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_ADDALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL";
         Pos = MAP_APPFONT ( 94 , 77 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -150,6 +156,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVE
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE";
         Pos = MAP_APPFONT ( 94 , 98 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
@@ -169,6 +176,7 @@ ModalDialog DLG_DBASE_INDEXES
     };
     ImageButton IB_REMOVEALL
     {
+        HelpID = "dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL";
         Pos = MAP_APPFONT ( 94, 114 ) ;
         Size = MAP_APPFONT ( 20 , 14 ) ;
         TabStop             = TRUE ;
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 5624420c904f..3333f06c0380 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -258,7 +258,7 @@ void ODbTypeWizDialog::clearPassword()
 // -----------------------------------------------------------------------------
 TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
 {
-    USHORT nStringId = STR_PAGETITLE_ADVANCED;
+    sal_uInt16 nStringId = STR_PAGETITLE_ADVANCED;
     TabPage* pPage = NULL;
     switch(_nState)
     {
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index fb3a27decc66..c02f603c99eb 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -76,7 +76,7 @@ namespace dbaui
     //========================================================================
     DBG_NAME(OCommonBehaviourTabPage)
     //------------------------------------------------------------------------
-    OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs,
+    OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs,
         sal_uInt32 nControlFlags,bool _bFreeResource)
 
         :OGenericAdministrationPage(pParent, ModuleRes(nResId), _rCoreAttrs)
@@ -500,7 +500,7 @@ namespace dbaui
     //========================================================================
     //= OMySQLJDBCDetailsPage
     //========================================================================
-    OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId)
+    OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId)
         :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false)
         ,m_aFL_1            (this, ModuleRes( FL_SEPARATOR1) )
         ,m_aFTHostname      (this, ModuleRes(FT_HOSTNAME))
@@ -531,9 +531,9 @@ namespace dbaui
         else
         {
             m_bUseClass = false;
-            m_aFTDriverClass.Show(FALSE);
-            m_aEDDriverClass.Show(FALSE);
-            m_aTestJavaDriver.Show(FALSE);
+            m_aFTDriverClass.Show(sal_False);
+            m_aEDDriverClass.Show(sal_False);
+            m_aTestJavaDriver.Show(sal_False);
         }
 
         m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass);
@@ -648,7 +648,7 @@ namespace dbaui
         {
         }
 
-        USHORT nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        sal_uInt16 nMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         OSQLMessageBox aMsg( this, String( ModuleRes( nMessage ) ), String() );
         aMsg.Execute();
         return 0L;
@@ -900,7 +900,7 @@ namespace dbaui
     IMPL_LINK( OAdabasDetailsPage, AttributesChangedHdl, void *, EMPTYARG )
     {
         m_CB_SHUTDB.Enable(m_ET_CTRLUSERNAME.GetText().Len() && m_ET_CTRLPASSWORD.GetText().Len());
-        bAttrsChanged = TRUE;
+        bAttrsChanged = sal_True;
         callModifiedHdl();
         return 0;
     }
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 2d304430e865..6d48d2fd2711 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -81,9 +81,9 @@ namespace dbaui
         sal_uInt32          m_nControlFlags;
 
     public:
-        virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
-        OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
+        OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
     protected:
 
             // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
@@ -105,7 +105,7 @@ namespace dbaui
     class ODbaseDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
     private:
@@ -148,7 +148,7 @@ namespace dbaui
     class OOdbcDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -167,7 +167,7 @@ namespace dbaui
     class OUserDriverDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -198,15 +198,15 @@ namespace dbaui
     {
     public:
         OGeneralSpecialJDBCDetailsPage(   Window* pParent
-                                        , USHORT _nResId
+                                        , sal_uInt16 _nResId
                                         , const SfxItemSet& _rCoreAttrs
-                                        , USHORT _nPortId
+                                        , sal_uInt16 _nPortId
                                         );
 
     protected:
 
 
-        virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -227,7 +227,7 @@ namespace dbaui
         PushButton          m_aTestJavaDriver;
 
         String              m_sDefaultJdbcDriverName;
-        USHORT              m_nPortId;
+        sal_uInt16              m_nPortId;
         bool                m_bUseClass;
     };
 
@@ -250,7 +250,7 @@ namespace dbaui
         CheckBox            m_aPasswordRequired;
 
     protected:
-        virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool FillItemSet( SfxItemSet& _rCoreAttrs );
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
         virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
         virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -262,7 +262,7 @@ namespace dbaui
     class OAdabasDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet (SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool        FillItemSet (SfxItemSet& _rCoreAttrs);
 
         OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -289,7 +289,7 @@ namespace dbaui
         CheckBox            m_CB_SHUTDB;
         PushButton          m_PB_STAT;
         String              m_sUser;
-        BOOL                bAttrsChanged;
+        sal_Bool                bAttrsChanged;
 
         DECL_LINK( AttributesChangedHdl,    void * );
         DECL_LINK( UserSettingsHdl,         void * );
@@ -303,7 +303,7 @@ namespace dbaui
     class OLDAPDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
@@ -343,7 +343,7 @@ namespace dbaui
     class OTextDetailsPage : public OCommonBehaviourTabPage
     {
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
         OTextConnectionHelper*  m_pTextConnectionHelper;
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index d964da262c30..99692ffc2961 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -171,7 +171,7 @@ DBG_NAME(DirectSQLDialog)
         {
             m_aStatementHistory.pop_front();
             m_aNormalizedHistory.pop_front();
-            m_pSQLHistory->RemoveEntry((USHORT)0);
+            m_pSQLHistory->RemoveEntry((sal_uInt16)0);
         }
     }
 
@@ -299,7 +299,7 @@ DBG_NAME(DirectSQLDialog)
             if (_bUpdateListBox)
             {
                 // selecte the normalized statement in the list box
-                m_pSQLHistory->SelectEntryPos((USHORT)_nHistoryPos);
+                m_pSQLHistory->SelectEntryPos((sal_uInt16)_nHistoryPos);
                 OSL_ENSURE(m_pSQLHistory->GetSelectEntry() == m_aNormalizedHistory[_nHistoryPos],
                     "DirectSQLDialog::switchToHistory: inconsistent listbox entries!");
             }
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index 74d9b3b69775..5428535c365a 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/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 4294d5e5b96e..e77c20704d26 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -51,7 +51,7 @@ using namespace dbaui;
 
 DBG_NAME(SbaSbAttrDlg)
 //==================================================================
-SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, USHORT nFlags, BOOL bRow)
+SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, sal_uInt16 nFlags, sal_Bool bRow)
              : SfxTabDialog(pParent, ModuleRes( DLG_ATTR ), pCellAttrs )
              ,aTitle(ModuleRes(ST_ROW))
 {
@@ -88,7 +88,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
     {
         case RID_SVXPAGE_NUMBERFORMAT:
         {
-            aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), (const USHORT)SID_ATTR_NUMBERFORMAT_INFO));
+            aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), (const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
             rTabPage.PageCreated(aSet);
         }
         break;
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index d9466a39663e..d9c7c6af7572 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -185,7 +185,7 @@ namespace
                     _rList.InsertEntry( sValue );
             }
 
-            USHORT nPos = _rList.GetEntryPos( String( _rCurrent ) );
+            sal_uInt16 nPos = _rList.GetEntryPos( String( _rCurrent ) );
             if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
                 _rList.SelectEntryPos( nPos );
             else
@@ -269,7 +269,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                                                         sTable,
                                                         ::dbtools::eInDataManipulation);
 
-                    USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog));
+                    sal_uInt16 nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog));
                     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
                         m_pImpl->m_aCatalog.SelectEntryPos(nPos);
 
@@ -289,7 +289,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                 m_pImpl->m_aPB_CANCEL.SetPosPixel(Point(m_pImpl->m_aPB_CANCEL.GetPosPixel().X(),aPos.Y()));
                 m_pImpl->m_aPB_HELP.SetPosPixel(Point(m_pImpl->m_aPB_HELP.GetPosPixel().X(),aPos.Y()));
 
-                USHORT nLength =  m_pImpl->m_xMetaData.is() ? static_cast<USHORT>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0;
+                sal_uInt16 nLength =  m_pImpl->m_xMetaData.is() ? static_cast<sal_uInt16>(m_pImpl->m_xMetaData->getMaxTableNameLength()) : 0;
                 nLength = nLength ? nLength : EDIT_NOLIMIT;
 
                 m_pImpl->m_aTitle.SetMaxTextLen(nLength);
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index 5ebc5374155c..bc94b77eee37 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 875ee79b99f5..556c53974c9a 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -24,11 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
- //---------------------------------------------------------------------------
- //
- // (c) Copyright 1996 - 2000 by Star Division GmbH, Hamburg, Germany
- //
- //---------------------------------------------------------------------------
 
 #ifndef DBAUI_DLGSIZE_HRC
 #include "dlgsize.hrc"
@@ -56,6 +51,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_ROWHEIGHT:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -69,6 +65,7 @@ ModalDialog DLG_ROWHEIGHT
     };
     CheckBox CB_STANDARD
     {
+        HelpID = "dbaccess:CheckBox:DLG_ROWHEIGHT:CB_STANDARD";
         Pos = MAP_APPFONT ( 36 , 25 ) ;
         Size = MAP_APPFONT ( 62 , 12 ) ;
         TabStop = TRUE ;
@@ -111,6 +108,7 @@ ModalDialog DLG_COLWIDTH
     };
     MetricField MF_VALUE
     {
+        HelpID = "dbaccess:MetricField:DLG_COLWIDTH:MF_VALUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 36 , 6 ) ;
         Size = MAP_APPFONT ( 63 , 12 ) ;
@@ -124,6 +122,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.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 0f787bcc996d..e6bbb8494e16 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -182,7 +182,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ )
                     if ( xPropInfo->hasPropertyByName(PROPERTY_PASSWORD) )
                     {
                         m_pOutputSet->Put(SfxStringItem(DSID_PASSWORD, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_PASSWORD))));
-                        m_pOutputSet->Put(SfxBoolItem(DSID_PASSWORDREQUIRED, TRUE));
+                        m_pOutputSet->Put(SfxBoolItem(DSID_PASSWORDREQUIRED, sal_True));
                     }
                     if ( xPropInfo->hasPropertyByName(PROPERTY_CACHESIZE) )
                         m_pOutputSet->Put(SfxInt32Item(DSID_CONN_CACHESIZE, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_CACHESIZE))));
@@ -197,11 +197,11 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ )
 }
 
 // -----------------------------------------------------------------------
-BOOL ODatasourceSelectDialog::Close()
+sal_Bool ODatasourceSelectDialog::Close()
 {
 #ifdef HAVE_ODBC_ADMINISTRATION
     if ( m_pODBCManagement.get() && m_pODBCManagement->isRunning() )
-        return FALSE;
+        return sal_False;
 #endif
 
     return ModalDialog::Close();
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index 555464635b84..34050aff9cb9 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -76,7 +76,7 @@ public:
     inline String   GetSelected() const { return m_aDatasource.GetSelectEntry();}
     void            Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); }
 
-    virtual BOOL    Close();
+    virtual sal_Bool    Close();
 
 protected:
     DECL_LINK( ListDblClickHdl, ListBox * );
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 8c59a26d1a16..d6a8855559a2 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/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 311bea0cc1ad..060f83d43853 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -505,7 +505,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    BOOL OGeneralPage::FillItemSet(SfxItemSet& _rCoreAttrs)
+    sal_Bool OGeneralPage::FillItemSet(SfxItemSet& _rCoreAttrs)
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -530,7 +530,7 @@ namespace dbaui
 
         if ( bCommitTypeSelection )
         {
-            USHORT nEntry = m_pDatasourceType->GetSelectEntryPos();
+            sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos();
             ::rtl::OUString sURLPrefix = m_aURLPrefixes[nEntry];
             if (m_DBWizardMode)
             {
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index ad28e2dc0692..5bd2dbe189fa 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -132,7 +132,7 @@ namespace dbaui
 
     protected:
         // SfxTabPage overridables
-        virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool FillItemSet(SfxItemSet& _rCoreAttrs);
         virtual void Reset(const SfxItemSet& _rCoreAttrs);
 
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index 05b294d3aa07..2071684c37b6 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -47,6 +47,7 @@
 
 ModalDialog DLG_INDEXDESIGN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
@@ -131,6 +132,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     CheckBox CB_UNIQUE
     {
+        HelpID = "dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE";
         Pos = MAP_APPFONT ( LIST_WIDTH + 16, 34 ) ;
         Size = MAP_APPFONT ( DIALOG_SIZE_X - LIST_WIDTH - 22, 8 ) ;
         SVLook = TRUE;
@@ -153,6 +155,7 @@ ModalDialog DLG_INDEXDESIGN
     };
     PushButton PB_CLOSE
     {
+        HelpID = "dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE";
         Pos = MAP_APPFONT ( DIALOG_SIZE_X - BUTTON_SIZE_X - 6 - BUTTON_SIZE_X - 6, DIALOG_SIZE_Y - BUTTON_SIZE_Y - 6 ) ;
         Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y );
         SVLook = TRUE;
diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk
index 0a7ddefb13f9..8fa615d28a52 100644
--- a/dbaccess/source/ui/dlg/makefile.mk
+++ b/dbaccess/source/ui/dlg/makefile.mk
@@ -137,7 +137,6 @@ SLOFILES+=		$(SLO)$/adodatalinks.obj
 .ENDIF
 
 # --- Targets ----------------------------------
-
 .INCLUDE : target.mk
 
 $(SLO)$/ConnectionHelper.obj : $(LOCALIZE_ME_DEST)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 8c340af17611..baf20415e4d6 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -55,7 +55,7 @@
 
 #ifdef HAVE_ODBC_SUPPORT
 
-#if defined(WIN) || defined(OS2)
+#if defined(OS2)
 #define ODBC_LIBRARY    "ODBC.DLL"
 #define ODBC_UI_LIBRARY "ODBCINST.DLL"
 #endif
@@ -77,7 +77,7 @@
 
 // just to go with calling convention of windows
 // so don't touch this
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #define SQL_API __stdcall
 // At least under some circumstances, the below #include <odbc/sqlext.h> re-
 // defines SQL_API to an empty string, leading to a compiler warning on MSC; to
@@ -87,7 +87,7 @@
 #pragma warning(push)
 #pragma warning(disable: 4005)
 #endif
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 
 #if defined(OS2)
 #define ALLREADY_HAVE_OS2_TYPES
@@ -100,13 +100,13 @@
 #include <odbc/sqlext.h>
 #endif
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 #if defined _MSC_VER
 #pragma warning(pop)
 #endif
 #undef SQL_API
 #define SQL_API __stdcall
-#endif // defined(WIN) || defined(WNT)
+#endif // defined(WNT)
 // from here on you can do what you want to
 
 #if defined(OS2)
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 479c0743953b..20b0adb0cb44 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -31,11 +31,11 @@
 
 #include "commontypes.hxx"
 
-#if defined(WIN) || defined(WNT) || defined (UNX) || defined (OS2)
+#if defined(WNT) || defined (UNX) || defined (OS2)
 #define HAVE_ODBC_SUPPORT
 #endif
 
-#if ( defined(WIN) || defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
+#if ( defined(WNT) || defined (OS2) ) && defined(HAVE_ODBC_SUPPORT)
 #define HAVE_ODBC_ADMINISTRATION
 #endif
 
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 6e8b61debff5..1f78123c6096 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -37,6 +37,7 @@
 
 ModalDialog DLG_PARAMETERS
 {
+    HelpID = "dbaccess:ModalDialog:DLG_PARAMETERS";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 6 + LIST_WIDTH + 3 + 6 + BUTTON_WIDTH + 6, 98 ) ;
@@ -51,6 +52,7 @@ ModalDialog DLG_PARAMETERS
     };
     ListBox LB_ALLPARAMS
     {
+        HelpID = "dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS";
         Pos = MAP_APPFONT ( 7 , 12 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , LIST_HEIGHT ) ;
         Border = TRUE;
@@ -64,6 +66,7 @@ ModalDialog DLG_PARAMETERS
     };
     Edit ET_PARAM
     {
+        HelpID = "dbaccess:Edit:DLG_PARAMETERS:ET_PARAM";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 7 , 12 + LIST_HEIGHT + 4 + 8 + 3 ) ;
         Size = MAP_APPFONT ( LIST_WIDTH , 12 ) ;
@@ -71,6 +74,7 @@ ModalDialog DLG_PARAMETERS
     };
     PushButton BT_TRAVELNEXT
     {
+        HelpID = "dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT";
         Pos = MAP_APPFONT ( 4 + 3 + LIST_WIDTH + 3 + 6 , 12 + LIST_HEIGHT + 4 + 8 + 3 + ( 12 - BUTTON_HEIGHT ) / 2) ;
         Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index f93fe24b8766..6d273b5c53aa 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -44,6 +44,7 @@ ModalDialog DLG_FILTERCRIT
     HelpId = HID_DLG_FILTERCRIT ;
     ListBox LB_WHEREFIELD1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -52,6 +53,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP1
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 25 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -62,6 +64,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE1
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 25 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -69,6 +72,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 41 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -83,6 +87,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -91,6 +96,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP2
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 41 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -101,6 +107,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE2
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 41 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
@@ -108,6 +115,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOND3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 15 , 57 ) ;
         Size = MAP_APPFONT ( 41 , 36 ) ;
@@ -122,6 +130,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHEREFIELD3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 90 ) ;
@@ -130,6 +139,7 @@ ModalDialog DLG_FILTERCRIT
     };
     ListBox LB_WHERECOMP3
     {
+        HelpID = "dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 124 , 57 ) ;
         Size = MAP_APPFONT ( 49 , 72 ) ;
@@ -140,6 +150,7 @@ ModalDialog DLG_FILTERCRIT
     };
     Edit ET_WHEREVALUE3
     {
+        HelpID = "dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 177 , 57 ) ;
         Size = MAP_APPFONT ( 60 , 12 ) ;
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index caa2b79e9a17..75f60ec28d81 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -89,7 +89,7 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
 
     AllSettings aSettings( GetSettings() );
     StyleSettings aStyle( aSettings.GetStyleSettings() );
-    aStyle.SetAutoMnemonic( FALSE );
+    aStyle.SetAutoMnemonic( sal_False );
     aSettings.SetStyleSettings( aStyle );
     SetSettings( aSettings );
 
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 318df3045aa1..7c349dda037b 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 dcf5ade1d83c..8636a152dc9a 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -47,6 +47,8 @@
 #include "UITools.hxx"
 #include "moduledbu.hxx"
 
+#include <tools/urlobj.hxx>
+
 #define BUTTONID_MORE   BUTTONID_RETRY + 1
 
 #define DIALOG_WIDTH    220
@@ -89,12 +91,12 @@ namespace
     class ImageProvider : public IImageProvider
     {
     private:
-        USHORT  m_defaultImageID;
+        sal_uInt16  m_defaultImageID;
 
         mutable Image   m_defaultImage;
 
     public:
-        ImageProvider( USHORT _defaultImageID )
+        ImageProvider( sal_uInt16 _defaultImageID )
             :m_defaultImageID( _defaultImageID )
         {
         }
@@ -113,7 +115,7 @@ namespace
     private:
         String  m_label;
     public:
-        LabelProvider( USHORT _labelResourceID )
+        LabelProvider( sal_uInt16 _labelResourceID )
             :m_label( ModuleRes( _labelResourceID ) )
         {
         }
@@ -143,7 +145,7 @@ namespace
         ::boost::shared_ptr< IImageProvider >   getImageProvider( SQLExceptionInfo::TYPE _eType ) const
         {
             ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
-            USHORT nNormalImageID( BMP_EXCEPTION_ERROR );
+            sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR );
 
             switch ( _eType )
             {
@@ -169,7 +171,7 @@ namespace
         ::boost::shared_ptr< ILabelProvider >   getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const
         {
             ::boost::shared_ptr< ILabelProvider >* ppProvider( &m_pErrorLabel );
-            USHORT nLabelID( STR_EXCEPTION_ERROR );
+            sal_uInt16 nLabelID( STR_EXCEPTION_ERROR );
 
             switch ( _eType )
             {
@@ -356,7 +358,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( );
@@ -470,7 +472,7 @@ namespace
 
     void lcl_addButton( ButtonDialog& _rDialog, StandardButtonType _eType, bool _bDefault )
     {
-        USHORT nButtonID = 0;
+        sal_uInt16 nButtonID = 0;
         switch ( _eType )
         {
         case BUTTON_YES:    nButtonID = BUTTONID_YES; break;
@@ -645,11 +647,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 979fdd3709df..94b2e394d527 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -56,6 +56,7 @@ Image BMP_EXCEPTION_INFO
 
 ModalDialog DLG_SQLEXCEPTIONCHAIN
 {
+    HelpID = "dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN";
     Moveable = TRUE ;
     Closeable = TRUE ;
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index cf04d792d241..9b5e771b2173 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -102,7 +102,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();
 
@@ -583,7 +583,7 @@ DBG_NAME(OTableSubscriptionPage)
     }
 
     //------------------------------------------------------------------------
-    BOOL OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs )
+    sal_Bool OTableSubscriptionPage::FillItemSet( SfxItemSet& _rCoreAttrs )
     {
         sal_Bool bValid, bReadonly;
         getFlags(_rCoreAttrs, bValid, bReadonly);
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index a15e7e159e53..81566ed7faf5 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -68,7 +68,7 @@ namespace dbaui
         OTableSubscriptionDialog* m_pTablesDlg;
 
     public:
-        virtual BOOL            FillItemSet(SfxItemSet& _rCoreAttrs);
+        virtual sal_Bool            FillItemSet(SfxItemSet& _rCoreAttrs);
         virtual int             DeactivatePage(SfxItemSet* _pSet);
         using OGenericAdministrationPage::DeactivatePage;
 
@@ -105,7 +105,7 @@ namespace dbaui
         ::com::sun::star::uno::Sequence< ::rtl::OUString > collectDetailedSelection() const;
 
         /// (un)check all entries
-        void CheckAll( BOOL bCheck = sal_True );
+        void CheckAll( sal_Bool bCheck = sal_True );
 
         virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
 
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 ;
author	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 23:17:51 -0600
committer	Norbert Thiebaud <nthiebaud@gmail.com>	2011-03-09 23:17:51 -0600
commit	256f6ca67d03b875e8e6a355a6cf5130ea7404a3 (patch)
tree	c1916add744093d07466b54d6af832cd87891d8e /dbaccess/source/ui/dlg
parent	f71ad82e60bebde81ebb193dcd16305ca339cc1a (diff)
parent	dee1ea70160df84946cf9040281de42945faf65a (diff)