removetooltypes01: #i112600# remove tooltypes from dbaccess

181 files changed, 949 insertions, 949 deletions

diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index f473586b4..c53c6f9dc 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -442,7 +442,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const String& _rDsn) const
 
     for ( size_t i=0; i < sizeof( aKnowPrefixes ) / sizeof( aKnowPrefixes[0] ); ++i )
     {
-        USHORT nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.Len() : (USHORT)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
+        sal_uInt16 nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.Len() : (sal_uInt16)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
         if ( sDsn.EqualsIgnoreCaseAscii( aKnowPrefixes[i].pAsciiPrefix, 0, nMatchLen ) )
             return aKnowPrefixes[i].eType;
     }
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index 0a6d531cf..31e9adb4a 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -184,7 +184,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
     class ModuleRes : public ::ResId
     {
     public:
-        ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+        ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
     };
 
     //==========================================================================
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 40ac350fe..8251337ff 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -176,7 +176,7 @@ DBG_NAME( OAdabasNewDbDlg )
 OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
                                  const Reference<XCreateCatalog>& _rxCreateCatalog,
                                  const Reference< XMultiServiceFactory >&	_rxORB,
-                                 BOOL _bRestore)
+                                 sal_Bool _bRestore)
     :ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB ))
     ,m_FT_DATABASENAME(         this, ModuleRes( FT_DATABASENAME        ) )
     ,m_ET_DATABASENAME(         this, ModuleRes( ET_DATABASENAME        ) )
@@ -269,7 +269,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
 
         m_ET_SYSUSR.SetModifyHdl(				LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
         m_ET_CONUSR.SetModifyHdl(				LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
-        m_ET_DOMAIN_USR.Enable(FALSE);
+        m_ET_DOMAIN_USR.Enable(sal_False);
 
         //	m_ET_SYSUSR.setUpperCase();
         //	m_ET_CONUSR.setUpperCase();
@@ -399,7 +399,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
     m_ET_CONUSR.SetText(String::CreateFromAscii("CONTROL"));
 
     m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl));
-    m_PB_OK.Enable(FALSE);
+    m_PB_OK.Enable(sal_False);
 
     m_ET_DATABASENAME.SetModifyHdl(	LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
 
@@ -485,7 +485,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
     }
 
 
-    BOOL bOk = FALSE;
+    sal_Bool bOk = sal_False;
 
     {
         // we need url
@@ -509,13 +509,13 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
     else if(m_ET_SYSUSR.GetText() == m_ET_CONUSR.GetText())
         aErrorMessage = String(ModuleRes(STR_NO_SAME_USER));
     else
-        bOk = TRUE;
+        bOk = sal_True;
 
 
     if (!bOk)
     {
         ErrorBox(this, WB_OK, aErrorMessage).Execute();
-        return FALSE;
+        return sal_False;
     }
 
     sal_Int32 nPos = 0;
@@ -560,7 +560,7 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
     m_aCreatorThread->setTerminateHandler(LINK(this,OAdabasNewDbDlg,TerminateHdl));
     m_aCreatorThread->create();
 
-    return TRUE;
+    return sal_True;
 }
 //-------------------------------------------------------------------------
 IMPL_LINK( OAdabasNewDbDlg, TerminateHdl, void*, /*NOTUSABLE*/ )
@@ -747,7 +747,7 @@ IMPL_LINK( OAdabasNewDbDlg, PwdClickHdl, Button *, pButton )
 //------------------------------------------------------------------------
 void OAdabasNewDbDlg::CheckBitmaps()
 {
-    INT16 i=0;
+    sal_Int16 i=0;
     if(m_ConPwd.Len() && m_ET_CONUSR.GetText().Len())
             i++,m_BMP_CON.SetImage(ModuleRes(((m_nSetBitmap & 2) == 2) ? DEFAULT_BLUE : CHECK_GREEN));
     else
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
index b8f4e65c0..ee48ed7a9 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
@@ -126,8 +126,8 @@ namespace adabasui
         String				m_sDbConfig;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>		m_xCreateCatalog;
         com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >	m_xORB;
-        BOOL				m_bRestore;
-        INT8				m_nSetBitmap;
+        sal_Bool				m_bRestore;
+        sal_Int8				m_nSetBitmap;
 
         ::std::auto_ptr<WaitObject>			m_aCreatorWait;
         ::std::auto_ptr<ODatabaseCreator>	m_aCreatorThread;
@@ -150,7 +150,7 @@ namespace adabasui
         OAdabasNewDbDlg(Window* pParent,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog,
                         const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&	_rxORB,
-                        BOOL _bRestore=FALSE);
+                        sal_Bool _bRestore=sal_False);
         virtual ~OAdabasNewDbDlg();
 
         ::rtl::OUString GetDatabaseName()		const { return m_ET_DATABASENAME.GetText();	}
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index aa119c28f..a01f04451 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -43,7 +43,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     String getScriptTypeDisplayName( const ScriptType _eType )
     {
-        USHORT nResId( 0 );
+        sal_uInt16 nResId( 0 );
 
         switch ( _eType )
         {
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index ec1b5c2f1..3837401e3 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -213,10 +213,10 @@ namespace dbmm
     }
 
     //--------------------------------------------------------------------
-    BOOL MacroMigrationDialog::Close()
+    sal_Bool MacroMigrationDialog::Close()
     {
         if ( m_pData->bMigrationIsRunning )
-            return FALSE;
+            return sal_False;
         return MacroMigrationDialog_Base::Close();
     }
 
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index 947f9d1ae..cda90cb5b 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -71,7 +71,7 @@ namespace dbmm
         virtual sal_Bool        onFinish();
 
         // Dialog overridables
-        virtual BOOL    Close();
+        virtual sal_Bool    Close();
         virtual short	Execute();
 
     private:
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 5ecfd37c0..dab594d60 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -397,7 +397,7 @@ namespace dbmm
         }
 
         //----------------------------------------------------------------
-        void lcl_describeErrors( ::rtl::OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const USHORT _nHeadingResId )
+        void lcl_describeErrors( ::rtl::OUStringBuffer& _rBuffer, const ErrorLog& _rErrors, const sal_uInt16 _nHeadingResId )
         {
             _rBuffer.appendAscii( "=== " );
             _rBuffer.append     ( String( MacroMigrationResId( _nHeadingResId ) ) );
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index 5a4168dfe..890324cf6 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -87,7 +87,7 @@ namespace dbmm
     //--------------------------------------------------------------------
     inline void RangeProgressBar::SetValue( sal_uInt32 _nValue )
     {
-        ProgressBar::SetValue( (USHORT)( 100.0 * _nValue / m_nRange ) );
+        ProgressBar::SetValue( (sal_uInt16)( 100.0 * _nValue / m_nRange ) );
     }
 
     //--------------------------------------------------------------------
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index cc823d92a..96139440e 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -246,7 +246,7 @@ private:
     ::comphelper::ComponentContext      m_aContext;
     Reference< XFrameLoader >			m_xMySelf;
     ::rtl::OUString						m_sCurrentURL;
-    ULONG								m_nStartWizard;
+    sal_uLong								m_nStartWizard;
 
     DECL_LINK( OnStartTableWizard, void* );
 public:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index e501032f8..f1db4deee 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1287,7 +1287,7 @@ void ODBExport::_ExportAutoStyles()
     }
 }
 // -----------------------------------------------------------------------------
-void ODBExport::_ExportStyles(BOOL bUsed)
+void ODBExport::_ExportStyles(sal_Bool bUsed)
 {
     SvXMLExport::_ExportStyles(bUsed);
 }
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 112ae856c..de2e4acf8 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -210,7 +210,7 @@ private:
                             ODBExport();
 protected:
 
-    virtual void					_ExportStyles( BOOL bUsed );
+    virtual void					_ExportStyles( sal_Bool bUsed );
     virtual void					_ExportAutoStyles();
     virtual void					_ExportContent();
     virtual void					_ExportMasterStyles();
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 07ef531a3..fe9ec59c1 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -511,7 +511,7 @@ sal_Bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
         uno::Reference<XComponent> xCom(GetModel(),UNO_QUERY);
 
         SfxMediumRef pMedium = new SfxMedium(
-                sFileName, ( STREAM_READ | STREAM_NOCREATE ), FALSE, 0 );
+                sFileName, ( STREAM_READ | STREAM_NOCREATE ), sal_False, 0 );
         uno::Reference< embed::XStorage > xStorage;
         try
         {
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 03029d062..32a4ef19f 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -127,7 +127,7 @@ namespace dbaui
         OTableCopyHelper        m_aTableCopyHelper;
         TransferableClipboardListener*
                                 m_pClipbordNotifier;		// notifier for changes in the clipboard
-        ULONG					m_nAsyncDrop;
+        sal_uLong					m_nAsyncDrop;
         OAsyncronousLink        m_aControllerConnectedEvent;
         OAsyncronousLink        m_aSelectContainerEvent;
         PreviewMode				m_ePreviewMode;				// the mode of the preview
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 70253590b..a26ac0be5 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -763,8 +763,8 @@ void OApplicationController::onLoadedMenu(const Reference< ::com::sun::star::fra
             MenuBar* pMenu = pSystemWindow ? pSystemWindow->GetMenuBar() : NULL;
             if ( pMenu )
             {
-                USHORT nMenuItems = pMenu->GetItemCount();
-                for ( USHORT i = 0; i < nMenuItems; ++i )
+                sal_uInt16 nMenuItems = pMenu->GetItemCount();
+                for ( sal_uInt16 i = 0; i < nMenuItems; ++i )
                     aMnemonicGenerator.RegisterMnemonic( pMenu->GetItemText( pMenu->GetItemId( i ) ) );
             }
             // - the icons should use automatic ones
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4129a7fff..f6f0833c8 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -224,7 +224,7 @@ namespace
     class OTablePreviewWindow : public Window
     {
         DECL_LINK(OnDisableInput, void*);
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
     public:
@@ -247,7 +247,7 @@ namespace
     // -----------------------------------------------------------------------------
     IMPL_LINK(OTablePreviewWindow, OnDisableInput, void*, EMPTYARG)
     {
-        EnableInput(FALSE);
+        EnableInput(sal_False);
         return 0L;
     }
     // -----------------------------------------------------------------------------
@@ -310,7 +310,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r
     m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB);
     m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) );
     m_aTBPreview.EnableMenuStrings();
-    m_aTBPreview.Enable(TRUE);
+    m_aTBPreview.Enable(sal_True);
 
     m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1);
 
@@ -374,7 +374,7 @@ void OAppDetailPageHelper::selectAll()
     int nPos = getVisibleControlIndex();
     if ( nPos < E_ELEMENT_TYPE_COUNT )
     {
-        m_pLists[nPos]->SelectAll(TRUE);
+        m_pLists[nPos]->SelectAll(sal_True);
     }
 }
 // -----------------------------------------------------------------------------
@@ -538,7 +538,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa
     if ( nPos < E_ELEMENT_TYPE_COUNT )
     {
         DBTreeListBox& rTree = *m_pLists[nPos];
-        rTree.SelectAll(FALSE);
+        rTree.SelectAll(sal_False);
         const ::rtl::OUString* pIter = _aNames.getConstArray();
         const ::rtl::OUString* pEnd  = pIter + _aNames.getLength();
         for(;pIter != pEnd;++pIter)
@@ -689,7 +689,7 @@ SvLBoxEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const
     SvLBoxEntry* pReturn = NULL;
     int nPos = getVisibleControlIndex();
     if ( nPos < E_ELEMENT_TYPE_COUNT )
-        pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,TRUE );
+        pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True );
     return pReturn;
 }
 // -----------------------------------------------------------------------------
@@ -722,14 +722,14 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
         SvLBoxEntry* pEntry = m_pLists[E_TABLE]->First();
         if ( pEntry )
             m_pLists[E_TABLE]->Expand(pEntry);
-        m_pLists[E_TABLE]->SelectAll(FALSE);
+        m_pLists[E_TABLE]->SelectAll(sal_False);
     }
 
     setDetailPage(m_pLists[E_TABLE]);
 }
 
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId )
+void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rImageId, sal_uInt16& _rHighContrastImageId )
 {
     ImageProvider aImageProvider;
     _rImageId = _rHighContrastImageId = 0;
@@ -753,7 +753,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    USHORT nImageId = 0, nImageIdH = 0;
+    sal_uInt16 nImageId = 0, nImageIdH = 0;
     rtl::OString sHelpId;
     ImageProvider aImageProvider;
     Image aFolderImage, aFolderImageHC;
@@ -790,7 +790,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
         {
             fillNames( _xContainer, _eType, nImageId, nImageIdH, NULL );
 
-            m_pLists[_eType]->SelectAll(FALSE);
+            m_pLists[_eType]->SelectAll(sal_False);
         }
         setDetailPage(m_pLists[_eType]);
     }
@@ -804,7 +804,7 @@ void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
         pCurrent->Hide();
 
     showPreview(NULL);
-    BOOL bHasFocus = FALSE;
+    sal_Bool bHasFocus = sal_False;
     m_aFL.Show();
     {
         bHasFocus = pCurrent->HasChildPathFocus();
@@ -812,7 +812,7 @@ void OAppDetailPageHelper::setDetailPage(Window* _pWindow)
     }
     m_aTBPreview.Show();
     m_aBorder.Show();
-    switchPreview(m_ePreviewMode,TRUE);
+    switchPreview(m_ePreviewMode,sal_True);
 
     if ( bHasFocus )
         _pWindow->GrabFocus();
@@ -836,7 +836,7 @@ namespace
 
 // -----------------------------------------------------------------------------
 void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType,
-                                      const USHORT _nImageId, const USHORT _nHighContrastImageId, SvLBoxEntry* _pParent )
+                                      const sal_uInt16 _nImageId, const sal_uInt16 _nHighContrastImageId, SvLBoxEntry* _pParent )
 {
     OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF");
     OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" );
@@ -859,7 +859,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
             Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY);
             if ( xSubElements.is() )
             {
-                pEntry = pList->InsertEntry( *pIter, _pParent, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+                pEntry = pList->InsertEntry( *pIter, _pParent, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
                 getBorderWin().getView()->getAppController().containerFound( Reference< XContainer >( xSubElements, UNO_QUERY ) );
                 fillNames( xSubElements, _eType, _nImageId, _nHighContrastImageId, pEntry );
             }
@@ -991,13 +991,13 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::
             }
         }
 
-        USHORT nImageId = 0, nImageIdH = 0;
+        sal_uInt16 nImageId = 0, nImageIdH = 0;
         getElementIcons( _eType, nImageId, nImageIdH );
         Reference<XNameAccess> xContainer(_rObject,UNO_QUERY);
         if ( xContainer.is() )
         {
             const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType );
-            pRet = pTreeView->InsertEntry( _rName, pEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+            pRet = pTreeView->InsertEntry( _rName, pEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
             fillNames( xContainer, _eType, nImageId, nImageIdH, pRet );
         }
         else
@@ -1133,7 +1133,7 @@ sal_Bool OAppDetailPageHelper::isPreviewEnabled()
     return m_ePreviewMode != E_PREVIEWNONE;
 }
 // -----------------------------------------------------------------------------
-void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,BOOL _bForce)
+void OAppDetailPageHelper::switchPreview(PreviewMode _eMode,sal_Bool _bForce)
 {
     if ( m_ePreviewMode != _eMode || _bForce )
     {
@@ -1364,7 +1364,7 @@ void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt )
     OSL_PRECOND( pCurrentView, "OAppDetailPageHelper::KeyInput: how this?" );
 
     KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); (void)eFunc;
-    USHORT      nCode = rKEvt.GetKeyCode().GetCode();
+    sal_uInt16      nCode = rKEvt.GetKeyCode().GetCode();
 
     if ( ( KEY_RETURN == nCode ) && pCurrentView )
     {
@@ -1436,11 +1436,11 @@ OPreviewWindow::OPreviewWindow(Window* _pParent)
     ImplInitSettings( sal_True, sal_True, sal_True );
 }
 // -----------------------------------------------------------------------------
-BOOL OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+sal_Bool OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
 {
     const Size aWinSize( GetOutputSizePixel() );
     Size       aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
-    BOOL       bRet = FALSE;
+    sal_Bool       bRet = sal_False;
 
     if( aNewSize.Width() && aNewSize.Height() )
     {
@@ -1463,7 +1463,7 @@ BOOL OPreviewWindow::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
                              ( aWinSize.Height() - aNewSize.Height() ) >> 1 );
 
         rResultRect = Rectangle( aNewPos, aNewSize );
-        bRet = TRUE;
+        bRet = sal_True;
     }
 
     return bRet;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 0e688b576..dfc2298df 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -93,8 +93,8 @@ namespace dbaui
             @return
                 <TRUE/> when successfull
         */
-        BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
     public:
@@ -142,7 +142,7 @@ namespace dbaui
 
         /** retrieves the resource ids of the images representing elements of the given type
         */
-        void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId );
+        void getElementIcons( ElementType _eType, sal_uInt16& _rImageId, sal_uInt16& _rHighContrastImageId );
 
         /** fills the names in the listbox
             @param	_xContainer
@@ -158,8 +158,8 @@ namespace dbaui
         */
         void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
                         const ElementType _eType,
-                        const USHORT _nImageId,
-                        const USHORT _nHighContrastImageId,
+                        const sal_uInt16 _nImageId,
+                        const sal_uInt16 _nHighContrastImageId,
                         SvLBoxEntry* _pParent );
 
         /** sets the detail page
@@ -374,7 +374,7 @@ namespace dbaui
             @param	_bForce
                 Force the preview to be resetted
         */
-        void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE);
+        void switchPreview(PreviewMode _eMode,sal_Bool _bForce = sal_False);
 
         /** shows the Preview of the content when it is enabled.
             @param	_xContent
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index ac6ec16d2..14a051a18 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -116,7 +116,7 @@ using ::com::sun::star::sdb::application::NamedDatabaseObject;
 #define SPACEBETWEENENTRIES		4
 
 // -----------------------------------------------------------------------------
-TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled )
+TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled )
     :sUNOCommand( ::rtl::OUString::createFromAscii( _pAsciiUNOCommand ) )
     ,nHelpID( _nHelpID )
     ,sTitle( ModuleRes( _nTitleResourceID ) )
@@ -131,7 +131,7 @@ OCreationList::OCreationList( OTasksWindow& _rParent )
     ,m_pMouseDownEntry( NULL )
     ,m_pLastActiveEntry( NULL )
 {
-    USHORT nSize = SPACEBETWEENENTRIES;
+    sal_uInt16 nSize = SPACEBETWEENENTRIES;
     SetSpaceBetweenEntries(nSize);
     SetSelectionMode( NO_SELECTION );
     SetExtendedWinBits( EWB_NO_AUTO_CURENTRY );
@@ -161,7 +161,7 @@ void OCreationList::PreparePaint( SvLBoxEntry* _pEntry )
         {
             // draw a selection background
             bool bIsMouseDownEntry = ( _pEntry == m_pMouseDownEntry );
-            DrawSelectionBackground( GetBoundingRect( _pEntry ), bIsMouseDownEntry ? 1 : 2, FALSE, TRUE, FALSE );
+            DrawSelectionBackground( GetBoundingRect( _pEntry ), bIsMouseDownEntry ? 1 : 2, sal_False, sal_True, sal_False );
 
             if ( bIsMouseDownEntry )
             {
@@ -352,7 +352,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvLBoxEntry* _pEntry )
 // -----------------------------------------------------------------------------
 void OCreationList::updateHelpText()
 {
-    USHORT nHelpTextId = 0;
+    sal_uInt16 nHelpTextId = 0;
     if ( GetCurEntry() )
         nHelpTextId = reinterpret_cast< TaskEntry* >( GetCurEntry()->GetUserData() )->nHelpID;
     m_rTaskWindow.setHelpText( nHelpTextId );
@@ -471,7 +471,7 @@ void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
     m_aDescription.SetControlFont(aFont);
 }
 // -----------------------------------------------------------------------------
-void OTasksWindow::setHelpText(USHORT _nId)
+void OTasksWindow::setHelpText(sal_uInt16 _nId)
 {
     DBG_CHKTHIS(OTasksWindow,NULL);
     if ( _nId )
@@ -569,7 +569,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
     }
 
     m_aCreation.Show();	
-    m_aCreation.SelectAll(FALSE);
+    m_aCreation.SelectAll(sal_False);
     m_aHelpText.Show();
     m_aDescription.Show();
     m_aFL.Show();
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 378918583..f7af54689 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -124,14 +124,14 @@ namespace dbaui
     struct TaskEntry
     {
         ::rtl::OUString sUNOCommand;
-        USHORT          nHelpID;
+        sal_uInt16          nHelpID;
         String          sTitle;
         bool            bHideWhenDisabled;
             // TODO: we should be consistent in the task pane and the menus/toolbars:
             // If an entry is disabled in the latter, it should also be disabled in the former.
             // If an entry is *hidden* in the former, it should also be hidden in the latter.
 
-        TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false );
+        TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false );
     };
     typedef ::std::vector< TaskEntry >	TaskEntryList;
 
@@ -140,7 +140,7 @@ namespace dbaui
         /// the tasks available in the pane
         TaskEntryList   aTasks;
         /// the resource ID for the title of the pane
-        USHORT          nTitleId;
+        sal_uInt16          nTitleId;
     };
 
     class OTasksWindow : public Window
@@ -152,7 +152,7 @@ namespace dbaui
         OApplicationDetailView*				m_pDetailView;
 
         DECL_LINK( OnEntrySelectHdl,		SvTreeListBox* );
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
     public:
@@ -173,7 +173,7 @@ namespace dbaui
         }
 
         void Clear();
-        void setHelpText(USHORT _nId);
+        void setHelpText(sal_uInt16 _nId);
     };
     //==================================================================
     class OApplicationDetailView : public OSplitterView
@@ -187,7 +187,7 @@ namespace dbaui
         ::std::vector< TaskPaneData >       m_aTaskPaneData;
         MnemonicGenerator                   m_aExternalMnemonics;
 
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
 
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 8e993f9b8..11e9bc9e9 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -68,10 +68,10 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
 
     struct CategoryDescriptor
     {
-        USHORT      nLabelResId;
+        sal_uInt16      nLabelResId;
         ElementType eType;
-        USHORT      nImageResId;
-        USHORT      nImageResIdHC;
+        sal_uInt16      nImageResId;
+        sal_uInt16      nImageResIdHC;
     }   aCategories[] = {
         { RID_STR_TABLES_CONTAINER,     E_TABLE,    IMG_TABLEFOLDER_TREE_L, IMG_TABLEFOLDER_TREE_LHC    },
         { RID_STR_QUERIES_CONTAINER,    E_QUERY,    IMG_QUERYFOLDER_TREE_L, IMG_QUERYFOLDER_TREE_LHC    },
@@ -88,14 +88,14 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
             pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
     }
 
-    SetChoiceWithCursor( TRUE );
+    SetChoiceWithCursor( sal_True );
     SetSelectionMode(SINGLE_SELECTION);
 }
 // -----------------------------------------------------------------------------
 OApplicationIconControl::~OApplicationIconControl()
 {
-    ULONG nCount = GetEntryCount();
-    for ( ULONG i = 0; i < nCount; ++i )
+    sal_uLong nCount = GetEntryCount();
+    for ( sal_uLong i = 0; i < nCount; ++i )
     {
         SvxIconChoiceCtrlEntry* pEntry = GetEntry( i );
         if ( pEntry )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index bfacb7e26..3d60c4506 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -75,7 +75,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     ,m_rBorderWin( _rBorderWindow )
 {
     DBG_CTOR(OApplicationSwapWindow,NULL);
-//	SetCompoundControl( TRUE );
+//	SetCompoundControl( sal_True );
 
     ImplInitSettings( sal_True, sal_True, sal_True );
 
@@ -83,7 +83,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
     m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() );
     m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL);
     m_aIconControl.Show();
-    //m_aIconControl.Enable(TRUE);
+    //m_aIconControl.Enable(sal_True);
 }
 // -----------------------------------------------------------------------------
 OApplicationSwapWindow::~OApplicationSwapWindow()
@@ -143,7 +143,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt )
 void OApplicationSwapWindow::clearSelection()
 {
     m_aIconControl.SetNoSelection();
-    ULONG nPos = 0;
+    sal_uLong nPos = 0;
     SvxIconChoiceCtrlEntry* pEntry = m_aIconControl.GetSelectedEntry(nPos);
     if ( pEntry )
         m_aIconControl.InvalidateEntry(pEntry);
@@ -170,7 +170,7 @@ bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent )
 // -----------------------------------------------------------------------------
 ElementType OApplicationSwapWindow::getElementType() const
 {
-    ULONG nPos = 0;
+    sal_uLong nPos = 0;
     SvxIconChoiceCtrlEntry* pEntry = m_aIconControl.GetSelectedEntry(nPos);
     return ( pEntry ) ? *static_cast<ElementType*>(pEntry->GetUserData()) : E_NONE;
 }
@@ -195,7 +195,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
 // -----------------------------------------------------------------------------
 IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl)
 {
-    ULONG nPos = 0;
+    sal_uLong nPos = 0;
     SvxIconChoiceCtrlEntry*	pEntry = _pControl->GetSelectedEntry( nPos );
     ElementType eType = E_NONE;
     if ( pEntry )
@@ -215,9 +215,9 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG)
 // -----------------------------------------------------------------------------
 void OApplicationSwapWindow::selectContainer(ElementType _eType)
 {
-    ULONG nCount = m_aIconControl.GetEntryCount();
+    sal_uLong nCount = m_aIconControl.GetEntryCount();
     SvxIconChoiceCtrlEntry*	pEntry = NULL;
-    for (ULONG i=0; i < nCount; ++i)
+    for (sal_uLong i=0; i < nCount; ++i)
     {
         pEntry = m_aIconControl.GetEntry(i);
         if ( pEntry && *static_cast<ElementType*>(pEntry->GetUserData()) == _eType )
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 038161280..625bf4783 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -51,7 +51,7 @@ namespace dbaui
         ElementType							m_eLastType;
         OAppBorderWindow&					m_rBorderWin;
 
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
 
         DECL_LINK( OnContainerSelectHdl,	SvtIconChoiceCtrl* );
         DECL_LINK( ChangeToLastSelected, void* );
@@ -72,8 +72,8 @@ namespace dbaui
         inline void cut()	{ }
         inline void paste()	{ }
 
-        inline ULONG					GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
-        inline SvxIconChoiceCtrlEntry*	GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
+        inline sal_uLong					GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
+        inline SvxIconChoiceCtrlEntry*	GetEntry( sal_uLong nPos ) const { return m_aIconControl.GetEntry(nPos); }
         inline Rectangle				GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
 
         /** automatically creates mnemonics for the icon/texts in our left hand side panel
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index 708ff55a8..d85d510ef 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -45,7 +45,7 @@ namespace dbaui
 {
     
 DBG_NAME(OTitleWindow)
-OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift)
+OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,sal_Bool _bShift)
 : Window(_pParent,_nBits | WB_DIALOGCONTROL)
 , m_aSpace1(this)
 , m_aSpace2(this)
@@ -108,7 +108,7 @@ void OTitleWindow::Resize()
     }
 }
 // -----------------------------------------------------------------------------
-void OTitleWindow::setTitle(USHORT _nTitleId)
+void OTitleWindow::setTitle(sal_uInt16 _nTitleId)
 {
     if ( _nTitleId != 0 )
     {
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 3e59dab0d..f0d8ec916 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -39,12 +39,12 @@ namespace dbaui
         FixedText	m_aSpace2;
         FixedText	m_aTitle;
         Window*		m_pChild;
-        BOOL		m_bShift;
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        sal_Bool		m_bShift;
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
     public:
-        OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE);
+        OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,sal_Bool _bShift = sal_True);
         virtual ~OTitleWindow();
         
         // window overloads
@@ -68,7 +68,7 @@ namespace dbaui
             @param	_nTitleId
                 The resource id of the title text.
         */
-        void setTitle(USHORT _nTitleId);
+        void setTitle(sal_uInt16 _nTitleId);
 
 
         /** Gets the min Width in Pixel which is needed to display the whole
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index f2e8c1ab8..04c96fc6d 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -134,7 +134,7 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev
 
     SetBorderStyle(WINDOW_BORDER_MONO);
 
-    m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL ,FALSE);
+    m_pPanel = new OTitleWindow(this,STR_DATABASE,WB_BORDER | WB_DIALOGCONTROL ,sal_False);
     m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO);
     OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this );
     pSwap->Show();
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 4d4f6adaa..ada51ab98 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -357,8 +357,8 @@ long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
         {
             const KeyEvent* pKeyEvt = rNEvt.GetKeyEvent();
             const KeyCode& rKeyCode = pKeyEvt->GetKeyCode();
-            if (  ( rKeyCode == KeyCode( KEY_E, TRUE, TRUE, FALSE, FALSE ) )
-               || ( rKeyCode == KeyCode( KEY_TAB, TRUE, FALSE, FALSE, FALSE ) )
+            if (  ( rKeyCode == KeyCode( KEY_E, sal_True, sal_True, sal_False, sal_False ) )
+               || ( rKeyCode == KeyCode( KEY_TAB, sal_True, sal_False, sal_False, sal_False ) )
                )
             {
                 if ( m_pTreeView && m_pVclControl && m_pTreeView->HasChildPathFocus() )
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 48a466907..21686affe 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -179,7 +179,7 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor )
     {
-        const ULONG nFormat = SotExchange::GetFormat(rFlavor);
+        const sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
         switch (nFormat)
         {
             case SOT_FORMAT_RTF:
diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index c2f5f9aaa..20f60eddb 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -51,8 +51,8 @@
 //	 tables                     holds the nameaccess for the tables
 //	   table                    holds the table
 
-#define CONTAINER_QUERIES		ULONG( 0 )
-#define CONTAINER_TABLES		ULONG( 1 )
+#define CONTAINER_QUERIES		sal_uLong( 0 )
+#define CONTAINER_TABLES		sal_uLong( 1 )
 
 namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
 
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 865503ac3..c83684eae 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -264,8 +264,8 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
             }
 
             // find the proper item, and set its icons
-            USHORT nCount = pEntryLoop->ItemCount();
-            for (USHORT i=0;i<nCount;++i)
+            sal_uInt16 nCount = pEntryLoop->ItemCount();
+            for (sal_uInt16 i=0;i<nCount;++i)
             {
                 SvLBoxItem* pItem = pEntryLoop->GetItem(i);
                 if ( !pItem || ( pItem->IsA() != SV_ITEM_ID_LBOXCONTEXTBMP ) )
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d6e917e42..e3d7d5a3b 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -403,7 +403,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
             throw RuntimeException( ::rtl::OUString::createFromAscii( "unable to create a view" ), *this );
 
         if ( m_bReadOnly || m_bPreview )
-            pView->EnableInput( FALSE );
+            pView->EnableInput( sal_False );
 
         impl_initialize();
     }
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index d8bb49710..ea572743b 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -936,7 +936,7 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM,
     :FmGridControl(_rM,pParent, _pPeer, nBits)
     ,m_pMasterListener(NULL)
     ,m_nAsyncDropEvent(0)
-    ,m_nCurrentActionColId((USHORT)-1)
+    ,m_nCurrentActionColId((sal_uInt16)-1)
     ,m_bActivatingForDrop(sal_False)
 {
     DBG_CTOR(SbaGridControl ,NULL);
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 451840e9a..2d931206c 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -480,8 +480,8 @@ void SbaTableQueryBrowser::initializePreviewMode()
 {
     if ( getBrowserView() && getBrowserView()->getVclControl() )
     {
-        getBrowserView()->getVclControl()->AlwaysEnableInput( FALSE );
-        getBrowserView()->getVclControl()->EnableInput( FALSE );
+        getBrowserView()->getVclControl()->AlwaysEnableInput( sal_False );
+        getBrowserView()->getVclControl()->EnableInput( sal_False );
         getBrowserView()->getVclControl()->ForceHideScrollbars( sal_True );
     }
     Reference< XPropertySet >  xDataSourceSet(getRowSet(), UNO_QUERY);
@@ -2006,7 +2006,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb
 
         m_pTreeView->getListBox().InsertEntry(
             _rQueryName, _rQueryImage, _rQueryImage, pDatasourceEntry,
-            TRUE /*ChildsOnDemand*/, LIST_APPEND, pQueriesData );
+            sal_True /*ChildsOnDemand*/, LIST_APPEND, pQueriesData );
     }
 
     // the child for the tables container
