Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
masterfix DEV300: #i10000# usage of L10N build_type
masterfix: #i10000# INT16 -> sal_Int16
fixed compile errors after resync to m100, part2
gridsort: post-rebase fixes
CWS gnumake3: found another tools integer type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
native359: #i114398# changing mac langpack icon
native359: #i115669# fixing package description for solaris packages
gnumake3: remove comphelper version; fix including extract.hxx
locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
sb138: #i116659# timely termination of OnLogRotateThread
accfixes: removed include of obsolete header file
accfixes: removed obsolete file
removetooltypes01: #i112600# Fix build problems on non-pro
accfixes: moved some shared strings to svx part2
accfixes: moved some shared strings to svx
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
removetooltypes01: #i112600# Remove tools types for Mac specific parts
fixed tab order in BasicIDE, Library dialog tab page
added some accessible names in BasicIDE
...

Conflicts:
UnoControls/source/base/registercontrols.cxx
accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
automation/inc/automation/communi.hxx
automation/inc/automation/simplecm.hxx
automation/source/communi/communi.cxx
automation/source/inc/rcontrol.hxx
automation/source/miniapp/servuid.hxx
automation/source/server/XMLParser.cxx
automation/source/server/cmdbasestream.cxx
automation/source/server/profiler.hxx
automation/source/server/recorder.cxx
automation/source/server/retstrm.hxx
automation/source/server/server.cxx
automation/source/server/sta_list.cxx
automation/source/server/statemnt.cxx
automation/source/server/statemnt.hxx
automation/source/simplecm/packethandler.cxx
automation/source/simplecm/simplecm.cxx
automation/source/simplecm/tcpio.cxx
automation/source/simplecm/tcpio.hxx
automation/source/testtool/comm_bas.hxx
automation/source/testtool/cretstrm.hxx
automation/source/testtool/httprequest.cxx
automation/source/testtool/httprequest.hxx
automation/source/testtool/objtest.cxx
automation/source/testtool/objtest.hxx
basctl/source/basicide/baside2.cxx
basctl/source/basicide/baside2.hxx
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
basctl/source/basicide/basides1.cxx
basctl/source/basicide/basides2.cxx
basctl/source/basicide/basidesh.cxx
basctl/source/basicide/basidesh.src
basctl/source/basicide/basobj3.cxx
basctl/source/basicide/bastype2.cxx
basctl/source/basicide/bastype3.cxx
basctl/source/basicide/bastypes.cxx
basctl/source/basicide/brkdlg.cxx
basctl/source/basicide/iderdll.cxx
basctl/source/basicide/macrodlg.cxx
basctl/source/basicide/moduldl2.cxx
basctl/source/basicide/moduldlg.cxx
basctl/source/basicide/objdlg.cxx
basctl/source/basicide/scriptdocument.cxx
basctl/source/basicide/tbxctl.cxx
basctl/source/basicide/tbxctl.hxx
basctl/source/basicide/tbxctl.src
basctl/source/dlged/dlged.cxx
basctl/source/dlged/dlgedfunc.cxx
basctl/source/dlged/dlgedobj.cxx
basctl/source/inc/basidesh.hxx
basctl/source/inc/bastypes.hxx
basctl/source/inc/dlgedmod.hxx
basctl/source/inc/dlgedpage.hxx
crashrep/prj/build.lst
cui/inc/pch/precompiled_cui.hxx
cui/source/customize/acccfg.cxx
cui/source/customize/acccfg.hrc
cui/source/customize/acccfg.src
cui/source/customize/cfg.cxx
cui/source/customize/cfgutil.cxx
cui/source/customize/macropg.cxx
cui/source/customize/macropg.src
cui/source/customize/selector.cxx
cui/source/dialogs/SpellDialog.cxx
cui/source/dialogs/commonlingui.cxx
cui/source/dialogs/cuicharmap.cxx
cui/source/dialogs/cuifmsearch.cxx
cui/source/dialogs/cuigaldlg.cxx
cui/source/dialogs/cuigrfflt.cxx
cui/source/dialogs/hldocntp.cxx
cui/source/dialogs/hldoctp.cxx
cui/source/dialogs/hlinettp.cxx
cui/source/dialogs/hlmailtp.cxx
cui/source/dialogs/hlmarkwn.cxx
cui/source/dialogs/hlmarkwn.src
cui/source/dialogs/hltpbase.cxx
cui/source/dialogs/iconcdlg.cxx
cui/source/dialogs/passwdomdlg.cxx
cui/source/dialogs/pastedlg.cxx
cui/source/dialogs/scriptdlg.cxx
cui/source/dialogs/thesdlg.cxx
cui/source/dialogs/zoom.cxx
cui/source/factory/dlgfact.hxx
cui/source/inc/SpellDialog.hxx
cui/source/inc/autocdlg.hxx
cui/source/inc/backgrnd.hxx
cui/source/inc/bbdlg.hxx
cui/source/inc/cfg.hxx
cui/source/inc/cfgutil.hxx
cui/source/inc/cuigaldlg.hxx
cui/source/inc/cuigrfflt.hxx
cui/source/inc/cuitabarea.hxx
cui/source/inc/cuitabline.hxx
cui/source/inc/hldocntp.hxx
cui/source/inc/hltpbase.hxx
cui/source/inc/iconcdlg.hxx
cui/source/inc/numpages.hxx
cui/source/inc/page.hxx
cui/source/inc/postdlg.hxx
cui/source/inc/scriptdlg.hxx
cui/source/inc/transfrm.hxx
cui/source/inc/zoom.hxx
cui/source/options/cfgchart.cxx
cui/source/options/cuisrchdlg.cxx
cui/source/options/dbregister.cxx
cui/source/options/dbregister.src
cui/source/options/fontsubs.cxx
cui/source/options/internationaloptions.cxx
cui/source/options/optasian.cxx
cui/source/options/optchart.cxx
cui/source/options/optcolor.cxx
cui/source/options/optcolor.src
cui/source/options/optfltr.cxx
cui/source/options/optfltr.src
cui/source/options/optgdlg.cxx
cui/source/options/optgdlg.src
cui/source/options/optgenrl.cxx
cui/source/options/opthtml.cxx
cui/source/options/optimprove.cxx
cui/source/options/optinet2.cxx
cui/source/options/optinet2.hxx
cui/source/options/optjava.cxx
cui/source/options/optlingu.cxx
cui/source/options/optsave.cxx
cui/source/options/optsave.hxx
cui/source/options/treeopt.cxx
cui/source/options/webconninfo.cxx
cui/source/tabpages/autocdlg.cxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/border.cxx
cui/source/tabpages/chardlg.cxx
cui/source/tabpages/dstribut.cxx
cui/source/tabpages/grfpage.cxx
cui/source/tabpages/macroass.cxx
cui/source/tabpages/measure.cxx
cui/source/tabpages/numfmt.cxx
cui/source/tabpages/numpages.cxx
cui/source/tabpages/page.cxx
cui/source/tabpages/paragrph.cxx
cui/source/tabpages/swpossizetabpage.cxx
cui/source/tabpages/tabarea.src
cui/source/tabpages/textanim.cxx
cui/source/tabpages/textattr.cxx
cui/source/tabpages/tparea.cxx
cui/source/tabpages/tpbitmap.cxx
cui/source/tabpages/tpcolor.cxx
cui/source/tabpages/tpgradnt.cxx
cui/source/tabpages/tphatch.cxx
cui/source/tabpages/tpline.cxx
cui/source/tabpages/tplnedef.cxx
cui/source/tabpages/tplneend.cxx
cui/source/tabpages/tpshadow.cxx
cui/source/tabpages/transfrm.cxx
embedserv/source/embed/register.cxx
extensions/inc/pch/precompiled_extensions.hxx
extensions/inc/propctrlr.hrc
extensions/source/abpilot/abpservices.cxx
extensions/source/bibliography/bibload.cxx
extensions/source/bibliography/datman.cxx
extensions/source/bibliography/general.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/inc/componentmodule.cxx
extensions/source/nsplugin/source/so_env.cxx
extensions/source/ole/oleobjw.cxx
extensions/source/ole/oleobjw.hxx
extensions/source/oooimprovement/invite_job.cxx
extensions/source/oooimprovement/onlogrotate_job.cxx
extensions/source/plugin/base/service.cxx
extensions/source/plugin/inc/plugin/unx/mediator.hxx
extensions/source/plugin/inc/plugin/unx/plugcon.hxx
extensions/source/plugin/unx/mediator.cxx
extensions/source/plugin/unx/nppapi.cxx
extensions/source/plugin/unx/plugcon.cxx
extensions/source/preload/services.cxx
extensions/source/propctrlr/formmetadata.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/resource/resource.cxx
extensions/source/scanner/sane.hxx
extensions/source/scanner/sanedlg.cxx
extensions/source/scanner/scanunx.cxx
extensions/source/scanner/scanwin.cxx
extensions/source/scanner/twain.cxx
extensions/source/scanner/twain.hxx
extensions/source/update/check/updatecheckconfig.cxx
extensions/test/stm/datatest.cxx
extensions/test/stm/marktest.cxx
extensions/test/stm/pipetest.cxx
extensions/test/stm/testfactreg.cxx
extensions/workben/testpgp.cxx
forms/qa/complex/forms/CheckOGroupBoxModel.java
forms/qa/makefile.mk
forms/source/component/Button.cxx
forms/source/component/Button.hxx
forms/source/component/ListBox.cxx
forms/source/inc/forms_module_impl.hxx
forms/source/misc/services.cxx
forms/source/solar/control/navtoolbar.cxx
javainstaller2/prj/build.lst
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
lingucomponent/prj/build.lst
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sreg.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/source/manifest/ManifestExport.cxx
package/source/manifest/UnoRegister.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/owriteablestream.hxx
package/source/xstor/xstorage.hxx
package/source/zippackage/ZipPackageFolder.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/mac/ooo/DS_Store
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
xmlsecurity/prj/build.lst
xmlsecurity/source/component/registerservices.cxx
xmlsecurity/source/dialogs/stbcontrl.cxx
xmlsecurity/source/framework/xsec_framework.cxx
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
xmlsecurity/tools/demo/util.hxx
xmlsecurity/workben/signaturetest.cxx

