dba34c: pulled and merged DEV300.m100

47 files changed, 183 insertions, 183 deletions

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 e8af8bcee..d68a144a5 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 0782afe2f..96727961e 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 >