@@ -2016,7 +2016,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb
 
         m_pTreeView->getListBox().InsertEntry(
             _rTableName, _rTableImage, _rTableImage, pDatasourceEntry,
-            TRUE /*ChildsOnDemand*/, LIST_APPEND, pTablesData );
+            sal_True /*ChildsOnDemand*/, LIST_APPEND, pTablesData );
     }
 
 }
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 08fe15e18..80ecbd721 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -106,7 +106,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
     }
 }
 // -----------------------------------------------------------------------------
-void OColumnControlWindow::CellModified(long /*nRow*/, USHORT /*nColId*/ )
+void OColumnControlWindow::CellModified(long /*nRow*/, sal_uInt16 /*nColId*/ )
 {
     saveCurrentFieldDescData();
 }
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 34830c560..9dfbe0f27 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -816,7 +816,7 @@ void OFieldDescControl::ArrangeAggregates()
     {
         Control*	pctrlInputControl;	// das eigentliche Control zur Eingabe
         Control*	pctrlTextControl;	// das Label dazu
-        USHORT		nPosSizeArgument;	// das zweite Argument fuer SetPosSize
+        sal_uInt16		nPosSizeArgument;	// das zweite Argument fuer SetPosSize
     };
     AGGREGATE_DESCRIPTION adAggregates[] = {
         { m_pColumnName, m_pColumnNameText, 1},
@@ -1081,7 +1081,7 @@ void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OStrin
     _pControl->EnableClipSiblings();
 }
 // -----------------------------------------------------------------------------
-FixedText* OFieldDescControl::CreateText(USHORT _nTextRes)
+FixedText* OFieldDescControl::CreateText(sal_uInt16 _nTextRes)
 {
     FixedText* pFixedText = new FixedText( this );
     pFixedText->SetText( ModuleRes(_nTextRes) );
@@ -1089,13 +1089,13 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes)
     return pFixedText;
 }
 // -----------------------------------------------------------------------------
-OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId)
+OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId)
 {
     OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
     pControl->SetDecimalDigits(0);
     pControl->SetMin(0);
     pControl->SetMax(0x7FFFFFFF);	// soll draussen geaendert werden, wenn noetig
-    pControl->SetStrictFormat(TRUE);
+    pControl->SetStrictFormat(sal_True);
 
     InitializeControl(pControl,_sHelpId,false);
 
@@ -1537,7 +1537,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
 
     if(m_pType)
     {
-        USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND;
+        sal_uInt16 nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND;
         if(nPos == LISTBOX_ENTRY_NOTFOUND)
         {
             const OTypeInfoMap*	pMap = getTypeInfo();
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index a49ba9d51..6b922e0ce 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -108,14 +108,14 @@ namespace dbaui
         Reference< XPropertySet>				m_xDestDef;
 
 
-        void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId);
+        void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,sal_uInt16 nColumnId);
         /** returns the column id for the editbrowsebox
             @param	_nColId
                     the column id SOURCE_COLUMN or DEST_COLUMN
 
             @return	the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data
         */
-        USHORT getColumnIdent( USHORT _nColId ) const;
+        sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const;
     public:
         ORelationControl( OTableListBoxControl* pParent,const OJoinTableView::OTableWindowMap* _pTableMap );
         virtual ~ORelationControl();
@@ -141,16 +141,16 @@ namespace dbaui
 
         virtual long PreNotify(NotifyEvent& rNEvt );
 
-        virtual BOOL IsTabAllowed(BOOL bForward) const;
+        virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
 
         virtual void Init(const TTableConnectionData::value_type& _pConnData);
         virtual void Init() { ORelationControl_Base::Init(); }
-        virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
-        virtual ::svt::CellController* GetController( long nRow, USHORT nCol );
-        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
-        virtual BOOL SeekRow( long nRow );
-        virtual BOOL SaveModified();
-        virtual String GetCellText( long nRow, USHORT nColId ) const;
+        virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
+        virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol );
+        virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
+        virtual sal_Bool SeekRow( long nRow );
+        virtual sal_Bool SaveModified();
+        virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
 
         virtual void CellModified();
 
@@ -222,7 +222,7 @@ namespace dbaui
             // not the first call
             RowRemoved(0, GetRowCount());
 
-        RowInserted(0, m_pConnData->GetConnLineDataList()->size() + 1, TRUE); // add one extra row
+        RowInserted(0, m_pConnData->GetConnLineDataList()->size() + 1, sal_True); // add one extra row
     }
     //------------------------------------------------------------------------------
     void ORelationControl::Resize()
@@ -261,20 +261,20 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------
-    BOOL ORelationControl::IsTabAllowed(BOOL bForward) const
+    sal_Bool ORelationControl::IsTabAllowed(sal_Bool bForward) const
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         long nRow = GetCurRow();
-        USHORT nCol = GetCurColumnId();
+        sal_uInt16 nCol = GetCurColumnId();
 
-        BOOL bRet = !((		( bForward && (nCol == DEST_COLUMN)		&& (nRow == GetRowCount() - 1))) 
+        sal_Bool bRet = !((		( bForward && (nCol == DEST_COLUMN)		&& (nRow == GetRowCount() - 1))) 
                         ||	(!bForward && (nCol == SOURCE_COLUMN)	&& (nRow == 0)));
 
         return bRet && EditBrowseBox::IsTabAllowed(bForward);
     }
 
     //------------------------------------------------------------------------------
-    BOOL ORelationControl::SaveModified()
+    sal_Bool ORelationControl::SaveModified()
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         sal_Int32 nRow = GetCurRow();
@@ -301,19 +301,19 @@ namespace dbaui
             }
         }
 
-        return TRUE;
+        return sal_True;
     }
     //------------------------------------------------------------------------------
-    USHORT ORelationControl::getColumnIdent( USHORT _nColId ) const
+    sal_uInt16 ORelationControl::getColumnIdent( sal_uInt16 _nColId ) const
     {
-        USHORT nId = _nColId;
+        sal_uInt16 nId = _nColId;
         if ( m_pConnData->getReferencingTable() != m_pBoxControl->getReferencingTable() )
             nId = ( _nColId == SOURCE_COLUMN) ? DEST_COLUMN : SOURCE_COLUMN;
         return nId;
     }
 
     //------------------------------------------------------------------------------
-    String ORelationControl::GetCellText( long nRow, USHORT nColId ) const
+    String ORelationControl::GetCellText( long nRow, sal_uInt16 nColId ) const
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         String sText;
@@ -334,7 +334,7 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------
-    void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId )
+    void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         
@@ -372,22 +372,22 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------------
-    CellController* ORelationControl::GetController( long /*nRow*/, USHORT /*nColumnId*/ )
+    CellController* ORelationControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         return new ListBoxCellController( m_pListCell.get() );
     }
 
     //------------------------------------------------------------------------------
-    BOOL ORelationControl::SeekRow( long nRow )
+    sal_Bool ORelationControl::SeekRow( long nRow )
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         m_nDataPos = nRow;
-        return TRUE;
+        return sal_True;
     }
 
     //------------------------------------------------------------------------------
-    void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+    void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         String aText  =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId );
@@ -405,7 +405,7 @@ namespace dbaui
             rDev.SetClipRegion();
     }
     // -----------------------------------------------------------------------------
-    void ORelationControl::fillListBox(const Reference< XPropertySet>& _xDest,long /*_nRow*/,USHORT /*nColumnId*/)
+    void ORelationControl::fillListBox(const Reference< XPropertySet>& _xDest,long /*_nRow*/,sal_uInt16 /*nColumnId*/)
     {
         m_pListCell->Clear();
         try
@@ -434,7 +434,7 @@ namespace dbaui
     void ORelationControl::setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest)
     {
         // wenn ich hier gerade editiere, ausblenden
-        BOOL bWasEditing = IsEditing();
+        sal_Bool bWasEditing = IsEditing();
         if ( bWasEditing )
             DeactivateCell();
 
@@ -670,7 +670,7 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
         if ( pLines->size() >= static_cast<sal_uInt32>(m_pRC_Tables->GetRowCount()) )
         {
             m_pRC_Tables->DeactivateCell();
-            m_pRC_Tables->RowInserted(m_pRC_Tables->GetRowCount(), pLines->size() - static_cast<sal_uInt32>(m_pRC_Tables->GetRowCount()) + 1, TRUE);
+            m_pRC_Tables->RowInserted(m_pRC_Tables->GetRowCount(), pLines->size() - static_cast<sal_uInt32>(m_pRC_Tables->GetRowCount()) + 1, sal_True);
             m_pRC_Tables->ActivateCell();
         }
     }
@@ -726,9 +726,9 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
         m_pRC_Tables->lateInit();
     }
     // -----------------------------------------------------------------------------
-    BOOL OTableListBoxControl::SaveModified()
+    sal_Bool OTableListBoxControl::SaveModified()
     {
-        BOOL bRet = m_pRC_Tables->SaveModified();
+        sal_Bool bRet = m_pRC_Tables->SaveModified();
         m_pRC_Tables->getData()->normalizeLines();
         return bRet;
     }
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index bed039f7d..d0b3bf1f0 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -63,14 +63,14 @@ using namespace ::com::sun::star::uno;
 using namespace ::dbaui;
 using namespace ::svt;
 
-const USHORT COL_TABLE_NAME = 1;
-const USHORT COL_SELECT		= 2;
-const USHORT COL_INSERT		= 3;
-const USHORT COL_DELETE		= 4;
-const USHORT COL_UPDATE		= 5;
-const USHORT COL_ALTER		= 6;
-const USHORT COL_REF		= 7;
-const USHORT COL_DROP		= 8;
+const sal_uInt16 COL_TABLE_NAME = 1;
+const sal_uInt16 COL_SELECT		= 2;
+const sal_uInt16 COL_INSERT		= 3;
+const sal_uInt16 COL_DELETE		= 4;
+const sal_uInt16 COL_UPDATE		= 5;
+const sal_uInt16 COL_ALTER		= 6;
+const sal_uInt16 COL_REF		= 7;
+const sal_uInt16 COL_DROP		= 8;
 
 DBG_NAME(OTableGrantControl)
 
@@ -82,13 +82,13 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
     ,m_pCheckCell( NULL )
     ,m_pEdit( NULL )
     ,m_nDataPos( 0 )
-    ,m_bEnable(TRUE)
+    ,m_bEnable(sal_True)
     ,m_nDeactivateEvent(0)
 {
     DBG_CTOR(OTableGrantControl,NULL);
     //////////////////////////////////////////////////////////////////////
     // Spalten einfuegen
-    USHORT i=1;
+    sal_uInt16 i=1;
     InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME)	), 75);
     FreezeColumn(i++);
     InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_SELECT)), 75);
@@ -161,11 +161,11 @@ void OTableGrantControl::Init()
     if(!m_pCheckCell)
     {
         m_pCheckCell	= new CheckBoxControl( &GetDataWindow() );
-        m_pCheckCell->GetBox().EnableTriState(FALSE);
+        m_pCheckCell->GetBox().EnableTriState(sal_False);
 
         m_pEdit			= new Edit( &GetDataWindow() );
         m_pEdit->SetReadOnly();
-        m_pEdit->Enable(FALSE);
+        m_pEdit->Enable(sal_False);
     }
 
     UpdateTables();
@@ -221,17 +221,17 @@ IMPL_LINK(OTableGrantControl, AsynchDeactivate, void*, EMPTYARG)
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const
+sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     long nRow = GetCurRow();
-    USHORT nCol = GetCurColumnId();
+    sal_uInt16 nCol = GetCurColumnId();
 
     if (bForward && (nCol == 2) && (nRow == GetRowCount() - 1))
-        return FALSE;
+        return sal_False;
 
     if (!bForward && (nCol == 1) && (nRow == 0))
-        return FALSE;
+        return sal_False;
 
     return EditBrowseBox::IsTabAllowed(bForward);
 }
@@ -243,16 +243,16 @@ BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const
         xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what)
 
 //------------------------------------------------------------------------------
-BOOL OTableGrantControl::SaveModified()
+sal_Bool OTableGrantControl::SaveModified()
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
 
     sal_Int32 nRow = GetCurRow();
     if(nRow == -1 || nRow >= m_aTableNames.getLength())
-        return FALSE;
+        return sal_False;
 
     ::rtl::OUString sTableName = m_aTableNames[nRow];
-    BOOL bErg = TRUE;
+    sal_Bool bErg = sal_True;
     try
     {
         
@@ -291,7 +291,7 @@ BOOL OTableGrantControl::SaveModified()
     }
     catch(SQLException& e)
     {
-        bErg = FALSE;
+        bErg = sal_False;
         ::dbaui::showError(::dbtools::SQLExceptionInfo(e),GetParent(),m_xORB);
     }
     if(bErg && Controller().Is())
@@ -303,7 +303,7 @@ BOOL OTableGrantControl::SaveModified()
 }
 
 //------------------------------------------------------------------------------
-String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const
+String OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     if(COL_TABLE_NAME == nColId)
@@ -318,7 +318,7 @@ String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const
 }
 
 //------------------------------------------------------------------------------
-void OTableGrantControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId )
+void OTableGrantControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     String sTablename = m_aTableNames[nRow];
@@ -329,7 +329,7 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon
     {
         // get the privileges from the user
         TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow);
-        m_pCheckCell->GetBox().Check(aFind != m_aPrivMap.end() ? isAllowed(nColumnId,aFind->second.nRights) : FALSE);
+        m_pCheckCell->GetBox().Check(aFind != m_aPrivMap.end() ? isAllowed(nColumnId,aFind->second.nRights) : sal_False);
     }
 }
 // -----------------------------------------------------------------------------
@@ -364,7 +364,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow)	const
     }
 }
 // -----------------------------------------------------------------------------
-sal_Bool OTableGrantControl::isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const
+sal_Bool OTableGrantControl::isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) const
 {
     sal_Bool bAllowed = sal_False;
     switch (_nColumnId)
@@ -406,7 +406,7 @@ void OTableGrantControl::setGrantUser(const Reference< XAuthorizable>& _xGrantUs
     m_xGrantUser = _xGrantUser;
 }
 //------------------------------------------------------------------------------
-CellController* OTableGrantControl::GetController( long nRow, USHORT nColumnId )
+CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumnId )
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
 
@@ -434,7 +434,7 @@ CellController* OTableGrantControl::GetController( long nRow, USHORT nColumnId )
     return pController;
 }
 //------------------------------------------------------------------------------
-BOOL OTableGrantControl::SeekRow( long nRow )
+sal_Bool OTableGrantControl::SeekRow( long nRow )
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     m_nDataPos = nRow;
@@ -443,7 +443,7 @@ BOOL OTableGrantControl::SeekRow( long nRow )
 }
 
 //------------------------------------------------------------------------------
-void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     
@@ -453,7 +453,7 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect,
         if(aFind != m_aPrivMap.end())
             PaintTristate(rDev, rRect, isAllowed(nColumnId,aFind->second.nRights) ? STATE_CHECK : STATE_NOCHECK,isAllowed(nColumnId,aFind->second.nWithGrant));
         else
-            PaintTristate(rDev, rRect, STATE_NOCHECK,FALSE);
+            PaintTristate(rDev, rRect, STATE_NOCHECK,sal_False);
     }
     else
     {
@@ -494,11 +494,11 @@ OTableGrantControl::TTablePrivilegeMap::const_iterator OTableGrantControl::findP
 // -----------------------------------------------------------------------------
 Reference< XAccessible > OTableGrantControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
-    USHORT nColumnId = GetColumnId( _nColumnPos );
+    sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
     if(nColumnId != COL_TABLE_NAME)
     {
         TriState eState = STATE_NOCHECK;
-        BOOL bEnable = FALSE;
+        sal_Bool bEnable = sal_False;
         TTablePrivilegeMap::const_iterator aFind = findPrivilege(_nRow);
         if(aFind != m_aPrivMap.end())
         {
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index eb18dd865..c7dbe09ae 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -97,7 +97,7 @@ namespace dbaui
     }
 
     //--------------------------------------------------------------------
-    bool CharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const USHORT _nItemId )
+    bool CharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId )
     {
         bool bChangedSomething = false;
         if ( GetSelectEntryPos() != GetSavedValue() )
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 484e5901a..02e9b11bd 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -43,7 +43,7 @@ namespace dbaui
 //=========================================================================
 //= OConnectionURLEdit
 //=========================================================================
-OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,BOOL _bShowPrefix)
+OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,sal_Bool _bShowPrefix)
     :Edit(_pParent, _rResId)
     ,m_pTypeCollection(NULL)
     ,m_pForcedPrefix(NULL)
@@ -146,7 +146,7 @@ String OConnectionURLEdit::GetText() const
     return Edit::GetText();
 }
 // -----------------------------------------------------------------------------
-void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix)
+void OConnectionURLEdit::ShowPrefix(sal_Bool _bShowPrefix)
 {
     m_bShowPrefix = _bShowPrefix;
     if ( m_pForcedPrefix )
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 6a09d050c..a316a3957 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -128,7 +128,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac
 // -----------------------------------------------------------------------------
 void DBTreeListBox::init()
 {
-    USHORT nSize = SPACEBETWEENENTRIES;
+    sal_uInt16 nSize = SPACEBETWEENENTRIES;
     SetSpaceBetweenEntries(nSize);
 
     m_aTimer.SetTimeout(900);
@@ -157,8 +157,8 @@ SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry*
     SvLBoxEntry* pEntry = NULL;
     if ( pChilds )
     {
-        ULONG nCount = pChilds->Count();
-        for (ULONG i=0; i < nCount; ++i)
+        sal_uLong nCount = pChilds->Count();
+        for (sal_uLong i=0; i < nCount; ++i)
         {
             pEntry = static_cast<SvLBoxEntry*>(pChilds->GetObject(i));
             SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
@@ -382,7 +382,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
 void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
 {
     KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
-    USHORT		nCode = rKEvt.GetKeyCode().GetCode();
+    sal_uInt16		nCode = rKEvt.GetKeyCode().GetCode();
     sal_Bool bHandled = sal_False;
 
     if(eFunc != KEYFUNC_DONTKNOW)
@@ -444,12 +444,12 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
         SvTreeListBox::KeyInput(rKEvt);
 }
 // -----------------------------------------------------------------------------
-BOOL DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelection*/)
+sal_Bool DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelection*/)
 {
     return m_aEditingHandler.Call(pEntry) != 0;
 }
 // -----------------------------------------------------------------------------
-BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
+sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText )
 {
     DBTreeEditedEntry aEntry;
     aEntry.pEntry = pEntry;
@@ -461,11 +461,11 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText
     }
     SetEntryText(pEntry,aEntry.aNewText);
     
-    return FALSE;  // we never want that the base change our text
+    return sal_False;  // we never want that the base change our text
 }
 
 // -----------------------------------------------------------------------------
-BOOL DBTreeListBox::DoubleClickHdl()
+sal_Bool DBTreeListBox::DoubleClickHdl()
 {
     long nResult = aDoubleClickHdl.Call( this );
     // continue default processing if the DoubleClickHandler didn't handle it
@@ -502,12 +502,12 @@ namespace
         if ( !_pPopup )
             return;
 
-        USHORT nCount = _pPopup->GetItemCount();
-        for (USHORT i=0; i < nCount; ++i)
+        sal_uInt16 nCount = _pPopup->GetItemCount();
+        for (sal_uInt16 i=0; i < nCount; ++i)
         {
             if ( _pPopup->GetItemType(i) != MENUITEM_SEPARATOR )
             {
-                USHORT nId = _pPopup->GetItemId(i);
+                sal_uInt16 nId = _pPopup->GetItemId(i);
                 PopupMenu* pSubPopUp = _pPopup->GetPopupMenu(nId);
                 if ( pSubPopUp )
                 {
@@ -534,14 +534,14 @@ namespace
 {
     void lcl_adjustMenuItemIDs( Menu& _rMenu, IController& _rCommandController )
     {
-        USHORT nCount = _rMenu.GetItemCount();
-        for ( USHORT pos = 0; pos < nCount; ++pos )
+        sal_uInt16 nCount = _rMenu.GetItemCount();
+        for ( sal_uInt16 pos = 0; pos < nCount; ++pos )
         {
             // do not adjust separators
             if ( _rMenu.GetItemType( pos ) == MENUITEM_SEPARATOR )
                 continue;
 
-            USHORT nId = _rMenu.GetItemId(pos);
+            sal_uInt16 nId = _rMenu.GetItemId(pos);
             String aCommand = _rMenu.GetItemCommand( nId );
             PopupMenu* pPopup = _rMenu.GetPopupMenu( nId );
             if ( pPopup )
@@ -550,7 +550,7 @@ namespace
                 continue;
             } // if ( pPopup )
 
-            const USHORT nCommandId = _rCommandController.registerCommandURL( aCommand );
+            const sal_uInt16 nCommandId = _rCommandController.registerCommandURL( aCommand );
             _rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), _rMenu.GetItemImage( nId ),
                 _rMenu.GetItemBits( nId ), pos );
 
@@ -567,19 +567,19 @@ namespace
     void lcl_insertMenuItemImages( Menu& _rMenu, IController& _rCommandController )
     {
         const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
-        const BOOL bHiContrast = rSettings.GetHighContrastMode();
+        const sal_Bool bHiContrast = rSettings.GetHighContrastMode();
         uno::Reference< frame::XController > xController = _rCommandController.getXController();
         uno::Reference< frame::XFrame> xFrame;
         if ( xController.is() )
             xFrame = xController->getFrame();
-        USHORT nCount = _rMenu.GetItemCount();
-        for ( USHORT pos = 0; pos < nCount; ++pos )
+        sal_uInt16 nCount = _rMenu.GetItemCount();
+        for ( sal_uInt16 pos = 0; pos < nCount; ++pos )
         {
             // do not adjust separators
             if ( _rMenu.GetItemType( pos ) == MENUITEM_SEPARATOR )
                 continue;
 
-            USHORT nId = _rMenu.GetItemId(pos);
+            sal_uInt16 nId = _rMenu.GetItemId(pos);
             String aCommand = _rMenu.GetItemCommand( nId );
             PopupMenu* pPopup = _rMenu.GetPopupMenu( nId );
             if ( pPopup )
@@ -589,7 +589,7 @@ namespace
             } // if ( pPopup )
 
             if ( xFrame.is() )
-                _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE,bHiContrast));
+                _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,sal_False,bHiContrast));
         }
     }
     // =========================================================================
@@ -733,7 +733,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu( void )
 }
 
 // -----------------------------------------------------------------------------
-void DBTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+void DBTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
 {
     if ( m_pContextMenuProvider && _nSelectedPopupEntry )
         m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() );
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index df9ef6ca7..2439962f0 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -56,7 +56,7 @@ namespace dbaui
     }
 
     //------------------------------------------------------------------------
-    USHORT OBoldListboxString::IsA()
+    sal_uInt16 OBoldListboxString::IsA()
     {
         return SV_ITEM_ID_BOLDLBSTRING;
     }
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 4e76e0e06..58b98dd81 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -227,8 +227,8 @@ namespace dbaui
 
         // Place icon left of text and both centered in the button.
         SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ), BMP_COLOR_NORMAL );
-        EnableImageDisplay( TRUE );
-        EnableTextDisplay( TRUE );
+        EnableImageDisplay( sal_True );
+        EnableTextDisplay( sal_True );
         SetImageAlign( IMAGEALIGN_LEFT );
         SetStyle( GetStyle() | WB_CENTER );
     }
@@ -287,7 +287,7 @@ namespace dbaui
 
                     String sDecodedURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
 
-                    USHORT nPos = InsertEntry( sTitle );
+                    sal_uInt16 nPos = InsertEntry( sTitle );
                     m_aURLs.insert( MapIndexToStringPair::value_type( nPos, StringPair( sDecodedURL, sFilter ) ) );
                 }
             }
@@ -302,7 +302,7 @@ namespace dbaui
     String OpenDocumentListBox::GetSelectedDocumentURL() const
     {
         String sURL;
-        USHORT nSelected = GetSelectEntryPos();
+        sal_uInt16 nSelected = GetSelectEntryPos();
         if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() )
             sURL = impl_getDocumentAtIndex( nSelected ).first;
         return sURL;
@@ -312,14 +312,14 @@ namespace dbaui
     String OpenDocumentListBox::GetSelectedDocumentFilter() const
     {
         String sFilter;
-        USHORT nSelected = GetSelectEntryPos();
+        sal_uInt16 nSelected = GetSelectEntryPos();
         if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() )
             sFilter = impl_getDocumentAtIndex( nSelected ).second;
         return sFilter;
     }
 
     //--------------------------------------------------------------------
-    OpenDocumentListBox::StringPair OpenDocumentListBox::impl_getDocumentAtIndex( USHORT _nListIndex, bool _bSystemNotation ) const
+    OpenDocumentListBox::StringPair OpenDocumentListBox::impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation ) const
     {
         MapIndexToStringPair::const_iterator pos = m_aURLs.find( _nListIndex );
         DBG_ASSERT( pos != m_aURLs.end(), "OpenDocumentListBox::impl_getDocumentAtIndex: invalid index!" );
@@ -346,7 +346,7 @@ namespace dbaui
             return;
 
         Point aRequestPos( ScreenToOutputPixel( _rHEvt.GetMousePosPixel() ) );
-        USHORT nItemIndex = LISTBOX_ENTRY_NOTFOUND;
+        sal_uInt16 nItemIndex = LISTBOX_ENTRY_NOTFOUND;
         if ( GetIndexForPoint( aRequestPos, nItemIndex ) != -1 )
         {
             Rectangle aItemRect( GetBoundingRectangle( nItemIndex ) );
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index b812f585f..d3090fcf3 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -68,7 +68,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent,  WinBits nWinStyle ) :
     m_ColorConfig.AddListener(this);
 
     //#i97044#
-    EnableFocusSelectionHide( FALSE );
+    EnableFocusSelectionHide( sal_False );
 }
 
 //------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 601eac341..73f1f29b0 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -174,8 +174,8 @@ void OTableTreeListBox::notifyHiContrastChanged()
     SvLBoxEntry* pEntryLoop = First();
     while (pEntryLoop)
     {
-        USHORT nCount = pEntryLoop->ItemCount();
-        for (USHORT i=0;i<nCount;++i)
+        sal_uInt16 nCount = pEntryLoop->ItemCount();
+        for (sal_uInt16 i=0;i<nCount;++i)
         {
             SvLBoxItem* pItem = pEntryLoop->GetItem(i);
             if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXCONTEXTBMP)
@@ -349,7 +349,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
                 sRootEntryText  = String(ModuleRes(STR_ALL_VIEWS));
             else
                 sRootEntryText  = String(ModuleRes(STR_ALL_TABLES_AND_VIEWS));
-            pAllObjects = InsertEntry( sRootEntryText, NULL, FALSE, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
+            pAllObjects = InsertEntry( sRootEntryText, NULL, sal_False, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
         }
 
         if ( _rTables.empty() )
@@ -395,7 +395,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
                 {
                     SvLBoxEntry* pFolder = GetEntryPosByName( *folder, pRootEntry );
                     if ( !pFolder )
-                        pFolder = InsertEntry( *folder, pRootEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderType ) );
+                        pFolder = InsertEntry( *folder, pRootEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderType ) );
                 }
             }
         }
@@ -533,7 +533,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry(
     {
         SvLBoxEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry );
         if ( !pFolder )
-            pFolder = InsertEntry( rFirstName, pParentEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) );
+            pFolder = InsertEntry( rFirstName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) );
         pParentEntry = pFolder;
     }
 
@@ -541,14 +541,14 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry(
     {
         SvLBoxEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry );
         if ( !pFolder )
-            pFolder = InsertEntry( rSecondName, pParentEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) );
+            pFolder = InsertEntry( rSecondName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) );
         pParentEntry = pFolder;
     }
 
     SvLBoxEntry* pRet = NULL;
     if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) )
     {
-        pRet = InsertEntry( sName, pParentEntry, FALSE, LIST_APPEND );
+        pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND );
 
         Image aImage, aImageHC;
         m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage, aImageHC );
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 35e6de41d..ece947361 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -106,7 +106,7 @@ namespace dbaui
 
     namespace
     {
-        void lcl_copy(Menu* _pMenu,USHORT _nMenuId,USHORT _nMenuPos,ToolBox* _pToolBox,USHORT _nToolId,const ::rtl::OUString& _sCommand)
+        void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const ::rtl::OUString& _sCommand)
         {
             if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING )
                 _pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId));
@@ -179,10 +179,10 @@ namespace dbaui
         ToolBox*    pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
         if ( pToolBox )
         {
-            USHORT nCount = pToolBox->GetItemCount();
-            for (USHORT nPos = 0; nPos < nCount; ++nPos)
+            sal_uInt16 nCount = pToolBox->GetItemCount();
+            for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
             {
-                USHORT nItemId = pToolBox->GetItemId(nPos);
+                sal_uInt16 nItemId = pToolBox->GetItemId(nPos);
                 if ( pToolBox->GetItemCommand(nItemId) == String(m_aCommandURL) )
                 {
                     m_nToolBoxId = nItemId;
@@ -206,10 +206,10 @@ namespace dbaui
             if ( m_aCommandURL == aFind->first && !Event.IsEnabled )
             {
                 ::std::auto_ptr<PopupMenu> pMenu = getMenu();
-                USHORT nCount = pMenu->GetItemCount();
-                for (USHORT i = 0; i < nCount; ++i)
+                sal_uInt16 nCount = pMenu->GetItemCount();
+                for (sal_uInt16 i = 0; i < nCount; ++i)
                 {
-                    USHORT nItemId = pMenu->GetItemId(i);
+                    sal_uInt16 nItemId = pMenu->GetItemId(i);
                     aFind = m_aStates.find(pMenu->GetItemCommand(nItemId));
                     if ( aFind != m_aStates.end() && aFind->second )
                     {
@@ -245,13 +245,13 @@ namespace dbaui
                     nImageType |= ImageType::COLOR_HIGHCONTRAST;
 
                 Sequence< ::rtl::OUString> aSeq(1);
-                USHORT nCount = pMenu->GetItemCount();
-                for (USHORT nPos = 0; nPos < nCount; ++nPos)
+                sal_uInt16 nCount = pMenu->GetItemCount();
+                for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
                 {
                     if ( pMenu->GetItemType( nPos ) == MENUITEM_SEPARATOR )
                         continue;
 
-                    USHORT nItemId = pMenu->GetItemId(nPos);
+                    sal_uInt16 nItemId = pMenu->GetItemId(nPos);
                     aSeq[0] = pMenu->GetItemCommand(nItemId);
                     Sequence< Reference<XGraphic> > aImages = xImageMgr->getImages(nImageType,aSeq);
 
@@ -285,7 +285,7 @@ namespace dbaui
         ToolBox* pToolBox = static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
         ::std::auto_ptr<PopupMenu> pMenu = getMenu();
 
-        USHORT nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
+        sal_uInt16 nSelected = pMenu->Execute(pToolBox, pToolBox->GetItemRect( m_nToolBoxId ),POPUPMENU_EXECUTE_DOWN);
         // "cleanup" the toolbox state
         Point aPoint = pToolBox->GetItemRect( m_nToolBoxId ).TopLeft();
         MouseEvent aLeave( aPoint, 0, MOUSE_LEAVEWINDOW | MOUSE_SYNTHETIC );
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx
index e522c26ed..a3d8a15e9 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@ -148,8 +148,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/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 154534640..dfc0c7378 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -271,7 +271,7 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG )
                 // xNameContainer->removeByName(sName);
             }
             m_aName.SetText(sName);
-            EndDialog( TRUE );
+            EndDialog( sal_True );
         }
     }
     catch( const Exception& )
@@ -358,7 +358,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/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 945454284..30f7e7ade 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -81,7 +81,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/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 632ffa2f6..40a1cda59 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -211,7 +211,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 487015ade..bc3d7ce83 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -86,7 +86,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 );
@@ -104,7 +104,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 d2cc9e57a..73d26dea2 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -385,7 +385,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;
@@ -473,7 +473,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))
@@ -631,7 +631,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;
@@ -726,7 +726,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;
 //		m_aTestConnection.Enable(bEnableTestConnection);