27 files changed, 151 insertions, 151 deletions

diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 77a59ef99fc1..b40253c2e100 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -357,12 +357,12 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId(
 
 Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBox()
 {
-    return mpBrowseBox->calcHeaderRect(isColumnBar(),FALSE);
+    return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_False);
 }
 
 Rectangle AccessibleBrowseBoxHeaderBar::implGetBoundingBoxOnScreen()
 {
-    return mpBrowseBox->calcHeaderRect(isColumnBar(),TRUE);
+    return mpBrowseBox->calcHeaderRect(isColumnBar(),sal_True);
 }
 
 sal_Int32 AccessibleBrowseBoxHeaderBar::implGetRowCount() const
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 4f778f5b8df8..8fa50319f5db 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -131,7 +131,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus()
 // -----------------------------------------------------------------------------
 namespace
 {
-    Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, BOOL _bOnScreen,BOOL _bRowBar)
+    Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar)
     {
         sal_Int32 nRow  = 0;
         sal_uInt16 nCol =  (sal_uInt16)_nRowColIndex;
@@ -141,20 +141,20 @@ namespace
             nCol = 0;
         }
 
-        Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, TRUE, _bOnScreen));
+        Rectangle aRet(_pBrowseBox->GetFieldRectPixelAbs( nRow , nCol, sal_True, _bOnScreen));
         return Rectangle(aRet.TopLeft() - Point(0,aRet.GetHeight()),aRet.GetSize());
     }
 }
 
 Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox()
 {
-    return getRectangle(mpBrowseBox,m_nColumnRowId,FALSE,isRowBarCell());
+    return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell());
 }
 // -----------------------------------------------------------------------------
 
 Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
 {
-    return getRectangle(mpBrowseBox,m_nColumnRowId,TRUE,isRowBarCell());
+    return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell());
 }
 // -----------------------------------------------------------------------------
 sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index fabe25d079f5..1e10f902cf2a 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -240,7 +240,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName()
 
 Rectangle AccessibleBrowseBoxTable::implGetBoundingBox()
 {
-    return mpBrowseBox->calcTableRect(FALSE);
+    return mpBrowseBox->calcTableRect(sal_False);
 }
 
 Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 6cdd7e22c4ab..40ca8ef9fbe4 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -66,7 +66,7 @@ namespace accessibility
     ::rtl::OUString AccessibleBrowseBoxTableCell::implGetText()
     {
         ensureIsAlive();
-        return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< USHORT >( getColumnPos() ) );
+        return mpBrowseBox->GetAccessibleCellText( getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) );
     }
 
     ::com::sun::star::lang::Locale AccessibleBrowseBoxTableCell::implGetLocale()
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 4fdadbec97f4..4c2c5d130582 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -246,8 +246,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil
     ensureIsValidIndex( nChildIndex );
     sal_Int32 nColumns = m_aTable.GetColumnCount();
     sal_Int32 nRow = (nChildIndex / nColumns);
-    std::vector< sal_Int32 > selectedRows = m_aTable.GetSelectedRows();
-    selectedRows.push_back(nRow);
+    m_aTable.SelectRow( nRow, sal_True );
 }
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
@@ -266,8 +265,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getOslMutex() );
     ensureIsAlive();
-    for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++)
-        m_aTable.RemoveSelectedRow((sal_Int32)i);
+    m_aTable.SelectAllRows( false );
 }
 void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
     throw ( uno::RuntimeException )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 211f2a29d03f..5dc6032eab7a 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -246,7 +246,10 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
 
 void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
 {
-    rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
+    sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() );
+    rSeq.realloc( selectionCount );
+    for ( sal_Int32 i=0; i<selectionCount; ++i )
+        rSeq[i] = m_aTable.GetSelectedRowIndex(i);
 }
 
 void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index addbcaaa7cf8..708d7bb0aabc 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -77,13 +77,13 @@ namespace accessibility
     // -----------------------------------------------------------------------------
     ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox()
     {
-        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, FALSE, FALSE );
+        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False );
     }
 
     // -----------------------------------------------------------------------------
     ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen()
     {
-        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, FALSE );
+        return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False );
     }
 
 // .................................................................................
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index dddb38fcbea1..ec970a5db414 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -91,7 +91,7 @@ namespace accessibility
                         SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
                         if ( pEntry )
                         {
-                            ULONG nPos = pCtrl->GetEntryListPos( pEntry );
+                            sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
                             Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
                             uno::Any aOldValue, aNewValue;
                             aNewValue <<= xChild;
diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
index 2e91908ce36a..117975bcd6f4 100644
--- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx
@@ -79,7 +79,7 @@ namespace accessibility
     // Ctor() and Dtor()
     // -----------------------------------------------------------------------------
     AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl,
-                                                                  ULONG _nPos,
+                                                                  sal_uLong _nPos,
                                                                   const Reference< XAccessible >& _xParent ) :
 
         AccessibleIconChoiceCtrlEntry_BASE  ( m_aMutex ),