@@ -751,7 +751,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;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 943fd93a3..ab275574e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -58,7 +58,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);
 
@@ -79,7 +79,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;
@@ -103,7 +103,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); }
@@ -146,7 +146,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();
@@ -162,18 +162,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);
@@ -196,7 +196,7 @@ namespace dbaui
         PushButton			m_aPBTestJavaDriver;
 
         String				m_sDefaultJdbcDriverName;
-        USHORT				m_nPortId;
+        sal_uInt16				m_nPortId;
     };
 
 
@@ -212,7 +212,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);
@@ -252,7 +252,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);
@@ -279,7 +279,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);
 
@@ -306,7 +306,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 816d3d5e9..7ffa5f5e0 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -104,7 +104,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;
 
@@ -723,7 +723,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;
@@ -782,7 +782,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) )
         {
@@ -1115,7 +1115,7 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
     ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
     DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
 
-    USHORT nPortNumberId	= 0;
+    sal_uInt16 nPortNumberId	= 0;
     sal_Int32 nPortNumber	= -1;
     String sNewHostName;
     //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 20e5b08ef..9f9e3d08a 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -77,7 +77,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/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index a46966744..6e3190cd2 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -97,7 +97,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())
 
@@ -117,7 +117,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);
 
@@ -155,18 +155,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;
     }
 
@@ -175,18 +175,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;
     }
 }
@@ -205,7 +205,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
 {
     //////////////////////////////////////////////////////////////////////
     // RadioButtons auslesen
-    UINT16 nAttrib = 0;
+    sal_uInt16 nAttrib = 0;
 
     // Delete Rules
     if( aRB_NoCascDel.IsChecked() )
@@ -234,7 +234,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());
@@ -261,7 +261,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/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index a5f029108..d7aac04c8 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -133,7 +133,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/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 1cb606a0c..c94733d11 100755
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -78,7 +78,7 @@ namespace dbaui
     private:
         const String    m_sDisabledText;
               String    m_sUserText;
-              BOOL      m_bLastKnownEnabledState;
+              sal_Bool      m_bLastKnownEnabledState;
     };
 
     //--------------------------------------------------------------------
@@ -150,7 +150,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 ) )
@@ -218,7 +218,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 c7d1b0407..61a8a67cb 100755
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -69,7 +69,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 eff9ed219..b3df8e349 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -214,7 +214,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() ) )
         {
@@ -236,16 +236,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()) )
         {
@@ -304,7 +304,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));
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index d10990acf..7bb422511 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -227,7 +227,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
@@ -239,7 +239,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
@@ -251,12 +251,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.
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 91370a031..e35a78e87 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -175,7 +175,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/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx
index b236eebba..c2b3a9b97 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.hxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.hxx
@@ -36,4 +36,4 @@
 #endif
 
 ::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink);
-#endif
\ No newline at end of file
+#endif
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 79ba2b86d..1e45dbab6 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -376,7 +376,7 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
     m_aQueryList.SetSelectHdl( LINK( this, OAddTableDlg, TableListSelectHdl ) );
 
     //////////////////////////////////////////////////////////////////////
-    m_aTableList.EnableInplaceEditing( FALSE );
+    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 );
@@ -384,7 +384,7 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext )
     m_aTableList.suppressEmptyFolders();
 
     //////////////////////////////////////////////////////////////////////
-    m_aQueryList.EnableInplaceEditing( FALSE );
+    m_aQueryList.EnableInplaceEditing( sal_False );
     m_aQueryList.SetSelectionMode( SINGLE_SELECTION );
 
     //////////////////////////////////////////////////////////////////////
@@ -421,15 +421,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;
@@ -503,7 +503,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/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 8c1c79557..9f522bf7b 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -69,9 +69,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
     };
 
     //========================================================================
@@ -110,17 +110,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 );
             }
         }
 
@@ -292,7 +292,7 @@ namespace dbaui
             }
             else
             {
-                BOOL bValue = *aValue;
+                sal_Bool bValue = *aValue;
                 if ( setting->bInvertedDisplay )
                     bValue = !bValue;
                 (*setting->ppControl)->Check( bValue );
@@ -303,7 +303,7 @@ 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() ) );
         }
 
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
@@ -486,7 +486,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.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 31e1b49c7..77e14d7fe 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -84,7 +84,7 @@ namespace dbaui
         bool                m_bHasBooleanComparisonMode;
 
     public:
-        virtual BOOL        FillItemSet ( SfxItemSet& _rCoreAttrs );
+        virtual sal_Bool        FillItemSet ( SfxItemSet& _rCoreAttrs );
 
         SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta );
 
@@ -122,7 +122,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/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 481ee3981..be804e243 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -108,7 +108,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());
@@ -123,7 +123,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);
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 3f1a3b9fe..7bbcf1a43 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -137,7 +137,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/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 53e3f928d..611576043 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -295,7 +295,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 b3e928e16..420831813 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -101,7 +101,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)
@@ -525,7 +525,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))
@@ -556,9 +556,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);
@@ -673,7 +673,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;
@@ -925,7 +925,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 42eb45122..9279baf46 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -98,9 +98,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
@@ -122,7 +122,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:
@@ -165,7 +165,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:
@@ -184,7 +184,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:
@@ -215,15 +215,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);
@@ -244,7 +244,7 @@ namespace dbaui
         PushButton			m_aTestJavaDriver;
 
         String				m_sDefaultJdbcDriverName;
-        USHORT				m_nPortId;
+        sal_uInt16				m_nPortId;
         bool                m_bUseClass;
     };
 
@@ -267,7 +267,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);
@@ -279,7 +279,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:
@@ -306,7 +306,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 * );
@@ -320,7 +320,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:
@@ -360,7 +360,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 253fdef0c..f92775890 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -188,7 +188,7 @@ DBG_NAME(DirectSQLDialog)
         {
             m_aStatementHistory.pop_front();
             m_aNormalizedHistory.pop_front();
-            m_pSQLHistory->RemoveEntry((USHORT)0);
+            m_pSQLHistory->RemoveEntry((sal_uInt16)0);
         }
     }
 
@@ -316,7 +316,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/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 79d2c2416..43fbbbed1 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -81,7 +81,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))
 {
@@ -121,7 +121,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
         {
             //CHINA001 ((SvxNumberFormatTabPage&)rTabPage).
                 //CHINA001 SetNumberFormatList( *pNumberInfoItem );
-            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 f8ae40b61..7ed6d3ff5 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -224,7 +224,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
@@ -308,7 +308,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);
                     
@@ -328,7 +328,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/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index ea9cc8b85..8f0c27cf8 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -222,7 +222,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))));
@@ -237,11 +237,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 8adf7c355..bda904b9b 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -75,7 +75,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/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 80134a070..36e0cfa28 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -503,7 +503,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    BOOL OGeneralPage::FillItemSet(SfxItemSet& _rCoreAttrs)
+    sal_Bool OGeneralPage::FillItemSet(SfxItemSet& _rCoreAttrs)
     {
         sal_Bool bChangedSomething = sal_False;
 
@@ -528,7 +528,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 0a2ae9c49..4500fb296 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -141,7 +141,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/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index ba025ae76..7eb36b3f5 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -114,7 +114,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/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 34b1d6f32..a2a24b20b 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -121,14 +121,14 @@ namespace
     class ImageProvider : public IImageProvider
     {
     private:
-        USHORT  m_defaultImageID;
-        USHORT  m_highContrastImageID;
+        sal_uInt16  m_defaultImageID;
+        sal_uInt16  m_highContrastImageID;
 
         mutable Image   m_defaultImage;
         mutable Image   m_highContrastImage;
 
     public:
-        ImageProvider( USHORT _defaultImageID, USHORT _highContrastImageID )
+        ImageProvider( sal_uInt16 _defaultImageID, sal_uInt16 _highContrastImageID )
             :m_defaultImageID( _defaultImageID )
             ,m_highContrastImageID( _highContrastImageID )
         {
@@ -155,7 +155,7 @@ namespace
     private:
         String  m_label;
     public:
-        LabelProvider( USHORT _labelResourceID )
+        LabelProvider( sal_uInt16 _labelResourceID )
             :m_label( ModuleRes( _labelResourceID ) )
         {
         }
@@ -185,8 +185,8 @@ namespace
         ::boost::shared_ptr< IImageProvider >   getImageProvider( SQLExceptionInfo::TYPE _eType ) const
         {
             ::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
-            USHORT nNormalImageID( BMP_EXCEPTION_ERROR );
-            USHORT nHCImageID( BMP_EXCEPTION_ERROR_SCH );
+            sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR );
+            sal_uInt16 nHCImageID( BMP_EXCEPTION_ERROR_SCH );
 
             switch ( _eType )
             {
@@ -214,7 +214,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 )
             {
@@ -516,7 +516,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;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index aa31cf532..6f815dc29 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -647,7 +647,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 7b9f33dd8..1a17ef476 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -81,7 +81,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;
 
@@ -118,7 +118,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/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
index de21329c1..1081a7878 100644
--- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx
+++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
@@ -70,7 +70,7 @@ namespace dbaui
         virtual TOTypeInfoSP		getTypeInfo(sal_Int32 _nPos);
         virtual sal_Bool			isAutoIncrementValueEnabled() const;
         virtual ::rtl::OUString		getAutoIncrementValue() const;
-        virtual void				CellModified(long nRow, USHORT nColId );
+        virtual void				CellModified(long nRow, sal_uInt16 nColId );
 
     public:
         OColumnControlWindow(Window* pParent
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 28a3d4a6e..2b4d9adb1 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -72,13 +72,13 @@ namespace dbaui
         virtual OConnectionLine& operator=( const OConnectionLine& rLine );
 
         Rectangle			GetBoundingRect();
-        BOOL				RecalcLine();
+        sal_Bool				RecalcLine();
         void				Draw( OutputDevice* pOutDev );
         bool				CheckHit( const Point& rMousePos ) const;
         String				GetSourceFieldName() const { return m_pData->GetSourceFieldName(); }
         String				GetDestFieldName() const { return m_pData->GetDestFieldName(); }
 
-        BOOL				IsValid() const;
+        sal_Bool				IsValid() const;
 
         Rectangle			GetSourceTextPos() const;
         Rectangle			GetDestTextPos() const;
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index efb73aaca..2df780bf2 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -48,7 +48,7 @@ namespace dbaui
 {
     namespace
     {
-        void lcl_setSpecialReadOnly( BOOL _bReadOnly, Window* _pWin )
+        void lcl_setSpecialReadOnly( sal_Bool _bReadOnly, Window* _pWin )
         {
             StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings();
             const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor();
@@ -64,14 +64,14 @@ namespace dbaui
         short	             m_nPos;
         String	             m_strHelpText;
     public:
-        inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
 
-        inline BOOL IsModified() const { return GetText() != GetSavedValue(); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
 
-        virtual void SetSpecialReadOnly(BOOL _bReadOnly)
+        virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
         {
             SetReadOnly(_bReadOnly);
             lcl_setSpecialReadOnly(_bReadOnly,this);
@@ -79,7 +79,7 @@ namespace dbaui
     };
     inline OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent,
                                                     ::rtl::OUString& _rAllowedChars, 
-                                                    USHORT nHelpId, 
+                                                    sal_uInt16 nHelpId, 
                                                     short nPosition, 
                                                     WinBits nWinStyle)
         :OSQLNameEdit(pParent, _rAllowedChars,nWinStyle)
@@ -95,28 +95,28 @@ namespace dbaui
         String	             m_strHelpText;
 
     public:
-        inline OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
-        inline OPropEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1);
+        inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
 
-        inline BOOL IsModified() const { return GetText() != GetSavedValue(); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
 
-        virtual void SetSpecialReadOnly(BOOL _bReadOnly)
+        virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
         {
             SetReadOnly(_bReadOnly);
             lcl_setSpecialReadOnly(_bReadOnly,this);
         }
     };
 
-    inline OPropEditCtrl::OPropEditCtrl(Window* pParent, USHORT nHelpId, short nPosition, WinBits nWinStyle)
+    inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
         :Edit(pParent, nWinStyle)
         ,m_nPos(nPosition)
     {
         m_strHelpText =String(ModuleRes(nHelpId));
     }
-    inline OPropEditCtrl::OPropEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition)
+    inline OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
         :Edit(pParent, _rRes)
         ,m_nPos(nPosition)
     {
@@ -130,28 +130,28 @@ namespace dbaui
         String	m_strHelpText;
 
     public:
-        inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
-        inline OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1);
+        inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
 
-        inline BOOL IsModified() const { return GetText() != GetSavedValue(); }
+        inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
 
-        virtual void SetSpecialReadOnly(BOOL _bReadOnly)
+        virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
         {
             SetReadOnly(_bReadOnly);
             lcl_setSpecialReadOnly(_bReadOnly,this);
         }
     };
 
-    inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, short nPosition, WinBits nWinStyle)
+    inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
         :NumericField(pParent, nWinStyle)
         ,m_nPos(nPosition)
     {
         m_strHelpText =String(ModuleRes(nHelpId));
     }
-    inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition)
+    inline OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
         :NumericField(pParent, _rRes)
         ,m_nPos(nPosition)
     {
@@ -165,28 +165,28 @@ namespace dbaui
         String	m_strHelpText;
 
     public:
-        inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
-        inline OPropListBoxCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition = -1);
+        inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
+        inline OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
 
-        inline BOOL IsModified() const { return GetSelectEntryPos() != GetSavedValue(); }
+        inline sal_Bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); }
 
         short GetPos() const { return m_nPos; }
         String GetHelp() const { return m_strHelpText; }
 
-        virtual void SetSpecialReadOnly(BOOL _bReadOnly)
+        virtual void SetSpecialReadOnly(sal_Bool _bReadOnly)
         {
             SetReadOnly(_bReadOnly);
             lcl_setSpecialReadOnly(_bReadOnly,this);
         }
     };
 
-    inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, USHORT nHelpId, short nPosition, WinBits nWinStyle)
+    inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle)
         :ListBox(pParent, nWinStyle)
         ,m_nPos(nPosition)
     {
         m_strHelpText =String(ModuleRes(nHelpId));
     }
-    inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, USHORT nHelpId, const ResId& _rRes,short nPosition)
+    inline OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition)
         :ListBox(pParent, _rRes)
         ,m_nPos(nPosition)
     {
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 7a541e768..ab4f4e851 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -124,7 +124,7 @@ namespace dbaui
         ScrollBar*				m_pHorzScroll;
 
         TOTypeInfoSP		    m_pPreviousType;
-        USHORT					nCurChildId;
+        sal_uInt16					nCurChildId;
         short					m_nPos;
         XubString				aYes;
         XubString				aNo;
@@ -133,7 +133,7 @@ namespace dbaui
         long					m_nOldHThumb;
         sal_Int32				m_nWidth;
 
-        ULONG					nDelayedGrabFocusEvent;
+        sal_uLong					nDelayedGrabFocusEvent;
         sal_Bool                m_bAdded;
         bool                    m_bRightAligned;
 
@@ -152,15 +152,15 @@ namespace dbaui
         void				UpdateFormatSample(OFieldDescription* pFieldDescr);
         void				ArrangeAggregates();
 
-        void				SetPosSize( Control** ppControl, long nRow, USHORT nCol );
+        void				SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol );
 
         void				ScrollAggregate(Control* pText, Control* pInput, Control* pButton, long nDeltaX, long nDeltaY);
         void				ScrollAllAggregates();
 
         sal_Bool			isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
         void                Contruct();
-        OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId);
-        FixedText*          CreateText(USHORT _nTextRes);
+        OPropNumericEditCtrl* CreateNumericControl(sal_uInt16 _nHelpStr,short _nProperty,const rtl::OString& _sHelpId);
+        FixedText*          CreateText(sal_uInt16 _nTextRes);
         void                InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler);
 
     protected:
@@ -176,15 +176,15 @@ namespace dbaui
 
         virtual void		ActivateAggregate( EControlType eType );
         virtual void		DeactivateAggregate( EControlType eType );
-        virtual BOOL		IsReadOnly() { return FALSE; };
+        virtual sal_Bool		IsReadOnly() { return sal_False; };
 
         // Sind von den abgeleiteten Klassen zu impl.
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const = 0;
         
         virtual ::com::sun::star::lang::Locale	GetLocale() const = 0;
 
-        virtual void							CellModified(long nRow, USHORT nColId ) = 0;
-        virtual void							SetModified(BOOL bModified);    // base implementation is empty
+        virtual void							CellModified(long nRow, sal_uInt16 nColId ) = 0;
+        virtual void							SetModified(sal_Bool bModified);    // base implementation is empty
                                                 
         virtual TOTypeInfoSP					getTypeInfo(sal_Int32 _nPos)		= 0;
         virtual const OTypeInfoMap*				getTypeInfo() const  = 0;
@@ -208,9 +208,9 @@ namespace dbaui
         void				SaveData( OFieldDescription* pFieldDescr );
         //	void				SaveData( OColumn* pColumn);
 
-        void				SetControlText( USHORT nControlId, const String& rText );
-        String				GetControlText( USHORT nControlId );
-        void				SetReadOnly( BOOL bReadOnly );
+        void				SetControlText( sal_uInt16 nControlId, const String& rText );
+        String				GetControlText( sal_uInt16 nControlId );
+        void				SetReadOnly( sal_Bool bReadOnly );
 
         // Resize aufegrufen
         void				CheckScrollBars();
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index 130505a64..772f8f5ff 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.hxx
@@ -49,7 +49,7 @@ namespace dbaui
 
     public:
         TYPEINFO();
-        OCommentUndoAction(USHORT nCommentID) { m_strComment = String(ModuleRes(nCommentID)); }
+        OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = String(ModuleRes(nCommentID)); }
 
         virtual UniString	GetComment() const { return m_strComment; }
     };															   
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 23ac8c220..d68046690 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -116,7 +116,7 @@ namespace dbaui
         OTableConnection*		m_pSelectedConn;
         
 
-        BOOL					m_bTrackingInitiallyMoved;
+        sal_Bool					m_bTrackingInitiallyMoved;
 
         DECL_LINK(OnDragScrollTimer, void*);
         
@@ -150,7 +150,7 @@ namespace dbaui
 
         void NotifyTitleClicked( OTableWindow* pTabWin, const Point rMousePos );
 
-        virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE);
+        virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False);
         virtual void RemoveTabWin( OTableWindow* pTabWin );
 
         // alle TabWins verstecken (NICHT loeschen, sie werden in eine Undo-Action gepackt)
@@ -178,8 +178,8 @@ namespace dbaui
         */
         void addConnection(OTableConnection* _pConnection,sal_Bool _bAddData = sal_True);
 
-        BOOL			ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars );
-        ULONG			GetTabWinCount();
+        sal_Bool			ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars );
+        sal_uLong			GetTabWinCount();
         Point			GetScrollOffset() const { return m_aScrollOffset; }
 
         OJoinDesignView*			getDesignView() const { return m_pView; }
@@ -197,7 +197,7 @@ namespace dbaui
         const ::std::vector<OTableConnection*>*	getTableConnections() const { return &m_vTableConnection; }
 
         
-        BOOL						ExistsAConn(const OTableWindow* pFromWin) const;
+        sal_Bool						ExistsAConn(const OTableWindow* pFromWin) const;
 
         /** getTableConnections searchs for all connections of a table
             @param	_pFromWin	the table for which connections should be found
@@ -229,7 +229,7 @@ namespace dbaui
         virtual void ClearAll();
 
         // wird vom AddTabDlg benutzt, um festzustellen, ob noch Tabellen hinzugefuegt werden duerfen
-        virtual BOOL IsAddAllowed();
+        virtual sal_Bool IsAddAllowed();
         virtual long PreNotify(NotifyEvent& rNEvt);
 
         // DnD stuff
@@ -263,7 +263,7 @@ namespace dbaui
                 <TRUE/> if the area is visible otherwise <FALSE/>
 
         */
-        BOOL isMovementAllowed(const Point& _rPoint,const Size& _rSize);
+        sal_Bool isMovementAllowed(const Point& _rPoint,const Size& _rSize);
 
         Size getRealOutputSize() const { return m_aOutputSize; }
 
@@ -316,7 +316,7 @@ namespace dbaui
 
     private:
         void	InitColors();
-        BOOL	ScrollWhileDragging();
+        sal_Bool	ScrollWhileDragging();
 
         /** executePopup opens the context menu to delate a connection
             @param	_aPos				the position where the popup menu should appear
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index db354e9f4..b90aa5d97 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -77,14 +77,14 @@ namespace dbaui
 
         // Basisklasse ueberschrieben : Fenster kreieren und loeschen
         // (eigentlich nicht wirklich LOESCHEN, es geht in die Verantwortung einer UNDO-Action ueber)
-        virtual void AddTabWin( const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, BOOL bNewTable = FALSE );
+        virtual void AddTabWin( const ::rtl::OUString& _rTableName, const ::rtl::OUString& _rAliasName, sal_Bool bNewTable = sal_False );
         virtual void RemoveTabWin(OTableWindow* pTabWin);
 
         // und ein AddTabWin, das einen Alias vorgibt
-        void	AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, BOOL bNewTable = FALSE);
+        void	AddTabWin(const ::rtl::OUString& strDatabase, const ::rtl::OUString& strTableName, const ::rtl::OUString& strAlias, sal_Bool bNewTable = sal_False);
         // TabWin suchen
         OQueryTableWindow*	FindTable(const String& rAliasName);
-        BOOL			FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, USHORT& rCnt);
+        sal_Bool			FindTableFromField(const String& rFieldName, OTableFieldDescRef& rInfo, sal_uInt16& rCnt);
 
         // Basisklasse ueberschrieben : Connections kreieren und loeschen
         virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest);
@@ -101,7 +101,7 @@ namespace dbaui
             // natuerlich alle Connections an diesen Fenstern und alle Abfrage-Spalten, die auf diesen Tabellen basierten.
 
         // TabWin anzeigen oder verstecken (NICHT kreieren oder loeschen)
-        BOOL	ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend);
+        sal_Bool	ShowTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction,sal_Bool _bAppend);
         void	HideTabWin(OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction);
 
         // Sichbarkeit eines TabWins sicherstellen (+ Invalidieren der Connections)
@@ -119,15 +119,15 @@ namespace dbaui
         virtual void ClearAll();
 
         // wird vom AddTabDlg benutzt, um festzustellen, ob noch Tabellen hinzugefuegt werden duerfen
-        //virtual BOOL IsAddAllowed();
+        //virtual sal_Bool IsAddAllowed();
 
         // eine neu Connection bekanntgeben und einfuegen lassen, wenn nicht schon existent
-        void NotifyTabConnection(const OQueryTableConnection& rNewConn, BOOL _bCreateUndoAction = TRUE);
+        void NotifyTabConnection(const OQueryTableConnection& rNewConn, sal_Bool _bCreateUndoAction = sal_True);
 
         Link	SetTabWinsChangeHandler(const Link& lnk) { Link lnkRet = m_lnkTabWinsChangeHandler; m_lnkTabWinsChangeHandler = lnk; return lnkRet; }
             // der Handler bekommt einen Zeiger auf eine TabWinsChangeNotification-Struktur
 
-        BOOL ExistsAVisitedConn(const OQueryTableWindow* pFrom) const;
+        sal_Bool ExistsAVisitedConn(const OQueryTableWindow* pFrom) const;
 
         virtual OTableWindowData* CreateImpl(const ::rtl::OUString& _rComposedName
                                             ,const ::rtl::OUString& _sTableName
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 34282557a..a9f05f193 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -42,10 +42,10 @@
 
 namespace dbaui
 {
-    const UINT16 CARDINAL_UNDEFINED	= 0x0000;
-    const UINT16 CARDINAL_ONE_MANY	= 0x0001;
-    const UINT16 CARDINAL_MANY_ONE	= 0x0002;
-    const UINT16 CARDINAL_ONE_ONE	= 0x0004;
+    const sal_uInt16 CARDINAL_UNDEFINED	= 0x0000;
+    const sal_uInt16 CARDINAL_ONE_MANY	= 0x0001;
+    const sal_uInt16 CARDINAL_MANY_ONE	= 0x0002;
+    const sal_uInt16 CARDINAL_ONE_ONE	= 0x0004;
 
     class OConnectionLineData;
     //==================================================================
@@ -61,9 +61,9 @@ namespace dbaui
         sal_Int32 m_nDeleteRules;
         sal_Int32 m_nCardinality;
 
-        BOOL checkPrimaryKey(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const;
-        BOOL IsSourcePrimKey()	const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM);	}
-        BOOL IsDestPrimKey()	const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO);		}
+        sal_Bool checkPrimaryKey(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const;
+        sal_Bool IsSourcePrimKey()	const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM);	}
+        sal_Bool IsDestPrimKey()	const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO);		}
 
     protected:
         virtual OConnectionLineDataRef CreateLineDataObj();
@@ -85,7 +85,7 @@ namespace dbaui
 
             @return true if successful
         */
-        virtual BOOL Update();
+        virtual sal_Bool Update();
         
 
         void		SetCardinality();
@@ -96,9 +96,9 @@ namespace dbaui
         inline sal_Int32	GetDeleteRules() const { return m_nDeleteRules; }
         inline sal_Int32	GetCardinality() const { return m_nCardinality; }
 
-        BOOL		IsConnectionPossible();
+        sal_Bool		IsConnectionPossible();
         void		ChangeOrientation();
-        BOOL		DropRelation();
+        sal_Bool		DropRelation();
     };
 }
 
diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx
index c14a6b64c..23693ccb5 100644
--- a/dbaccess/source/ui/inc/RelationControl.hxx
+++ b/dbaccess/source/ui/inc/RelationControl.hxx
@@ -79,7 +79,7 @@ namespace dbaui
 
         /** enables the relation control
         *
-        * \param _bEnable when TRUE enables it, otherwise disable it.
+        * \param _bEnable when sal_True enables it, otherwise disable it.
         */
         void enableRelation(bool _bEnable);
 
@@ -95,7 +95,7 @@ namespace dbaui
         void lateUIInit(Window* _pTableSeparator = NULL);
         void lateInit();
 
-        BOOL SaveModified();
+        sal_Bool SaveModified();
 
         TTableWindowData::value_type getReferencingTable()	const;
 
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index 34817abbc..ae0a4d128 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -47,7 +47,7 @@ namespace dbaui
     {
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >	m_xTables;
         ::std::auto_ptr<WaitObject> m_pWaitObject;
-        ULONG		m_nThreadEvent;
+        sal_uLong		m_nThreadEvent;
         sal_Bool	m_bRelationsPossible;
     protected:
         // all the features which should be handled by this class
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index dbed46e21..d83933dd3 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -87,12 +87,12 @@ namespace dbaui
         TTableConnectionData::value_type 										m_pOrigConnData;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
 
-        BOOL																	m_bTriedOneUpdate;
+        sal_Bool																	m_bTriedOneUpdate;
 
     public:
         ORelationDialog(OJoinTableView* pParent,
                         const TTableConnectionData::value_type& pConnectionData,
-                        BOOL bAllowTableSelect = FALSE );
+                        sal_Bool bAllowTableSelect = sal_False );
         virtual ~ORelationDialog();
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection(){ return m_xConnection; }
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index bcbabcbf1..3faee1f37 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.hxx
@@ -46,7 +46,7 @@ namespace dbaui
         bool                             m_bInRemove;
     
         virtual void ConnDoubleClicked( OTableConnection* pConnection );
-        virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE);
+        virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool bNewTable = sal_False);
 
         virtual OTableWindow* createWindow(const TTableWindowData::value_type& _pData);
 
@@ -72,7 +72,7 @@ namespace dbaui
         void AddNewRelation();
             // reisst den Dialog fuer eine voellig neue Relation hoch
         // wird vom AddTabDlg benutzt, um festzustellen, ob noch Tabellen hinzugefuegt werden duerfen
-        virtual BOOL IsAddAllowed();
+        virtual sal_Bool IsAddAllowed();
 
         virtual void lookForUiActivities();
     };
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 8c3aac9da..2819d44b0 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -66,7 +66,7 @@ namespace dbaui
                                         m_pData;
         OJoinTableView*					m_pParent;
 
-        BOOL							m_bSelected;
+        sal_Bool							m_bSelected;
 
         void Init();
         /** clearLineData loops through the vector and deletes all lines
@@ -90,8 +90,8 @@ namespace dbaui
 
         void		Select();
         void		Deselect();
-        BOOL		IsSelected() const { return m_bSelected; }
-        BOOL		CheckHit( const Point& rMousePos ) const;
+        sal_Bool		IsSelected() const { return m_bSelected; }
+        sal_Bool		CheckHit( const Point& rMousePos ) const;
         bool		InvalidateConnection();
         void		UpdateLineList();
 
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index b4e1f50c4..67d4f49a2 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -84,14 +84,14 @@ namespace dbaui
         virtual OTableConnectionData* NewInstance() const;
             // (von OTableConnectionData abgeleitete Klasse muessen entsprechend eine Instanz ihrer Klasse liefern)
 
-        BOOL SetConnLine( USHORT nIndex, const String& rSourceFieldName, const String& rDestFieldName );
-        BOOL AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName );
-        void ResetConnLines( BOOL bUseDefaults = TRUE );
+        sal_Bool SetConnLine( sal_uInt16 nIndex, const String& rSourceFieldName, const String& rDestFieldName );
+        sal_Bool AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName );
+        void ResetConnLines( sal_Bool bUseDefaults = sal_True );
 
         /** normalizeLines moves the empty lines to the back
         */
         void normalizeLines();
-            // loescht die Liste der ConnLines, bei bUseDefaults == TRUE werden danach MAX_CONN_COUNT neue Dummy-Linien eingefuegt
+            // loescht die Liste der ConnLines, bei bUseDefaults == sal_True werden danach MAX_CONN_COUNT neue Dummy-Linien eingefuegt
 
         OConnectionLineDataVec* GetConnLineDataList(){ return &m_vConnLineData; }
 