@@ -504,7 +504,7 @@ throw(RuntimeException)
             for ( long i = 0; i < nLen; ++i )
             {
                 Rectangle aRect = aLayoutData.GetCharacterBounds(i);
-                BOOL bInside = aRect.IsInside( aPnt );
+                sal_Bool bInside = aRect.IsInside( aPnt );
 
                 if ( bInside )
                     break;
@@ -525,7 +525,7 @@ throw(RuntimeException)
             throw IndexOutOfBoundsException();
 
         sal_Int32 nLen = nEndIndex - nStartIndex + 1;
-        ::svt::OStringTransfer::CopyString( sText.Copy( (USHORT)nStartIndex, (USHORT)nLen ), m_pIconCtrl );
+        ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), m_pIconCtrl );
 
         return sal_True;
     }
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index 95e52056e1da..5ad861d9da12 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -307,7 +307,7 @@ namespace accessibility
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
-        getListBox()->Select( pEntry, TRUE );
+        getListBox()->Select( pEntry, sal_True );
     }
     // -----------------------------------------------------------------------------
     sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
@@ -335,7 +335,7 @@ namespace accessibility
         {
             SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
             if ( getListBox()->IsSelected( pEntry ) )
-                getListBox()->Select( pEntry, FALSE );
+                getListBox()->Select( pEntry, sal_False );
         }
     }
     // -----------------------------------------------------------------------------
@@ -351,7 +351,7 @@ namespace accessibility
         {
             SvLBoxEntry* pEntry = getListBox()->GetEntry( i );
             if ( !getListBox()->IsSelected( pEntry ) )
-                getListBox()->Select( pEntry, TRUE );
+                getListBox()->Select( pEntry, sal_True );
         }
     }
     // -----------------------------------------------------------------------------
@@ -411,7 +411,7 @@ namespace accessibility
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
-        getListBox()->Select( pEntry, FALSE );
+        getListBox()->Select( pEntry, sal_False );
     }
     // -----------------------------------------------------------------------------
     void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 71c52a90b1db..27390c51ce1c 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -609,7 +609,7 @@ namespace accessibility
             throw IndexOutOfBoundsException();
 
         sal_Int32 nLen = nEndIndex - nStartIndex + 1;
-        ::svt::OStringTransfer::CopyString( sText.Copy( (USHORT)nStartIndex, (USHORT)nLen ), getListBox() );
+        ::svt::OStringTransfer::CopyString( sText.Copy( (sal_uInt16)nStartIndex, (sal_uInt16)nLen ), getListBox() );
 
         return sal_True;
     }
@@ -716,7 +716,7 @@ namespace accessibility
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
-        getListBox()->Select( pEntry, TRUE );
+        getListBox()->Select( pEntry, sal_True );
     }
     // -----------------------------------------------------------------------------
     sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
@@ -750,7 +750,7 @@ namespace accessibility
         {
             SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( getListBox()->IsSelected( pEntry ) )
-                getListBox()->Select( pEntry, FALSE );
+                getListBox()->Select( pEntry, sal_False );
         }
     }
     // -----------------------------------------------------------------------------
@@ -770,7 +770,7 @@ namespace accessibility
         {
             SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, i );
             if ( !getListBox()->IsSelected( pEntry ) )
-                getListBox()->Select( pEntry, TRUE );
+                getListBox()->Select( pEntry, sal_True );
         }
     }
     // -----------------------------------------------------------------------------
@@ -842,7 +842,7 @@ namespace accessibility
         if ( !pEntry )
             throw IndexOutOfBoundsException();
 
-        getListBox()->Select( pEntry, FALSE );
+        getListBox()->Select( pEntry, sal_False );
     }
     sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition(  ) throw (::com::sun::star::uno::RuntimeException)
     {
diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx
index db46d1862b9d..61bd754c8d6a 100644
--- a/accessibility/source/extended/accessibletabbar.cxx
+++ b/accessibility/source/extended/accessibletabbar.cxx
@@ -273,7 +273,7 @@ namespace accessibility
 
                 if ( i < nCount )
                 {
-                    Window* pChild = m_pTabBar->GetAccessibleChildWindow( (USHORT)i );
+                    Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i );
                     if ( pChild )
                         xChild = pChild->GetAccessible();
                 }
@@ -319,7 +319,7 @@ namespace accessibility
             Window* pParent = m_pTabBar->GetAccessibleParentWindow();
             if ( pParent )
             {
-                for ( USHORT i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
+                for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i )
                 {
                     Window* pChild = pParent->GetAccessibleChildWindow( i );
                     if ( pChild == static_cast< Window* >( m_pTabBar ) )
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index ebbf07949e26..1f0adda0bc32 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -489,7 +489,7 @@ namespace accessibility
         {
             if ( m_pTabBar )
             {
-                sal_uInt16 nPageId = m_pTabBar->GetPageId( (USHORT)i );
+                sal_uInt16 nPageId = m_pTabBar->GetPageId( (sal_uInt16)i );
 
                 xChild = new AccessibleTabBarPage( m_pTabBar, nPageId, this );
 
@@ -716,7 +716,7 @@ namespace accessibility
 
         if ( m_pTabBar )
         {
-            m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( (USHORT)nChildIndex ) );
+            m_pTabBar->SetCurPageId( m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) );
             m_pTabBar->Update();
             m_pTabBar->ActivatePage();
             m_pTabBar->Select();
@@ -733,7 +733,7 @@ namespace accessibility
             throw IndexOutOfBoundsException();
 
         sal_Bool bSelected = sal_False;
-        if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (USHORT)nChildIndex ) )
+        if ( m_pTabBar && m_pTabBar->GetCurPageId() == m_pTabBar->GetPageId( (sal_uInt16)nChildIndex ) )
             bSelected = sal_True;
 
         return bSelected;
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 746963c9fe7a..7374cc020cf6 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -82,7 +82,7 @@ namespace accessibility
     {
         if ( isAlive() )
         {
-            ULONG nEventId = rVclWindowEvent.GetId();
+            sal_uLong nEventId = rVclWindowEvent.GetId();
             switch ( nEventId )
             {
                 case  VCLEVENT_OBJECT_DYING :
@@ -117,7 +117,7 @@ namespace accessibility
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
-                            USHORT nCol = m_pTabListBox->GetCurrColumn();
+                            sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
                             Reference< XAccessible > xChild =
                                 m_pTabListBox->CreateAccessibleCell( nRow, nCol );
                             uno::Any aOldValue, aNewValue;
@@ -157,7 +157,7 @@ namespace accessibility
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
-                            USHORT nCol = m_pTabListBox->GetCurrColumn();
+                            sal_uInt16 nCol = m_pTabListBox->GetCurrColumn();
                             TriState eState = STATE_DONTKNOW;
                             if ( m_pTabListBox->IsCellCheckBox( nRow, nCol, eState ) )
                             {
@@ -182,7 +182,7 @@ namespace accessibility
                         if ( pEntry )
                         {
                             sal_Int32 nRow = m_pTabListBox->GetEntryPos( pEntry );
-                            USHORT nCol = pData->m_nColumn;
+                            sal_uInt16 nCol = pData->m_nColumn;
                             Reference< XAccessible > xChild =
                                 m_pTabListBox->CreateAccessibleCell( nRow, nCol );
                             uno::Any aOldValue, aNewValue;
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index f3b209d419bc..6a4d5e53d8f1 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -896,7 +896,7 @@ Document::retrieveParagraphText(ParagraphImpl const * pParagraph)
 {
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     ::osl::MutexGuard aInternalGuard(GetMutex());
-    return m_rEngine.GetText(static_cast< ::ULONG >(pParagraph->getNumber()));
+    return m_rEngine.GetText(static_cast< ::sal_uLong >(pParagraph->getNumber()));
         // numeric overflow cannot happen here
 }
 
@@ -920,7 +920,7 @@ void Document::retrieveParagraphSelection(ParagraphImpl const * pParagraph,
             : static_cast< ::sal_Int32 >( aMinPaM.GetIndex() );
             // XXX numeric overflow
         *pEnd = nNumber < aMaxPaM.GetPara()
-            ? static_cast< ::sal_Int32 >( m_rEngine.GetText(static_cast< ::ULONG >(nNumber)).Len() )
+            ? static_cast< ::sal_Int32 >( m_rEngine.GetText(static_cast< ::sal_uLong >(nNumber)).Len() )
             : static_cast< ::sal_Int32 >( aMaxPaM.GetIndex() );
             // XXX  numeric overflow (3x)
 
@@ -952,7 +952,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
 {
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     ::osl::MutexGuard aInternalGuard(GetMutex());
-    ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
     sal_Int32 nLength = m_rEngine.GetText(nNumber).Len();
         // XXX  numeric overflow
     if (nIndex < 0 || nIndex > nLength)
@@ -967,17 +967,17 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
     {
         aBounds = AWTRectangle(
             m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
-                                                static_cast< ::USHORT >(nIndex))));
+                                                static_cast< ::sal_uInt16 >(nIndex))));
     }
     else
     {
         ::Rectangle aLeft(
             m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
-                                                static_cast< ::USHORT >(nIndex))));
+                                                static_cast< ::sal_uInt16 >(nIndex))));
             // XXX  numeric overflow
         ::Rectangle aRight(
             m_rEngine.PaMtoEditCursor(::TextPaM(nNumber,
-                                                static_cast< ::USHORT >(nIndex)
+                                                static_cast< ::sal_uInt16 >(nIndex)
                                                 + 1)));
             // XXX  numeric overflow (2x)
         // FIXME  If the vertical extends of the two cursors do not match, assume