@@ -108,7 +108,7 @@ namespace dbaui
 
             @return true if successful
         */
-        virtual BOOL Update(){ return TRUE; }
+        virtual sal_Bool Update(){ return sal_True; }
     };
 
     typedef ::std::vector< ::boost::shared_ptr<OTableConnectionData> >  TTableConnectionData;
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index e14ee4772..dd15a3d4b 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.hxx
@@ -56,25 +56,25 @@ namespace dbaui
         long	m_nDataPos;				// derzeit benoetigte Zeile
         long	m_nCurrentPos;			// Aktuelle Position der ausgewaehlten Column
     private:
-        USHORT	m_nCurUndoActId;
+        sal_uInt16	m_nCurUndoActId;
     protected:
-        BOOL	m_bCurrentModified;
-        BOOL	m_bUpdatable;
-        BOOL	m_bClipboardFilled;
+        sal_Bool	m_bCurrentModified;
+        sal_Bool	m_bUpdatable;
+        sal_Bool	m_bClipboardFilled;
 
     public:
         OTableRowView(Window* pParent);
         virtual ~OTableRowView();
 
-        virtual void				SetCellData( long nRow, USHORT nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
-        virtual void				SetCellData( long nRow, USHORT nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0;
-        virtual ::com::sun::star::uno::Any			GetCellData( long nRow, USHORT nColId ) = 0;
-        virtual void				SetControlText( long nRow, USHORT nColId, const String& rText ) = 0;
-        virtual String				GetControlText( long nRow, USHORT nColId ) = 0;
+        virtual void				SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0;
+        virtual void				SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) = 0;
+        virtual ::com::sun::star::uno::Any			GetCellData( long nRow, sal_uInt16 nColId ) = 0;
+        virtual void				SetControlText( long nRow, sal_uInt16 nColId, const String& rText ) = 0;
+        virtual String				GetControlText( long nRow, sal_uInt16 nColId ) = 0;
 
         virtual OTableDesignView* GetView() const = 0;
 
-        USHORT	GetCurUndoActId(){ return m_nCurUndoActId; }
+        sal_uInt16	GetCurUndoActId(){ return m_nCurUndoActId; }
 
         // IClipboardTest
         virtual void cut();
@@ -93,8 +93,8 @@ namespace dbaui
         virtual sal_Bool IsInsertNewAllowed( long nRow )	= 0;
         virtual sal_Bool IsDeleteAllowed( long nRow )		= 0;
 
-        virtual BOOL IsUpdatable() const {return m_bUpdatable;}
-        virtual void SetUpdatable( BOOL bUpdate=TRUE );
+        virtual sal_Bool IsUpdatable() const {return m_bUpdatable;}
+        virtual void SetUpdatable( sal_Bool bUpdate=sal_True );
 
         virtual RowStatus GetRowStatus(long nRow) const;
         virtual void KeyInput(const KeyEvent& rEvt);
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 013303d8d..ae0641030 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -52,7 +52,7 @@ namespace dbaui
     private:
         String			m_sHelpText;
         MultiLineEdit*	m_pTextWin;
-        USHORT			m_nDummy;
+        sal_uInt16			m_nDummy;
 
     protected:
         virtual void Resize();
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 80bf6dc48..5f1b61dab 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -55,7 +55,7 @@ namespace dbaui
         OTableFieldDescWin*					m_pFieldDescWin;
         OTableEditorCtrl*					m_pEditorCtrl;
 
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
         void ArrangeChilds( long nSplitPos ,Rectangle& rRect);
         DECL_LINK( SplitHdl, Splitter* );
     protected:
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 8591c7043..27313e4e4 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -73,8 +73,8 @@ class OTableGrantControl : public ::svt::EditBrowseBox
     ::svt::CheckBoxControl*		m_pCheckCell;
     Edit*						m_pEdit;
     long						m_nDataPos;
-    BOOL						m_bEnable;
-    ULONG		                m_nDeactivateEvent;
+    sal_Bool						m_bEnable;
+    sal_uLong		                m_nDeactivateEvent;
 
 public:
     OTableGrantControl( Window* pParent,const ResId& _RsId);
@@ -102,13 +102,13 @@ protected:
 
     virtual long PreNotify(NotifyEvent& rNEvt );
 
-    virtual BOOL IsTabAllowed(BOOL bForward) const;
-    virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
-    virtual ::svt::CellController* GetController( long nRow, USHORT nCol );
-    virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
-    virtual BOOL SeekRow( long nRow );
-    virtual BOOL SaveModified();
-    virtual String GetCellText( long nRow, USHORT nColId ) const;
+    virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
+    virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
+    virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol );
+    virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
+    virtual sal_Bool SeekRow( long nRow );
+    virtual sal_Bool SaveModified();
+    virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
 
     virtual void CellModified();
 
@@ -116,7 +116,7 @@ private:
     DECL_LINK( AsynchActivate, void* );
     DECL_LINK( AsynchDeactivate, void* );
 
-    sal_Bool	isAllowed(USHORT _nColumnId,sal_Int32 _nPrivilege) const;
+    sal_Bool	isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege) const;
     void		fillPrivilege(sal_Int32 _nRow) const;
     TTablePrivilegeMap::const_iterator findPrivilege(sal_Int32 _nRow) const;
 };
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index c77995573..2b2a8b499 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -71,8 +71,8 @@ namespace dbaui
 
         void SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce = sal_False );
 
-        void SetPrimaryKey( BOOL bSet );
-        BOOL IsPrimaryKey() const;
+        void SetPrimaryKey( sal_Bool bSet );
+        sal_Bool IsPrimaryKey() const;
 
         /** returns the current position in the table.
             @return 
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index c6238b0a9..5628d1fe9 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -44,11 +44,11 @@ namespace dbaui
 {
     //////////////////////////////////////////////////////////////////////////
     // Flags fuer die Groessenanpassung der SbaJoinTabWins
-    const UINT16 SIZING_NONE	= 0x0000;
-    const UINT16 SIZING_TOP		= 0x0001;
-    const UINT16 SIZING_BOTTOM	= 0x0002;
-    const UINT16 SIZING_LEFT	= 0x0004;
-    const UINT16 SIZING_RIGHT	= 0x0008;
+    const sal_uInt16 SIZING_NONE	= 0x0000;
+    const sal_uInt16 SIZING_TOP		= 0x0001;
+    const sal_uInt16 SIZING_BOTTOM	= 0x0002;
+    const sal_uInt16 SIZING_LEFT	= 0x0004;
+    const sal_uInt16 SIZING_RIGHT	= 0x0008;
 
     class OTableWindowListBox;
     class OJoinDesignView;
@@ -75,8 +75,8 @@ namespace dbaui
                                 m_pContainerListener;
         sal_Int32				m_nMoveCount;			// how often the arrow keys was pressed
         sal_Int32				m_nMoveIncrement;		// how many pixel we should move
-        UINT16					m_nSizingFlags;
-        BOOL					m_bActive;
+        sal_uInt16					m_nSizingFlags;
+        sal_Bool					m_bActive;
 
         void Draw3DBorder( const Rectangle& rRect );
         // OContainerListener
@@ -93,7 +93,7 @@ namespace dbaui
 
         virtual OTableWindowListBox*	CreateListBox();
             // wird im ERSTEN Init aufgerufen
-        BOOL FillListBox();
+        sal_Bool FillListBox();
             // wird in JEDEM Init aufgerufen
 
         virtual void OnEntryDoubleClicked(SvLBoxEntry* /*pEntry*/) { }
@@ -105,7 +105,7 @@ namespace dbaui
             @return
                 <TRUE/> when the table could handle the keyevent.
         */
-        BOOL			HandleKeyInput( const KeyEvent& rEvt );
+        sal_Bool			HandleKeyInput( const KeyEvent& rEvt );
 
         /** delete the user data with the equal type as created within createUserData
             @param	_pUserData
@@ -136,7 +136,7 @@ namespace dbaui
         virtual ~OTableWindow();
 
         // spaeter Constructor, siehe auch CreateListbox und FillListbox
-        virtual BOOL Init();
+        virtual sal_Bool Init();
 
         OJoinTableView*				getTableView();
         const OJoinTableView*		getTableView() const;
@@ -146,11 +146,11 @@ namespace dbaui
         void						SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
 
         String						getTitle() const;
-        void						SetBoldTitle( BOOL bBold );
+        void						SetBoldTitle( sal_Bool bBold );
         void						setActive(sal_Bool _bActive = sal_True);
 
         void						Remove();
-        BOOL						IsActiveWindow(){ return m_bActive; }
+        sal_Bool						IsActiveWindow(){ return m_bActive; }
 
         ::rtl::OUString				GetTableName() const { return m_pData->GetTableName(); }
         ::rtl::OUString				GetWinName() const { return m_pData->GetWinName(); }
@@ -168,7 +168,7 @@ namespace dbaui
         inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetOriginalColumns() const { return m_pData->getColumns(); }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >    GetTable() const { return m_pData->getTable(); }
 
-        UINT16						GetSizingFlags() const { return m_nSizingFlags; }
+        sal_uInt16						GetSizingFlags() const { return m_nSizingFlags; }
         /** set the sizing flag to the direction
             @param	_rPos
                 The EndPosition after resizing.
@@ -192,7 +192,7 @@ namespace dbaui
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
         // habe ich Connections nach aussen ?
-        BOOL ExistsAConn() const;
+        sal_Bool ExistsAConn() const;
 
         void EnumValidFields(::std::vector< ::rtl::OUString>& arrstrFields);
 
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index 5299a6cee..a1eb7fb63 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.hxx
@@ -81,16 +81,16 @@ namespace dbaui
         inline ::rtl::OUString GetWinName()		    const { return m_aWinName; }
         inline Point GetPosition()					const { return m_aPosition; }
         inline Size GetSize()						const { return m_aSize; }
-        inline BOOL IsShowAll()					    const { return m_bShowAll; }
+        inline sal_Bool IsShowAll()					    const { return m_bShowAll; }
         inline bool isQuery()                       const { return m_bIsQuery; }
         inline bool isValid()                       const { return m_bIsValid; } // it is either a table or query but it is known
-        BOOL HasPosition()	const;
-        BOOL HasSize()		const;
+        sal_Bool HasPosition()	const;
+        sal_Bool HasSize()		const;
 
         inline void SetWinName( const ::rtl::OUString& rWinName )		{ m_aWinName = rWinName; }
         inline void SetPosition( const Point& rPos )					{ m_aPosition=rPos; }
         inline void SetSize( const Size& rSize )						{ m_aSize = rSize; }
-        inline void ShowAll( BOOL bAll )								{ m_bShowAll = bAll; }        
+        inline void ShowAll( sal_Bool bAll )								{ m_bShowAll = bAll; }        
 
         inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getTable() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xTable; }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> getKeys() const { ::osl::MutexGuard aGuard( m_aMutex  ); return m_xKeys; }   
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 187d32406..d0d50fd25 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -65,12 +65,12 @@ namespace dbaui
         Point						m_aMousePos;
 
         OTableWindow*				m_pTabWin;
-        ULONG						m_nDropEvent;
-        ULONG						m_nUiEvent;
+        sal_uLong						m_nDropEvent;
+        sal_uLong						m_nUiEvent;
         OJoinDropData				m_aDropInfo;
 
-        BOOL						m_bReallyScrolled : 1;
-        BOOL						m_bDragSource : 1;
+        sal_Bool						m_bReallyScrolled : 1;
+        sal_Bool						m_bDragSource : 1;
 
     protected:
         virtual void LoseFocus();
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 5715cfd6d..5896fa376 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -125,8 +125,8 @@ namespace dbaui
         void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; }
         //dyf add end
 
-        virtual BOOL Write(); // Export
-        virtual BOOL Read(); // Import
+        virtual sal_Bool Write(); // Export
+        virtual sal_Bool Read(); // Import
 
         void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor);
         void dispose();
@@ -162,8 +162,8 @@ namespace dbaui
                         : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) 
         {}
 
-        virtual BOOL Write();
-        virtual BOOL Read();
+        virtual sal_Bool Write();
+        virtual sal_Bool Read();
     };
     // =========================================================================
     // HTML Im- und Export
@@ -181,7 +181,7 @@ namespace dbaui
         char					sIndent[nIndentMax+1];
         sal_Int16				m_nIndent;
     #ifdef DBG_UTIL
-        BOOL					m_bCheckFont;
+        sal_Bool					m_bCheckFont;
     #endif
 
         void WriteHeader();
@@ -206,8 +206,8 @@ namespace dbaui
                         : ODatabaseImportExport(_rxConnection,_rxNumberF,_rM) 
         {}
 
-        virtual BOOL Write();
-        virtual BOOL Read();
+        virtual sal_Bool Write();
+        virtual sal_Bool Read();
 
     };
     // =========================================================================
@@ -243,8 +243,8 @@ namespace dbaui
                         : ODatabaseImportExport(_rxConnection,NULL,_rM) 
         {}
         
-        virtual BOOL Write();
-        virtual BOOL Read();
+        virtual sal_Bool Write();
+        virtual sal_Bool Read();
 
     private:
         using ODatabaseImportExport::initialize;
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index bb30b8679..1faca3f3b 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -311,7 +311,7 @@ namespace dbaui
         @param	_xDatasource
             Asked for the properties.
         @param	_rAutoIncrementValueEnabled
-            <OUT/> Set to TRUE when the property was set in the datasource.
+            <OUT/> Set to sal_True when the property was set in the datasource.
         @param	_rsAutoIncrementValue
             <OUT/> Set to the value when the property was set in the datasource.
     */
@@ -323,7 +323,7 @@ namespace dbaui
         @param	_xConnection
             Used to get the datasource as parent from the connection.
         @param	_rAutoIncrementValueEnabled
-            <OUT/> Set to TRUE when the property was set in the datasource.
+            <OUT/> Set to sal_True when the property was set in the datasource.
         @param	_rsAutoIncrementValue
             <OUT/> Set to the value when the property was set in the datasource.
     */
@@ -382,7 +382,7 @@ namespace dbaui
         @return
             RET_YES, RET_NO, RET_ALL
     */
-    sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName);
+    sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName);
 
     /** creates a new view from a query or table
         @param	_sName
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index f11306f02..6a6cf798e 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -68,7 +68,7 @@ namespace dbaui
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>			m_xConnection;
         sal_Bool	m_bOwnConnection;
     protected:
-        virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage);
+        virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
     public:
         OUserAdminDlg( Window* _pParent
                             ,SfxItemSet* _pItems
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index da8b1a26d..e932bf367 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -41,7 +41,7 @@ namespace dbaui
         Window*								m_pRight;
         sal_Bool							m_bVertical;
 
-        void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
+        void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
         DECL_LINK( SplitHdl, Splitter* );
     protected:
         virtual void DataChanged(const DataChangedEvent& rDCEvt);
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index d19620437..5d79f752b 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -72,8 +72,8 @@ namespace dbaui
         OWizColumnSelect*						m_pPage2;
         OWizNormalExtend*						m_pPage3;
 
-        BOOL									m_bPKeyAllowed;
-        BOOL                                    m_bUseHeaderAllowed;
+        sal_Bool									m_bPKeyAllowed;
+        sal_Bool                                    m_bUseHeaderAllowed;
 
 
         DECL_LINK( AppendDataClickHdl, Button* );
@@ -88,17 +88,17 @@ namespace dbaui
     public:
         virtual	void			Reset();
         virtual void			ActivatePage();
-        virtual BOOL			LeavePage();
+        virtual sal_Bool			LeavePage();
         virtual String			GetTitle() const ;
 
         OCopyTable( Window * pParent );
         virtual ~OCopyTable();
 
-        inline BOOL IsOptionDefData()		const { return m_aRB_DefData.IsChecked(); }
-        inline BOOL IsOptionDef()			const { return m_aRB_Def.IsChecked(); }
-        inline BOOL IsOptionAppendData()	const { return m_aRB_AppendData.IsChecked(); }
-        inline BOOL IsOptionView()			const { return m_aRB_View.IsChecked(); }
-        inline BOOL UseHeaderLine()			const { return m_aCB_UseHeaderLine.IsChecked(); }
+        inline sal_Bool IsOptionDefData()		const { return m_aRB_DefData.IsChecked(); }
+        inline sal_Bool IsOptionDef()			const { return m_aRB_Def.IsChecked(); }
+        inline sal_Bool IsOptionAppendData()	const { return m_aRB_AppendData.IsChecked(); }
+        inline sal_Bool IsOptionView()			const { return m_aRB_View.IsChecked(); }
+        inline sal_Bool UseHeaderLine()			const { return m_aCB_UseHeaderLine.IsChecked(); }
         String      GetKeyName()            const { return m_edKeyName.GetText(); }
 
         void setCreateStyleAction();
@@ -108,7 +108,7 @@ namespace dbaui
         }
         inline void disallowUseHeaderLine()
         {
-            m_bUseHeaderAllowed = FALSE;
+            m_bUseHeaderAllowed = sal_False;
             m_aCB_UseHeaderLine.Disable();
         }
 
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 31e957642..872355442 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -88,7 +88,7 @@ namespace dbaui
         void enableButtons();
 
         
-        USHORT adjustColumnPosition(ListBox* _pLeft,
+        sal_uInt16 adjustColumnPosition(ListBox* _pLeft,
                                     const ::rtl::OUString&	_sColumnName,
                                     ODatabaseExport::TColumnVector::size_type nCurrentPos,
                                     const ::comphelper::TStringMixEqualFunctor& _aCase);
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 18138a6ca..fcb3a15aa 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -124,7 +124,7 @@ namespace dbaui
             IAddTableDialogContext& _rContext );
 
     private:
-        virtual BOOL Close();
+        virtual sal_Bool Close();
 
         bool impl_isAddAllowed();
         void impl_addTable();
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 3b2c18e99..f1196b0fe 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -58,7 +58,7 @@ namespace dbaui
         SfxItemSet*                                         m_pItemSet;
 
     protected:
-        virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage);
+        virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
 
     public:
         AdvancedSettingsDialog( Window* _pParent
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 1a1193592..233d465de 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -122,7 +122,7 @@ namespace dbaui
         // members for asynchronous load operations
         FormControllerImpl*		m_pFormControllerImpl;	// implementing the XFormController
 
-        ULONG					m_nPendingLoadFinished;			// the event used to tell ourself that the load is finished
+        sal_uLong					m_nPendingLoadFinished;			// the event used to tell ourself that the load is finished
         sal_uInt16				m_nFormActionNestingLevel;		// see enter-/leaveFormAction
 
         sal_Bool				m_bLoadCanceled : 1;			// the load was canceled somehow
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index d7fd7289c..8a9b5d695 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -52,7 +52,7 @@ namespace dbaui
         ~CharSetListBox();
 
         void    SelectEntryByIanaName( const String& _rIanaName );
-        bool    StoreSelectedCharSet( SfxItemSet& _rSet, const USHORT _nItemId );
+        bool    StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId );
 
     private:
         OCharsetDisplay		m_aCharSets;
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 1cf52da8c..3b8a366d4 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -57,10 +57,10 @@ class OConnectionURLEdit : public Edit
                         m_pTypeCollection;
     FixedText*			m_pForcedPrefix;
     String				m_sSaveValueNoPrefix;
-    BOOL				m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not
+    sal_Bool				m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not
 
 public:
-    OConnectionURLEdit(Window* pParent, const ResId& rResId,BOOL _bShowPrefix = FALSE);
+    OConnectionURLEdit(Window* pParent, const ResId& rResId,sal_Bool _bShowPrefix = sal_False);
     ~OConnectionURLEdit();
 
 public:
@@ -74,7 +74,7 @@ public:
         @param	_bShowPrefix
             If <TRUE/> than the prefix will be visible, otherwise not.
     */
-    void ShowPrefix(BOOL _bShowPrefix);
+    void ShowPrefix(sal_Bool _bShowPrefix);
     /// get the currently set text, excluding the prefix indicating the type
     virtual String	GetTextNoPrefix() const;
     /// set a new text, leave the current prefix unchanged
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 58443f8a8..9db4c063f 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -68,7 +68,7 @@ private:
 
     sal_Bool				m_bApplied : 1;		/// sal_True if any changes have been applied while the dialog was executing
     sal_Bool				m_bUIEnabled : 1;	/// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/>
-    USHORT                  m_nMainPageID;
+    sal_uInt16                  m_nMainPageID;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
@@ -110,9 +110,9 @@ public:
 
 protected:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(USHORT _nPageId,USHORT _nTextId,CreateTabPage pCreateFunc);
+    void addDetailPage(sal_uInt16 _nPageId,sal_uInt16 _nTextId,CreateTabPage pCreateFunc);
 
-    virtual void PageCreated(USHORT _nId, SfxTabPage& _rPage);
+    virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage);
     virtual short Ok();
 
 protected:
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 858864fdb..87957c6cf 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -131,13 +131,13 @@ namespace dbaui
         virtual void	InitEntry( SvLBoxEntry* pEntry, const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind);
 
         // enable editing for tables/views and queries
-        virtual BOOL	EditingEntry( SvLBoxEntry* pEntry, Selection& );
-        virtual BOOL	EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
+        virtual sal_Bool	EditingEntry( SvLBoxEntry* pEntry, Selection& );
+        virtual sal_Bool	EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText );
 
-        virtual BOOL 	DoubleClickHdl();
+        virtual sal_Bool 	DoubleClickHdl();
 
         virtual PopupMenu* CreateContextMenu( void );
-        virtual void	ExcecuteContextMenuAction( USHORT nSelectedPopupEntry );
+        virtual void	ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry );
 
         void			SetEnterKeyHdl(const Link& rNewHdl) {m_aEnterKeyHdl = rNewHdl;}
 
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index f1ef24c28..b1e7fa08e 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -55,10 +55,10 @@ namespace dbaui
         SvxNumberInfoItem* pNumberInfoItem;
 
     public:
-        SbaSbAttrDlg( Window * pParent, const SfxItemSet*, SvNumberFormatter*, USHORT nFlags = TP_ATTR_CHAR , BOOL bRow = FALSE);
+        SbaSbAttrDlg( Window * pParent, const SfxItemSet*, SvNumberFormatter*, sal_uInt16 nFlags = TP_ATTR_CHAR , sal_Bool bRow = sal_False);
         ~SbaSbAttrDlg();
 
-        virtual void  PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+        virtual void  PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
     };
 //.........................................................................
 }	// namespace dbaui
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 099476a6d..84eb8e53f 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.hxx
@@ -65,7 +65,7 @@ namespace dbaui
         HelpButton		aPB_HELP;
 
     public:
-        DlgSize( Window * pParent, sal_Int32 nVal, BOOL bRow, sal_Int32 _nAlternativeStandard = -1 );
+        DlgSize( Window * pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAlternativeStandard = -1 );
         ~DlgSize();
 
         sal_Int32 GetValue();
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index f1a14b04a..42e39b34f 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -146,7 +146,7 @@ namespace dbaui
                 the resource ID image to be used for the object type. Must be fed into a
                 ModuleRes instance to actually load the image.
         */
-        USHORT getDefaultImageResourceID(
+        sal_uInt16 getDefaultImageResourceID(
             sal_Int32 _nDatabaseObjectType,
             bool _bHighContrast
         );
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index b076b3c4f..ca8a330e8 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -53,7 +53,7 @@ namespace dbaui
         {
         }
 
-        virtual USHORT IsA();
+        virtual sal_uInt16 IsA();
 
         virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
         virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData);
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 5b646d002..815fc5c30 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -96,7 +96,7 @@ public:
 class ModuleRes : public ::ResId
 {
 public:
-    ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+    ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
 };
 
 //.........................................................................
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 4444ea509..06fa78ed1 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -71,7 +71,7 @@ namespace dbaui
     {
     private:
         typedef ::std::pair< String, String >       StringPair;
-        typedef ::std::map< USHORT, StringPair >    MapIndexToStringPair;
+        typedef ::std::map< sal_uInt16, StringPair >    MapIndexToStringPair;
 
         ::rtl::OUString         m_sModule;
         MapIndexToStringPair    m_aURLs;
@@ -85,7 +85,7 @@ namespace dbaui
     protected:
         virtual void        RequestHelp( const HelpEvent& _rHEvt );
 
-        StringPair  impl_getDocumentAtIndex( USHORT _nListIndex, bool _bSystemNotation = false ) const;
+        StringPair  impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation = false ) const;
 
     private:
         void    impl_init( const sal_Char* _pAsciiModuleName );
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index 58001bf46..0eac7090b 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -62,7 +62,7 @@ namespace dbaui
     //====================================================================
     //= SetItemPropertyStorage
     //====================================================================
-    typedef USHORT  ItemId;
+    typedef sal_uInt16  ItemId;
 
     /** a PropertyStorage implementation which stores the value in an item set
     */
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index ee7f8cb6b..ec15058c8 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -99,7 +99,7 @@ namespace dbaui
         sal_Int32		m_nVisibleRows;		// which rows the selection browse should show
         sal_Int32		m_nSplitPos;		// the position of the splitter
         sal_Int32       m_nCommandType;     // the type of the object we're designing
-        sal_Bool		m_bGraphicalDesign; // are we in the graphical design mode (TRUE) or in the text design (FALSE)?
+        sal_Bool		m_bGraphicalDesign; // are we in the graphical design mode (sal_True) or in the text design (sal_False)?
         sal_Bool		m_bDistinct;		// true when you want "select distinct" otherwise false
         sal_Bool		m_bViewAlias;		// show the alias row in the design view
         sal_Bool		m_bViewTable;		// show the table row in the design view
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index 26a69cd1b..d4c3b6eda 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -130,10 +130,10 @@ namespace dbaui
         DECL_LINK( ListSelectHdl, ListBox * );
         DECL_LINK( ListSelectCompHdl, ListBox * );
 
-        void			SetLine( USHORT nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr );
+        void			SetLine( sal_uInt16 nIdx,const ::com::sun::star::beans::PropertyValue& _rItem,sal_Bool _bOr );
         void			EnableLines();
         sal_Int32		GetOSQLPredicateType( const String& _rSelectedPredicate ) const;
-        USHORT			GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const;
+        sal_uInt16			GetSelectionPos(sal_Int32 eType,const ListBox& rListBox) const;
         sal_Bool 		getCondition(const ListBox& _rField,const ListBox& _rComp,const Edit& _rValue,::com::sun::star::beans::PropertyValue& _rFilter) const;
         void			fillLines(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& _aValues);
 
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index d7ce4a671..93a21750a 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -259,7 +259,7 @@ namespace dbaui
 
         sal_Int32			            m_nAsyncDropEvent;
 
-        USHORT                          m_nCurrentActionColId;
+        sal_uInt16                          m_nCurrentActionColId;
             // ui actions (e.g. a context menu) may be performed on columns which aren't the current one
             // and aren't selected, so we have to track this column id
 
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 6515a0d99..8d135a2d5 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -43,8 +43,8 @@ namespace dbaui
         Link					m_lnkTextModifyHdl;
         String					m_strOrigText;		// wird beim Undo wiederhergestellt
         OQueryTextView*			m_pView;
-        BOOL					m_bAccelAction;		// Wird bei Cut, Copy, Paste gesetzt
-        BOOL					m_bStopTimer;
+        sal_Bool					m_bAccelAction;		// Wird bei Cut, Copy, Paste gesetzt
+        sal_Bool					m_bStopTimer;
         utl::SourceViewConfig   m_SourceViewConfig;
         svtools::ColorConfig	m_ColorConfig;
 
@@ -69,7 +69,7 @@ namespace dbaui
         using MultiLineEditSyntaxHighlight::SetText;
 
         // own functionality
-        BOOL IsInAccelAct();
+        sal_Bool IsInAccelAct();
 
         void SetTextModifyHdl(const Link& lnk) { m_lnkTextModifyHdl = lnk; }
             // bitte nicht SetModifyHdl benutzen, den brauche ich selber, der hier wird von dem damit gesetzten Handler
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index e87f1caf1..7c03c5c45 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -163,12 +163,12 @@ namespace dbaui
         Splitter*				m_pSplitter;
         SvLBoxTreeList*         m_pTreeModel;			// contains the datasources of the registry
         SvLBoxEntry*			m_pCurrentlyDisplayed;
-        ULONG					m_nAsyncDrop;
+        sal_uLong					m_nAsyncDrop;
 
-        sal_Int16				m_nBorder;				// TRUE when border should be shown
+        sal_Int16				m_nBorder;				// sal_True when border should be shown
 
         sal_Bool				m_bQueryEscapeProcessing : 1;	// the escape processing flag of the query currently loaded (if any)
-        sal_Bool				m_bShowMenu;			// if TRUE the menu should be visible otherwise not
+        sal_Bool				m_bShowMenu;			// if sal_True the menu should be visible otherwise not
         sal_Bool				m_bInSuspend;
         sal_Bool				m_bEnableBrowser;
         ::boost::optional< bool >
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index d1266e43c..ab9d6d845 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -114,10 +114,10 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
     ,m_nRows(1)
     ,m_nRowCount(0)
     ,m_nDefToken( gsl_getSystemTextEncoding() )
-    ,m_bError(FALSE)
-    ,m_bInTbl(FALSE)
-    ,m_bHead(TRUE)
-    ,m_bDontAskAgain(FALSE)
+    ,m_bError(sal_False)
+    ,m_bInTbl(sal_False)
+    ,m_bHead(sal_True)
+    ,m_bDontAskAgain(sal_False)
     ,m_bIsAutoIncrement(_bAutoIncrementEnabled)
     ,m_bFoundTable(sal_False)
     ,m_bCheckOnly(sal_False)
@@ -173,7 +173,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
     ,m_nDefToken( gsl_getSystemTextEncoding() )
     ,m_bError(sal_False)
     ,m_bInTbl(sal_False)
-    ,m_bHead(TRUE)
+    ,m_bHead(sal_True)
     ,m_bDontAskAgain(sal_False)
     ,m_bIsAutoIncrement(sal_False)
     ,m_bFoundTable(sal_False)
@@ -786,9 +786,9 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
         OSQLWarningBox aBox( NULL, aMsg, WB_YES_NO | WB_DEF_NO );
 
         if (aBox.Execute() == RET_YES)
-            m_bDontAskAgain = TRUE;
+            m_bDontAskAgain = sal_True;
         else
-            m_bError = TRUE;
+            m_bError = sal_True;
     } // if(!m_bDontAskAgain)
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index cd8983fe6..1ddbf6403 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -110,7 +110,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
     DBG_CTOR(OHTMLReader,NULL);
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 }
 // ---------------------------------------------------------------------------
 OHTMLReader::OHTMLReader(SvStream& rIn,
@@ -132,7 +132,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
     DBG_CTOR(OHTMLReader,NULL);
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 }
 // ---------------------------------------------------------------------------
 OHTMLReader::~OHTMLReader()
@@ -325,7 +325,7 @@ void OHTMLReader::NextToken( int nToken )
 void OHTMLReader::fetchOptions()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::fetchOptions" );
-    m_bInTbl = TRUE;
+    m_bInTbl = sal_True;
     const HTMLOptions* options = GetOptions();
     sal_Int16 nArrLen = options->Count();
     for ( sal_Int16 i = 0; i < nArrLen; i++ )
@@ -492,7 +492,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
                 // run through
             case HTML_TABLEHEADER_ON:
                 TableDataOn(eVal,nTmpToken2);
-                bTableHeader = TRUE;
+                bTableHeader = sal_True;
                 break;
             case HTML_TABLEDATA_OFF:
                 // m_bAppendFirstLine = true;
@@ -519,7 +519,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
 
             case HTML_TITLE_ON:
             case HTML_CAPTION_ON:
-                bCaption = TRUE;
+                bCaption = sal_True;
                 break;
             case HTML_TITLE_OFF:
             case HTML_CAPTION_OFF:
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 8a87f5f3c..3e41b4496 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -106,19 +106,19 @@ void ORowSetImportExport::initialize()
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ORowSetImportExport::Write()
+sal_Bool ORowSetImportExport::Write()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Write" );
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ORowSetImportExport::Read()
+sal_Bool ORowSetImportExport::Read()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Read" );
     // check if there is any column to copy
     if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(),
                         ::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end())
-        return FALSE;
+        return sal_False;
     sal_Int32 nCurrentRow = 0;
     sal_Int32 nRowFilterIndex = 0;
     sal_Bool bContinue = sal_True;
@@ -164,7 +164,7 @@ BOOL ORowSetImportExport::Read()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 sal_Bool ORowSetImportExport::insertNewRow()
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 75fbea9bc..af4b707d6 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -129,7 +129,7 @@ void ORTFReader::NextToken( int nToken )
                 {
 
                     int nTmpToken2 = GetNextToken();
-                    sal_Bool bNext = TRUE;
+                    sal_Bool bNext = sal_True;
                     do
                     {
                         Color aColor;
@@ -193,7 +193,7 @@ void ORTFReader::NextToken( int nToken )
                     eraseTokens();
                 }
 
-                m_bInTbl = TRUE; // jetzt befinden wir uns in einer Tabellenbeschreibung
+                m_bInTbl = sal_True; // jetzt befinden wir uns in einer Tabellenbeschreibung
                 break;
             case RTF_TEXTTOKEN:
             case RTF_SINGLECHAR:
@@ -250,7 +250,7 @@ void ORTFReader::NextToken( int nToken )
                 }
                 break;
             case RTF_INTBL:
-                m_bInTbl = TRUE;
+                m_bInTbl = sal_True;
                 break;
             case RTF_TEXTTOKEN:
             case RTF_SINGLECHAR:
@@ -295,7 +295,7 @@ sal_Bool ORTFReader::CreateTable(int nToken)
                 if(m_bInTbl)
                     aColumnName.Erase();
 
-                m_bInTbl = TRUE;
+                m_bInTbl = sal_True;
                 break;
             case RTF_TEXTTOKEN:
             case RTF_SINGLECHAR:
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 6de15f1ce..e67220be6 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -362,24 +362,24 @@ void ODatabaseImportExport::initialize()
     m_bInInitialize = sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL ODatabaseImportExport::Write()
+sal_Bool ODatabaseImportExport::Write()
 {
     if ( m_bNeedToReInitialize )
     {
         if ( !m_bInInitialize )
             initialize();
     } // if ( m_bNeedToReInitialize )
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODatabaseImportExport::Read()
+sal_Bool ODatabaseImportExport::Read()
 {
     if ( m_bNeedToReInitialize )
     {
         if ( !m_bInInitialize )
             initialize();
     } // if ( m_bNeedToReInitialize )
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::impl_initializeRowMember_throw()
@@ -395,7 +395,7 @@ void ODatabaseImportExport::impl_initializeRowMember_throw()
     }
 }
 //======================================================================
-BOOL ORTFImportExport::Write()
+sal_Bool ORTFImportExport::Write()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Write" );
     ODatabaseImportExport::Write();
@@ -451,10 +451,10 @@ BOOL ORTFImportExport::Write()
     }
     */
 
-    BOOL bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
-    BOOL bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
-    BOOL bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
-    BOOL bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
+    sal_Bool bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
+    sal_Bool bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
+    sal_Bool bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
+    sal_Bool bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
 
     sal_Int32 nColor = 0;
     if(m_xObject.is())
@@ -618,7 +618,7 @@ BOOL ORTFImportExport::Write()
     }
 
     (*m_pStream) << '}' << ODatabaseImportExport::sNewLine;
-    (*m_pStream) << (BYTE) 0;
+    (*m_pStream) << (sal_uInt8) 0;
     return ((*m_pStream).GetError() == SVSTREAM_OK);
 }
 // -----------------------------------------------------------------------------
@@ -641,10 +641,10 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
             (*m_pStream) << ODatabaseImportExport::sNewLine;
         }
 
-        const BOOL bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
-        const BOOL bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
-        const BOOL bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
-        const BOOL bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
+        const sal_Bool bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
+        const sal_Bool bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
+        const sal_Bool bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
+        const sal_Bool bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
         static const ::rtl::OString aFS2("\\fs20\\f1\\cf0\\cb1");
         ::comphelper::ComponentContext aContext(m_xFactory);
         Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
@@ -691,7 +691,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
     ++k;
 }
 //-------------------------------------------------------------------
-BOOL ORTFImportExport::Read()
+sal_Bool ORTFImportExport::Read()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Read" );
     ODatabaseImportExport::Read();
@@ -727,7 +727,7 @@ const char __FAR_DATA OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t
 //========================================================================
 #define OUT_PROLOGUE()		((*m_pStream) << sHTML30_Prologue << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine)
 #define TAG_ON( tag )		HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag )
-#define TAG_OFF( tag )		HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, FALSE )
+#define TAG_OFF( tag )		HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False )
 #define OUT_STR( str )		HTMLOutFuncs::Out_String( (*m_pStream), str )
 #define OUT_LF()			(*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr()
 #define lcl_OUT_LF() 		(*m_pStream) << ODatabaseImportExport::sNewLine
@@ -745,7 +745,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
         : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange)
     ,m_nIndent(0)
 #ifdef DBG_UTIL
-    ,m_bCheckFont(FALSE)
+    ,m_bCheckFont(sal_False)
 #endif
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::OHTMLImportExport" );
@@ -756,7 +756,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
     sIndent[0] = 0;
 }
 //-------------------------------------------------------------------
-BOOL OHTMLImportExport::Write()
+sal_Bool OHTMLImportExport::Write()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Write" );
     ODatabaseImportExport::Write();
@@ -775,7 +775,7 @@ BOOL OHTMLImportExport::Write()
     return sal_False;
 }
 //-------------------------------------------------------------------
-BOOL OHTMLImportExport::Read()
+sal_Bool OHTMLImportExport::Read()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Read" );
     ODatabaseImportExport::Read();
@@ -1067,12 +1067,12 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
         {
             fVal = m_xFormatter->convertStringToNumber(nFormat,rValue);
             ByteString aTmpString(aStrTD);
-            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, FALSE, fVal,nFormat, *pFormatter );
+            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, sal_False, fVal,nFormat, *pFormatter );
         }
         catch(Exception&)
         {
             ByteString aTmpString(aStrTD);
-            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, FALSE, fVal,nFormat, *pFormatter );
+            HTMLOutFuncs::CreateTableDataOptionsValNum( aTmpString, sal_False, fVal,nFormat, *pFormatter );
         }
     }
 
@@ -1080,10 +1080,10 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
 
     FontOn();
 
-    BOOL bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
-    BOOL bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
-    BOOL bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
-    BOOL bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
+    sal_Bool bBold			= ( ::com::sun::star::awt::FontWeight::BOLD		== m_aFont.Weight );
+    sal_Bool bItalic		= ( ::com::sun::star::awt::FontSlant_ITALIC		== m_aFont.Slant );
+    sal_Bool bUnderline		= ( ::com::sun::star::awt::FontUnderline::NONE	!= m_aFont.Underline );
+    sal_Bool bStrikeout		= ( ::com::sun::star::awt::FontStrikeout::NONE	!= m_aFont.Strikeout );
 
     if ( bBold )		TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
     if ( bItalic )		TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
@@ -1110,7 +1110,7 @@ void OHTMLImportExport::FontOn()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::FontOn" );
 #ifdef DBG_UTIL
-        m_bCheckFont = TRUE;
+        m_bCheckFont = sal_True;
 #endif
 
     // <FONT FACE="xxx">
@@ -1143,7 +1143,7 @@ inline void OHTMLImportExport::FontOff()
     DBG_ASSERT(m_bCheckFont,"Kein FontOn() gerufen");
     TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
 #ifdef DBG_UTIL
-    m_bCheckFont = FALSE;
+    m_bCheckFont = sal_False;
 #endif
 }
 //-----------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index a4f1700c4..da6d6b6eb 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -1643,7 +1643,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
     return pTypeInfo;
 }
 // -----------------------------------------------------------------------------
-sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
+sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
 {
     vos::OGuard aGuard( Application::GetSolarMutex() );
     String aMsg = String(ModuleRes(_nText));
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 7143392e9..790516777 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -115,7 +115,7 @@ OCopyTable::OCopyTable( Window * pParent )
     ,m_edKeyName(			this, ModuleRes( ET_KEYNAME			) )
     ,m_pPage2(NULL)
     ,m_pPage3(NULL)
-    ,m_bUseHeaderAllowed(TRUE)
+    ,m_bUseHeaderAllowed(sal_True)
 {
     DBG_CTOR(OCopyTable,NULL);
 
@@ -126,7 +126,7 @@ OCopyTable::OCopyTable( Window * pParent )
         if ( !m_pParent->supportsViews() )
             m_aRB_View.Disable();
 
-        m_aCB_UseHeaderLine.Check(TRUE);
+        m_aCB_UseHeaderLine.Check(sal_True);
         m_bPKeyAllowed = m_pParent->supportsPrimaryKey();
 
         m_aCB_PrimaryColumn.Enable(m_bPKeyAllowed);
@@ -297,7 +297,7 @@ sal_Bool OCopyTable::LeavePage()
 void OCopyTable::ActivatePage()
 {
     DBG_CHKTHIS(OCopyTable,NULL);
-    m_pParent->GetOKButton().Enable( TRUE );
+    m_pParent->GetOKButton().Enable( sal_True );
     m_nOldOperation = m_pParent->getOperation();
     m_edTableName.GrabFocus();
     m_aCB_UseHeaderLine.Check(m_pParent->UseHeaderLine());
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 27ab47c93..61b1d7c41 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -173,7 +173,7 @@ void OWizColumnSelect::ActivatePage( )
     ODatabaseExport::TColumnVector::const_iterator aEnd = pDestColumns->end();
     for(;aIter != aEnd;++aIter)
     {
-        USHORT nPos = m_lbNewColumnNames.InsertEntry((*aIter)->first);
+        sal_uInt16 nPos = m_lbNewColumnNames.InsertEntry((*aIter)->first);
         m_lbNewColumnNames.SetEntryData(nPos,new OFieldDescription(*((*aIter)->second)));
         m_lbOrgColumnNames.RemoveEntry((*aIter)->first);
     }
@@ -382,7 +382,7 @@ void OWizColumnSelect::moveColumn(	ListBox* _pRight,
             OSL_ENSURE( aPos != pSrcVector->end(),"Invalid position for the iterator here!");
             ODatabaseExport::TColumnVector::size_type nPos = (aPos - pSrcVector->begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - pSrcVector->begin()), _aCase);
 
-            _pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, sal::static_int_cast< USHORT >(nPos)),aSrcIter->second );
+            _pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, sal::static_int_cast< sal_uInt16 >(nPos)),aSrcIter->second );
             _rRightColumns.push_back((*aIter).first);
             m_pParent->removeColumnNameFromNameMap(_sColumnName);
         }
@@ -393,12 +393,12 @@ void OWizColumnSelect::moveColumn(	ListBox* _pRight,
 // not enough. We need to take into acccount what fields have
 // been removed earlier and adjust accordingly. Based on the 
 // algorithm employed in moveColumn().
-USHORT OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft,
+sal_uInt16 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft,
                                                const ::rtl::OUString&	_sColumnName,
                                                ODatabaseExport::TColumnVector::size_type nCurrentPos,
                                                const ::comphelper::TStringMixEqualFunctor& _aCase)
 {
-    USHORT nAdjustedPos = 0;
+    sal_uInt16 nAdjustedPos = 0;
 
     // if returning all entries to their original position,
     // then there is no need to adjust the positions.
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 0d070c500..c15140607 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -286,7 +286,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
     SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected();
     if(pEntry)
     {
-        ULONG nPos			= m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry);
+        sal_uLong nPos			= m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry);
         SvLBoxEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected();
         if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry))
         {
@@ -295,7 +295,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
             pOldEntry = m_CTRL_RIGHT.GetEntry(nPos);
             if(pOldEntry)
             {
-                ULONG nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView());
+                sal_uLong nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView());
                 if ( nNewPos - nPos == 1 )
                     --nNewPos;
                 m_CTRL_RIGHT.MakeVisible(m_CTRL_RIGHT.GetEntry(nNewPos),sal_True);
@@ -320,7 +320,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/
     SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected();
     if(pEntry)
     {
-        ULONG nPos			= m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry);
+        sal_uLong nPos			= m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry);
         SvLBoxEntry* pOldEntry = m_CTRL_LEFT.FirstSelected();
         if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry))
         {
@@ -329,7 +329,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/
             pOldEntry = m_CTRL_LEFT.GetEntry(nPos);
             if(pOldEntry)
             {
-                ULONG nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView());
+                sal_uLong nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView());
                 if ( nNewPos - nPos == 1 )
                     nNewPos--;
                 m_CTRL_LEFT.MakeVisible(m_CTRL_LEFT.GetEntry(nNewPos),sal_True);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 0e9226a13..8926820b8 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -158,8 +158,8 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
                 if ( getMetaData().is() && !getMetaData()->supportsMixedCaseQuotedIdentifiers() )
                 {
                     bCase = sal_False;
-                    USHORT nCount = aListBox.GetEntryCount();
-                    for (USHORT i=0 ; !bDoubleName && i < nCount ; ++i)
+                    sal_uInt16 nCount = aListBox.GetEntryCount();
+                    for (sal_uInt16 i=0 ; !bDoubleName && i < nCount ; ++i)
                     {
                         ::rtl::OUString sEntry(aListBox.GetEntry(i));
                         bDoubleName = sNewName.equalsIgnoreAsciiCase(sEntry);
@@ -360,7 +360,7 @@ void OWizTypeSelect::ActivatePage( )
     Reset();
     m_bFirstTime = bOldFirstTime;
 
-    m_lbColumnNames.SelectEntryPos(static_cast<USHORT>(m_nDisplayRow));
+    m_lbColumnNames.SelectEntryPos(static_cast<sal_uInt16>(m_nDisplayRow));
     m_nDisplayRow = 0;
     m_lbColumnNames.GetSelectHdl().Call(&m_lbColumnNames);
 }
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 9cfa08f65..da4ce39ad 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -99,7 +99,7 @@ namespace dbaui
 
         //................................................................
         static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName,
-            USHORT& _out_rResourceID, USHORT& _out_rResourceID_HC )
+            sal_uInt16& _out_rResourceID, sal_uInt16& _out_rResourceID_HC )
         {
             _out_rResourceID = _out_rResourceID_HC = 0;
             try
@@ -173,8 +173,8 @@ namespace dbaui
             if ( !_out_rImage || !_out_rImageHC )
             {
                 // no -> determine by type
-                USHORT nImageResourceID = 0;
-                USHORT nImageResourceID_HC = 0;
+                sal_uInt16 nImageResourceID = 0;
+                sal_uInt16 nImageResourceID_HC = 0;
                 lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID, nImageResourceID_HC );
 
                 if ( nImageResourceID && !_out_rImage )
@@ -189,16 +189,16 @@ namespace dbaui
     Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
         Image aObjectImage;
-        USHORT nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
+        sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
         if ( nImageResourceID )
             aObjectImage = Image( ModuleRes( nImageResourceID ) );
         return aObjectImage;
     }
 
     //--------------------------------------------------------------------
-    USHORT ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+    sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
-        USHORT nImageResourceID( 0 );
+        sal_uInt16 nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
@@ -223,7 +223,7 @@ namespace dbaui
     //--------------------------------------------------------------------
     Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
     {
-        USHORT nImageResourceID( 0 );
+        sal_uInt16 nImageResourceID( 0 );
         switch ( _nDatabaseObjectType )
         {
         case DatabaseObject::QUERY:
diff --git a/dbaccess/source/ui/querydesign/ConnectionData.hxx b/dbaccess/source/ui/querydesign/ConnectionData.hxx
index 5f93d6529..5b7de2e42 100644
--- a/dbaccess/source/ui/querydesign/ConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/ConnectionData.hxx
@@ -53,7 +53,7 @@ DECLARE_LIST( OConnectionLineList, OConnectionLine* );
 DECLARE_LIST( OTableConnectionDataList, OTableConnectionData* );
 
 //==================================================================
-const USHORT MAX_CONN_COUNT		= 2;
+const sal_uInt16 MAX_CONN_COUNT		= 2;
 
 class SbaJoinTabWin;
 class SbaJoinTabWinCont;
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 1bb517915..fb908e32f 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -246,7 +246,7 @@ void calcPointX2(const OTableWindow* _pWin,Point& _rNewConPos,Point& _rNewDescrP
     _rNewConPos.X() -= DESCRIPT_LINE_WIDTH;
 }
 //------------------------------------------------------------------------
-BOOL OConnectionLine::RecalcLine()
+sal_Bool OConnectionLine::RecalcLine()
 {
     //////////////////////////////////////////////////////////////////////
     // Fenster und Entries muessen gesetzt sein
@@ -254,7 +254,7 @@ BOOL OConnectionLine::RecalcLine()
     const OTableWindow* pDestWin = m_pTabConn->GetDestWin();
 
     if( !pSourceWin || !pDestWin )
-        return FALSE;
+        return sal_False;
 
     SvLBoxEntry* pSourceEntry = pSourceWin->GetListBox()->GetEntryFromText( GetData()->GetSourceFieldName() );
     SvLBoxEntry* pDestEntry = pDestWin->GetListBox()->GetEntryFromText( GetData()->GetDestFieldName() );
@@ -297,14 +297,14 @@ BOOL OConnectionLine::RecalcLine()
     // aDestConnPosY bestimmen
     calcPointsYValue(pDestWin,pDestEntry,m_aDestConnPos,m_aDestDescrLinePos);
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 
 //------------------------------------------------------------------------
 void OConnectionLine::Draw( OutputDevice* pOutDev )
 {
-    const UINT16 nRectSize = 3;
+    const sal_uInt16 nRectSize = 3;
 
     //////////////////////////////////////////////////////////////////////
     // Neue Dimensionen berechnen
@@ -337,7 +337,7 @@ void OConnectionLine::Draw( OutputDevice* pOutDev )
     pOutDev->DrawRect( calcRect( m_aDestDescrLinePos,aVector) );
 }
 // -----------------------------------------------------------------------------
-BOOL OConnectionLine::IsValid() const
+sal_Bool OConnectionLine::IsValid() const
 {
     return m_pData.isValid();
 }
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 0f9fd8507..2cf697696 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -216,7 +216,7 @@ bool AddTableDialogContext::allowAddition() const
 // -----------------------------------------------------------------------------
 void AddTableDialogContext::addTableWindow( const String& _rQualifiedTableName, const String& _rAliasName )
 {
-    getTableView()->AddTabWin( _rQualifiedTableName, _rAliasName, TRUE );
+    getTableView()->AddTabWin( _rQualifiedTableName, _rAliasName, sal_True );
 }
 
 // -----------------------------------------------------------------------------
@@ -382,7 +382,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
 
             if ( m_pAddTableDialog->IsVisible() )
             {
-                m_pAddTableDialog->Show( FALSE );
+                m_pAddTableDialog->Show( sal_False );
                 getView()->GrabFocus();
             }
             else
@@ -391,7 +391,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >&
                     WaitObject aWaitCursor( getView() );
                     m_pAddTableDialog->Update();
                 }
-                m_pAddTableDialog->Show( TRUE );
+                m_pAddTableDialog->Show( sal_True );
                 ::dbaui::notifySystemWindow(getView(),m_pAddTableDialog,::comphelper::mem_fun(&TaskPaneList::AddWindow));
             }
             break;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 4806ee2a9..74dd3aa55 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -229,7 +229,7 @@ OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView )
     ,m_pDragWin( NULL )
     ,m_pSizingWin( NULL )
     ,m_pSelectedConn( NULL )
-    ,m_bTrackingInitiallyMoved(FALSE)
+    ,m_bTrackingInitiallyMoved(sal_False)
     ,m_pLastFocusTabWin(NULL)
     ,m_pView( pView )
     ,m_pAccessible(NULL)
@@ -260,7 +260,7 @@ IMPL_LINK( OJoinTableView, ScrollHdl, ScrollBar*, pScrollBar )
 {
     //////////////////////////////////////////////////////////////////////
     // Alle Fenster verschieben
-    ScrollPane( pScrollBar->GetDelta(), (pScrollBar == GetHScrollBar()), FALSE );
+    ScrollPane( pScrollBar->GetDelta(), (pScrollBar == GetHScrollBar()), sal_False );
 
     return 0;
 }
@@ -298,7 +298,7 @@ void OJoinTableView::Resize()
     }
 }
 //------------------------------------------------------------------------------
-ULONG OJoinTableView::GetTabWinCount()
+sal_uLong OJoinTableView::GetTabWinCount()
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
     return m_aTableMap.size();
@@ -381,7 +381,7 @@ OTableWindowData* OJoinTableView::CreateImpl(const ::rtl::OUString& _rComposedNa
     return new OTableWindowData( NULL,_rComposedName,_sTableName, _rWinName );
 }
 //------------------------------------------------------------------------------
-void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL /*bNewTable*/)
+void OJoinTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/)
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
     OSL_ENSURE(_rComposedName.getLength(),"There must be a table name supplied!");
@@ -478,9 +478,9 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin )
 namespace
 {
     // -----------------------------------------------------------------------------
-    BOOL isScrollAllowed( OJoinTableView* _pView,long nDelta, BOOL bHoriz)
+    sal_Bool isScrollAllowed( OJoinTableView* _pView,long nDelta, sal_Bool bHoriz)
     {
-        BOOL bRet = TRUE;
+        sal_Bool bRet = sal_True;
         //////////////////////////////////////////////////////////////////////
         // adjust ScrollBar-Positions
         ScrollBar* pBar = _pView->GetVScrollBar();
@@ -490,22 +490,22 @@ namespace
         long nOldThumbPos = pBar->GetThumbPos();
         long nNewThumbPos = nOldThumbPos + nDelta;
         if( nNewThumbPos < 0 )
-            nNewThumbPos = 0;//	bRet = FALSE;
+            nNewThumbPos = 0;//	bRet = sal_False;
         else if( nNewThumbPos > pBar->GetRangeMax() )
-            nNewThumbPos = pBar->GetRangeMax();// bRet = FALSE;
+            nNewThumbPos = pBar->GetRangeMax();// bRet = sal_False;
 
         if ( bHoriz )
         {
             if( nNewThumbPos == _pView->GetScrollOffset().X() )
-                return FALSE;
+                return sal_False;
         }
         else if ( nNewThumbPos == _pView->GetScrollOffset().Y() )
-            return FALSE;
+            return sal_False;
 
         return bRet;
     }
     // -----------------------------------------------------------------------------
-    BOOL getMovementImpl(OJoinTableView* _pView,const Point& _rPoint,const Size& _rSize,long& _nScrollX,long& _nScrollY)
+    sal_Bool getMovementImpl(OJoinTableView* _pView,const Point& _rPoint,const Size& _rSize,long& _nScrollX,long& _nScrollY)
     {
         _nScrollY = _nScrollX = 0;
         // data about the tab win
@@ -518,9 +518,9 @@ namespace
         // data about ourself
         Size aSize = _pView->getRealOutputSize(); //GetOutputSizePixel();
 
-        BOOL bVisbile = TRUE;
-        BOOL bFitsHor = (aUpperLeft.X() >= 0) && (aLowerRight.X() <= aSize.Width());
-        BOOL bFitsVert= (aUpperLeft.Y() >= 0) && (aLowerRight.Y() <= aSize.Height());
+        sal_Bool bVisbile = sal_True;
+        sal_Bool bFitsHor = (aUpperLeft.X() >= 0) && (aLowerRight.X() <= aSize.Width());
+        sal_Bool bFitsVert= (aUpperLeft.Y() >= 0) && (aLowerRight.Y() <= aSize.Height());
         if (!bFitsHor || !bFitsVert)
         {
             // #100386# OJ
@@ -548,10 +548,10 @@ namespace
             }
 
             if ( _nScrollX ) // aSize.Width() > _rSize.Width() &&
-                bVisbile = isScrollAllowed(_pView,_nScrollX, TRUE);
+                bVisbile = isScrollAllowed(_pView,_nScrollX, sal_True);
 
             if ( _nScrollY ) // aSize.Height() > _rSize.Height() &&
-                bVisbile = bVisbile && isScrollAllowed(_pView,_nScrollY, FALSE);
+                bVisbile = bVisbile && isScrollAllowed(_pView,_nScrollY, sal_False);
 
             if ( bVisbile )
             {
@@ -559,9 +559,9 @@ namespace
                 sal_Int32 nVRangeMax = _pView->GetVScrollBar()->GetRangeMax();
 
                 if ( aSize.Width() + _pView->GetHScrollBar()->GetThumbPos() + _nScrollX > nHRangeMax )
-                    bVisbile = FALSE;
+                    bVisbile = sal_False;
                 if ( bVisbile && aSize.Height() + _pView->GetVScrollBar()->GetThumbPos() + _nScrollY > nVRangeMax )
-                    bVisbile = FALSE;
+                    bVisbile = sal_False;
             }
         }
 
@@ -570,7 +570,7 @@ namespace
     }
 } // end of ano namespace
 // -----------------------------------------------------------------------------
-BOOL OJoinTableView::isMovementAllowed(const Point& _rPoint,const Size& _rSize)
+sal_Bool OJoinTableView::isMovementAllowed(const Point& _rPoint,const Size& _rSize)
 {
     long nX,nY;
     return getMovementImpl(this,_rPoint,_rSize,nX,nY);
@@ -591,12 +591,12 @@ void OJoinTableView::EnsureVisible(const Point& _rPoint,const Size& _rSize)
 
     if ( getMovementImpl(this,_rPoint,_rSize,nScrollX,nScrollY) )
     {
-        BOOL bVisbile = TRUE;
+        sal_Bool bVisbile = sal_True;
         if (nScrollX)
-            bVisbile = ScrollPane(nScrollX, TRUE, TRUE);
+            bVisbile = ScrollPane(nScrollX, sal_True, sal_True);
 
         if (nScrollY)
-            bVisbile = bVisbile && ScrollPane(nScrollY, FALSE, TRUE);
+            bVisbile = bVisbile && ScrollPane(nScrollY, sal_False, sal_True);
     }
 }
 
@@ -611,8 +611,8 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
     // Wenn kein Platz ist, wird die naechste Zeile ueberprueft.
     Size aOutSize = GetSizePixel();
     Point aNewPos( 0,0 );
-    USHORT nRow = 0;
-    BOOL bEnd = FALSE;
+    sal_uInt16 nRow = 0;
+    sal_Bool bEnd = sal_False;
     while( !bEnd )
     {
         //////////////////////////////////////////////////////////////////
@@ -653,7 +653,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
         if( (aNewPos.X()+TABWIN_WIDTH_STD)<aRowRect.Right() )
         {
             aNewPos.Y() = aRowRect.Top() + TABWIN_SPACING_Y;
-            bEnd = TRUE;
+            bEnd = sal_True;
         }
         else
         {
@@ -663,7 +663,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
                 sal_Int32 nCount = m_aTableMap.size() % (nRow+1);
                 ++nCount;
                 aNewPos.Y() = nCount * TABWIN_SPACING_Y + (nCount-1)*CalcZoom(TABWIN_HEIGHT_STD);
-                bEnd = TRUE;
+                bEnd = sal_True;
             }
             else
                 nRow++;
@@ -725,7 +725,7 @@ void OJoinTableView::BeginChildMove( OTableWindow* pTabWin, const Point& rMouseP
     Point aMousePos = ScreenToOutputPixel( rMousePos );
     m_aDragOffset = aMousePos - pTabWin->GetPosPixel();
     m_pDragWin->SetZOrder(NULL, WINDOW_ZORDER_FIRST);
-    m_bTrackingInitiallyMoved = FALSE;
+    m_bTrackingInitiallyMoved = sal_False;
     StartTracking();
 }
 
@@ -750,10 +750,10 @@ void OJoinTableView::BeginChildSizing( OTableWindow* pTabWin, const Pointer& rPo
 }
 
 //------------------------------------------------------------------------------
-BOOL OJoinTableView::ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars )
+sal_Bool OJoinTableView::ScrollPane( long nDelta, sal_Bool bHoriz, sal_Bool bPaintScrollBars )
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
-    BOOL bRet = TRUE;
+    sal_Bool bRet = sal_True;
 
     //////////////////////////////////////////////////////////////////////
     // ScrollBar-Positionen anpassen
@@ -766,12 +766,12 @@ BOOL OJoinTableView::ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars
             if( nNewThumbPos < 0 )
             {
                 nNewThumbPos = 0;
-                bRet = FALSE;
+                bRet = sal_False;
             }
             if( nNewThumbPos > GetHScrollBar()->GetRange().Max() )
             {
                 nNewThumbPos = GetHScrollBar()->GetRange().Max();
-                bRet = FALSE;
+                bRet = sal_False;
             }
             GetHScrollBar()->SetThumbPos( nNewThumbPos );
             nDelta = GetHScrollBar()->GetThumbPos() - nOldThumbPos;
@@ -783,12 +783,12 @@ BOOL OJoinTableView::ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars
             if( nNewThumbPos < 0 )
             {
                 nNewThumbPos = 0;
-                bRet = FALSE;
+                bRet = sal_False;
             }
             if( nNewThumbPos > GetVScrollBar()->GetRange().Max() )
             {
                 nNewThumbPos = GetVScrollBar()->GetRange().Max();
-                bRet = FALSE;
+                bRet = sal_False;
             }
             GetVScrollBar()->SetThumbPos( nNewThumbPos );
             nDelta = GetVScrollBar()->GetThumbPos() - nOldThumbPos;