@@ -1004,7 +1004,7 @@ Document::retrieveCharacterBounds(ParagraphImpl const * pParagraph,
 {
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     ::osl::MutexGuard aInternalGuard(GetMutex());
-    ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
         // XXX  numeric overflow
     ::TextPaM aPaM(m_rEngine.GetPaM(::Point(static_cast< long >(rPoint.X),
                                             static_cast< long >(rPoint.Y))));
@@ -1021,7 +1021,7 @@ Document::retrieveCharacterAttributes(
 {
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     ::osl::MutexGuard aInternalGuard(GetMutex());
-    ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
         // XXX  numeric overflow
     if (nIndex < 0 || nIndex >= m_rEngine.GetText(nNumber).Len())
         throw ::css::lang::IndexOutOfBoundsException(
@@ -1096,8 +1096,8 @@ void Document::retrieveRunAttributesImpl(
     const ::css::uno::Sequence< ::rtl::OUString >& RequestedAttributes,
     tPropValMap& rRunAttrSeq)
 {
-    ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
-    ::TextPaM aPaM( nNumber, static_cast< ::USHORT >( Index ) );
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
+    ::TextPaM aPaM( nNumber, static_cast< ::sal_uInt16 >( Index ) );
         // XXX  numeric overflow
     // FIXME  TEXTATTR_HYPERLINK ignored:
     ::TextAttribFontColor const * pColor
@@ -1153,7 +1153,7 @@ Document::retrieveRunAttributes(
 {
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
     ::osl::MutexGuard aInternalGuard( GetMutex() );
-    ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+    ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         // XXX  numeric overflow
     if ( Index < 0 || Index >= m_rEngine.GetText(nNumber).Len() )
         throw ::css::lang::IndexOutOfBoundsException(
@@ -1174,7 +1174,7 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     {
         ::osl::MutexGuard aInternalGuard(GetMutex());
-        ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
             // XXX  numeric overflow
         changeParagraphText(nNumber, 0, m_rEngine.GetTextLen(nNumber), false,
                             false, rText);
@@ -1189,7 +1189,7 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     {
         ::osl::MutexGuard aInternalGuard(GetMutex());
-        ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1199,8 +1199,8 @@ void Document::changeParagraphText(ParagraphImpl * pParagraph,
                         "textwindowaccessibility.cxx:"
                         " Document::changeParagraphText")),
                 static_cast< ::css::uno::XWeak * >(this));
-        changeParagraphText(nNumber, static_cast< ::USHORT >(nBegin),
-                            static_cast< ::USHORT >(nEnd), bCut, bPaste, rText);
+        changeParagraphText(nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                            static_cast< ::sal_uInt16 >(nEnd), bCut, bPaste, rText);
             // XXX  numeric overflow (2x)
     }
 }
@@ -1211,7 +1211,7 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     {
         ::osl::MutexGuard aInternalGuard(GetMutex());
-        ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1221,8 +1221,8 @@ void Document::copyParagraphText(ParagraphImpl const * pParagraph,
                                     " Document::copyParagraphText")),
                 static_cast< ::css::uno::XWeak * >(this));
         m_rView.SetSelection(
-            ::TextSelection(::TextPaM(nNumber, static_cast< ::USHORT >(nBegin)),
-                            ::TextPaM(nNumber, static_cast< ::USHORT >(nEnd))));
+            ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+                            ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
             // XXX  numeric overflow (2x)
         m_rView.Copy();
     }
@@ -1235,7 +1235,7 @@ void Document::changeParagraphAttributes(
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     {
         ::osl::MutexGuard aInternalGuard(GetMutex());
-        ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
         // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1254,15 +1254,15 @@ void Document::changeParagraphAttributes(
                     RTL_CONSTASCII_STRINGPARAM("CharColor")))
                 m_rEngine.SetAttrib(::TextAttribFontColor(
                                         mapFontColor(rAttributeSet[i].Value)),
-                                    nNumber, static_cast< ::USHORT >(nBegin),
-                                    static_cast< ::USHORT >(nEnd));
+                                    nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                                    static_cast< ::sal_uInt16 >(nEnd));
                     // XXX  numeric overflow (2x)
             else if (rAttributeSet[i].Name.equalsAsciiL(
                          RTL_CONSTASCII_STRINGPARAM("CharWeight")))
                 m_rEngine.SetAttrib(::TextAttribFontWeight(
                                         mapFontWeight(rAttributeSet[i].Value)),
-                                    nNumber, static_cast< ::USHORT >(nBegin),
-                                    static_cast< ::USHORT >(nEnd));
+                                    nNumber, static_cast< ::sal_uInt16 >(nBegin),
+                                    static_cast< ::sal_uInt16 >(nEnd));
                     // XXX  numeric overflow (2x)
     }
 }
@@ -1273,7 +1273,7 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard(getExternalLock());
     {
         ::osl::MutexGuard aInternalGuard(GetMutex());
-        ::ULONG nNumber = static_cast< ::ULONG >(pParagraph->getNumber());
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >(pParagraph->getNumber());
             // XXX  numeric overflow
         if (nBegin < 0 || nBegin > nEnd
             || nEnd > m_rEngine.GetText(nNumber).Len())
@@ -1283,8 +1283,8 @@ void Document::changeParagraphSelection(ParagraphImpl * pParagraph,
                                     " Document::changeParagraphSelection")),
                 static_cast< ::css::uno::XWeak * >(this));
         m_rView.SetSelection(
-            ::TextSelection(::TextPaM(nNumber, static_cast< ::USHORT >(nBegin)),
-                            ::TextPaM(nNumber, static_cast< ::USHORT >(nEnd))));
+            ::TextSelection(::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nBegin)),
+                            ::TextPaM(nNumber, static_cast< ::sal_uInt16 >(nEnd))));
             // XXX  numeric overflow (2x)
     }
 }
@@ -1300,7 +1300,7 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
     {
         ::osl::MutexGuard aInternalGuard( GetMutex() );
-        ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         if ( nIndex < 0 || nIndex > m_rEngine.GetText( nNumber ).Len() )
             throw ::css::lang::IndexOutOfBoundsException(
                 ::rtl::OUString(
@@ -1310,8 +1310,8 @@ Document::retrieveParagraphLineBoundary( ParagraphImpl const * pParagraph,
                 static_cast< ::css::uno::XWeak * >( this ) );
         ::sal_Int32 nLineStart = 0;
         ::sal_Int32 nLineEnd = 0;
-        ::USHORT nLineCount = m_rEngine.GetLineCount( nNumber );
-        for ( ::USHORT nLine = 0; nLine < nLineCount; ++nLine )
+        ::sal_uInt16 nLineCount = m_rEngine.GetLineCount( nNumber );
+        for ( ::sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine )
         {
             ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
                 m_rEngine.GetLineLen( nNumber, nLine ) );
@@ -1342,7 +1342,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
     ::osl::Guard< ::comphelper::IMutex > aExternalGuard( getExternalLock() );
     {
         ::osl::MutexGuard aInternalGuard( GetMutex() );
-        ::ULONG nNumber = static_cast< ::ULONG >( pParagraph->getNumber() );
+        ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() );
         if ( nLineNo >= m_rEngine.GetLineCount( nNumber ) )
             throw ::css::lang::IndexOutOfBoundsException(
                 ::rtl::OUString(
@@ -1352,7 +1352,7 @@ Document::retrieveParagraphBoundaryOfLine( ParagraphImpl const * pParagraph,
                 static_cast< ::css::uno::XWeak * >( this ) );
         ::sal_Int32 nLineStart = 0;
         ::sal_Int32 nLineEnd = 0;
-        for ( ::USHORT nLine = 0; nLine <= nLineNo; ++nLine )
+        for ( ::sal_uInt16 nLine = 0; nLine <= nLineNo; ++nLine )
         {
             ::sal_Int32 nLineLength = static_cast< ::sal_Int32 >(
                 m_rEngine.GetLineLen( nNumber, nLine ) );
@@ -1673,11 +1673,11 @@ void Document::init()
 {
     if (m_xParagraphs.get() == 0)
     {
-        ::ULONG nCount = m_rEngine.GetParagraphCount();
+        ::sal_uLong nCount = m_rEngine.GetParagraphCount();
         ::std::auto_ptr< Paragraphs > p(new Paragraphs);
         p->reserve(static_cast< Paragraphs::size_type >(nCount));
             // numeric overflow is harmless here
-        for (::ULONG i = 0; i < nCount; ++i)
+        for (::sal_uLong i = 0; i < nCount; ++i)
             p->push_back(ParagraphInfo(static_cast< ::sal_Int32 >(
                                            m_rEngine.GetTextHeight(i))));
                 // XXX  numeric overflow
@@ -1786,7 +1786,7 @@ void Document::notifyVisibleRangeChanges(
 }
 
 void
-Document::changeParagraphText(::ULONG nNumber, ::USHORT nBegin, ::USHORT nEnd,
+Document::changeParagraphText(::sal_uLong nNumber, ::sal_uInt16 nBegin, ::sal_uInt16 nEnd,
                               bool bCut, bool bPaste,
                               ::rtl::OUString const & rText)
 {
@@ -1812,7 +1812,7 @@ void Document::handleParagraphNotifications()
         {
         case TEXT_HINT_PARAINSERTED:
             {
-                ::ULONG n = aHint.GetValue();
+                ::sal_uLong n = aHint.GetValue();
                 OSL_ENSURE(n <= m_xParagraphs->size(),
                            "bad TEXT_HINT_PARAINSERTED event");
 
@@ -1864,7 +1864,7 @@ void Document::handleParagraphNotifications()
             }
         case TEXT_HINT_PARAREMOVED:
             {
-                ::ULONG n = aHint.GetValue();
+                ::sal_uLong n = aHint.GetValue();
                 if (n == TEXT_PARA_ALL)
                 {
                     {for (Paragraphs::iterator aIt(m_aVisibleBegin);
@@ -1979,7 +1979,7 @@ void Document::handleParagraphNotifications()
             }
         case TEXT_HINT_FORMATPARA:
             {
-                ::ULONG n = aHint.GetValue();
+                ::sal_uLong n = aHint.GetValue();
                 OSL_ENSURE(n < m_xParagraphs->size(),
                            "Bad TEXT_HINT_FORMATPARA event");
 
@@ -2080,10 +2080,10 @@ void Document::handleSelectionChangeNotification()
     // overlap---the overlap and/or the range to the right of it possibly being
     // empty.  Only for these two ranges notifications have to be sent.)
 
-    TextPaM aOldTextStart( static_cast< ULONG >( m_nSelectionFirstPara ), static_cast< USHORT >( m_nSelectionFirstPos ) );
-    TextPaM aOldTextEnd( static_cast< ULONG >( m_nSelectionLastPara ), static_cast< USHORT >( m_nSelectionLastPos ) );
-    TextPaM aNewTextStart( static_cast< ULONG >( nNewFirstPara ), static_cast< USHORT >( nNewFirstPos ) );
-    TextPaM aNewTextEnd( static_cast< ULONG >( nNewLastPara ), static_cast< USHORT >( nNewLastPos ) );
+    TextPaM aOldTextStart( static_cast< sal_uLong >( m_nSelectionFirstPara ), static_cast< sal_uInt16 >( m_nSelectionFirstPos ) );
+    TextPaM aOldTextEnd( static_cast< sal_uLong >( m_nSelectionLastPara ), static_cast< sal_uInt16 >( m_nSelectionLastPos ) );
+    TextPaM aNewTextStart( static_cast< sal_uLong >( nNewFirstPara ), static_cast< sal_uInt16 >( nNewFirstPos ) );
+    TextPaM aNewTextEnd( static_cast< sal_uLong >( nNewLastPara ), static_cast< sal_uInt16 >( nNewLastPos ) );
 
     // justify selections
     justifySelection( aOldTextStart, aOldTextEnd );
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index ab02caaa322c..d416efeee799 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -354,13 +354,13 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i )
             // create a new child
             OAccessibleMenuBaseComponent* pChild;
 
-            if ( m_pMenu->GetItemType( (USHORT)i ) == MENUITEM_SEPARATOR )
+            if ( m_pMenu->GetItemType( (sal_uInt16)i ) == MENUITEM_SEPARATOR )
             {
                 pChild = new VCLXAccessibleMenuSeparator( m_pMenu, (sal_uInt16)i );
             }
             else
             {
-                PopupMenu* pPopupMenu = m_pMenu->GetPopupMenu( m_pMenu->GetItemId( (USHORT)i ) );
+                PopupMenu* pPopupMenu = m_pMenu->GetPopupMenu( m_pMenu->GetItemId( (sal_uInt16)i ) );
                 if ( pPopupMenu )
                 {
                     pChild = new VCLXAccessibleMenu( m_pMenu, (sal_uInt16)i, pPopupMenu );
@@ -525,7 +525,7 @@ void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i )
 
     // highlight the child
     if ( m_pMenu )
-        m_pMenu->HighlightItem( (USHORT)i );
+        m_pMenu->HighlightItem( (sal_uInt16)i );
 }
 
 // -----------------------------------------------------------------------------
@@ -542,7 +542,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
 {
     sal_Bool bSelected = sal_False;
 
-    if ( m_pMenu && m_pMenu->IsHighlighted( (USHORT)i ) )
+    if ( m_pMenu && m_pMenu->IsHighlighted( (sal_uInt16)i ) )
         bSelected = sal_True;
 
     return bSelected;
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index 0b34e2efa800..2348198a7a1e 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -158,7 +158,7 @@ void OAccessibleMenuItemComponent::Click()
             // that the popup menus are executed synchronously.
             AllSettings aSettings = pWindow->GetSettings();
             MouseSettings aMouseSettings = aSettings.GetMouseSettings();
-            ULONG nDelay = aMouseSettings.GetMenuDelay();
+            sal_uLong nDelay = aMouseSettings.GetMenuDelay();
             aMouseSettings.SetMenuDelay( 0 );
             aSettings.SetMouseSettings( aMouseSettings );
             pWindow->SetSettings( aSettings );
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index c8177943a3f2..8e7d349ef988 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -32,7 +32,6 @@
 #include <accessibility/standard/vclxaccessibletextfield.hxx>
 #include <accessibility/standard/vclxaccessibleedit.hxx>
 #include <accessibility/standard/vclxaccessiblelist.hxx>
-#include <accessibility/standard/vclxaccessiblelistboxlist.hxx>
 #include <accessibility/helper/listboxhelper.hxx>
 
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f30a690c89d9..11e7f5497da9 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -293,7 +293,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt
         else if ( nValue > 1 )
             nValue = 1;
 
-        pButton->SetPressed( (BOOL) nValue );
+        pButton->SetPressed( (sal_Bool) nValue );
         bReturn = sal_True;
     }
 
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index b8f05dbc66c8..bbd329594f24 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -159,7 +159,7 @@ void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper&
             if ( !cEchoChar )
                 cEchoChar = '*';
             XubString sTmp;
-            aText = sTmp.Fill( (USHORT)aText.getLength(), cEchoChar );
+            aText = sTmp.Fill( (sal_uInt16)aText.getLength(), cEchoChar );
         }
     }
 
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index accce8440c7e..a411936fea4f 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -95,7 +95,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
     }
     UpdateVisibleLineCount();
 
-    USHORT nCount = static_cast<USHORT>(getAccessibleChildCount());
+    sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount());
     m_aAccessibleChildren.reserve(nCount);
 }
 // -----------------------------------------------------------------------------
@@ -178,10 +178,10 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew )
         VCLXAccessibleListItem* pItem = static_cast<VCLXAccessibleListItem*>(xHold.get());
         if ( pItem )
         {
-            USHORT nTopEntry = 0;
+            sal_uInt16 nTopEntry = 0;
             if ( m_pListBoxHelper )
                 nTopEntry = m_pListBoxHelper->GetTopEntry();
-            USHORT nPos = (USHORT)(aIter - m_aAccessibleChildren.begin());
+            sal_uInt16 nPos = (sal_uInt16)(aIter - m_aAccessibleChildren.begin());
             sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
             pItem->SetVisible( m_bVisible && bVisible );
         }
@@ -242,7 +242,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
             {
                 uno::Any    aOldValue,
                             aNewValue;
-                USHORT nPos = m_pListBoxHelper->GetSelectEntryPos();
+                sal_uInt16 nPos = m_pListBoxHelper->GetSelectEntryPos();
                 if ( nPos == LISTBOX_ENTRY_NOTFOUND )
                     nPos = m_pListBoxHelper->GetTopEntry();
                 if ( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -272,7 +272,7 @@ void VCLXAccessibleList::UpdateSelection (::rtl::OUString sTextOfSelectedItem)
         if ( pBox != NULL )
         {
             // Find the index of the selected item inside the VCL control...
-            USHORT nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
+            sal_uInt16 nIndex = pBox->GetEntryPos (XubString(sTextOfSelectedItem));
             // ...and then find the associated accessibility object.
             if ( nIndex == LISTBOX_ENTRY_NOTFOUND )
                 nIndex = 0;
@@ -301,7 +301,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
 {
     Reference<XAccessible> xChild;
 
-    USHORT nPos = static_cast<USHORT>(i);
+    sal_uInt16 nPos = static_cast<sal_uInt16>(i);
     if ( nPos >= m_aAccessibleChildren.size() )
     {
         m_aAccessibleChildren.resize(nPos + 1);
@@ -330,15 +330,15 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
     if ( xChild.is() )
     {
         // Just add the SELECTED state.
-        BOOL bNowSelected = FALSE;
+        sal_Bool bNowSelected = sal_False;
         if ( m_pListBoxHelper )
-            bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((USHORT)i);
+            bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
         VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
         pItem->SetSelected( bNowSelected );
 
         // Set the child's VISIBLE state.
         UpdateVisibleLineCount();
-        USHORT nTopEntry = 0;
+        sal_uInt16 nTopEntry = 0;
         if ( m_pListBoxHelper )
             nTopEntry = m_pListBoxHelper->GetTopEntry();
         sal_Bool bVisible = ( nPos>=nTopEntry && nPos<( nTopEntry + m_nVisibleLineCount ) );
@@ -359,7 +359,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nI
         }
         else
         {
-            if ( nIndex >= 0 && static_cast<USHORT>(nIndex) < m_aAccessibleChildren.size() )
+            if ( nIndex >= 0 && static_cast<sal_uInt16>(nIndex) < m_aAccessibleChildren.size() )
             {
                 ListItems::iterator aIter = m_aAccessibleChildren.erase(m_aAccessibleChildren.begin()+nIndex);
             ::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::DecrementIndexInParent);
@@ -416,7 +416,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3
 
     Reference< XAccessible > xChild;
     // search for the child
-    if ( static_cast<USHORT>(i) >= m_aAccessibleChildren.size() )
+    if ( static_cast<sal_uInt16>(i) >= m_aAccessibleChildren.size() )
         xChild = CreateChild (i);
     else
     {
@@ -488,8 +488,8 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt
         if ( contains( rPoint ) && m_nVisibleLineCount > 0 )
         {
             Point aPos = VCLPoint( rPoint );
-            USHORT nEndPos = m_pListBoxHelper->GetTopEntry() + (USHORT)m_nVisibleLineCount;
-            for ( USHORT i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i )
+            sal_uInt16 nEndPos = m_pListBoxHelper->GetTopEntry() + (sal_uInt16)m_nVisibleLineCount;
+            for ( sal_uInt16 i = m_pListBoxHelper->GetTopEntry(); i < nEndPos; ++i )
             {
                 if ( m_pListBoxHelper->GetBoundingRectangle(i).IsInside( aPos ) )
                 {
@@ -532,7 +532,7 @@ void VCLXAccessibleList::UpdateVisibleLineCount()
             m_nVisibleLineCount = m_pListBoxHelper->GetDisplayLineCount();
         else
         {
-            USHORT nCols = 0,
+            sal_uInt16 nCols = 0,
                 nLines = 0;
             m_pListBoxHelper->GetMaxVisColumnsAndLines (nCols, nLines);
             m_nVisibleLineCount = nLines;
@@ -555,7 +555,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
         UpdateVisibleLineCount();
         sal_Int32 nBegin = Min( m_nLastTopEntry, nTop );
         sal_Int32 nEnd = Max( m_nLastTopEntry + m_nVisibleLineCount, nTop + m_nVisibleLineCount );
-        for (USHORT i = static_cast<USHORT>(nBegin); (i <= static_cast<USHORT>(nEnd)); ++i)
+        for (sal_uInt16 i = static_cast<sal_uInt16>(nBegin); (i <= static_cast<sal_uInt16>(nEnd)); ++i)
         {
             sal_Bool bVisible = ( i >= nTop && i < ( nTop + m_nVisibleLineCount ) );
             Reference< XAccessible > xHold;
@@ -572,10 +572,10 @@ void VCLXAccessibleList::UpdateEntryRange_Impl()
     m_nLastTopEntry = nTop;
 }
 // -----------------------------------------------------------------------------
-BOOL VCLXAccessibleList::checkEntrySelected(USHORT _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
+sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc)
 {
     OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!");
-    BOOL bNowSelected = FALSE;
+    sal_Bool bNowSelected = sal_False;
     if ( m_pListBoxHelper )
     {
         bNowSelected = m_pListBoxHelper->IsEntryPosSelected (_nPos);
@@ -589,7 +589,7 @@ BOOL VCLXAccessibleList::checkEntrySelected(USHORT _nPos,Any& _rNewValue,Referen
 }
 // -----------------------------------------------------------------------------
 
-void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
+void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16)
 {
     uno::Any aOldValue, aNewValue;
 
@@ -600,7 +600,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
 
         if ( m_pListBoxHelper )
         {
-            USHORT i=0;
+            sal_uInt16 i=0;
             for ( ListItems::iterator aIter = m_aAccessibleChildren.begin();
                   aIter != m_aAccessibleChildren.end(); ++aIter,++i)
             {
@@ -609,7 +609,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
                 {
                     VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >( xHold.get() );
                     // Retrieve the item's index from the list entry.
-                    BOOL bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
+                    sal_Bool bNowSelected = m_pListBoxHelper->IsEntryPosSelected (i);
 
                     if ( bNowSelected && !pItem->IsSelected() )
                     {
@@ -626,7 +626,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT)
                     checkEntrySelected(i,aNewValue,xNewAcc);
                 }
             }
-            USHORT nCount = m_pListBoxHelper->GetEntryCount();
+            sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
             if ( i < nCount ) // here we have to check the if any other listbox entry is selected
             {
                 for (; i < nCount && !checkEntrySelected(i,aNewValue,xNewAcc) ;++i )
@@ -665,7 +665,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex )
         {
             checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
 
-            m_pListBoxHelper->SelectEntryPos( (USHORT)nChildIndex, TRUE );
+            m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nChildIndex, sal_True );
             // call the select handler, don't handle events in this time
             m_bDisableProcessEvent = true;
             m_pListBoxHelper->Select();
@@ -688,7 +688,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil
     {
         checkSelection_Impl(nChildIndex,*m_pListBoxHelper,sal_False);
 
-        bRet = m_pListBoxHelper->IsEntryPosSelected( (USHORT)nChildIndex );
+        bRet = m_pListBoxHelper->IsEntryPosSelected( (sal_uInt16)nChildIndex );
     }
     return bRet;
 }
@@ -722,9 +722,9 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren(  ) throw (Runtime
 
         if ( m_pListBoxHelper )
         {
-            USHORT nCount = m_pListBoxHelper->GetEntryCount();
-            for ( USHORT i = 0; i < nCount; ++i )
-                m_pListBoxHelper->SelectEntryPos( i, TRUE );
+            sal_uInt16 nCount = m_pListBoxHelper->GetEntryCount();
+            for ( sal_uInt16 i = 0; i < nCount; ++i )
+                m_pListBoxHelper->SelectEntryPos( i, sal_True );
             // call the select handler, don't handle events in this time
             m_bDisableProcessEvent = true;
             m_pListBoxHelper->Select();
@@ -756,7 +756,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild
     if ( m_pListBoxHelper )
     {
         checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_True);
-        return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (USHORT)nSelectedChildIndex ) );
+        return getAccessibleChild( (sal_Int32)m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) );
     }
 
     return NULL;
@@ -774,7 +774,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh
         {
             checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,sal_False);
 
-            m_pListBoxHelper->SelectEntryPos( (USHORT)nSelectedChildIndex, FALSE );
+            m_pListBoxHelper->SelectEntryPos( (sal_uInt16)nSelectedChildIndex, sal_False );
             // call the select handler, don't handle events in this time
             m_bDisableProcessEvent = true;
             m_pListBoxHelper->Select();
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 31332bd14a21..121e781e8c30 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -91,7 +91,7 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe
         m_xParentContext = m_xParent->getAccessibleContext();
 
     if ( m_pListBoxHelper )
-        m_sEntryText = m_pListBoxHelper->GetEntry( (USHORT)_nIndexInParent );
+        m_sEntryText = m_pListBoxHelper->GetEntry( (sal_uInt16)_nIndexInParent );
 }
 // -----------------------------------------------------------------------------
 VCLXAccessibleListItem::~VCLXAccessibleListItem()
@@ -357,7 +357,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
     sal_Bool bInside = sal_False;
     if ( m_pListBoxHelper )
     {
-        Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ) );
+        Rectangle aRect( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
         aRect.Move(-aRect.TopLeft().X(),-aRect.TopLeft().Y());
         bInside = aRect.IsInside( VCLPoint( _aPoint ) );
     }
@@ -376,7 +376,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds(  ) throw (RuntimeExce
 
     awt::Rectangle aRect;
     if ( m_pListBoxHelper )
-        aRect = AWTRectangle( m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ) );
+        aRect = AWTRectangle( m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ) );
 
     return aRect;
 }
@@ -389,7 +389,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation(  ) throw (RuntimeExcept
     Point aPoint(0,0);
     if ( m_pListBoxHelper )
     {
-        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aPoint = aRect.TopLeft();
     }
     return AWTPoint( aPoint );
@@ -403,7 +403,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen(  ) throw (Runti
     Point aPoint(0,0);
     if ( m_pListBoxHelper )
     {
-        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+        Rectangle aRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aPoint = aRect.TopLeft();
         aPoint += m_pListBoxHelper->GetWindowExtentsRelative( NULL ).TopLeft();
     }
@@ -417,7 +417,7 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize(  ) throw (RuntimeException)
 
     Size aSize;
     if ( m_pListBoxHelper )
-        aSize = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent ).GetSize();
+        aSize = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent ).GetSize();
 
     return AWTSize( aSize );
 }
@@ -478,7 +478,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
     if ( m_pListBoxHelper )
     {
         Rectangle aCharRect = m_pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
-        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
         aBounds = AWTRectangle( aCharRect );
     }
@@ -502,12 +502,12 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
     sal_Int32 nIndex = -1;
     if ( m_pListBoxHelper )
     {
-        USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
-        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (USHORT)m_nIndexInParent );
+        sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
+        Rectangle aItemRect = m_pListBoxHelper->GetBoundingRectangle( (sal_uInt16)m_nIndexInParent );
         Point aPnt( VCLPoint( aPoint ) );
         aPnt += aItemRect.TopLeft();
         sal_Int32 nI = m_pListBoxHelper->GetIndexForPoint( aPnt, nPos );
-        if ( nI != -1 && (USHORT)m_nIndexInParent == nPos )
+        if ( nI != -1 && (sal_uInt16)m_nIndexInParent == nPos )
             nIndex = nI;
     }
     return nIndex;
diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx
index 557c7756b027..56cd4fcf44f2 100644
--- a/accessibility/source/standard/vclxaccessiblemenubar.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx
@@ -173,7 +173,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent(  ) throw (RuntimeEx
             Window* pParent = pWindow->GetAccessibleParentWindow();
             if ( pParent )
             {
-                for ( USHORT n = pParent->GetAccessibleChildWindowCount(); n; )
+                for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; )
                 {
                     Window* pChild = pParent->GetAccessibleChildWindow( --n );
                     if ( pChild == pWindow )
diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
index fd8be1a820b6..32e132802391 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx
@@ -332,7 +332,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32
     {
         if ( m_pStatusBar )
         {
-            sal_uInt16 nItemId = m_pStatusBar->GetItemId( (USHORT)i );
+            sal_uInt16 nItemId = m_pStatusBar->GetItemId( (sal_uInt16)i );
 
             xChild = new VCLXAccessibleStatusBarItem( m_pStatusBar, nItemId );
 
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index cb4339aab4f7..913871240191 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -289,7 +289,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV
                 {
                     for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i )
                     {
-                        sal_uInt16 nPageId = m_pTabControl->GetPageId( (USHORT)i );
+                        sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
                         TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId );
                         if ( pTabPage == (TabPage*) pChild )
                             UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW );
@@ -392,7 +392,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32
     {
         if ( m_pTabControl )
         {
-            sal_uInt16 nPageId = m_pTabControl->GetPageId( (USHORT)i );
+            sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i );
 
             xChild = new VCLXAccessibleTabPage( m_pTabControl, nPageId );
 
@@ -434,7 +434,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th
         throw IndexOutOfBoundsException();
 
     if ( m_pTabControl )
-        m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (USHORT)nChildIndex ) );
+        m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) );
 }
 
 // -----------------------------------------------------------------------------
@@ -447,7 +447,7 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn
         throw IndexOutOfBoundsException();
 
     sal_Bool bSelected = sal_False;
-    if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (USHORT)nChildIndex ) )
+    if ( m_pTabControl && m_pTabControl->GetCurPageId() == m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) )
         bSelected = sal_True;
 
     return bSelected;
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx
index 26e586260005..71ae99652215 100644
--- a/accessibility/source/standard/vclxaccessibletoolbox.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx
@@ -227,26 +227,26 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl()
         return;
 
     // submit events only if toolbox has the focus to avoid sending events due to mouse move
-    BOOL bHasFocus = FALSE;
+    sal_Bool bHasFocus = sal_False;
     if ( pToolBox->HasFocus() )
-        bHasFocus = TRUE;
+        bHasFocus = sal_True;
     else
     {
         // check for subtoolbar, i.e. check if our parent is a toolbar
         ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() );
         // subtoolbars never get the focus as key input is just forwarded, so check if the parent toolbar has it
         if ( pToolBoxParent && pToolBoxParent->HasFocus() )
-            bHasFocus = TRUE;
+            bHasFocus = sal_True;
     }
 
     if ( bHasFocus )
     {
-        USHORT nHighlightItemId = pToolBox->GetHighlightItemId();
-        USHORT nFocusCount = 0;
+        sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
+        sal_uInt16 nFocusCount = 0;
         for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
               aIter != m_aAccessibleChildren.end(); ++aIter )
         {
-            USHORT nItemId = pToolBox->GetItemId( (USHORT)aIter->first );
+            sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
 
             if ( aIter->second.is() )
             {
@@ -296,7 +296,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32  )
         for ( ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.begin();
               aIter != m_aAccessibleChildren.end(); ++aIter )
         {
-                USHORT nItemId = pToolBox->GetItemId( (USHORT)aIter->first );
+                sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)aIter->first );
 
                 VCLXAccessibleToolBoxItem* pItem =
                     static_cast< VCLXAccessibleToolBoxItem* >( aIter->second.get() );
@@ -310,7 +310,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos )
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pToolBox )
     {
-        USHORT nItemId = pToolBox->GetItemId( (USHORT)_nPos );
+        sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)_nPos );
 
         ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find( _nPos );
         if ( aIter != m_aAccessibleChildren.end() && aIter->second.is() )
@@ -432,7 +432,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl()
         m_aAccessibleChildren.clear();
 
         // register the new items
-        USHORT i, nCount = pToolBox->GetItemCount();
+        sal_uInt16 i, nCount = pToolBox->GetItemCount();
         for ( i = 0; i < nCount; ++i )
         {
             Any aNewValue;
@@ -726,8 +726,8 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal
         ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(i);
         if ( m_aAccessibleChildren.end() == aIter )
         {
-            USHORT nItemId = pToolBox->GetItemId( (USHORT)i );
-            USHORT nHighlightItemId = pToolBox->GetHighlightItemId();
+            sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i );
+            sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId();
             Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
             // not found -> create a new child
             VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i );
@@ -766,7 +766,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pToolBox )
     {
-        USHORT nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) );
+        sal_uInt16 nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) );
         if ( nItemPos != TOOLBOX_ITEM_NOTFOUND )
             xAccessible = getAccessibleChild( nItemPos );
     }