@@ -799,7 +799,7 @@ BOOL OJoinTableView::ScrollPane( long nDelta, BOOL bHoriz, BOOL bPaintScrollBars
     // Wenn ScrollOffset bereits an den Grenzen liegt, kein Neuzeichnen
     if( (GetHScrollBar()->GetThumbPos()==m_aScrollOffset.X()) &&
         (GetVScrollBar()->GetThumbPos()==m_aScrollOffset.Y()) )
-        return FALSE;
+        return sal_False;
 
     //////////////////////////////////////////////////////////////////////
     // ScrollOffset neu setzen
@@ -976,9 +976,9 @@ void OJoinTableView::MouseButtonUp( const MouseEvent& rEvt )
 void OJoinTableView::KeyInput( const KeyEvent& rEvt )
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
-    USHORT nCode = rEvt.GetKeyCode().GetCode();
-    BOOL   bShift = rEvt.GetKeyCode().IsShift();
-    BOOL   bCtrl = rEvt.GetKeyCode().IsMod1();
+    sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
+    sal_Bool   bShift = rEvt.GetKeyCode().IsShift();
+    sal_Bool   bCtrl = rEvt.GetKeyCode().IsMod1();
 
     if( !bCtrl && !bShift && (nCode==KEY_DELETE) )
     {
@@ -999,11 +999,11 @@ void OJoinTableView::DeselectConn(OTableConnection* pConn)
     // die zugehoerigen Eitnraege in der ListBox des Tabellenfenster deselektieren
     OTableWindow* pWin = pConn->GetSourceWin();
     if (pWin && pWin->GetListBox())
-        pWin->GetListBox()->SelectAll(FALSE);
+        pWin->GetListBox()->SelectAll(sal_False);
 
     pWin = pConn->GetDestWin();
     if (pWin && pWin->GetListBox())
-        pWin->GetListBox()->SelectAll(FALSE);
+        pWin->GetListBox()->SelectAll(sal_False);
 
     pConn->Deselect();
     m_pSelectedConn = NULL;
@@ -1028,8 +1028,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
         OTableWindowListBox* pDestBox = pConnDest->GetListBox();
         if (pSourceBox && pDestBox)
         {
-            pSourceBox->SelectAll(FALSE);
-            pDestBox->SelectAll(FALSE);
+            pSourceBox->SelectAll(sal_False);
+            pDestBox->SelectAll(sal_False);
 
             SvLBoxEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView();
             SvLBoxEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView();
@@ -1043,14 +1043,14 @@ void OJoinTableView::SelectConn(OTableConnection* pConn)
                     SvLBoxEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName());
                     if (pSourceEntry)
                     {
-                        pSourceBox->Select(pSourceEntry, TRUE);
+                        pSourceBox->Select(pSourceEntry, sal_True);
                         pSourceBox->MakeVisible(pSourceEntry);
                     }
 
                     SvLBoxEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName());
                     if (pDestEntry)
                     {
-                        pDestBox->Select(pDestEntry, TRUE);
+                        pDestBox->Select(pDestEntry, sal_True);
                         pDestBox->MakeVisible(pDestEntry);
                     }
 
@@ -1109,7 +1109,7 @@ sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) cons
                             ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin));
 }
 //------------------------------------------------------------------------------
-BOOL OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const
+sal_Bool OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
     return getTableConnections(pFrom) != m_vTableConnection.end();
@@ -1118,7 +1118,7 @@ BOOL OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const
 void OJoinTableView::ClearAll()
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
-    SetUpdateMode(FALSE);
+    SetUpdateMode(sal_False);
 
     HideTabWins();
 
@@ -1133,13 +1133,13 @@ void OJoinTableView::ClearAll()
     m_pSelectedConn		= NULL;
 
     // scroll to the upper left
-    ScrollPane(-GetScrollOffset().X(), TRUE, TRUE);
-    ScrollPane(-GetScrollOffset().Y(), FALSE, TRUE);
+    ScrollPane(-GetScrollOffset().X(), sal_True, sal_True);
+    ScrollPane(-GetScrollOffset().Y(), sal_False, sal_True);
     Invalidate();
 }
 
 //------------------------------------------------------------------------
-BOOL OJoinTableView::ScrollWhileDragging()
+sal_Bool OJoinTableView::ScrollWhileDragging()
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
     DBG_ASSERT(m_pDragWin != NULL, "OJoinTableView::ScrollWhileDragging darf nur waehrend Dragging eines Fensters aufgerufen werden !");
@@ -1153,19 +1153,19 @@ BOOL OJoinTableView::ScrollWhileDragging()
     Point aLowerRight(aDragWinPos.X() + aDragWinSize.Width(), aDragWinPos.Y() + aDragWinSize.Height());
 
     if (!m_bTrackingInitiallyMoved && (aDragWinPos == m_pDragWin->GetPosPixel()))
-        return TRUE;
+        return sal_True;
 
     // Darstellungsfehler vermeiden (wenn bei aktivem TrackingRect gescrollt wird)
     HideTracking();
 
-    BOOL bScrolling = FALSE;
-    BOOL bNeedScrollTimer = FALSE;
+    sal_Bool bScrolling = sal_False;
+    sal_Bool bNeedScrollTimer = sal_False;
 
     // An Fenstergrenzen scrollen
     // TODO : nur dann abfangen, wenn das Fenster komplett verschwinden wuerde (nicht, solange noch ein Pixel sichtbar ist)
     if( aDragWinPos.X() < 5 )
     {
-        bScrolling = ScrollPane( -LINE_SIZE, TRUE, TRUE );
+        bScrolling = ScrollPane( -LINE_SIZE, sal_True, sal_True );
         if( !bScrolling && (aDragWinPos.X()<0) )
             aDragWinPos.X() = 0;
 
@@ -1175,7 +1175,7 @@ BOOL OJoinTableView::ScrollWhileDragging()
 
     if( aLowerRight.X() > m_aOutputSize.Width() - 5 )
     {
-        bScrolling = ScrollPane( LINE_SIZE, TRUE, TRUE ) ;
+        bScrolling = ScrollPane( LINE_SIZE, sal_True, sal_True ) ;
         if( !bScrolling && ( aLowerRight.X() > m_aOutputSize.Width() ) )
             aDragWinPos.X() = m_aOutputSize.Width() - aDragWinSize.Width();
 
@@ -1185,7 +1185,7 @@ BOOL OJoinTableView::ScrollWhileDragging()
 
     if( aDragWinPos.Y() < 5 )
     {
-        bScrolling = ScrollPane( -LINE_SIZE, FALSE, TRUE );
+        bScrolling = ScrollPane( -LINE_SIZE, sal_False, sal_True );
         if( !bScrolling && (aDragWinPos.Y()<0) )
             aDragWinPos.Y() = 0;
 
@@ -1194,7 +1194,7 @@ BOOL OJoinTableView::ScrollWhileDragging()
 
     if( aLowerRight.Y() > m_aOutputSize.Height() - 5 )
     {
-        bScrolling = ScrollPane( LINE_SIZE, FALSE, TRUE );
+        bScrolling = ScrollPane( LINE_SIZE, sal_False, sal_True );
         if( !bScrolling && ( (aDragWinPos.Y() + aDragWinSize.Height()) > m_aOutputSize.Height() ) )
             aDragWinPos.Y() =  m_aOutputSize.Height() - aDragWinSize.Height();
 
@@ -1249,36 +1249,36 @@ void OJoinTableView::TabWinSized(OTableWindow* ptWhich, const Point& ptOldPositi
 }
 
 //------------------------------------------------------------------------------
-BOOL OJoinTableView::IsAddAllowed()
+sal_Bool OJoinTableView::IsAddAllowed()
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
 
     // nicht wenn Db readonly
     if (m_pView->getController().isReadOnly())
-        return FALSE;
+        return sal_False;
 
     try
     {
         Reference< XConnection> xConnection = m_pView->getController().getConnection();
         if(!xConnection.is())
-            return FALSE;
+            return sal_False;
         // nicht wenn schon zuviele Tabellen
         Reference < XDatabaseMetaData > xMetaData( xConnection->getMetaData() );
 
         sal_Int32 nMax = xMetaData.is() ? xMetaData->getMaxTablesInSelect() : 0;
         if (nMax && nMax <= (sal_Int32)m_aTableMap.size())
-            return FALSE;
+            return sal_False;
     }
     catch(SQLException&)
     {
-        return FALSE;
+        return sal_False;
     }
 
     // nicht wenn keine Joins moeglich
 //	if (!GetDatabase()->IsCapable(SDB_CAP_JOIN) && nMax <= GetTabWinCount())
-//		return FALSE;
+//		return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void OJoinTableView::executePopup(const Point& _aPos,OTableConnection* _pSelConnection)
@@ -1299,7 +1299,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt)
 {
     DBG_CHKTHIS(OJoinTableView,NULL);
 
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
 
     switch (rEvt.GetCommand())
     {
@@ -1338,7 +1338,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt)
                     }
                 }
             }
-            bHandled = TRUE;
+            bHandled = sal_True;
         }
     }
     if (!bHandled)
@@ -1354,7 +1354,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
 
     if ((!pLhs || pLhs->ExistsAConn()) && (!pRhs || pRhs->ExistsAConn()))
     {
-        BOOL bFoundStart = _rpFirstAfter ? FALSE : TRUE;
+        sal_Bool bFoundStart = _rpFirstAfter ? sal_False : sal_True;
 
         ::std::vector<OTableConnection*>::const_iterator aIter = m_vTableConnection.begin();
         ::std::vector<OTableConnection*>::const_iterator aEnd = m_vTableConnection.end();
@@ -1391,7 +1391,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
                     pConn = pData;
 
                 if (pData == _rpFirstAfter)
-                    bFoundStart = TRUE;
+                    bFoundStart = sal_True;
             }
         }
     }
@@ -1401,7 +1401,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
 //------------------------------------------------------------------------------
 long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
 {
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
     {
         case EVENT_COMMAND:
@@ -1413,10 +1413,10 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
                 if (pData->GetMode() == COMMAND_WHEEL_SCROLL)
                 {
                     if (pData->GetDelta() > 0)
-                        ScrollPane(-10 * pData->GetScrollLines(), pData->IsHorz(), TRUE);
+                        ScrollPane(-10 * pData->GetScrollLines(), pData->IsHorz(), sal_True);
                     else
-                        ScrollPane(10 * pData->GetScrollLines(), pData->IsHorz(), TRUE);
-                    bHandled = TRUE;
+                        ScrollPane(10 * pData->GetScrollLines(), pData->IsHorz(), sal_True);
+                    bHandled = sal_True;
                 }
             }
         }
@@ -1437,7 +1437,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
                         if (!HasChildPathFocus())
                             break;
 
-                        BOOL bForward = !pKeyEvent->GetKeyCode().IsShift();
+                        sal_Bool bForward = !pKeyEvent->GetKeyCode().IsShift();
                         // is there an active tab win ?
                         OTableWindowMapIterator aIter = m_aTableMap.begin();
                         OTableWindowMapIterator aEnd = m_aTableMap.end();
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index 15efbfeb7..4ec99d162 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -167,9 +167,9 @@ OTableConnectionData* OQueryTableConnectionData::NewInstance() const
     return new OQueryTableConnectionData(); 
 }
 // -----------------------------------------------------------------------------
-BOOL OQueryTableConnectionData::Update()
+sal_Bool OQueryTableConnectionData::Update()
 {
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 4d035937e..116e2ad55 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -76,7 +76,7 @@ namespace dbaui
 
             @return true if successful
         */
-        virtual BOOL Update();
+        virtual sal_Bool Update();
 
         ::rtl::OUString	GetAliasName(EConnectionSide nWhich) const;
 
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index 12853e04a..327eb8205 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -61,12 +61,12 @@ namespace dbaui
         }
 
         // spaeter Constructor, die Basisklasse ERZEUGT beim ersten Aufruf die Listbox
-        virtual BOOL	Init();
+        virtual sal_Bool	Init();
 
         inline sal_Int32		GetAliasNum() const	{ return m_nAliasNum; }
 
-        BOOL			ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo);
-        BOOL			ExistsAVisitedConn() const;
+        sal_Bool			ExistsField(const ::rtl::OUString& strFieldName, OTableFieldDescRef& rInfo);
+        sal_Bool			ExistsAVisitedConn() const;
 
         virtual ::rtl::OUString		GetName() const { return GetWinName(); }
 
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index a1efc958f..679814bf6 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -48,16 +48,16 @@ namespace dbaui
     {
     protected:
         OSelectionBrowseBox*	pOwner;
-        USHORT					m_nColumnPostion;
+        sal_uInt16					m_nColumnPostion;
 
         virtual void	Undo() = 0;
         virtual void	Redo() = 0;
 
     public:
-        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID);
+        OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID);
         virtual ~OQueryDesignFieldUndoAct();
 
-        inline void SetColumnPosition(USHORT _nColumnPostion) 
+        inline void SetColumnPosition(sal_uInt16 _nColumnPostion) 
         { 
             m_nColumnPostion = _nColumnPostion; 
             OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
@@ -112,7 +112,7 @@ namespace dbaui
         OTableFieldDescRef		pDescr;		// geloeschte Spaltenbeschreibung
 
     public:
-        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
+        OTabFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) : OQueryDesignFieldUndoAct(pSelBrwBox, nCommentID) { }
 
         void SetTabFieldDescr(OTableFieldDescRef pDescription) { pDescr = pDescription; }
     };
diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
index e23d82fc8..8f714fb1c 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
@@ -43,7 +43,7 @@ namespace dbaui
         OJoinTableView*	m_pOwner;		// in diesem Container spielt sich alles ab
 
     public:
-        OQueryDesignUndoAction(OJoinTableView* pOwner, USHORT nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { }
+        OQueryDesignUndoAction(OJoinTableView* pOwner, sal_uInt16 nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { }
     };
 }
 #endif // DBAUI_QUERYDESIGNUNDOACTION_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 42ec8d4a4..a41681641 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -800,7 +800,7 @@ namespace
         }
         Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
         if(!xConnection.is())
-            return FALSE;
+            return sal_False;
         try
         {
             const Reference< XDatabaseMetaData >  xMetaData = xConnection->getMetaData();
@@ -1025,7 +1025,7 @@ namespace
                         aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
                     }
                     aWorkStr += ::rtl::OUString(' ');
-                    aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (USHORT)eOrder );
+                    aWorkStr += String::CreateFromAscii( ";ASC;DESC" ).GetToken( (sal_uInt16)eOrder );
                     aWorkStr += ::rtl::OUString(',');
                 }
             }
@@ -2537,7 +2537,7 @@ namespace
     //------------------------------------------------------------------------------
     String getParseErrorMessage( SqlParseError _eErrorCode )
     {
-        USHORT nResId;
+        sal_uInt16 nResId;
         switch(_eErrorCode)
         {
             case eIllegalJoin:
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index 14442600f..cd7341804 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -64,10 +64,10 @@ OQueryTabConnUndoAction::~OQueryTabConnUndoAction()
 }
 
 // ------------------------------------------------------------------------------------------------
-OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, USHORT nCommentID)
+OQueryTabConnUndoAction::OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID)
     :OQueryDesignUndoAction(pOwner, nCommentID)
     ,m_pConnection(NULL)
-    ,m_bOwnerOfConn(FALSE)
+    ,m_bOwnerOfConn(sal_False)
 {
     DBG_CTOR(OQueryTabConnUndoAction,NULL);
 }
@@ -80,13 +80,13 @@ OQueryAddTabConnUndoAction::OQueryAddTabConnUndoAction(OQueryTableView* pOwner)
 void OQueryAddTabConnUndoAction::Undo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); 
-    SetOwnership(TRUE); 
+    SetOwnership(sal_True); 
 }
 // -----------------------------------------------------------------------------
 void OQueryAddTabConnUndoAction::Redo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); 
-    SetOwnership(FALSE); 
+    SetOwnership(sal_False); 
 }
 // -----------------------------------------------------------------------------
 OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner) 
@@ -97,13 +97,13 @@ OQueryDelTabConnUndoAction::OQueryDelTabConnUndoAction(OQueryTableView* pOwner)
 void OQueryDelTabConnUndoAction::Undo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->GetConnection(m_pConnection); 
-    SetOwnership(FALSE); 
+    SetOwnership(sal_False); 
 }
 // -----------------------------------------------------------------------------
 void OQueryDelTabConnUndoAction::Redo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->DropConnection(m_pConnection); 
-    SetOwnership(TRUE); 
+    SetOwnership(sal_True); 
 }
 // -----------------------------------------------------------------------------
 OQueryTabWinShowUndoAct::OQueryTabWinShowUndoAct(OQueryTableView* pOwner) 
@@ -118,13 +118,13 @@ OQueryTabWinShowUndoAct::~OQueryTabWinShowUndoAct()
 void OQueryTabWinShowUndoAct::Undo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->HideTabWin(m_pTabWin, this); 
-    SetOwnership(TRUE); 
+    SetOwnership(sal_True); 
 }
 // -----------------------------------------------------------------------------
 void OQueryTabWinShowUndoAct::Redo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin(m_pTabWin, this,sal_True); 
-    SetOwnership(FALSE); 
+    SetOwnership(sal_False); 
 }
 // -----------------------------------------------------------------------------
 OQueryTabWinDelUndoAct::OQueryTabWinDelUndoAct(OQueryTableView* pOwner) 
@@ -139,12 +139,12 @@ OQueryTabWinDelUndoAct::~OQueryTabWinDelUndoAct()
 void OQueryTabWinDelUndoAct::Undo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->ShowTabWin( m_pTabWin, this,sal_True ); 
-    SetOwnership(FALSE); 
+    SetOwnership(sal_False); 
 }
 // -----------------------------------------------------------------------------
 void OQueryTabWinDelUndoAct::Redo() 
 { 
     static_cast<OQueryTableView*>(m_pOwner)->HideTabWin( m_pTabWin, this ); 
-    SetOwnership(TRUE); 
+    SetOwnership(sal_True); 
 }
 // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
index 86d903184..929a168d2 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
@@ -39,11 +39,11 @@ namespace dbaui
     {
     protected:
         OQueryTableConnection*	m_pConnection;
-        BOOL					m_bOwnerOfConn;
+        sal_Bool					m_bOwnerOfConn;
             // bin ich alleiniger Eigentuemer der Connection ? (aendert sich mit jedem Redo oder Undo)
 
     public:
-        OQueryTabConnUndoAction(OQueryTableView* pOwner, USHORT nCommentID);
+        OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID);
         virtual ~OQueryTabConnUndoAction();
 
         virtual void Undo() = 0;
@@ -51,7 +51,7 @@ namespace dbaui
 
         void SetConnection(OQueryTableConnection* pConn) { m_pConnection = pConn; }
             // anschliessend bitte SetOwnership
-        void SetOwnership(BOOL bTakeIt) { m_bOwnerOfConn = bTakeIt; }
+        void SetOwnership(sal_Bool bTakeIt) { m_bOwnerOfConn = bTakeIt; }
     };
 }
 #endif // DBAUI_QUERYTABCONNUNDOACTION_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index debf95ff7..d178effea 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -55,7 +55,7 @@
 
 using namespace dbaui;
 DBG_NAME(OQueryDesignFieldUndoAct) 
-OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, USHORT nCommentID) 
+OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID) 
     : OCommentUndoAction(nCommentID)
     , pOwner(pSelBrwBox)
     , m_nColumnPostion(BROWSER_INVALIDID) 
@@ -72,7 +72,7 @@ OQueryDesignFieldUndoAct::~OQueryDesignFieldUndoAct()
 
 DBG_NAME(OQueryTabWinUndoAct ) 
 // ------------------------------------------------------------------------------------------------
-OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID)
+OQueryTabWinUndoAct::OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID)
     :OQueryDesignUndoAction(pOwner, nCommentID)
     ,m_pTabWin(NULL)
 {
@@ -110,7 +110,7 @@ void OTabFieldCellModifiedUndoAct::Undo()
     OSL_ENSURE(m_nColumnPostion < pOwner->GetColumnCount(),"Position outside the column count!");
     if ( m_nColumnPostion != BROWSER_INVALIDID )
     {
-        USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
+        sal_uInt16 nColumnId = pOwner->GetColumnId(m_nColumnPostion);
         String strNext = pOwner->GetCellContents(m_nCellIndex, nColumnId);
         pOwner->SetCellContents(m_nCellIndex, nColumnId, m_strNextCellContents);
         m_strNextCellContents = strNext;
@@ -125,7 +125,7 @@ void OTabFieldSizedUndoAct::Undo()
     OSL_ENSURE(m_nColumnPostion != BROWSER_INVALIDID,"Column position was not set add the undo action!");
     if ( m_nColumnPostion != BROWSER_INVALIDID )
     {
-        USHORT nColumnId = pOwner->GetColumnId(m_nColumnPostion);
+        sal_uInt16 nColumnId = pOwner->GetColumnId(m_nColumnPostion);
         long nNextWidth = pOwner->GetColumnWidth(nColumnId);
         pOwner->SetColWidth(nColumnId, m_nNextWidth);
         m_nNextWidth = nNextWidth;
@@ -140,9 +140,9 @@ void OTabFieldMovedUndoAct::Undo()
     if ( m_nColumnPostion != BROWSER_INVALIDID )
     {
         sal_uInt16 nId = pDescr->GetColumnId();
-        USHORT nOldPos = pOwner->GetColumnPos(nId);
+        sal_uInt16 nOldPos = pOwner->GetColumnPos(nId);
         pOwner->SetColumnPos(nId,m_nColumnPostion);
-        pOwner->ColumnMoved(nId,FALSE); 
+        pOwner->ColumnMoved(nId,sal_False); 
         m_nColumnPostion = nOldPos;
     }
     pOwner->LeaveUndoMode();
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index 4154d36cf..dd20a2f69 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
@@ -50,14 +50,14 @@ namespace dbaui
     protected:
         ::std::vector<OTableConnection*> m_vTableConnection;
         OQueryTableWindow*				 m_pTabWin;
-        BOOL							 m_bOwnerOfObjects;
+        sal_Bool							 m_bOwnerOfObjects;
             // bin ich alleiniger Eigentuemer der verwalteten Objekte ? (aendert sich mit jedem Redo oder Undo)
 
     public:
-        OQueryTabWinUndoAct(OQueryTableView* pOwner, USHORT nCommentID);
+        OQueryTabWinUndoAct(OQueryTableView* pOwner, sal_uInt16 nCommentID);
         virtual ~OQueryTabWinUndoAct();
 
-        void SetOwnership(BOOL bTakeIt) { m_bOwnerOfObjects = bTakeIt; }
+        void SetOwnership(sal_Bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; }
 
 
         virtual void Undo() = 0;
@@ -68,7 +68,7 @@ namespace dbaui
             // anschliessend sollte das SetOwnership aufgerufen werden
 
         // Zugriff auf die verwalteten Connections
-        USHORT	ConnCount() { return (USHORT)m_vTableConnection.size(); }
+        sal_uInt16	ConnCount() { return (sal_uInt16)m_vTableConnection.size(); }
 
         ::std::vector<OTableConnection*>*		GetTabConnList() { return &m_vTableConnection; }
 
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index fba1cdb24..2f0df346a 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -192,7 +192,7 @@ namespace
 
         @return	true when OK was pressed otherwise false
     */
-    sal_Bool openJoinDialog(OQueryTableView* _pView,const TTableConnectionData::value_type& _pConnectionData,BOOL _bSelectableTables)
+    sal_Bool openJoinDialog(OQueryTableView* _pView,const TTableConnectionData::value_type& _pConnectionData,sal_Bool _bSelectableTables)
     {
         OQueryTableConnectionData* pData = static_cast< OQueryTableConnectionData*>(_pConnectionData.get());
 
@@ -752,7 +752,7 @@ void OQueryTableView::AddConnection(const OJoinExchangeData& jxdSource, const OJ
 void OQueryTableView::ConnDoubleClicked(OTableConnection* pConnection)
 {
     DBG_CHKTHIS(OQueryTableView,NULL);
-    if( openJoinDialog(this,pConnection->GetData(),FALSE) )
+    if( openJoinDialog(this,pConnection->GetData(),sal_False) )
     {
         connectionModified(this,pConnection,sal_False);
         SelectConn( pConnection );
@@ -762,7 +762,7 @@ void OQueryTableView::ConnDoubleClicked(OTableConnection* pConnection)
 void OQueryTableView::createNewConnection()
 {
     TTableConnectionData::value_type pData(new OQueryTableConnectionData());
-    if( openJoinDialog(this,pData,TRUE) )
+    if( openJoinDialog(this,pData,sal_True) )
     {
         OTableWindowMap* pMap = GetTabWinMap();
         OQueryTableWindow* pSourceWin	= static_cast< OQueryTableWindow*>((*pMap)[pData->getReferencingTable()->GetWinName()]);
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index b5ca9120a..86e46ad41 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -84,7 +84,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent)
 {
     DBG_CTOR(OQueryTextView,NULL);
     m_pEdit = new OSqlEdit(this);
-    m_pEdit->SetRightToLeft(FALSE);
+    m_pEdit->SetRightToLeft(sal_False);
     m_pEdit->ClearModifyFlag();
     m_pEdit->SaveValue();
     m_pEdit->SetPosPixel( Point( 0, 0 ) );
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 90fa24b1c..8d4b96dcc 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -352,15 +352,15 @@ BrowserHeader* OSelectionBrowseBox::imp_CreateHeaderBar(BrowseBox* /*pParent*/)
     return new OSelectionBrwBoxHeader(this);
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo )
+void OSelectionBrowseBox::ColumnMoved( sal_uInt16 nColId,sal_Bool _bCreateUndo )
 {
     EditBrowseBox::ColumnMoved( nColId );
     // swap the two columns
-    USHORT nNewPos = GetColumnPos( nColId );
+    sal_uInt16 nNewPos = GetColumnPos( nColId );
     OTableFields& rFields = getFields();
-    if ( rFields.size() > USHORT(nNewPos-1) )
+    if ( rFields.size() > sal_uInt16(nNewPos-1) )
     {
-        USHORT nOldPos = 0;
+        sal_uInt16 nOldPos = 0;
         OTableFields::iterator aEnd = rFields.end();
         OTableFields::iterator aIter = rFields.begin();
         for (; aIter != aEnd && ( (*aIter)->GetColumnId() != nColId ); ++aIter,++nOldPos)
@@ -533,7 +533,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
     OSL_ENSURE(nColId != BROWSER_INVALIDID,"An Invalid Id was set!");
     if ( nColId == BROWSER_INVALIDID )
         return;
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
     if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() )
         return;
     OTableFieldDescRef pEntry = getFields()[nPos-1];
@@ -605,7 +605,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
         }	break;
         case BROW_ORDER_ROW:
             m_pOrderCell->SelectEntryPos(
-                sal::static_int_cast< USHORT >(pEntry->GetOrderDir()));
+                sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()));
             enableControl(pEntry,m_pOrderCell);
             break;
         case BROW_COLUMNALIAS_ROW:
@@ -623,14 +623,14 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon
     Controller()->ClearModified();
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
 {
     appendUndoAction(_sOldAlias,_sAlias,BROW_TABLE_ROW,_bListAction);
     if ( m_bVisibleRow[BROW_TABLE_ROW] )
         RowModified(GetBrowseRow(BROW_TABLE_ROW), _nColumnId);
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
 {
     appendUndoAction(_sOldFunctionName,_sFunctionName,BROW_FUNCTION_ROW,_bListAction);
     if ( !m_bVisibleRow[BROW_FUNCTION_ROW] )
@@ -638,7 +638,7 @@ void OSelectionBrowseBox::notifyFunctionFieldChanged(const String& _sOldFunction
     RowModified(GetBrowseRow(BROW_FUNCTION_ROW), _nColumnId);
 }
 // -----------------------------------------------------------------------------
-void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId)
+void OSelectionBrowseBox::clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,sal_uInt16 _nColumnId)
 {
     if ( isFieldNameAsterix( _sFieldName ) && (!_pEntry->isNoneFunction() || _pEntry->IsGroupBy()) )
     {
@@ -803,14 +803,14 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes
         ::comphelper::UStringMixEqual bCase(xMetaData->supportsMixedCaseQuotedIdentifiers());
 
         OTableFieldDescRef aSelEntry = _pEntry;
-        USHORT nColumnId = aSelEntry->GetColumnId();
+        sal_uInt16 nColumnId = aSelEntry->GetColumnId();
 
         sal_uInt32 nCount = pSelection->count();
         for (sal_uInt32 i = 0; i < nCount; ++i)
         {
             if ( i > 0 ) // may we have to append more than one field
             {
-                USHORT nColumnPostion;
+                sal_uInt16 nColumnPostion;
                 aSelEntry = FindFirstFreeCol(nColumnPostion);
                 if ( !aSelEntry.isValid() )
                 {
@@ -968,8 +968,8 @@ sal_Bool OSelectionBrowseBox::SaveModified()
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
     OTableFieldDescRef pEntry = NULL;
-    USHORT nCurrentColumnPos = GetColumnPos(GetCurColumnId());
-    if(getFields().size() > static_cast<USHORT>(nCurrentColumnPos - 1))
+    sal_uInt16 nCurrentColumnPos = GetColumnPos(GetCurColumnId());
+    if(getFields().size() > static_cast<sal_uInt16>(nCurrentColumnPos - 1))
         pEntry = getEntry(nCurrentColumnPos - 1);
 
     sal_Bool bWasEmpty = pEntry.isValid() ? pEntry->IsEmpty() : sal_False;
@@ -1023,7 +1023,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
                         if ( !m_bInUndoMode )
                             rController.getUndoMgr()->EnterListAction(String(),String());
 
-                        USHORT nPos = m_pFieldCell->GetEntryPos(aFieldName);
+                        sal_uInt16 nPos = m_pFieldCell->GetEntryPos(aFieldName);
                         String aAliasName = pEntry->GetAlias();
                         if ( nPos != COMBOBOX_ENTRY_NOTFOUND && !aAliasName.Len() && aFieldName.GetTokenCount('.') > 1 )
                         { // special case, we have a table field so we must cut the table name
@@ -1255,7 +1255,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
 
         if ( bAppendRow )
         {
-            RowInserted( GetRowCount()-1, 1, TRUE );
+            RowInserted( GetRowCount()-1, 1, sal_True );
             m_bVisibleRow.push_back(sal_True);
             ++m_nVisibleCount;
         }
@@ -1277,7 +1277,7 @@ sal_Bool OSelectionBrowseBox::SaveModified()
         RowModified(BROW_VIS_ROW, GetCurColumnId());
 
         // wenn noetig neue freie Spalten anlegen
-        USHORT nDummy;
+        sal_uInt16 nDummy;
         CheckFreeColumns(nDummy);
     }
 
@@ -1307,7 +1307,7 @@ void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect,
     rDev.SetClipRegion( rRect );
 
     OTableFieldDescRef pEntry = NULL;
-    USHORT nPos = GetColumnPos(nColumnId);
+    sal_uInt16 nPos = GetColumnPos(nColumnId);
     if(getFields().size() > sal_uInt16(nPos - 1))
         pEntry = getFields()[nPos - 1];
 
@@ -1339,12 +1339,12 @@ void OSelectionBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& r
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::RemoveColumn(USHORT _nColumnId)
+void OSelectionBrowseBox::RemoveColumn(sal_uInt16 _nColumnId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
 
-    USHORT nPos = GetColumnPos(_nColumnId);
+    sal_uInt16 nPos = GetColumnPos(_nColumnId);
         // das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
     DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::RemoveColumn : invalid parameter nColId");
         // ColId ist bei mir gleichbedeutend mit Position, und da sollte die Bedingung natuerlich zutreffen
@@ -1379,7 +1379,7 @@ void OSelectionBrowseBox::RemoveField(sal_uInt16 nColumnId )
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController());
 
-    USHORT nPos = GetColumnPos(nColumnId);
+    sal_uInt16 nPos = GetColumnPos(nColumnId);
     OSL_ENSURE(getFields().size() > sal_uInt16(nPos-1),"ID is to great!");
 
     OTableFieldDescRef pDesc = getEntry((sal_uInt32)(nPos - 1)) ;
@@ -1521,7 +1521,7 @@ OTableFieldDescRef OSelectionBrowseBox::AppendNewCol( sal_uInt16 nCnt)
     {
         OTableFieldDescRef pEmptyEntry = new OTableFieldDesc();
         getFields().push_back(pEmptyEntry);
-        USHORT nColumnId = sal::static_int_cast< USHORT >(getFields().size());
+        sal_uInt16 nColumnId = sal::static_int_cast< sal_uInt16 >(getFields().size());
         pEmptyEntry->SetColumnId( nColumnId );
         
         InsertDataColumn( nColumnId , String(), DEFAULT_SIZE, HIB_STDSTYLE, HEADERBAR_APPEND);
@@ -1545,7 +1545,7 @@ void OSelectionBrowseBox::DeleteFields(const String& rAliasName)
 
         OTableFields::reverse_iterator aIter = getFields().rbegin();
         OTableFieldDescRef pEntry = NULL;
-        for(USHORT nPos=sal::static_int_cast< USHORT >(getFields().size());aIter != getFields().rend();++aIter,--nPos)
+        for(sal_uInt16 nPos=sal::static_int_cast< sal_uInt16 >(getFields().size());aIter != getFields().rend();++aIter,--nPos)
         {
             pEntry = *aIter;
             if ( pEntry->GetAlias().equals( rAliasName ) )
@@ -1597,7 +1597,7 @@ Rectangle OSelectionBrowseBox::GetInvalidRect( sal_uInt16 nColId )
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColumnPostion)
+void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, sal_uInt16& _nColumnPostion)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
         // das Control sollte immer genau eine Spalte mehr haben, naemlich die HandleColumn
@@ -1610,14 +1610,14 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
     DeactivateCell();
 
     // remember the column id of the current positon
-    USHORT nColumnId = GetColumnId(_nColumnPostion);
+    sal_uInt16 nColumnId = GetColumnId(_nColumnPostion);
     // Wenn zu klein oder zu gross, auf Ende der Liste setzen
     if ((_nColumnPostion == BROWSER_INVALIDID) || (_nColumnPostion >= getFields().size()))	 // Anhaengen des Feldes
     {
         if (FindFirstFreeCol(_nColumnPostion) == NULL)	// keine freie Column mehr
         {
             AppendNewCol(1);
-            _nColumnPostion = sal::static_int_cast< USHORT >(
+            _nColumnPostion = sal::static_int_cast< sal_uInt16 >(
                 getFields().size());
         }
         else
@@ -1630,14 +1630,14 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
     // check if the column ids are identical, if not we have to move
     if ( pEntry->GetColumnId() != nColumnId )
     {
-        USHORT nOldPosition = GetColumnPos(pEntry->GetColumnId());
+        sal_uInt16 nOldPosition = GetColumnPos(pEntry->GetColumnId());
         OSL_ENSURE( nOldPosition != 0,"Old position was 0. Not possible!");
         SetColumnPos(pEntry->GetColumnId(),_nColumnPostion);
         // we have to delete an empty field for the fields list, because the columns must have equal length
         if ( nOldPosition > 0 && nOldPosition <= getFields().size() )
             getFields()[nOldPosition - 1] = pEntry;
 
-        ColumnMoved(pEntry->GetColumnId(),FALSE);
+        ColumnMoved(pEntry->GetColumnId(),sal_False);
     } // if ( pEntry->GetColumnId() != nColumnId )
 
     if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) )
@@ -1661,7 +1661,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OQueryTableWindow* pSourceWin = static_cast<OQueryTableWindow*>(jxdSource.pListBox->GetTabWin());
@@ -1687,7 +1687,7 @@ OTableFieldDescRef OSelectionBrowseBox::InsertField(const OJoinExchangeData& jxd
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, USHORT _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
+OTableFieldDescRef OSelectionBrowseBox::InsertField(const OTableFieldDescRef& _rInfo, sal_uInt16 _nColumnPostion, sal_Bool bVis, sal_Bool bActivate)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
 
@@ -1733,7 +1733,7 @@ sal_uInt16 OSelectionBrowseBox::FieldsCount()
 }
 
 //------------------------------------------------------------------------------
-OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPosition )
+OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(sal_uInt16& _rColumnPosition )
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     OTableFields::iterator aIter = getFields().begin();
@@ -1754,7 +1754,7 @@ OTableFieldDescRef OSelectionBrowseBox::FindFirstFreeCol(USHORT& _rColumnPositio
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::CheckFreeColumns(USHORT& _rColumnPosition)
+void OSelectionBrowseBox::CheckFreeColumns(sal_uInt16& _rColumnPosition)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     if (FindFirstFreeCol(_rColumnPosition) == NULL)
@@ -1838,7 +1838,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel)
             pEntry->SetCriteria( nNewLevel, sValue);
             if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) )
             {
-                RowInserted( GetRowCount()-1, 1, TRUE );
+                RowInserted( GetRowCount()-1, 1, sal_True );
                 m_bVisibleRow.push_back(sal_True);
                 ++m_nVisibleCount;
             }
@@ -1887,7 +1887,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
                 pEntry->SetCriteria( nLevel, rValue);
                 if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
                 {
-                    RowInserted( GetRowCount()-1, 1, TRUE );
+                    RowInserted( GetRowCount()-1, 1, sal_True );
                     m_bVisibleRow.push_back(sal_True);
                     ++m_nVisibleCount;
                 }
@@ -1915,7 +1915,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
         pLastEntry->SetCriteria( nLevel, sCriteria);
         if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
         {
-            RowInserted( GetRowCount()-1, 1, TRUE );
+            RowInserted( GetRowCount()-1, 1, sal_True );
             m_bVisibleRow.push_back(sal_True);
             ++m_nVisibleCount;
         }
@@ -1932,7 +1932,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const S
             pTmp->SetCriteria( nLevel, rValue);
             if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1))
             {
-                RowInserted( GetRowCount()-1, 1, TRUE );
+                RowInserted( GetRowCount()-1, 1, sal_True );
                 m_bVisibleRow.push_back(sal_True);
                 ++m_nVisibleCount;
             }
@@ -2073,7 +2073,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                 if	( 1 == GetSelectColumnCount() )
                 {
                     sal_uInt16 nSelId = GetColumnId(
-                        sal::static_int_cast< USHORT >(
+                        sal::static_int_cast< sal_uInt16 >(
                             FirstSelectedColumn() ) );
                     ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
 
@@ -2196,8 +2196,8 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, sal_Bool _bVis)
 //------------------------------------------------------------------------------
 long OSelectionBrowseBox::GetBrowseRow(long nRowId) const
 {
-    USHORT nCount(0);
-    for(USHORT i = 0 ; i < nRowId ; ++i)
+    sal_uInt16 nCount(0);
+    for(sal_uInt16 i = 0 ; i < nRowId ; ++i)
     {
         if ( m_bVisibleRow[i] )
             ++nCount;
@@ -2262,7 +2262,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
 
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
 
     OTableFieldDescRef pEntry = getFields()[nPos-1];
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... ");
@@ -2289,7 +2289,7 @@ String OSelectionBrowseBox::GetCellText(long nRow, sal_uInt16 nColId) const
         }	break;
         case BROW_ORDER_ROW:
             if (pEntry->GetOrderDir() != ORDER_NONE)
-                aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< USHORT >(pEntry->GetOrderDir()));
+                aText = String(ModuleRes(STR_QUERY_SORTTEXT) ).GetToken(sal::static_int_cast< sal_uInt16 >(pEntry->GetOrderDir()));
             break;
         case BROW_VIS_ROW:
             break;
@@ -2381,14 +2381,14 @@ sal_Bool OSelectionBrowseBox::GetFunctionName(sal_uInt32 _nFunctionTokenId,Strin
     return bErg;
 }
 //------------------------------------------------------------------------------
-String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
+String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
     //	DBG_ASSERT(nCellIndex <	(GetRowCount()-1),"CellIndex ist zu gross");
     if ( GetCurColumnId() == nColId && !m_bInUndoMode )
         SaveModified();
 
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
     OTableFieldDescRef pEntry = getFields()[nPos - 1];
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::GetCellContents : invalid column id, prepare for GPF ... ");
 
@@ -2409,14 +2409,14 @@ String OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, USHORT nColId)
 }
 
 //------------------------------------------------------------------------------
-void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const String& strNewText)
+void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, sal_uInt16 nColId, const String& strNewText)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<USHORT>(nRow)) && (GetCurRow() == static_cast<USHORT>(GetBrowseRow(nRow)));
+    sal_Bool bWasEditing = IsEditing() && (GetCurColumnId() == nColId) && IsRowVisible(static_cast<sal_uInt16>(nRow)) && (GetCurRow() == static_cast<sal_uInt16>(GetBrowseRow(nRow)));
     if (bWasEditing)
         DeactivateCell();
 
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
     OTableFieldDescRef pEntry = getEntry(nPos - 1);
     DBG_ASSERT(pEntry != NULL, "OSelectionBrowseBox::SetCellContents : invalid column id, prepare for GPF ... ");
 
@@ -2466,7 +2466,7 @@ void OSelectionBrowseBox::SetCellContents(sal_Int32 nRow, USHORT nColId, const S
     }
 
     long nCellIndex = GetRealRow(nRow);
-    if(IsRowVisible(static_cast<USHORT>(nRow)))
+    if(IsRowVisible(static_cast<sal_uInt16>(nRow)))
         RowModified(nCellIndex, nColId);
 
     // die entsprechende Feld-Beschreibung ist jetzt leer -> Visible auf sal_False (damit das konsistent mit normalen leeren Spalten ist)
@@ -2500,7 +2500,7 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
     // but the changes aren't permanent ...
 
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
     DBG_ASSERT(nPos <= getFields().size(),"ColumnResized:: nColId sollte nicht groesser als List::count sein!");
     OTableFieldDescRef pEntry = getEntry(nPos-1);
     DBG_ASSERT(pEntry.isValid(), "OSelectionBrowseBox::ColumnResized : keine FieldDescription !");
@@ -2525,7 +2525,7 @@ void OSelectionBrowseBox::ColumnResized(sal_uInt16 nColId)
 sal_uInt32 OSelectionBrowseBox::GetTotalCellWidth(long nRowId, sal_uInt16 nColId)
 {
     DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-    USHORT nPos = GetColumnPos(nColId);
+    sal_uInt16 nPos = GetColumnPos(nColId);
     DBG_ASSERT((nPos == 0) || (nPos <= getFields().size()), "OSelectionBrowseBox::GetTotalCellWidth : invalid parameter nColId");
 
     OTableFieldDescRef pEntry = getFields()[nPos-1];
@@ -2695,7 +2695,7 @@ OTableFields& OSelectionBrowseBox::getFields() const
 // -----------------------------------------------------------------------------
 void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl)
 {
-    BOOL bEnable = !_rEntry->isCondition();
+    sal_Bool bEnable = !_rEntry->isCondition();
     _pControl->Enable(bEnable);
     _pControl->EnableInput(bEnable);
 }
@@ -2735,7 +2735,7 @@ OTableFieldDescRef OSelectionBrowseBox::getEntry(OTableFields::size_type _nPos)
     {
         pEntry = new OTableFieldDesc();
         pEntry->SetColumnId(
-            GetColumnId(sal::static_int_cast< USHORT >(_nPos+1)));
+            GetColumnId(sal::static_int_cast< sal_uInt16 >(_nPos+1)));
         aFields[_nPos] = pEntry;
     }
     return pEntry;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 0babd2bcd..6b32ab817 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -115,10 +115,10 @@ namespace dbaui
                                     ~OSelectionBrowseBox();
 
         void						initialize();
-        OTableFieldDescRef			InsertField( const OJoinExchangeData& jxdSource, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
-        OTableFieldDescRef			InsertField( const OTableFieldDescRef& rInfo, USHORT _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
-        void						InsertColumn( OTableFieldDescRef pEntry, USHORT& _nColumnPostion );
-        void						RemoveColumn( USHORT _nColumnId );
+        OTableFieldDescRef			InsertField( const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
+        OTableFieldDescRef			InsertField( const OTableFieldDescRef& rInfo, sal_uInt16 _nColumnPostion = BROWSER_INVALIDID, sal_Bool bVis=sal_True, sal_Bool bActivate=sal_True );
+        void						InsertColumn( OTableFieldDescRef pEntry, sal_uInt16& _nColumnPostion );
+        void						RemoveColumn( sal_uInt16 _nColumnId );
         void						DeleteFields( const String& rAliasName );
 
         bool                        HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const;
@@ -141,8 +141,8 @@ namespace dbaui
         void						SetColWidth(sal_uInt16 nColId, long lNewWidth);
                                     // beachtet im Gegensatz zum SetColumnWidth der Basisklasse auch eine eventuell aktive Zelle in dieser Spalte
 
-        String						GetCellContents(sal_Int32 nCellIndex, USHORT nColId);
-        void						SetCellContents(sal_Int32 nCellIndex, USHORT nColId, const String& strNewText);
+        String						GetCellContents(sal_Int32 nCellIndex, sal_uInt16 nColId);
+        void						SetCellContents(sal_Int32 nCellIndex, sal_uInt16 nColId, const String& strNewText);
                                         // Zelleninhalt (als String formatiert) setzen/liefern
         sal_Int32					GetNoneVisibleRows() const;
         void						SetNoneVisbleRow(long nRows);
@@ -163,8 +163,8 @@ namespace dbaui
 
         virtual void				GetFocus();
         virtual void				DeactivateCell(sal_Bool bUpdate = sal_True);
-        virtual void				ColumnMoved( USHORT nColId ) { ColumnMoved(nColId,TRUE); }
-        void						ColumnMoved( USHORT nColId,BOOL _bCreateUndo);
+        virtual void				ColumnMoved( sal_uInt16 nColId ) { ColumnMoved(nColId,sal_True); }
+        void						ColumnMoved( sal_uInt16 nColId,sal_Bool _bCreateUndo);
 
         void						Fill();
         void						PreFill();
@@ -184,7 +184,7 @@ namespace dbaui
             @return
                 the text out of the cell
         */
-        virtual String				GetCellText(long _nRow, USHORT _nColId) const;
+        virtual String				GetCellText(long _nRow, sal_uInt16 _nColId) const;
 
         /** returns the description of the row.
             @param	_nRow
@@ -245,10 +245,10 @@ namespace dbaui
         void						startTimer();
 
     private:
-        OTableFieldDescRef			FindFirstFreeCol(USHORT& _rColumnPosition);
+        OTableFieldDescRef			FindFirstFreeCol(sal_uInt16& _rColumnPosition);
             // rCol enthaelt die Nummer (in pOTableFieldDescList) der ersten Spalte, die von sich sagt, dass sie leer ist
             // wenn es keine solche gibt, ist rCol undefiniert und der Rueckgabewert NULL
-        void						CheckFreeColumns(USHORT& _rColumnPosition);
+        void						CheckFreeColumns(sal_uInt16& _rColumnPosition);
             // testet, ob es noch freie Spalten gibt, wenn nicht, wird ein neuer Packen angefuegt
             // rCol enthaelt die Nummer der ersten freien Spalte (in pOTableFieldDescList)
 
@@ -320,7 +320,7 @@ namespace dbaui
             @param	_bListAction
                 Will be set to <TRUE/> when we are in a list action otherwise <FALSE/>
         */
-        void			notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,USHORT _nColumnId);
+        void			notifyTableFieldChanged(const String& _sOldAlias,const String& _sAlias,sal_Bool& _bListAction,sal_uInt16 _nColumnId);
 
         /** append an undo action for the function field
             @param	_sOldFunctionName
@@ -330,7 +330,7 @@ namespace dbaui
             @param	_bListAction
                 Will be set to <TRUE/> when we are in a list action otherwise <FALSE/>
         */
-        void			notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,USHORT _nColumnId);
+        void			notifyFunctionFieldChanged(const String& _sOldFunctionName,const String& _sFunctionName,sal_Bool& _bListAction,sal_uInt16 _nColumnId);
 
         /** clears the function fields of the submitted entry if it doesn't match the SQL standard and append an undo action.
             E.q. AGGREGATE functions are only valid when the field name isn't an asterix
@@ -341,7 +341,7 @@ namespace dbaui
             @param	_bListAction
                 When <TRUE/> an list action will be created.
         */
-        void			clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,USHORT _nColumnId);
+        void			clearEntryFunctionField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction,sal_uInt16 _nColumnId);
 
         /** remove or insert the necessary function types
             @param	_pEntry
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 1f49c4681..03374b1d5 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -64,7 +64,7 @@ namespace dbaui
         :Window(_pContainer)
         ,m_pData( _pTabConnData )
         ,m_pParent( _pContainer )
-        ,m_bSelected( FALSE )
+        ,m_bSelected( sal_False )
     {
         DBG_CTOR(OTableConnection,NULL);
         Init();
@@ -179,19 +179,19 @@ namespace dbaui
     //------------------------------------------------------------------------
     void OTableConnection::Select()
     {
-        m_bSelected = TRUE;
+        m_bSelected = sal_True;
         m_pParent->Invalidate( GetBoundingRect(), INVALIDATE_NOCHILDREN);
     }
 
     //------------------------------------------------------------------------
     void OTableConnection::Deselect()
     {
-        m_bSelected = FALSE;
+        m_bSelected = sal_False;
         InvalidateConnection();
     }
 
     //------------------------------------------------------------------------
-    BOOL OTableConnection::CheckHit( const Point& rMousePos ) const
+    sal_Bool OTableConnection::CheckHit( const Point& rMousePos ) const
     {								 
         //////////////////////////////////////////////////////////////////////
         // check if the point hit our line
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 6530fa31a..79f6c6002 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -66,7 +66,7 @@ void OTableConnectionData::Init()
     //////////////////////////////////////////////////////////////////////
     // LineDataList mit Defaults initialisieren
     DBG_ASSERT(m_vConnLineData.size() == 0, "OTableConnectionData::Init() : nur mit leere Linienliste aufzurufen !");
-    ResetConnLines(TRUE);
+    ResetConnLines(sal_True);
         // das legt Defaults an
 }
 //------------------------------------------------------------------------
@@ -88,7 +88,7 @@ OTableConnectionData::~OTableConnectionData()
     DBG_DTOR(OTableConnectionData,NULL);
     // LineDataList loeschen
     OConnectionLineDataVec().swap(m_vConnLineData);
-    //ResetConnLines(FALSE);	
+    //ResetConnLines(sal_False);	
 }
 
 //------------------------------------------------------------------------
@@ -102,7 +102,7 @@ OTableConnectionData& OTableConnectionData::operator=( const OTableConnectionDat
     m_aConnName = rConnData.GetConnName();
 
     // clear line list
-    ResetConnLines(FALSE);
+    ResetConnLines(sal_False);
 
     // und kopieren
     OConnectionLineDataVec* pLineData = const_cast<OTableConnectionData*>(&rConnData)->GetConnLineDataList();
@@ -116,10 +116,10 @@ OTableConnectionData& OTableConnectionData::operator=( const OTableConnectionDat
 }
 
 //------------------------------------------------------------------------
-BOOL OTableConnectionData::SetConnLine( USHORT nIndex, const String& rSourceFieldName, const String& rDestFieldName )
+sal_Bool OTableConnectionData::SetConnLine( sal_uInt16 nIndex, const String& rSourceFieldName, const String& rDestFieldName )
 {
-    if (USHORT(m_vConnLineData.size()) < nIndex)
-        return FALSE;
+    if (sal_uInt16(m_vConnLineData.size()) < nIndex)
+        return sal_False;
         // == ist noch erlaubt, das entspricht einem Append
 
     if (m_vConnLineData.size() == nIndex)
@@ -131,11 +131,11 @@ BOOL OTableConnectionData::SetConnLine( USHORT nIndex, const String& rSourceFiel
     pConnLineData->SetSourceFieldName( rSourceFieldName );
     pConnLineData->SetDestFieldName( rDestFieldName );
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
-BOOL OTableConnectionData::AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName )
+sal_Bool OTableConnectionData::AppendConnLine( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName )
 {
     OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin();
     OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end();
@@ -148,15 +148,15 @@ BOOL OTableConnectionData::AppendConnLine( const ::rtl::OUString& rSourceFieldNa
     {
         OConnectionLineDataRef pNew = new OConnectionLineData(rSourceFieldName, rDestFieldName);
         if (!pNew.isValid())
-            return FALSE;
+            return sal_False;
 
         m_vConnLineData.push_back(pNew);
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
-void OTableConnectionData::ResetConnLines( BOOL /*bUseDefaults*/ )
+void OTableConnectionData::ResetConnLines( sal_Bool /*bUseDefaults*/ )
 {
     OConnectionLineDataVec().swap(m_vConnLineData);
 }
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 01890fd6f..1ef7d3154 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -109,7 +109,7 @@ OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type&
           ,m_nMoveCount(0)
           ,m_nMoveIncrement(1)
           ,m_nSizingFlags( SIZING_NONE )
-          ,m_bActive( FALSE )
+          ,m_bActive( sal_False )
 {
     DBG_CTOR(OTableWindow,NULL);
 
@@ -197,7 +197,7 @@ OTableWindowListBox* OTableWindow::CreateListBox()
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableWindow::FillListBox()
+sal_Bool OTableWindow::FillListBox()
 {
     m_pListBox->Clear();
     if ( !m_pContainerListener.is() )
@@ -256,7 +256,7 @@ BOOL OTableWindow::FillListBox()
         OSL_ENSURE(0,"Exception occured!");
     }
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void* OTableWindow::createUserData(const Reference< XPropertySet>& /*_xColumn*/,bool /*_bPrimaryKey*/)
@@ -307,7 +307,7 @@ void OTableWindow::impl_updateImage()
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableWindow::Init()
+sal_Bool OTableWindow::Init()
 {
     // create list box if necessary
     if ( !m_pListBox )
@@ -325,9 +325,9 @@ BOOL OTableWindow::Init()
 
     // die Felder in die ListBox eintragen
     clearListBox();
-    BOOL bSuccess = FillListBox();
+    sal_Bool bSuccess = FillListBox();
     if ( bSuccess )
-        m_pListBox->SelectAll( FALSE );
+        m_pListBox->SelectAll( sal_False );
 
     impl_updateImage();
 
@@ -379,7 +379,7 @@ void OTableWindow::Draw3DBorder(const Rectangle& rRect)
 Rectangle OTableWindow::getSizingRect(const Point& _rPos,const Size& _rOutputSize) const
 {
     Rectangle aSizingRect = Rectangle( GetPosPixel(), GetSizePixel() );
-    UINT16 nSizingFlags = GetSizingFlags();
+    sal_uInt16 nSizingFlags = GetSizingFlags();
 
     if( nSizingFlags & SIZING_TOP )
     {
@@ -529,7 +529,7 @@ void OTableWindow::Resize()
 }
 
 //------------------------------------------------------------------------------
-void OTableWindow::SetBoldTitle( BOOL bBold )
+void OTableWindow::SetBoldTitle( sal_Bool bBold )
 {
     Font aFont = m_aTitle.GetFont();
     aFont.SetWeight( bBold?WEIGHT_BOLD:WEIGHT_NORMAL );
@@ -551,7 +551,7 @@ void OTableWindow::setActive(sal_Bool _bActive)
     SetBoldTitle( _bActive );
     m_bActive = _bActive;
     if (!_bActive && m_pListBox && m_pListBox->GetSelectionCount() != 0)
-        m_pListBox->SelectAll(FALSE);
+        m_pListBox->SelectAll(sal_False);
 }
 
 //------------------------------------------------------------------------------
@@ -564,25 +564,25 @@ void OTableWindow::Remove()
     pTabWinCont->Invalidate();
 }
 //------------------------------------------------------------------------------
-BOOL OTableWindow::HandleKeyInput( const KeyEvent& rEvt )
+sal_Bool OTableWindow::HandleKeyInput( const KeyEvent& rEvt )
 {
     const KeyCode& rCode = rEvt.GetKeyCode();
-    USHORT nCode = rCode.GetCode();
-    BOOL   bShift = rCode.IsShift();
-    BOOL   bCtrl = rCode.IsMod1();
+    sal_uInt16 nCode = rCode.GetCode();
+    sal_Bool   bShift = rCode.IsShift();
+    sal_Bool   bCtrl = rCode.IsMod1();
 
-    BOOL bHandle = FALSE;
+    sal_Bool bHandle = sal_False;
 
     if( !bCtrl && !bShift && (nCode==KEY_DELETE) )
     {
         Remove();
-        bHandle = TRUE;
+        bHandle = sal_True;
     }
     return bHandle;
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableWindow::ExistsAConn() const
+sal_Bool OTableWindow::ExistsAConn() const
 {
     return getTableView()->ExistsAConn(this);
 }
@@ -668,7 +668,7 @@ void OTableWindow::Command(const CommandEvent& rEvt)
 // -----------------------------------------------------------------------------
 long OTableWindow::PreNotify(NotifyEvent& rNEvt)
 {
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
     {
         case EVENT_KEYINPUT:
@@ -690,19 +690,19 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt)
                 switch( rCode.GetCode() )
                 {
                     case KEY_DOWN:
-                        bHandled = TRUE;
+                        bHandled = sal_True;
                         aStartPoint.Y() += m_nMoveIncrement;
                         break;
                     case KEY_UP:
-                        bHandled = TRUE;
+                        bHandled = sal_True;
                         aStartPoint.Y() += -m_nMoveIncrement;
                         break;
                     case KEY_LEFT:
-                        bHandled = TRUE;
+                        bHandled = sal_True;
                         aStartPoint.X() += -m_nMoveIncrement;
                         break;
                     case KEY_RIGHT:
-                        bHandled = TRUE;
+                        bHandled = sal_True;
                         aStartPoint.X()  += m_nMoveIncrement;
                         break;
                 }
@@ -785,7 +785,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt)
         {
             const KeyEvent* pKeyEvent =	rNEvt.GetKeyEvent();
             const KeyCode& rCode = pKeyEvent->GetKeyCode();
-            USHORT nKeyCode = rCode.GetCode();
+            sal_uInt16 nKeyCode = rCode.GetCode();
             if ( rCode.IsMod2() && nKeyCode != KEY_UP && nKeyCode != KEY_DOWN && nKeyCode != KEY_LEFT && nKeyCode != KEY_RIGHT )
             {
                 m_nMoveCount		= 0; // reset our movement count
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index a30ac3dc5..3f0ee9c26 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -64,7 +64,7 @@ OTableWindowData::OTableWindowData( const Reference< XPropertySet>& _xTable
     ,m_sComposedName(_rComposedName)
     ,m_aPosition( Point(-1,-1) )
     ,m_aSize( Size(-1,-1) )
-    ,m_bShowAll( TRUE )
+    ,m_bShowAll( sal_True )
     ,m_bIsQuery(false)
     ,m_bIsValid(true)
 {
@@ -85,13 +85,13 @@ OTableWindowData::~OTableWindowData()
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableWindowData::HasPosition() const
+sal_Bool OTableWindowData::HasPosition() const
 {
     return ( (m_aPosition.X() != -1) && (m_aPosition.Y() != -1) );
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableWindowData::HasSize() const
+sal_Bool OTableWindowData::HasSize() const
 {
     return ( (m_aSize.Width() != -1) && (m_aSize.Height() !=-1) );
 }
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index fd22dfd75..4b4efa045 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -68,7 +68,7 @@ OJoinExchangeData::OJoinExchangeData(OTableWindowListBox* pBox)
     , pEntry(pBox->FirstSelected()) 
 { }
 
-const ULONG SCROLLING_TIMESPAN = 500;
+const sal_uLong SCROLLING_TIMESPAN = 500;
 const long LISTBOX_SCROLLING_AREA = 6;
 //==================================================================
 // class OTableWindowListBox
@@ -126,7 +126,7 @@ SvLBoxEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
     OJoinDesignView* pView = m_pTabWin->getDesignView();
     OJoinController& rController = pView->getController();
 
-    BOOL bCase = FALSE;
+    sal_Bool bCase = sal_False;
     try
     {
         Reference<XConnection> xConnection = rController.getConnection();
@@ -155,7 +155,7 @@ SvLBoxEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText )
 //------------------------------------------------------------------------------
 void OTableWindowListBox::NotifyScrolled()
 {
-    m_bReallyScrolled = TRUE;
+    m_bReallyScrolled = sal_True;
 }
 
 //------------------------------------------------------------------------------
@@ -166,13 +166,13 @@ void OTableWindowListBox::NotifyEndScroll()
         m_pTabWin->getTableView()->Invalidate(INVALIDATE_NOCHILDREN);
         // ohne das INVALIDATE_NOCHILDREN wuerden auch alle Tabellen neu gezeichnet werden,
         // sprich : es flackert
-    m_bReallyScrolled = FALSE;
+    m_bReallyScrolled = sal_False;
 }
 
 //------------------------------------------------------------------------------
 long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
 {
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
     {
         case EVENT_KEYINPUT:
@@ -185,7 +185,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
                 if(m_pTabWin)
                 {
                     bHandled = m_pTabWin->HandleKeyInput(*pKeyEvent);
-                    //	bHandled = TRUE;
+                    //	bHandled = sal_True;
                 }
                 break;
             }
@@ -214,7 +214,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
     {
         ScrollOutputArea( -1 );
         pEntry = GetEntry( m_aMousePos );
-        Select( pEntry, TRUE );
+        Select( pEntry, sal_True );
 //		m_aScrollTimer.Start();
     }
 
@@ -232,7 +232,7 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ )
     {
         ScrollOutputArea( 1 );
         pEntry = GetEntry( m_aMousePos );
-        Select( pEntry, TRUE );
+        Select( pEntry, sal_True );
 //		m_aScrollTimer.Start();
     }
 
@@ -269,7 +269,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
         
         // remove the selection if the dragging operation is leaving the window
         if (_rEvt.mbLeaving)
-            SelectAll(FALSE);
+            SelectAll(sal_False);
         else
         {
             // hit test
@@ -311,8 +311,8 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
 
             // Beim Drag automatisch den richtigen Eintrag selektieren
             if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected())))
-                SelectAll(FALSE);
-            Select(pEntry, TRUE);
+                SelectAll(sal_False);
+            Select(pEntry, sal_True);
 
             // Auf den ersten Eintrag (*) kann nicht gedroppt werden
             if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) ))
@@ -386,8 +386,8 @@ void OTableWindowListBox::GetFocus()
         if ( GetSelectionCount() == 0 || GetCurEntry() != FirstSelected() )
         {
             if ( FirstSelected() )
-                Select(FirstSelected(), FALSE);
-            Select(GetCurEntry(), TRUE);
+                Select(FirstSelected(), sal_False);
+            Select(GetCurEntry(), sal_True);
         }
         else
             ShowFocusRect(FirstSelected());
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 30a0fcba7..03f48e7d4 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -91,7 +91,7 @@ OTableWindowTitle::OTableWindowTitle( OTableWindow* pParent ) :
     SetTextColor(aSystemStyle.GetButtonTextColor());
 
     Font aFont( GetFont() );
-    aFont.SetTransparent( TRUE );
+    aFont.SetTransparent( sal_True );
     SetFont( aFont );
 }
 
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 6daa54afb..36a4cdd3e 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -207,7 +207,7 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     long OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
     {
-        BOOL bHandled = FALSE;
+        sal_Bool bHandled = sal_False;
         switch (rNEvt.GetType())
         {
             case  EVENT_GETFOCUS:
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 06a2eb5cb..721678024 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -238,13 +238,13 @@ namespace dbaui
     namespace
     {
         // -----------------------------------------------------------------------------
-        String lcl_getObjectResourceString( USHORT _nResId, sal_Int32 _nCommandType )
+        String lcl_getObjectResourceString( sal_uInt16 _nResId, sal_Int32 _nCommandType )
         {
             String sMessageText = String( ModuleRes( _nResId ) );
             String sObjectType;
             {
                 LocalResourceAccess aLocalRes( RSC_QUERY_OBJECT_TYPE, RSC_RESOURCE );
-                sObjectType = String( ModuleRes( (USHORT)( _nCommandType + 1 ) ) );
+                sObjectType = String( ModuleRes( (sal_uInt16)( _nCommandType + 1 ) ) );
             }
             sMessageText.SearchAndReplace( String::CreateFromAscii( "$object$" ), sObjectType );
             return sMessageText;
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 37b17e5f5..13c1be31f 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -98,7 +98,7 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
                        const TTableConnectionData::value_type& _pData,
                        OJoinTableView::OTableWindowMap*	_pTableMap,
                        const Reference< XConnection >& _xConnection,
-                       BOOL _bAllowTableSelect)
+                       sal_Bool _bAllowTableSelect)
     :ModalDialog( pParent, ModuleRes(DLG_QRY_JOIN) )
     ,aML_HelpText( this, ModuleRes(ML_HELPTEXT) )
     ,aPB_OK( this, ModuleRes( PB_OK ) )
@@ -177,8 +177,8 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
     }
     else
     {
-        const USHORT nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
-        for (USHORT i = 0; i < nCount; ++i)
+        const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
+        for (sal_uInt16 i = 0; i < nCount; ++i)
         {
             const long nJoinTyp = reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(i));
             if ( !bSupportFullJoin && nJoinTyp == ID_FULL_JOIN )
@@ -216,8 +216,8 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
     String sFirstWinName	= m_pConnData->getReferencingTable()->GetWinName();
     String sSecondWinName	= m_pConnData->getReferencedTable()->GetWinName();
     const EJoinType eOldJoinType = eJoinType;
-    USHORT nResId = 0;
-    const USHORT nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos();
+    sal_uInt16 nResId = 0;
+    const sal_uInt16 nPos = m_pJoinControl->aLB_JoinType.GetSelectEntryPos();
     const long nJoinType = reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(nPos));
     sal_Bool bAddHint = sal_True;
     switch ( nJoinType )
@@ -252,11 +252,11 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ )
                 
                 m_pConnData->ResetConnLines();
                 m_pTableControl->lateInit();
-                m_pJoinControl->m_aCBNatural.Check(FALSE);
+                m_pJoinControl->m_aCBNatural.Check(sal_False);
                 m_pTableControl->enableRelation(false);
                 ::rtl::OUString sEmpty;
                 m_pConnData->AppendConnLine(sEmpty,sEmpty);
-                aPB_OK.Enable(TRUE);
+                aPB_OK.Enable(sal_True);
             }
             break;
     }