@@ -781,10 +781,10 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V
     ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() );
     if ( pChildWindow && pToolBox )
     {
-        USHORT nCount = pToolBox->GetItemCount();
-        for (USHORT i = 0 ; i < nCount && !xReturn.is() ; ++i)
+        sal_uInt16 nCount = pToolBox->GetItemCount();
+        for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i)
         {
-            USHORT nItemId = pToolBox->GetItemId( i );
+            sal_uInt16 nItemId = pToolBox->GetItemId( i );
             Window* pItemWindow = pToolBox->GetItemWindow( nItemId );
             if ( pItemWindow == pChildWindow )
                 xReturn = getAccessibleChild(i);
@@ -810,7 +810,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
         throw IndexOutOfBoundsException();
     ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
-    USHORT nPos = static_cast < USHORT > (nChildIndex);
+    sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
     pToolBox->ChangeHighlight( nPos );
 }
 // -----------------------------------------------------------------------------
@@ -820,7 +820,7 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex
     if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() )
         throw IndexOutOfBoundsException();
     ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() );
-    USHORT nPos = static_cast < USHORT > (nChildIndex);
+    sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex);
     if ( pToolBox != NULL && pToolBox->GetHighlightItemId() == pToolBox->GetItemId( nPos ) )
         return sal_True;
     else
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index d1a61c726711..3c6a46c17242 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -87,11 +87,11 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
     m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) );
 
     DBG_ASSERT( m_pToolBox, "invalid toolbox" );