@@ -307,7 +307,7 @@ IMPL_LINK( DlgQryJoin, OKClickHdl, Button*, /*pButton*/ )
 IMPL_LINK( DlgQryJoin, NaturalToggleHdl, CheckBox*, /*pButton*/ )
 {
     DBG_CHKTHIS(DlgQryJoin,NULL);
-    BOOL bChecked = m_pJoinControl->m_aCBNatural.IsChecked();
+    sal_Bool bChecked = m_pJoinControl->m_aCBNatural.IsChecked();
     static_cast<OQueryTableConnectionData*>(m_pConnData.get())->setNatural(bChecked);
     m_pTableControl->enableRelation(!bChecked);
     if ( bChecked )
@@ -381,8 +381,8 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType)
             break;
     }
 
-    const USHORT nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
-    for (USHORT i = 0; i < nCount; ++i)
+    const sal_uInt16 nCount = m_pJoinControl->aLB_JoinType.GetEntryCount();
+    for (sal_uInt16 i = 0; i < nCount; ++i)
     {
         if ( nJoinType == reinterpret_cast<long>(m_pJoinControl->aLB_JoinType.GetEntryData(i)) )
         {
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 4323a5ec8..89732cfe1 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -92,7 +92,7 @@ namespace dbaui
                     const TTableConnectionData::value_type& pData,
                     OJoinTableView::OTableWindowMap*	_pTableMap,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                    BOOL _bAllowTableSelect);
+                    sal_Bool _bAllowTableSelect);
         virtual ~DlgQryJoin();
         EJoinType GetJoinType() const { return eJoinType; };
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 145568f25..37c2c5a80 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -96,7 +96,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData()
 }
 
 //------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::DropRelation()
+sal_Bool ORelationTableConnectionData::DropRelation()
 {
     DBG_CHKTHIS(ORelationTableConnectionData,NULL);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -125,7 +125,7 @@ BOOL ORelationTableConnectionData::DropRelation()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -174,10 +174,10 @@ void ORelationTableConnectionData::SetCardinality()
 
 }
 // -----------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const
+sal_Bool ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet>& i_xTable,EConnectionSide _eEConnectionSide) const
 {
     // check if Table has the primary key column dependig on _eEConnectionSide
-    USHORT	nPrimKeysCount		= 0,
+    sal_uInt16	nPrimKeysCount		= 0,
             nValidLinesCount	= 0;
     const Reference< XNameAccess> xKeyColumns = dbtools::getPrimaryKeyColumns_throw(i_xTable);
     if ( xKeyColumns.is() )
@@ -201,15 +201,15 @@ BOOL ORelationTableConnectionData::checkPrimaryKey(const Reference< XPropertySet
             }
         }
         if ( nPrimKeysCount != aKeyColumns.getLength() )
-            return FALSE;
+            return sal_False;
     }
     if ( !nPrimKeysCount || nPrimKeysCount != nValidLinesCount )
-        return FALSE;
+        return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 //------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::IsConnectionPossible()
+sal_Bool ORelationTableConnectionData::IsConnectionPossible()
 {
     DBG_CHKTHIS(ORelationTableConnectionData,NULL);
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -219,7 +219,7 @@ BOOL ORelationTableConnectionData::IsConnectionPossible()
     if ( IsSourcePrimKey() && !IsDestPrimKey() )
         ChangeOrientation();
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------------
@@ -282,7 +282,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
 }
 }
 //------------------------------------------------------------------------
-BOOL ORelationTableConnectionData::Update()
+sal_Bool ORelationTableConnectionData::Update()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ////////////////////////////////////////////////////////////
@@ -290,7 +290,7 @@ BOOL ORelationTableConnectionData::Update()
     {
         DropRelation();
         if( !IsConnectionPossible() )
-            return FALSE;
+            return sal_False;
     }
 
     // reassign the keys because the orientaion could be changed
@@ -298,7 +298,7 @@ BOOL ORelationTableConnectionData::Update()
     Reference< XIndexAccess> xKeys ( getReferencingTable()->getKeys());
     
     if ( !xKeys.is() )
-        return FALSE;
+        return sal_False;
     ////////////////////////////////////////////////////////////
     // Neue Relation erzeugen
     Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY);
@@ -460,7 +460,7 @@ xKey.clear();
     // Kardinalitaet bestimmen
     SetCardinality();
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index c32fbb75b..46f06c788 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -370,7 +370,7 @@ namespace
         if ( aFind == m_aTableData.end() )
         {
             aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first;
-            aFind->second->ShowAll(FALSE);
+            aFind->second->ShowAll(sal_False);
             bAdded = true;
         }
         TTableWindowData::value_type pReferencingTable = aFind->second;
@@ -405,7 +405,7 @@ namespace
                         {
                             Reference<XPropertySet>  xReferencedTable(m_xTables->getByName(sReferencedTable),UNO_QUERY);
                             aRefFind = m_aTableData.insert(TTableDataHelper::value_type(sReferencedTable,::boost::shared_ptr<OTableWindowData>(new OTableWindowData(xReferencedTable,sReferencedTable, sReferencedTable)))).first;
-                            aRefFind->second->ShowAll(FALSE);
+                            aRefFind->second->ShowAll(sal_False);
                         }
                         else
                             continue; // table name could not be found so we do not show this table releation
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 8e7e3feb6..e70374e6b 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -188,7 +188,7 @@ void ORelationTableView::ReSync()
         GetTabWinMap()->begin()->second->GrabFocus();
 }
 //------------------------------------------------------------------------------
-BOOL ORelationTableView::IsAddAllowed()
+sal_Bool ORelationTableView::IsAddAllowed()
 {
     DBG_CHKTHIS(ORelationTableView,NULL);
 
@@ -291,9 +291,9 @@ void ORelationTableView::AddNewRelation()
     DBG_CHKTHIS(ORelationTableView,NULL);
 
     TTableConnectionData::value_type pNewConnData( new ORelationTableConnectionData() );
-    ORelationDialog aRelDlg(this, pNewConnData, TRUE);
+    ORelationDialog aRelDlg(this, pNewConnData, sal_True);
 
-    BOOL bSuccess = (aRelDlg.Execute() == RET_OK);
+    sal_Bool bSuccess = (aRelDlg.Execute() == RET_OK);
     if (bSuccess)
     {
         // already updated by the dialog
@@ -324,7 +324,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_
 }
 
 //------------------------------------------------------------------------------
-void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL /*bNewTable*/)
+void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, sal_Bool /*bNewTable*/)
 {
     DBG_CHKTHIS(ORelationTableView,NULL);
     OSL_ENSURE(_rComposedName.getLength(),"There must be a table name supplied!");
@@ -342,7 +342,7 @@ void ORelationTableView::AddTabWin(const ::rtl::OUString& _rComposedName, const
     //////////////////////////////////////////////////////////////////
     // Neue Datenstruktur in DocShell eintragen
     TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
-    pNewTabWinData->ShowAll(FALSE);	
+    pNewTabWinData->ShowAll(sal_False);	
 
     //////////////////////////////////////////////////////////////////
     // Neues Fenster in Fensterliste eintragen
@@ -420,7 +420,7 @@ void ORelationTableView::lookForUiActivities()
         aDlg.AddButton( ModuleRes(STR_QUERY_REL_EDIT), BUTTONID_OK, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON);
         aDlg.AddButton( ModuleRes(STR_QUERY_REL_CREATE), BUTTONID_YES, 0);
         aDlg.AddButton(BUTTON_CANCEL,BUTTONID_CANCEL,0);
-        UINT16 nRet = aDlg.Execute();
+        sal_uInt16 nRet = aDlg.Execute();
         if( nRet == RET_CANCEL)
         {
             m_pCurrentlyTabConnData.reset();
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index e3e919f70..ab947d4b6 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -59,9 +59,9 @@ namespace dbaui
 
         void DisplayData( OFieldDescription* pFieldDescr );
         void SaveData( OFieldDescription* pFieldDescr );
-        void SetControlText( USHORT nControlId, const String& rText );
-        String GetControlText( USHORT nControlId );
-        void SetReadOnly( BOOL bReadOnly );
+        void SetControlText( sal_uInt16 nControlId, const String& rText );
+        String GetControlText( sal_uInt16 nControlId );
+        void SetReadOnly( sal_Bool bReadOnly );
 #if OSL_DEBUG_LEVEL > 0
         OTableEditorCtrl* GetEditorCtrl();
 #endif
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 6990143f8..670146a7c 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -157,7 +157,7 @@ DBG_NAME(OTableEditorCtrl)
 //==================================================================
 DBG_NAME(ClipboardInvalidator)
 //------------------------------------------------------------------
-OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(ULONG nTimeout,OTableEditorCtrl* _pOwner)
+OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl* _pOwner)
 : m_pOwner(_pOwner)
 {
     DBG_CTOR(ClipboardInvalidator,NULL);
@@ -269,7 +269,7 @@ SfxUndoManager* OTableEditorCtrl::GetUndoManager() const
 }
 
 //------------------------------------------------------------------------------
-BOOL OTableEditorCtrl::IsReadOnly()
+sal_Bool OTableEditorCtrl::IsReadOnly()
 {
     DBG_CHKTHIS(OTableEditorCtrl,NULL);
     return bReadOnly;
@@ -902,7 +902,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId )
 // -----------------------------------------------------------------------------
 void OTableEditorCtrl::resetType()
 {
-    USHORT nPos = pTypeCell->GetSelectEntryPos();
+    sal_uInt16 nPos = pTypeCell->GetSelectEntryPos();
     if(nPos != LISTBOX_ENTRY_NOTFOUND)
         SwitchType( GetView()->getController().getTypeInfo(nPos) );
     else
@@ -1653,7 +1653,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
                 if	( 1 == GetSelectColumnCount() )
                 {
                     sal_uInt16 nSelId = GetColumnId(
-                        sal::static_int_cast< USHORT >(
+                        sal::static_int_cast< sal_uInt16 >(
                             FirstSelectedColumn() ) );
                     ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
 
@@ -1951,7 +1951,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType )
             ||  ( GetView()->getController().getTypeInfo( nCurrentlySelected ) != _pType )
             )
         {
-            USHORT nEntryPos = 0;
+            sal_uInt16 nEntryPos = 0;
             const OTypeInfoMap* pTypeInfo = GetView()->getController().getTypeInfo();
             OTypeInfoMap::const_iterator aIter = pTypeInfo->begin();
             OTypeInfoMap::const_iterator aEnd = pTypeInfo->end();
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 7d0fc5821..1dd9f6bd9 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -74,19 +74,19 @@ namespace dbaui
         
          ::boost::shared_ptr<OTableRow> pActRow;
 
-        ULONG						nIndexEvent;
-        ULONG						nCutEvent;
-        ULONG						nPasteEvent;
-        ULONG						nDeleteEvent;
-        ULONG						nInsNewRowsEvent;
-        ULONG						nInvalidateTypeEvent;
-        ULONG						nEntryNotFoundEvent;
+        sal_uLong						nIndexEvent;
+        sal_uLong						nCutEvent;
+        sal_uLong						nPasteEvent;
+        sal_uLong						nDeleteEvent;
+        sal_uLong						nInsNewRowsEvent;
+        sal_uLong						nInvalidateTypeEvent;
+        sal_uLong						nEntryNotFoundEvent;
         ChildFocusState				m_eChildFocus;
 
         long nOldDataPos;
 
-        BOOL bSaveOnMove;
-        BOOL bReadOnly;
+        sal_Bool bSaveOnMove;
+        sal_Bool bReadOnly;
         //------------------------------------------------------------------
         // Hilfsklasse
         class ClipboardInvalidator
@@ -96,7 +96,7 @@ namespace dbaui
             OTableEditorCtrl* m_pOwner;
 
         public:
-            ClipboardInvalidator(ULONG nTimeout,OTableEditorCtrl*);
+            ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl*);
             ~ClipboardInvalidator();
 
         protected:
@@ -108,19 +108,19 @@ namespace dbaui
 
     protected:
         virtual void Command( const CommandEvent& rEvt );
-        virtual BOOL SeekRow(long nRow);
+        virtual sal_Bool SeekRow(long nRow);
         virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect,
-                               USHORT nColumnId ) const;
+                               sal_uInt16 nColumnId ) const;
 
         virtual void CursorMoved();
         virtual RowStatus GetRowStatus(long nRow) const;
 
-        virtual ::svt::CellController* GetController(long nRow, USHORT nCol);
-        virtual void InitController(::svt::CellControllerRef& rController, long nRow, USHORT nCol);
+        virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
+        virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
 
         virtual void CellModified();
-        virtual BOOL SaveModified();	// wird aufgerufen vor einem Zellenwechsel
-                                        // return FALSE, verhindert Zellenwechsel
+        virtual sal_Bool SaveModified();	// wird aufgerufen vor einem Zellenwechsel
+                                        // return sal_False, verhindert Zellenwechsel
         virtual void Undo();
         virtual void Redo();
         virtual String GetCellText(long nRow, sal_uInt16 nColId) const;
@@ -137,8 +137,8 @@ namespace dbaui
 
         void		 ClearModified();
 
-        void		 SetPrimaryKey( BOOL bSet );
-        BOOL		 IsPrimaryKey();
+        void		 SetPrimaryKey( sal_Bool bSet );
+        sal_Bool		 IsPrimaryKey();
 
         DECL_LINK(ControlPreNotifyHdl, NotifyEvent*);
 
@@ -146,15 +146,15 @@ namespace dbaui
         //	TYPEINFO();
         OTableEditorCtrl(Window* pParentWin);
         virtual			~OTableEditorCtrl();
-        virtual BOOL	CursorMoving(long nNewRow, USHORT nNewCol);
+        virtual sal_Bool	CursorMoving(long nNewRow, sal_uInt16 nNewCol);
         virtual void	UpdateAll();
         SfxUndoManager* GetUndoManager() const;
         
         void			SetDescrWin( OTableFieldDescWin* pWin ){ pDescrWin = pWin; if (pDescrWin && pActRow) pDescrWin->DisplayData(pActRow->GetActFieldDescr()); }
-        BOOL			SaveCurRow();
+        sal_Bool			SaveCurRow();
         void			SwitchType( const TOTypeInfoSP& _pType );
 
-        void			DisplayData( long nRow, BOOL bGrabFocus = TRUE );
+        void			DisplayData( long nRow, sal_Bool bGrabFocus = sal_True );
             // erzwingt das Anzeigen der genannten Zeile (selbst wenn es eigentlich schon die aktuelle ist)
 
         virtual void    SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo );
@@ -169,15 +169,15 @@ namespace dbaui
 
         ::boost::shared_ptr<OTableRow>         GetActRow(){ return pActRow; }
         void            CellModified( long nRow, sal_uInt16 nColId );
-        void			SetReadOnly( BOOL bRead=TRUE );
+        void			SetReadOnly( sal_Bool bRead=sal_True );
 
         virtual void Init();
         virtual void DeactivateCell(sal_Bool bUpdate = sal_True);
 
-        BOOL IsCutAllowed( long nRow = -1 );
-        BOOL IsCopyAllowed( long nRow = -1 );
-        BOOL IsPasteAllowed( long nRow = -1 );
-        BOOL IsReadOnly();
+        sal_Bool IsCutAllowed( long nRow = -1 );
+        sal_Bool IsCopyAllowed( long nRow = -1 );
+        sal_Bool IsPasteAllowed( long nRow = -1 );
+        sal_Bool IsReadOnly();
         OFieldDescription* GetFieldDescr( long nRow );
 
         // window overloads
@@ -202,11 +202,11 @@ namespace dbaui
         DECL_LINK( EntryNotFound, void* );
 
         void InitCellController();
-        INT32 HasFieldName( const String& rFieldName );
+        sal_Int32 HasFieldName( const String& rFieldName );
         String GenerateName( const String& rName );
-        BOOL SetDataPtr( long nRow );
+        sal_Bool SetDataPtr( long nRow );
         
-        BOOL SaveData(long nRow, USHORT nColumnId);
+        sal_Bool SaveData(long nRow, sal_uInt16 nColumnId);
         /** AdjustFieldDescription set the needed values for the description
             @param	_pFieldDesc		the field description where to set the values
             @param	_rMultiSel		contains the postions which changed for undo/redo
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 4d738e4a0..f49a73ea3 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -70,9 +70,9 @@ OTableRowView::OTableRowView(Window* pParent)
     ,m_nDataPos(-1)
     ,m_nCurrentPos(-1)
     ,m_nCurUndoActId(0)
-    ,m_bCurrentModified(FALSE)
-    ,m_bUpdatable(FALSE)
-    ,m_bClipboardFilled(FALSE)
+    ,m_bCurrentModified(sal_False)
+    ,m_bUpdatable(sal_False)
+    ,m_bClipboardFilled(sal_False)
 {
     DBG_CTOR(OTableRowView,NULL);
 
@@ -103,7 +103,7 @@ void OTableRowView::Init()
     SetFont(aFont);
 
     // HandleColumn, fuer maximal fuenf Ziffern einrichten
-    InsertHandleColumn(static_cast<USHORT>(GetTextWidth('0') * 4)/*, TRUE */);
+    InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth('0') * 4)/*, sal_True */);
 
     BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
                         BROWSER_HLINESFULL | BROWSER_VLINESFULL | BROWSER_AUTOSIZE_LASTCOL;
@@ -136,7 +136,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt )
 }
 
 //------------------------------------------------------------------------
-void OTableRowView::SetUpdatable( BOOL bUpdate )
+void OTableRowView::SetUpdatable( sal_Bool bUpdate )
 {
     m_bUpdatable = bUpdate;
 
@@ -156,7 +156,7 @@ void OTableRowView::Command(const CommandEvent& rEvt)
                 return;
             }
 
-            USHORT nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
+            sal_uInt16 nColId = GetColumnAtXPosPixel(rEvt.GetMousePosPixel().X());
             long   nRow = GetRowAtYPosPixel(rEvt.GetMousePosPixel().Y());
 
             if ( nColId == HANDLE_ID )
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index fd208f2a3..a6bced474 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -303,7 +303,7 @@ IMPL_LINK( OTableDesignView, SwitchHdl, Accelerator*, /*pAcc*/ )
 //------------------------------------------------------------------------------
 long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
 {
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
     switch(rNEvt.GetType())
     {
         case EVENT_GETFOCUS:
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index c6c9f0679..3e5a9789f 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -123,7 +123,7 @@ void OTableFieldControl::DeactivateAggregate( EControlType eType )
     }
 }
 // -----------------------------------------------------------------------------
-void OTableFieldControl::SetModified(BOOL bModified)
+void OTableFieldControl::SetModified(sal_Bool bModified)
 {
     GetCtrl()->GetView()->getController().setModified(bModified);
 }
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index da0ed4a80..e6e3e9726 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -45,9 +45,9 @@ namespace dbaui
         virtual void		ActivateAggregate( EControlType eType );
         virtual void		DeactivateAggregate( EControlType eType );
         // Sind von den abgeleiteten Klassen zu impl.
-        virtual void		CellModified(long nRow, USHORT nColId );
-        virtual BOOL		IsReadOnly();
-        virtual void		SetModified(BOOL bModified);
+        virtual void		CellModified(long nRow, sal_uInt16 nColId );
+        virtual sal_Bool		IsReadOnly();
+        virtual void		SetModified(sal_Bool bModified);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >	GetFormatter() const;
         
         virtual ::com::sun::star::lang::Locale	GetLocale() const;
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 01362544e..ca87dc842 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -320,7 +320,7 @@ void OTableFieldDescWin::LoseFocus()
 // -----------------------------------------------------------------------------
 long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
 {
-    BOOL bHandled = FALSE;
+    sal_Bool bHandled = sal_False;
     switch(rNEvt.GetType())
     {
         case EVENT_GETFOCUS:
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 3dd5165ec..3df94efc4 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -75,16 +75,16 @@ namespace dbaui
 
         void DisplayData( OFieldDescription* pFieldDescr );
         void SaveData( OFieldDescription* pFieldDescr );
-        void SetReadOnly( BOOL bReadOnly );
+        void SetReadOnly( sal_Bool bReadOnly );
 
         // window overloads
         virtual long PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
         virtual void LoseFocus();
 
-        void SetControlText( USHORT nControlId, const String& rText )
+        void SetControlText( sal_uInt16 nControlId, const String& rText )
                 { m_pGenPage->SetControlText(nControlId,rText); }
-        String GetControlText( USHORT nControlId )
+        String GetControlText( sal_uInt16 nControlId )
                 { return m_pGenPage->GetControlText(nControlId); }
 
         //	short GetFormatCategory(OFieldDescription* pFieldDescr) { return m_pGenPage ? m_pGenPage->GetFormatCategory(pFieldDescr) : -1; }
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 375caea90..e84ef6981 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -75,7 +75,7 @@ namespace dbaui
     // -----------------------------------------------------------------------------
     sal_Bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
     {
-        ULONG nFormat = SotExchange::GetFormat(rFlavor);
+        sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
         if(nFormat == SOT_FORMATSTR_ID_SBA_TABED)
             return SetObject(&m_vTableRow,SOT_FORMATSTR_ID_SBA_TABED,rFlavor);
         return sal_False;
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index de4c09939..fe5afaec4 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -72,7 +72,7 @@ TYPEINIT1( OPrimKeyUndoAct,             OTableEditorUndoAct );
 // class OTableDesignUndoAct
 //==============================================================================
 DBG_NAME(OTableDesignUndoAct);
-OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,USHORT nCommentID ) : OCommentUndoAction(nCommentID)
+OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID)
     ,m_pTabDgnCtrl(  pOwner )
 {
     DBG_CTOR(OTableDesignUndoAct,NULL);
@@ -116,7 +116,7 @@ void OTableDesignUndoAct::Redo()
 // class OTableDesignCellUndoAct
 //==============================================================================
 DBG_NAME(OTableDesignCellUndoAct);
-OTableDesignCellUndoAct::OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, USHORT nColumn ) :
+OTableDesignCellUndoAct::OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ) :
      OTableDesignUndoAct( pOwner ,STR_TABED_UNDO_CELLMODIFIED)
     ,m_nCol( nColumn )
     ,m_nRow( nRowID )
@@ -170,7 +170,7 @@ void OTableDesignCellUndoAct::Redo()
 // class OTableEditorUndoAct
 //==============================================================================
 DBG_NAME(OTableEditorUndoAct);
-OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,USHORT _nCommentID ) :
+OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) :
      OTableDesignUndoAct(  pOwner ,_nCommentID)
     ,pTabEdCtrl(pOwner)
 {
@@ -187,7 +187,7 @@ OTableEditorUndoAct::~OTableEditorUndoAct()
 // class OTableEditorTypeSelUndoAct
 //==============================================================================
 DBG_NAME(OTableEditorTypeSelUndoAct);
-OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType )
+OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType )
     :OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_TYPE_CHANGED)
     ,m_nCol( nColumn )
     ,m_nRow( nRowID )
@@ -266,7 +266,7 @@ void OTableEditorDelUndoAct::Undo()
 {
     //////////////////////////////////////////////////////////////////////
     // Geloeschte Zeilen wieder einfuegen
-    ULONG nPos;
+    sal_uLong nPos;
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
     
@@ -290,7 +290,7 @@ void OTableEditorDelUndoAct::Redo()
 {
     //////////////////////////////////////////////////////////////////////
     // Zeilen wieder loeschen
-    ULONG nPos;
+    sal_uLong nPos;
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_aDeletedRows.begin();
     ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_aDeletedRows.end();
     ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList();
@@ -339,7 +339,7 @@ void OTableEditorInsUndoAct::Undo()
         pOriginalRows->erase(pOriginalRows->begin()+i);
     }
 
-    pTabEdCtrl->RowRemoved( m_nInsPos, m_vInsertedRows.size(), TRUE );
+    pTabEdCtrl->RowRemoved( m_nInsPos, m_vInsertedRows.size(), sal_True );
     pTabEdCtrl->InvalidateHandleColumn();
 
     OTableEditorUndoAct::Undo();
@@ -362,7 +362,7 @@ void OTableEditorInsUndoAct::Redo()
         nInsertRow++;
     }
 
-    pTabEdCtrl->RowInserted( m_nInsPos, m_vInsertedRows.size(), TRUE );
+    pTabEdCtrl->RowInserted( m_nInsPos, m_vInsertedRows.size(), sal_True );
     pTabEdCtrl->InvalidateHandleColumn();
 
     OTableEditorUndoAct::Redo();
@@ -398,7 +398,7 @@ void OTableEditorInsNewUndoAct::Undo()
         pOriginalRows->erase(pOriginalRows->begin()+i);
     }
 
-    pTabEdCtrl->RowRemoved( m_nInsPos, m_nInsRows, TRUE );
+    pTabEdCtrl->RowRemoved( m_nInsPos, m_nInsRows, sal_True );
     pTabEdCtrl->InvalidateHandleColumn();
 
     OTableEditorUndoAct::Undo();
@@ -414,7 +414,7 @@ void OTableEditorInsNewUndoAct::Redo()
     for( long i=m_nInsPos; i<(m_nInsPos+m_nInsRows); i++ )
         pRowList->insert( pRowList->begin()+i,::boost::shared_ptr<OTableRow>(new OTableRow()) );
 
-    pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, TRUE );
+    pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, sal_True );
     pTabEdCtrl->InvalidateHandleColumn();
 
     OTableEditorUndoAct::Redo();
@@ -454,7 +454,7 @@ void OPrimKeyUndoAct::Undo()
     {
         OSL_ENSURE(nIndex <= static_cast<long>(pRowList->size()),"Index for undo isn't valid!");
         pRow = (*pRowList)[nIndex];
-        pRow->SetPrimaryKey( FALSE );
+        pRow->SetPrimaryKey( sal_False );
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -463,7 +463,7 @@ void OPrimKeyUndoAct::Undo()
     {
         OSL_ENSURE(nIndex <= static_cast<long>(pRowList->size()),"Index for undo isn't valid!");
         pRow = (*pRowList)[nIndex];
-        pRow->SetPrimaryKey( TRUE );
+        pRow->SetPrimaryKey( sal_True );
     }
 
     m_pEditorCtrl->InvalidateHandleColumn();
@@ -479,12 +479,12 @@ void OPrimKeyUndoAct::Redo()
     //////////////////////////////////////////////////////////////////////
     // Die geloeschten Keys loeschen
     for( nIndex = m_aDelKeys.FirstSelected(); nIndex != (long)SFX_ENDOFSELECTION; nIndex=m_aDelKeys.NextSelected() )
-        (*pRowList)[nIndex]->SetPrimaryKey( FALSE );
+        (*pRowList)[nIndex]->SetPrimaryKey( sal_False );
 
     //////////////////////////////////////////////////////////////////////
     // Die eingefuegten Keys herstellen
     for( nIndex = m_aInsKeys.FirstSelected(); nIndex != (long)SFX_ENDOFSELECTION; nIndex=m_aInsKeys.NextSelected() )
-        (*pRowList)[nIndex]->SetPrimaryKey( TRUE );
+        (*pRowList)[nIndex]->SetPrimaryKey( sal_True );
 
     m_pEditorCtrl->InvalidateHandleColumn();
     OTableEditorUndoAct::Redo();
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 5f00196eb..f73c803c6 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -57,7 +57,7 @@ namespace dbaui
         virtual void	Redo();
     public:
         TYPEINFO();
-        OTableDesignUndoAct( OTableRowView* pOwner ,USHORT nCommentID);
+        OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID);
         virtual ~OTableDesignUndoAct();
     };
 
@@ -70,7 +70,7 @@ namespace dbaui
 
     public:
         TYPEINFO();
-        OTableEditorUndoAct( OTableEditorCtrl* pOwner,USHORT nCommentID );
+        OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID );
         virtual ~OTableEditorUndoAct();
     };
 
@@ -79,7 +79,7 @@ namespace dbaui
     class OTableDesignCellUndoAct : public OTableDesignUndoAct
     {
     protected:
-        USHORT	m_nCol;
+        sal_uInt16	m_nCol;
         long	m_nRow;
         ::com::sun::star::uno::Any	m_sOldText;
         ::com::sun::star::uno::Any	m_sNewText;
@@ -88,7 +88,7 @@ namespace dbaui
         virtual void	Redo();
     public:
         TYPEINFO();
-        OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, USHORT nColumn );
+        OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn );
         virtual ~OTableDesignCellUndoAct();
     };
 
@@ -97,7 +97,7 @@ namespace dbaui
     class OTableEditorTypeSelUndoAct : public OTableEditorUndoAct
     {
     protected:
-        USHORT			m_nCol;
+        sal_uInt16			m_nCol;
         long			m_nRow;
         TOTypeInfoSP	m_pOldType;
         TOTypeInfoSP	m_pNewType;
@@ -106,7 +106,7 @@ namespace dbaui
         virtual void	Redo();
     public:
         TYPEINFO();
-        OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, USHORT nColumn, const TOTypeInfoSP& _pOldType );
+        OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType );
         virtual ~OTableEditorTypeSelUndoAct();
     };
 
@@ -162,7 +162,7 @@ namespace dbaui
     protected:
         MultiSelection		m_aDelKeys, 
                             m_aInsKeys;
-        BOOL				m_bActPrimKeySet;
+        sal_Bool				m_bActPrimKeySet;
         OTableEditorCtrl* m_pEditorCtrl;
 
         virtual void	Undo();