-    m_nItemId = m_pToolBox->GetItemId( (USHORT)m_nIndexInParent );
+    m_nItemId = m_pToolBox->GetItemId( (sal_uInt16)m_nIndexInParent );
     m_sOldName = GetText( true );
     m_bIsChecked = m_pToolBox->IsItemChecked( m_nItemId );
     m_bIndeterminate = ( m_pToolBox->GetItemState( m_nItemId ) == STATE_DONTKNOW );
-    ToolBoxItemType eType = m_pToolBox->GetItemType( (USHORT)m_nIndexInParent );
+    ToolBoxItemType eType = m_pToolBox->GetItemType( (sal_uInt16)m_nIndexInParent );
     switch ( eType )
     {
         case TOOLBOXITEM_BUTTON :
@@ -234,7 +234,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds(  ) throw (Runt
 {
     awt::Rectangle aRect;
     if ( m_pToolBox )
-        aRect = AWTRectangle( m_pToolBox->GetItemPosRect( (USHORT)m_nIndexInParent ) );
+        aRect = AWTRectangle( m_pToolBox->GetItemPosRect( (sal_uInt16)m_nIndexInParent ) );
 
     return aRect;
 }
@@ -686,7 +686,7 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw
         else if ( nValue > 1 )
             nValue = 1;
 
-        m_pToolBox->CheckItem( m_nItemId, (BOOL) nValue );
+        m_pToolBox->CheckItem( m_nItemId, (sal_Bool) nValue );
         bReturn = sal_True;
     }