Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
avmedia/source/framework/mediacontrol.cxx
connectivity/source/commontools/DateConversion.cxx
desktop/source/deployment/registry/component/dp_component.cxx
editeng/inc/editeng/numitem.hxx
editeng/inc/editeng/txtrange.hxx
editeng/source/editeng/editobj.cxx
editeng/source/editeng/editview.cxx
editeng/source/editeng/eehtml.cxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/misc/txtrange.cxx
editeng/source/outliner/outlin2.cxx
editeng/source/outliner/outlvw.cxx
framework/source/layoutmanager/layoutmanager.cxx
linguistic/source/lngsvcmgr.hxx
sfx2/source/appl/app.cxx
sfx2/source/appl/app.src
sfx2/source/appl/appbas.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appdde.cxx
sfx2/source/appl/appmain.cxx
sfx2/source/appl/appopen.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/appl/appserv.cxx
sfx2/source/appl/childwin.cxx
sfx2/source/appl/fileobj.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/workwin.cxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/macro.cxx
sfx2/source/control/objface.cxx
sfx2/source/control/request.cxx
sfx2/source/control/shell.cxx
sfx2/source/control/statcach.cxx
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/mailmodel.cxx
sfx2/source/dialog/mailmodelapi.cxx
sfx2/source/dialog/mgetempl.cxx
sfx2/source/dialog/splitwin.cxx
sfx2/source/dialog/styledlg.cxx
sfx2/source/dialog/tabdlg.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/dialog/tplcitem.cxx
sfx2/source/dialog/tplpitem.cxx
sfx2/source/doc/doctempl.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/new.cxx
sfx2/source/doc/objcont.cxx
sfx2/source/doc/objserv.cxx
sfx2/source/doc/objxtor.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/inc/helpid.hrc
sfx2/source/inc/sfxlocal.hrc
sfx2/source/inc/statcach.hxx
sfx2/source/inc/templdgi.hxx
sfx2/source/inc/virtmenu.hxx
sfx2/source/inc/workwin.hxx
sfx2/source/menu/mnumgr.cxx
sfx2/source/menu/virtmenu.cxx
sfx2/source/statbar/stbitem.cxx
sfx2/source/view/frame.cxx
sfx2/source/view/frame2.cxx
sfx2/source/view/orgmgr.cxx
sfx2/source/view/printer.cxx
sfx2/source/view/prnmon.cxx
sfx2/source/view/sfxbasecontroller.cxx
sfx2/source/view/viewfrm.cxx
sfx2/source/view/viewfrm2.cxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
svx/inc/svx/svditer.hxx
svx/source/dialog/sdstring.src
svx/source/form/fmpage.cxx
svx/source/form/formcontroller.cxx
svx/source/svdraw/svdcrtv.cxx
svx/source/svdraw/svditer.cxx
svx/source/svdraw/svdview.cxx
xmloff/source/forms/elementimport.cxx

17 files changed, 244 insertions, 312 deletions

diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index fd53e2577212..fd53e2577212 100644..100755
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.hrc
diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
index 5ef74f5874b3..5ef74f5874b3 100644..100755
--- a/sfx2/source/bastyp/bastyp.src
+++ b/sfx2/source/bastyp/bastyp.src
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index 9799afd9fa4e..1a462c8133e2 100644..100755
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -38,7 +38,7 @@
 //====================================================================
 // add nOffset to each bit-value in the set
 
-BitSet BitSet::operator<<( USHORT nOffset ) const
+BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
 {
     DBG_MEMTEST();
     // create a work-copy, return it if nothing to shift
@@ -47,17 +47,17 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
         return aSet;
 
     // compute the shiftment in long-words and bits
-    USHORT nBlockDiff = nOffset / 32;
-    ULONG nBitValDiff = nOffset % 32;
+    sal_uInt16 nBlockDiff = nOffset / 32;
+    sal_uIntPtr nBitValDiff = nOffset % 32;
 
     // compute the new number of bits
-    for ( USHORT nBlock = 0; nBlock < nBlockDiff; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nBlockDiff; ++nBlock )
         aSet.nCount = aSet.nCount - CountBits( *(aSet.pBitmap+nBlock) );
     aSet.nCount = aSet.nCount -
         CountBits( *(aSet.pBitmap+nBlockDiff) >> (32-nBitValDiff) );
 
     // shift complete long-words
-    USHORT nTarget, nSource;
+    sal_uInt16 nTarget, nSource;
     for ( nTarget = 0, nSource = nBlockDiff;
           (nSource+1) < aSet.nBlocks;
           ++nTarget, ++nSource )
@@ -75,7 +75,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
     // shorten the block-array
     if ( nTarget < aSet.nBlocks )
     {
-        ULONG* pNewMap = new ULONG[nTarget];
+        sal_uIntPtr* pNewMap = new sal_uIntPtr[nTarget];
         memcpy( pNewMap, aSet.pBitmap, 4 * nTarget );
         delete [] aSet.pBitmap;
         aSet.pBitmap = pNewMap;
@@ -89,7 +89,7 @@ BitSet BitSet::operator<<( USHORT nOffset ) const
 
 // substracts nOffset from each bit-value in the set
 
-BitSet BitSet::operator>>( USHORT ) const
+BitSet BitSet::operator>>( sal_uInt16 ) const
 {
     DBG_MEMTEST();
     return BitSet();
@@ -107,7 +107,7 @@ void BitSet::CopyFrom( const BitSet& rSet )
     if ( rSet.nBlocks )
     {
         DBG_MEMTEST();
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
     }
     else
@@ -140,13 +140,13 @@ BitSet::BitSet( const BitSet& rOrig )
 
 // creates a bitset from an array
 
-BitSet::BitSet( USHORT* pArray, USHORT nSize ):
+BitSet::BitSet( sal_uInt16* pArray, sal_uInt16 nSize ):
     nCount(nSize)
 {
     DBG_MEMTEST();
     // find the highest bit to set
-    USHORT nMax = 0;
-    for ( USHORT n = 0; n < nCount; ++n )
+    sal_uInt16 nMax = 0;
+    for ( sal_uInt16 n = 0; n < nCount; ++n )
         if ( pArray[n] > nMax )
             nMax = pArray[n];
 
@@ -155,15 +155,15 @@ BitSet::BitSet( USHORT* pArray, USHORT nSize ):
     {
         // allocate memory for all blocks needed
         nBlocks = nMax / 32 + 1;
-        pBitmap = new ULONG[nBlocks];
+        pBitmap = new sal_uIntPtr[nBlocks];
         memset( pBitmap, 0, 4 * nBlocks );
 
         // set all the bits
-        for ( USHORT n = 0; n < nCount; ++n )
+        for ( sal_uInt16 n = 0; n < nCount; ++n )
         {
             // compute the block no. and bitvalue
-            USHORT nBlock = n / 32;
-            ULONG nBitVal = 1L << (n % 32);
+            sal_uInt16 nBlock = n / 32;
+            sal_uIntPtr nBitVal = 1L << (n % 32);
 
             // set a single bit
             if ( ( *(pBitmap+nBlock) & nBitVal ) == 0 )
@@ -219,16 +219,16 @@ BitSet& BitSet::operator=( const BitSet& rOrig )
 
 // assignment from a single bit
 
-BitSet& BitSet::operator=( USHORT nBit )
+BitSet& BitSet::operator=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
     delete [] pBitmap;
 
     nBlocks = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
     nCount = 1;
 
-    pBitmap = new ULONG[nBlocks];
+    pBitmap = new sal_uIntPtr[nBlocks];
     memset( pBitmap + nBlocks, 0, 4 * nBlocks );
 
     *(pBitmap+nBlocks) = nBitVal;
@@ -240,11 +240,11 @@ BitSet& BitSet::operator=( USHORT nBit )
 
 // creates the asymetric difference with another bitset
 
-BitSet& BitSet::operator-=(USHORT nBit)
+BitSet& BitSet::operator-=(sal_uInt16 nBit)
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
       return *this;
@@ -265,12 +265,12 @@ BitSet& BitSet::operator-=(USHORT nBit)
 BitSet& BitSet::operator|=( const BitSet& rSet )
 {
     DBG_MEMTEST();
-    USHORT nMax = Min(nBlocks, rSet.nBlocks);
+    sal_uInt16 nMax = Min(nBlocks, rSet.nBlocks);
 
     // expand the bitmap
     if ( nBlocks < rSet.nBlocks )
     {
-        ULONG *pNewMap = new ULONG[rSet.nBlocks];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[rSet.nBlocks];
         memset( pNewMap + nBlocks, 0, 4 * (rSet.nBlocks - nBlocks) );
 
         if ( pBitmap )
@@ -283,10 +283,10 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
     }
 
     // add the bits blocks by block
-    for ( USHORT nBlock = 0; nBlock < nMax; ++nBlock )
+    for ( sal_uInt16 nBlock = 0; nBlock < nMax; ++nBlock )
     {
         // compute numberof additional bits
-        ULONG nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
+        sal_uIntPtr nDiff = ~*(pBitmap+nBlock) & *(rSet.pBitmap+nBlock);
         nCount = nCount + CountBits(nDiff);
 
         *(pBitmap+nBlock) |= *(rSet.pBitmap+nBlock);
@@ -299,15 +299,15 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
 
 // unites with a single bit
 
-BitSet& BitSet::operator|=( USHORT nBit )
+BitSet& BitSet::operator|=( sal_uInt16 nBit )
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
     {
-        ULONG *pNewMap = new ULONG[nBlock+1];
+        sal_uIntPtr *pNewMap = new sal_uIntPtr[nBlock+1];
         memset( pNewMap + nBlocks, 0, 4 * (nBlock - nBlocks + 1) );
 
         if ( pBitmap )
@@ -332,14 +332,14 @@ BitSet& BitSet::operator|=( USHORT nBit )
 
 // determines if the bit is set (may be the only one)
 
-BOOL BitSet::Contains( USHORT nBit ) const
+sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
 {
     DBG_MEMTEST();
-    USHORT nBlock = nBit / 32;
-    ULONG nBitVal = 1L << (nBit % 32);
+    sal_uInt16 nBlock = nBit / 32;
+    sal_uIntPtr nBitVal = 1L << (nBit % 32);
 
     if ( nBlock >= nBlocks )
-        return FALSE;
+        return sal_False;
     return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal;
 }
 
@@ -347,27 +347,27 @@ BOOL BitSet::Contains( USHORT nBit ) const
 
 // determines if the bitsets are equal
 
-BOOL BitSet::operator==( const BitSet& rSet ) const
+sal_Bool BitSet::operator==( const BitSet& rSet ) const
 {
     DBG_MEMTEST();
     if ( nBlocks != rSet.nBlocks )
-        return FALSE;
+        return sal_False;
 
-    USHORT nBlock = nBlocks;
+    sal_uInt16 nBlock = nBlocks;
     while ( nBlock-- > 0 )
         if ( *(pBitmap+nBlock) != *(rSet.pBitmap+nBlock) )
-            return FALSE;
+            return sal_False;
 
-    return TRUE;
+    return sal_True;
 }
 
 //--------------------------------------------------------------------
 
 // counts the number of 1-bits in the parameter
 
-USHORT BitSet::CountBits( ULONG nBits )
+sal_uInt16 BitSet::CountBits( sal_uIntPtr nBits )
 {
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
     int nBit = 32;
     while ( nBit-- && nBits )
     {   if ( ( (long)nBits ) < 0 )
@@ -379,15 +379,15 @@ USHORT BitSet::CountBits( ULONG nBits )
 
 //--------------------------------------------------------------------
 
-USHORT IndexBitSet::GetFreeIndex()
+sal_uInt16 IndexBitSet::GetFreeIndex()
 {
-  for(USHORT i=0;i<USHRT_MAX;i++)
+  for(sal_uInt16 i=0;i<USHRT_MAX;i++)
     if(!Contains(i))
       {
         *this|=i;
         return i;
       }
-  DBG_ASSERT(FALSE, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
+  DBG_ASSERT(sal_False, "IndexBitSet enthaelt mehr als USHRT_MAX Eintraege");
   return 0;
 }
 
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 6563953a1dc7..533320e64acd 100644..100755
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -101,8 +101,7 @@ using namespace ::com::sun::star::beans;
 #include <svtools/sfxecode.hxx>
 #include <unotools/syslocale.hxx>
 
-#include "sfxhelp.hxx"
-#include "sfxbasic.hxx"
+#include "sfx2/sfxhelp.hxx"
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfac.hxx>
 #include "sfxtypes.hxx"
@@ -111,7 +110,7 @@ using namespace ::com::sun::star::beans;
 #include <sfx2/progress.hxx>
 #include "openflag.hxx"
 #include "bastyp.hrc"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/doctempl.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/dispatch.hxx>
@@ -124,7 +123,7 @@ using namespace ::com::sun::star::beans;
 #include <sfx2/viewfrm.hxx>
 
 static SfxFilterList_Impl* pFilterArr = 0;
-static BOOL bFirstRead = TRUE;
+static sal_Bool bFirstRead = sal_True;
 
 static void CreateFilterArr()
 {
@@ -277,7 +276,7 @@ SfxFilterMatcher::SfxFilterMatcher( const String& rName )
 
     String aName = SfxObjectShell::GetServiceNameFromFactory( rName );
     DBG_ASSERT(aName.Len(), "Found boes type :-)");
-    for ( USHORT n=0; n<pImplArr->Count(); n++ )
+    for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
     {
         // find the impl-Data of any comparable FilterMatcher that was created before
         SfxFilterMatcher_Impl* pImp = pImplArr->GetObject(n);
@@ -538,7 +537,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
     const SfxFilter* pFilter = pOldFilter;
 
     sal_Bool bPreview = rMedium.IsPreview_Impl();
-    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, FALSE);
+    SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False);
     if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) )
         return ERRCODE_ABORT;
 
@@ -583,7 +582,6 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter**
         if( STRING_NOTFOUND != aFlags.Search( 'H' ) )
             bHidden = sal_True;
     }
-
     *ppFilter = pFilter;
 
     if ( bHidden || (bAPI && nErr == ERRCODE_SFX_CONSULTUSER) )
@@ -766,7 +764,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4UIName( const String& rName, SfxFil
 const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
 {
     String aName( rName );
-    USHORT nIndex = aName.SearchAscii(": ");
+    sal_uInt16 nIndex = aName.SearchAscii(": ");
     if (  nIndex != STRING_NOTFOUND )
     {
         OSL_FAIL("Old filter name used!");
@@ -799,7 +797,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const String& rName, Sf
                 }
             }
 
-            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, FALSE );
+            SfxFilterContainer::ReadSingleFilter_Impl( rName, xTypeCFG, xFilterCFG, sal_False );
         }
     }
 
@@ -901,7 +899,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     const ::rtl::OUString& rName,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
-    BOOL bUpdate
+    sal_Bool bUpdate
     )
 {
     ::rtl::OUString sFilterName( rName );
@@ -1042,16 +1040,16 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
         }
 
         SfxFilter* pFilter = bUpdate ? (SfxFilter*) SfxFilter::GetFilterByName( sFilterName ) : 0;
-        BOOL bNew = FALSE;
+        sal_Bool bNew = sal_False;
         if (!pFilter)
         {
-            bNew = TRUE;
+            bNew = sal_True;
             pFilter = new SfxFilter( sFilterName             ,
                                      sExtension              ,
                                      nFlags                  ,
                                      nClipboardId            ,
                                      sType                   ,
-                                     (USHORT)nDocumentIconId ,
+                                     (sal_uInt16)nDocumentIconId ,
                                      sMimeType               ,
                                      sUserData               ,
                                      sServiceName );
@@ -1063,7 +1061,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
             pFilter->nFormatType  = nFlags;
             pFilter->lFormat      = nClipboardId;
             pFilter->aTypeName    = sType;
-            pFilter->nDocIcon     = (USHORT)nDocumentIconId;
+            pFilter->nDocIcon     = (sal_uInt16)nDocumentIconId;
             pFilter->aMimeType    = sMimeType;
             pFilter->aUserData    = sUserData;
             pFilter->aServiceName = sServiceName;
@@ -1084,13 +1082,13 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
     }
 }
 
-void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
+void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate )
 {
     RTL_LOGFILE_CONTEXT( aMeasure, "sfx2 (as96863) ::SfxFilterContainer::ReadFilters" );
     if ( !pFilterArr )
         CreateFilterArr();
 
-    bFirstRead = FALSE;
+    bFirstRead = sal_False;
     SfxFilterList_Impl& rList = *pFilterArr;
 
     try
@@ -1120,7 +1118,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
                 // and change it back for all valid filters afterwards.
                 if( !rList.empty() )
                 {
-                    bUpdate = TRUE;
+                    bUpdate = sal_True;
                     SfxFilter* pFilter;
                     for ( size_t i = 0, n = rList.size(); i < n; ++i )
                     {
@@ -1151,7 +1149,7 @@ void SfxFilterContainer::ReadFilters_Impl( BOOL bUpdate )
     if ( pImplArr && bUpdate )
     {
         // global filter arry was modified, factory specific ones might need an update too
-        for ( USHORT n=0; n<pImplArr->Count(); n++ )
+        for ( sal_uInt16 n=0; n<pImplArr->Count(); n++ )
             pImplArr->GetObject(n)->Update();
     }
 }
diff --git a/sfx2/source/bastyp/fltfnc.src b/sfx2/source/bastyp/fltfnc.src
index 4203163eceeb..4203163eceeb 100644..100755
--- a/sfx2/source/bastyp/fltfnc.src
+++ b/sfx2/source/bastyp/fltfnc.src
diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx
index d921e3496062..3fc966c45d8e 100644..100755
--- a/sfx2/source/bastyp/fltlst.cxx
+++ b/sfx2/source/bastyp/fltlst.cxx
@@ -103,7 +103,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) t
         (xContainer==m_xFilterCache)
       )
     {
-        SfxFilterContainer::ReadFilters_Impl( TRUE );
+        SfxFilterContainer::ReadFilters_Impl( sal_True );
     }
 }
 
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 02af4663037c..02af4663037c 100644..100755
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index f0f4d7994200..6ebd346e4e5e 100644..100755
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -75,10 +75,10 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
     // do like that for now. Netscape does however not allow for a direct
     // seting to 0, while IE4.0 does
     // We will not mimic that bug !
-    BOOL bMarginWidth = FALSE, bMarginHeight = FALSE;
+    sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False;
 
-    USHORT nArrLen = pOptions->Count();
-    for ( USHORT i=0; i<nArrLen; i++ )
+    sal_uInt16 nArrLen = pOptions->Count();
+    for ( sal_uInt16 i=0; i<nArrLen; i++ )
     {
         const HTMLOption *pOption = (*pOptions)[i];
         switch( pOption->GetToken() )
@@ -104,14 +104,14 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
 
             if( !bMarginHeight )
                 aMargin.Height() = 0;
-            bMarginWidth = TRUE;
+            bMarginWidth = sal_True;
             break;
         case HTML_O_MARGINHEIGHT:
             aMargin.Height() = pOption->GetNumber();
 
             if( !bMarginWidth )
                 aMargin.Width() = 0;
-            bMarginHeight = TRUE;
+            bMarginHeight = sal_True;
             break;
         case HTML_O_SCROLLING:
             pFrame->SetScrollingMode(
@@ -121,33 +121,33 @@ void SfxFrameHTMLParser::ParseFrameOptions( SfxFrameDescriptor *pFrame, const HT
         case HTML_O_FRAMEBORDER:
         {
             String aStr = pOption->GetString();
-            BOOL bBorder = TRUE;
+            sal_Bool bBorder = sal_True;
             if ( aStr.EqualsIgnoreCaseAscii("NO") ||
                  aStr.EqualsIgnoreCaseAscii("0") )
-                bBorder = FALSE;
+                bBorder = sal_False;
             pFrame->SetFrameBorder( bBorder );
             break;
         }
         case HTML_O_NORESIZE:
-            pFrame->SetResizable( FALSE );
+            pFrame->SetResizable( sal_False );
             break;
         default:
             if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_READONLY ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bReadonly = TRUE;
+                sal_Bool bReadonly = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bReadonly = FALSE;
+                    bReadonly = sal_False;
                 pFrame->SetReadOnly( bReadonly );
             }
             else if ( pOption->GetTokenString().EqualsIgnoreCaseAscii(
                                                         HTML_O_EDIT ) )
             {
                 String aStr = pOption->GetString();
-                BOOL bEdit = TRUE;
+                sal_Bool bEdit = sal_True;
                 if ( aStr.EqualsIgnoreCaseAscii("FALSE") )
-                    bEdit = FALSE;
+                    bEdit = sal_False;
                 pFrame->SetEditable( bEdit );
             }
 
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index ee2f3458feb7..6d12c0e09e2b 100644..100755
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -44,7 +44,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfx.hrc>
 #include "bastyp.hrc"
@@ -74,7 +74,7 @@ const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012";
 void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
                                   const sal_Char *pIndent,
                                   const String& rName,
-                                  const String& rContent, BOOL bHTTPEquiv,
+                                  const String& rContent, sal_Bool bHTTPEquiv,
                                      rtl_TextEncoding eDestEnc,
                                   String *pNonConvertableChars  )
 {
@@ -108,7 +108,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     {
         String aContentType = String::CreateFromAscii( sHTML_MIME_text_html );
         aContentType.AppendAscii( pCharSet );
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, TRUE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True,
                  eDestEnc, pNonConvertableChars );
     }
 
@@ -123,7 +123,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         if( rTitle.Len() )
             HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars );
     }
-    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, FALSE );
+    HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, sal_False );
 
     // Target-Frame
     if( i_xDocProps.is() )
@@ -146,7 +146,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
     // Who we are
     String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
     sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) );
-    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, FALSE, eDestEnc, pNonConvertableChars );
+    OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
 
     if( i_xDocProps.is() )
     {
@@ -166,14 +166,14 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                         rBaseURL, rReloadURL));
             }
 
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, TRUE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_refresh, sContent, sal_True,
                      eDestEnc, pNonConvertableChars );
         }
 
         // Author
         const String& rAuthor = i_xDocProps->getAuthor();
         if( rAuthor.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_author, rAuthor, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // created
@@ -183,13 +183,13 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         String sOut = String::CreateFromInt32(aD.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_created, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // changedby
         const String& rChangedBy = i_xDocProps->getModifiedBy();
         if( rChangedBy.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changedby, rChangedBy, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // changed
@@ -199,26 +199,26 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
         sOut = String::CreateFromInt32(aD2.GetDate());
         sOut += ';';
         sOut += String::CreateFromInt32(aT2.GetTime());
-        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, FALSE,
+        OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_changed, sOut, sal_False,
                  eDestEnc, pNonConvertableChars );
 
         // Subject
         const String& rTheme = i_xDocProps->getSubject();
         if( rTheme.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_classification, rTheme, sal_False,
                      eDestEnc, pNonConvertableChars );
 
         // Description
         const String& rComment = i_xDocProps->getDescription();
         if( rComment.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_description, rComment, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         // Keywords
         String Keywords = ::comphelper::string::convertCommaSeparated(
             i_xDocProps->getKeywords());
         if( Keywords.Len() )
-            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, FALSE,
+            OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_keywords, Keywords, sal_False,
                      eDestEnc, pNonConvertableChars);
 
         uno::Reference < script::XTypeConverter > xConverter(
@@ -242,7 +242,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
                 aStr >>= str;
                 String valstr(str);
                 valstr.EraseTrailingChars();
-                OutMeta( rStrm, pIndent, name, valstr, FALSE,
+                OutMeta( rStrm, pIndent, name, valstr, sal_False,
                          eDestEnc, pNonConvertableChars );
             } catch (uno::Exception &) {
                 // may happen with concurrent modification...
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index cee73183ddba..123951f1bcff 100644..100755
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -814,9 +814,9 @@ ErrCode SfxContentHelper::QueryDiskSpace( const String& rPath, sal_Int64& rFreeB
 
 // -----------------------------------------------------------------------
 
-ULONG SfxContentHelper::GetSize( const String& rContent )
+sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
 {
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     sal_Int64 nTemp = 0;
     INetURLObject aObj( rContent );
     DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
@@ -833,7 +833,7 @@ ULONG SfxContentHelper::GetSize( const String& rContent )
     {
         DBG_ERRORFILE( "Any other exception" );
     }
-    nSize = (UINT32)nTemp;
+    nSize = (sal_uInt32)nTemp;
     return nSize;
 }
 
diff --git a/sfx2/source/bastyp/makefile.mk b/sfx2/source/bastyp/makefile.mk
deleted file mode 100644
index 75c0cace40d6..000000000000
--- a/sfx2/source/bastyp/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=sfx2
-TARGET=bastyp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
-        $(SLO)$/sfxhtml.obj				\
-        $(SLO)$/frmhtml.obj				\
-        $(SLO)$/frmhtmlw.obj				\
-        $(SLO)$/misc.obj				\
-        $(SLO)$/progress.obj			\
-        $(SLO)$/sfxresid.obj			\
-        $(SLO)$/bitset.obj				\
-        $(SLO)$/minarray.obj			\
-        $(SLO)$/fltfnc.obj				\
-        $(SLO)$/mieclip.obj				\
-        $(SLO)$/fltlst.obj				\
-        $(SLO)$/helper.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-        fltfnc.src	\
-                bastyp.src
-
-EXCEPTIONSFILES =\
-    $(SLO)$/helper.obj
-
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx
index c5208cebb96e..db1899e23b71 100644..100755
--- a/sfx2/source/bastyp/mieclip.cxx
+++ b/sfx2/source/bastyp/mieclip.cxx
@@ -34,7 +34,7 @@
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 
-#include <mieclip.hxx>
+#include <sfx2/mieclip.hxx>
 #include <sfx2/sfxuno.hxx>
 
 MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
@@ -44,13 +44,13 @@ MSE40HTMLClipFormatObj::~MSE40HTMLClipFormatObj()
 
 SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( pStrm )
         delete pStrm, pStrm = 0;
 
     ByteString sLine, sVersion;
-    ULONG nStt = 0, nEnd = 0;
-    USHORT nIndex = 0;
+    sal_uIntPtr nStt = 0, nEnd = 0;
+    sal_uInt16 nIndex = 0;
 
     rStream.Seek(STREAM_SEEK_TO_BEGIN);
     rStream.ResetError();
@@ -64,16 +64,16 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream )
             nIndex = 0;
             ByteString sTmp( sLine.GetToken( 0, ':', nIndex ) );
             if( sTmp == "StartHTML" )
-                nStt = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nStt = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "EndHTML" )
-                nEnd = (ULONG)(sLine.Erase( 0, nIndex ).ToInt32());
+                nEnd = (sal_uIntPtr)(sLine.Erase( 0, nIndex ).ToInt32());
             else if( sTmp == "SourceURL" )
                 sBaseURL = String(S2U(sLine.Erase( 0, nIndex )));
 
             if( nEnd && nStt &&
                 ( sBaseURL.Len() || rStream.Tell() >= nStt ))
             {
-                bRet = TRUE;
+                bRet = sal_True;
                 break;
             }
         }
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 1ed27d01c74e..4deae2555f0a 100644..100755
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -33,13 +33,13 @@
 
 // -----------------------------------------------------------------------
 
-SfxPtrArr::SfxPtrArr( BYTE nInitSize, BYTE nGrowSize ):
+SfxPtrArr::SfxPtrArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nMSCBug > 0 )
         pData = new void*[nMSCBug];
@@ -104,7 +104,7 @@ void SfxPtrArr::Append( void* aElem )
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
         if ( pData )
         {
@@ -112,7 +112,7 @@ void SfxPtrArr::Append( void* aElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -124,11 +124,11 @@ void SfxPtrArr::Append( void* aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 SfxPtrArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -148,8 +148,8 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         void** pNewData = new void*[nNewSize];
@@ -164,7 +164,7 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -172,71 +172,71 @@ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(void*) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Remove( void* aElem )
+sal_Bool SfxPtrArr::Remove( void* aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
+sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     void* *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aOldElem )
         {
             pData[nUsed-n-1] = aNewElem;
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL SfxPtrArr::Contains( const void* rItem ) const
+sal_Bool SfxPtrArr::Contains( const void* rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         void* p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void SfxPtrArr::Insert( USHORT nPos, void* rElem )
+void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem )
 {
     DBG_MEMTEST();
     DBG_ASSERT( sal::static_int_cast< unsigned >(nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too large" );
@@ -244,7 +244,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
     if ( nUnused == 0 )
     {
         // increase (rounded up ) to the next Grow-border
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         void** pNewData = new void*[nNewSize];
 
         if ( pData )
@@ -253,7 +253,7 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
             memmove( pNewData, pData, sizeof(void*)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -269,13 +269,13 @@ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
 
 // class ByteArr ---------------------------------------------------------
 
-ByteArr::ByteArr( BYTE nInitSize, BYTE nGrowSize ):
+ByteArr::ByteArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new char[nMSCBug];
@@ -339,7 +339,7 @@ void ByteArr::Append( char aElem )
     // Does the Array have o be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         char* pNewData = new char[nNewSize];
         if ( pData )
         {
@@ -347,7 +347,7 @@ void ByteArr::Append( char aElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -359,11 +359,11 @@ void ByteArr::Append( char aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 ByteArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -383,8 +383,8 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         char* pNewData = new char[nNewSize];
@@ -399,7 +399,7 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
         delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -407,58 +407,58 @@ USHORT ByteArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(char) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Remove( char aElem )
+sal_Bool ByteArr::Remove( char aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     char *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL ByteArr::Contains( const char rItem ) const
+sal_Bool ByteArr::Contains( const char rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         char p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void ByteArr::Insert( USHORT nPos, char rElem )
+void ByteArr::Insert( sal_uInt16 nPos, char rElem )
 {
     DBG_MEMTEST();
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
         // increase (rounded up) to the next Grow-border
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         char* pNewData = new char[nNewSize];
 
         if ( pData )
@@ -467,7 +467,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
             memmove( pNewData, pData, sizeof(char)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -483,7 +483,7 @@ void ByteArr::Insert( USHORT nPos, char rElem )
 
 // -----------------------------------------------------------------------
 
-char ByteArr::operator[]( USHORT nPos ) const
+char ByteArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -492,7 +492,7 @@ char ByteArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-char& ByteArr::operator [] (USHORT nPos)
+char& ByteArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -501,13 +501,13 @@ char& ByteArr::operator [] (USHORT nPos)
 
 // class WordArr ---------------------------------------------------------
 
-WordArr::WordArr( BYTE nInitSize, BYTE nGrowSize ):
+WordArr::WordArr( sal_uInt8 nInitSize, sal_uInt8 nGrowSize ):
     nUsed( 0 ),
     nGrow( nGrowSize ? nGrowSize : 1 ),
     nUnused( nInitSize )
 {
     DBG_MEMTEST();
-    USHORT nMSCBug = nInitSize;
+    sal_uInt16 nMSCBug = nInitSize;
 
     if ( nInitSize > 0 )
         pData = new short[nMSCBug];
@@ -571,7 +571,7 @@ void WordArr::Append( short aElem )
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
-        USHORT nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
+        sal_uInt16 nNewSize = (nUsed == 1) ? (nGrow==1 ? 2 : nGrow) : nUsed+nGrow;
         short* pNewData = new short[nNewSize];
         if ( pData )
         {
@@ -579,7 +579,7 @@ void WordArr::Append( short aElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -591,11 +591,11 @@ void WordArr::Append( short aElem )
 
 // -----------------------------------------------------------------------
 
-USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
+sal_uInt16 WordArr::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
 {
     DBG_MEMTEST();
     // Adjust nLen, thus to avoid deleting beyond the end
-    nLen = Min( (USHORT)(nUsed-nPos), nLen );
+    nLen = Min( (sal_uInt16)(nUsed-nPos), nLen );
 
     // simple problems require simple solutions!
     if ( nLen == 0 )
@@ -615,8 +615,8 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( (nUnused+nLen) >= nGrow )
     {
         // reduce (rounded up) to the next Grow-border
-        USHORT nNewUsed = nUsed-nLen;
-        USHORT nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
+        sal_uInt16 nNewUsed = nUsed-nLen;
+        sal_uInt16 nNewSize = ((nNewUsed+nGrow-1)/nGrow) * nGrow;
         DBG_ASSERT( nNewUsed <= nNewSize && nNewUsed+nGrow > nNewSize,
                     "shrink size computation failed" );
         short* pNewData = new short[nNewSize];
@@ -631,7 +631,7 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
             delete [] pData;
         pData = pNewData;
         nUsed = nNewUsed;
-        nUnused = sal::static_int_cast< BYTE >(nNewSize - nNewUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize - nNewUsed);
         return nLen;
     }
 
@@ -639,58 +639,58 @@ USHORT WordArr::Remove( USHORT nPos, USHORT nLen )
     if ( nUsed-nPos-nLen > 0 )
         memmove( pData+nPos, pData+nPos+nLen, (nUsed-nPos-nLen)*sizeof(short) );
     nUsed = nUsed - nLen;
-    nUnused = sal::static_int_cast< BYTE >(nUnused + nLen);
+    nUnused = sal::static_int_cast< sal_uInt8 >(nUnused + nLen);
     return nLen;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Remove( short aElem )
+sal_Bool WordArr::Remove( short aElem )
 {
     DBG_MEMTEST();
     // simple tasks ...
     if ( nUsed == 0 )
-        return FALSE;
+        return sal_False;
 
     // backwards, since most of the last is first removed
     short *pIter = pData + nUsed - 1;
-    for ( USHORT n = 0; n < nUsed; ++n, --pIter )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
         if ( *pIter == aElem )
         {
             Remove(nUsed-n-1, 1);
-            return TRUE;
+            return sal_True;
         }
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL WordArr::Contains( const short rItem ) const
+sal_Bool WordArr::Contains( const short rItem ) const
 {
     DBG_MEMTEST();
     if ( !nUsed )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT n = 0; n < nUsed; ++n )
+    for ( sal_uInt16 n = 0; n < nUsed; ++n )
     {
         short p = GetObject(n);
         if ( p == rItem )
-            return TRUE;
+            return sal_True;
     }
 
-    return FALSE;
+    return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-void WordArr::Insert( USHORT nPos, short rElem )
+void WordArr::Insert( sal_uInt16 nPos, short rElem )
 {
     DBG_MEMTEST();
     // Does the Array need to be copied?
     if ( nUnused == 0 )
     {
         // increase (rounded up) to the next Grow-border
-        USHORT nNewSize = nUsed+nGrow;
+        sal_uInt16 nNewSize = nUsed+nGrow;
         short* pNewData = new short[nNewSize];
 
         if ( pData )
@@ -699,7 +699,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
             memmove( pNewData, pData, sizeof(short)*nUsed );
             delete [] pData;
         }
-        nUnused = sal::static_int_cast< BYTE >(nNewSize-nUsed);
+        nUnused = sal::static_int_cast< sal_uInt8 >(nNewSize-nUsed);
         pData = pNewData;
     }
 
@@ -715,7 +715,7 @@ void WordArr::Insert( USHORT nPos, short rElem )
 
 // -----------------------------------------------------------------------
 
-short WordArr::operator[]( USHORT nPos ) const
+short WordArr::operator[]( sal_uInt16 nPos ) const
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
@@ -724,7 +724,7 @@ short WordArr::operator[]( USHORT nPos ) const
 
 // -----------------------------------------------------------------------
 
-short& WordArr::operator [] (USHORT nPos)
+short& WordArr::operator [] (sal_uInt16 nPos)
 {
     DBG_MEMTEST();
     DBG_ASSERT( nPos < nUsed, "" );
diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx
index d96009497282..80991dcc492b 100644..100755
--- a/sfx2/source/bastyp/misc.cxx
+++ b/sfx2/source/bastyp/misc.cxx
@@ -44,7 +44,7 @@ String SearchAndReplace( const String &rSource,
                          const String &rReplacement )
 {
     String aTarget( rSource );
-    USHORT nPos = rSource.Search( rToReplace );
+    sal_uInt16 nPos = rSource.Search( rToReplace );
     if ( nPos != STRING_NOTFOUND )
     {
         aTarget.Erase( nPos, rToReplace.Len() );
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index c5735ea251b6..0ad5de1fea52 100644..100755
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -49,7 +49,7 @@
 #include "sfxtypes.hxx"
 #include <sfx2/docfile.hxx>
 #include "workwin.hxx"
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include "bastyp.hrc"
 #include <sfx2/msg.hxx>
 
@@ -79,14 +79,14 @@ struct SfxProgress_Impl
 {
     Reference < XStatusIndicator > xStatusInd;
     String                  aText, aStateText;
-    ULONG                   nMax;
+    sal_uIntPtr                 nMax;
     clock_t                 nCreate;
     clock_t                 nNextReschedule;
-    BOOL                    bLocked, bAllDocs;
-    BOOL                    bWaitMode;
-    BOOL                    bAllowRescheduling;
-    BOOL                    bRunning;
-    BOOL                    bIsStatusText;
+    sal_Bool                    bLocked, bAllDocs;
+    sal_Bool                    bWaitMode;
+    sal_Bool                    bAllowRescheduling;
+    sal_Bool                    bRunning;
+    sal_Bool                    bIsStatusText;
 
     SfxProgress*            pActiveProgress;
     SfxObjectShellRef       xObjSh;
@@ -94,7 +94,7 @@ struct SfxProgress_Impl
     SfxViewFrame*           pView;
 
                             SfxProgress_Impl( const String& );
-    void                    Enable_Impl( BOOL );
+    void                    Enable_Impl( sal_Bool );
 
 };
 
@@ -116,7 +116,7 @@ extern sal_uInt32 Get10ThSec();
 
 // -----------------------------------------------------------------------
 
-void SfxProgress_Impl::Enable_Impl( BOOL bEnable )
+void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
 {
     SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
     SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
@@ -156,10 +156,10 @@ SfxProgress::SfxProgress
     const String&       rText,  /* Text, which appears before the Statusmonitor
                                   in the status line */
 
-    ULONG               nRange, /* Max value for range  */
+    sal_uIntPtr               nRange, /* Max value for range  */
 
-    BOOL                bAll    /* Disable all documents or only the document of the ViewFram */
-    ,BOOL               bWait   /* Aktivate the wait-Pointer initially (TRUE) */
+    sal_Bool                bAll,    /* Disable all documents or only the document of the ViewFram */
+    sal_Bool                bWait    /* Activate the wait-Pointer initially (TRUE) */
 )
 
 /*  [Description]
@@ -173,17 +173,17 @@ SfxProgress::SfxProgress
 
 :       pImp( new SfxProgress_Impl( rText ) ),
     nVal(0),
-    bSuspended(TRUE)
+    bSuspended(sal_True)
 {
-    pImp->bRunning = TRUE;
+    pImp->bRunning = sal_True;
     pImp->bAllowRescheduling = Application::IsInExecute();;
 
     pImp->xObjSh = pObjSh;
     pImp->aText = rText;
     pImp->nMax = nRange;
-    pImp->bLocked = FALSE;
+    pImp->bLocked = sal_False;
     pImp->bWaitMode = bWait;
-    pImp->bIsStatusText = FALSE;
+    pImp->bIsStatusText = sal_False;
     pImp->nCreate = Get10ThSec();
     pImp->nNextReschedule = pImp->nCreate;
     DBG( DbgOutf( "SfxProgress: created for '%s' at %luds",
@@ -215,7 +215,7 @@ SfxProgress::~SfxProgress()
     if ( pImp->xStatusInd.is() )
         pImp->xStatusInd->end();
 
-    if( pImp->bIsStatusText == TRUE )
+    if( pImp->bIsStatusText == sal_True )
         GetpApp()->HideStatusText( );
     delete pImp;
 }
@@ -239,7 +239,7 @@ void SfxProgress::Stop()
 
     if ( !pImp->bRunning )
         return;
-    pImp->bRunning = FALSE;
+    pImp->bRunning = sal_False;
     DBG( DbgOutf( "SfxProgress: destroyed at %luds", Get10ThSec() ) );
 
     Suspend();
@@ -248,7 +248,7 @@ void SfxProgress::Stop()
     else
         SFX_APP()->SetProgress_Impl(0);
     if ( pImp->bLocked )
-        pImp->Enable_Impl(TRUE);
+        pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -282,7 +282,7 @@ const String& SfxProgress::GetStateText_Impl() const
 // -----------------------------------------------------------------------
 
 // Required in App data
-static ULONG nLastTime = 0;
+static sal_uIntPtr nLastTime = 0;
 
 long TimeOut_Impl( void*, void* pArgV )
 {
@@ -299,11 +299,11 @@ long TimeOut_Impl( void*, void* pArgV )
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetStateText
+sal_Bool SfxProgress::SetStateText
 (
-    ULONG          nNewVal,     /* New value for the progress-bar */
+    sal_uLong      nNewVal,     /* New value for the progress-bar */
     const String&  rNewVal,     /* Status as Text */
-    ULONG          nNewRange    /* new maximum value, 0 for retaining the old */
+    sal_uLong      nNewRange    /* new maximum value, 0 for retaining the old */
 )
 
 {
@@ -313,11 +313,11 @@ BOOL SfxProgress::SetStateText
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::SetState
+sal_Bool SfxProgress::SetState
 (
-    ULONG   nNewVal,    /* new value for the progress bar */
+    sal_uLong   nNewVal,    /* new value for the progress bar */
 
-    ULONG   nNewRange   /* new maximum value, 0 for retaining the old */
+    sal_uLong   nNewRange   /* new maximum value, 0 for retaining the old */
 )
 /*  [Description]
 
@@ -325,7 +325,7 @@ BOOL SfxProgress::SetState
 
     [Return value]
 
-    BOOL                TRUE
+    sal_Bool                TRUE
                         Proceed with the action
 
                         FALSE
@@ -333,7 +333,7 @@ BOOL SfxProgress::SetState
 */
 
 {
-    if( pImp->pActiveProgress ) return TRUE;
+    if( pImp->pActiveProgress ) return sal_True;
 
     nVal = nNewVal;
 
@@ -362,11 +362,11 @@ BOOL SfxProgress::SetState
             {
                 // don't show status indicator for hidden documents (only valid while loading)
                 SfxMedium* pMedium = pObjSh->GetMedium();
-                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, FALSE );
+                SFX_ITEMSET_ARG( pMedium->GetItemSet(), pHiddenItem, SfxBoolItem, SID_HIDDEN, sal_False );
                 if ( !pHiddenItem || !pHiddenItem->GetValue() )
                 {
                     {
-                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, FALSE );
+                        SFX_ITEMSET_ARG( pMedium->GetItemSet(), pIndicatorItem, SfxUnoAnyItem, SID_PROGRESS_STATUSBAR_CONTROL, sal_False );
                         Reference< XStatusIndicator > xInd;
                         if ( pIndicatorItem && (pIndicatorItem->GetValue()>>=xInd) )
                             pImp->xStatusInd = xInd;
@@ -393,7 +393,7 @@ BOOL SfxProgress::SetState
         pImp->xStatusInd->setValue( nNewVal );
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -438,7 +438,7 @@ void SfxProgress::Resume()
                 pFrame->GetBindings().ENTERREGISTRATIONS();
         }
 
-        bSuspended = FALSE;
+        bSuspended = sal_False;
     }
 }
 
@@ -460,7 +460,7 @@ void SfxProgress::Suspend()
     if ( !bSuspended )
     {
         DBG( DbgOutf( "SfxProgress: suspended" ) );
-        bSuspended = TRUE;
+        bSuspended = sal_True;
 
         if ( pImp->xStatusInd.is() )
         {
@@ -502,7 +502,7 @@ void SfxProgress::Lock()
                  ( eMode == SFX_CREATE_MODE_PREVIEW ) )
             {
                 DBG( DbgOutf( "SfxProgress: not locked because EMBEDDED/PREVIEW found" ) );
-                pImp->bAllowRescheduling = FALSE;
+                pImp->bAllowRescheduling = sal_False;
             }
         }
     }
@@ -513,14 +513,14 @@ void SfxProgress::Lock()
              ( eMode == SFX_CREATE_MODE_PREVIEW ) )
         {
             DBG( DbgOutf( "SfxProgress: not locked because ObjectShell is EMBEDDED/PREVIEW" ) );
-            pImp->bAllowRescheduling = FALSE;
+            pImp->bAllowRescheduling = sal_False;
         }
     }
 
-    pImp->Enable_Impl( FALSE );
+    pImp->Enable_Impl( sal_False );
 
     DBG( DbgOutf( "SfxProgress: locked" ) );
-    pImp->bLocked = TRUE;
+    pImp->bLocked = sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -532,8 +532,8 @@ void SfxProgress::UnLock()
         return;
 
     DBG( DbgOutf( "SfxProgress: unlocked" ) );
-    pImp->bLocked = FALSE;
-    pImp->Enable_Impl(TRUE);
+    pImp->bLocked = sal_False;
+    pImp->Enable_Impl(sal_True);
 }
 
 // -----------------------------------------------------------------------
@@ -566,7 +566,7 @@ void SfxProgress::Reschedule()
 
 void SfxProgress::SetWaitMode
 (
-    BOOL        bWait  /*   TRUE  Wait-cursor is used
+    sal_Bool    bWait       /*  TRUE
 
                             FALSE Wait-cursor not used */
 )
@@ -609,7 +609,7 @@ void SfxProgress::SetWaitMode
 
 // -----------------------------------------------------------------------
 
-BOOL SfxProgress::GetWaitMode() const
+sal_Bool SfxProgress::GetWaitMode() const
 
 /* [Description]
 
@@ -699,7 +699,7 @@ bool SfxProgress::StatusBarManagerGone_Impl
 */
 
 {
-    return TRUE;
+    return sal_True;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index b301563aa9a6..ce3b19725727 100644..100755
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -74,7 +74,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
     { 0,                    0                   }
 };
 
-SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
+SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
                               SfxMedium *pMed ) :
     HTMLParser( rStream, bIsNewDoc ),
     pMedium( pMed ), pDLMedium( 0 ),
@@ -90,7 +90,7 @@ SfxHTMLParser::SfxHTMLParser( SvStream& rStream, BOOL bIsNewDoc,
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
 
     // If the file starts with a BOM, switch to UCS2.
-    SetSwitchToUCS2( TRUE );
+    SetSwitchToUCS2( sal_True );
 }
 
 SfxHTMLParser::~SfxHTMLParser()
@@ -99,7 +99,7 @@ SfxHTMLParser::~SfxHTMLParser()
     delete pDLMedium;
 }
 
-BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
+sal_Bool SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
                                     const HTMLOptions * pOptions)
 {
     DBG_ASSERT( pImageMap, "ParseMapOptions: No Image-Map" );
@@ -107,7 +107,7 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
 
     String aName;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -124,23 +124,23 @@ BOOL SfxHTMLParser::ParseMapOptions(ImageMap * pImageMap,
     return aName.Len() > 0;
 }
 
-BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
+sal_Bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseURL,
                                      const HTMLOptions * pOptions,
-                                     USHORT nEventMouseOver,
-                                     USHORT nEventMouseOut )
+                                     sal_uInt16 nEventMouseOver,
+                                     sal_uInt16 nEventMouseOut )
 {
     DBG_ASSERT( pImageMap, "ParseAreaOptions: no Image-Map" );
     DBG_ASSERT( pOptions, "ParseAreaOptions: no Options" );
 
-    USHORT nShape = IMAP_OBJ_RECTANGLE;
+    sal_uInt16 nShape = IMAP_OBJ_RECTANGLE;
     SvULongs aCoords;
     String aName, aHRef, aAlt, aTarget, sEmpty;
-    BOOL bNoHRef = FALSE;
+    sal_Bool bNoHRef = sal_False;
     SvxMacroTableDtor aMacroTbl;
 
-    for( USHORT i=pOptions->Count(); i; )
+    for( sal_uInt16 i=pOptions->Count(); i; )
     {
-        USHORT nEvent = 0;
+        sal_uInt16 nEvent = 0;
         ScriptType eScrpType = STARBASIC;
         const HTMLOption *pOption = (*pOptions)[--i];
         switch( pOption->GetToken() )
@@ -152,13 +152,13 @@ BOOL SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const String& rBaseUR
             pOption->GetEnum( nShape, aAreaShapeOptEnums );
             break;
         case HTML_O_COORDS:
-            pOption->GetNumbers( aCoords, TRUE );
+            pOption->GetNumbers( aCoords, sal_True );
             break;
         case HTML_O_HREF:
             aHRef = INetURLObject::GetAbsURL( rBaseURL, pOption->GetString() );
             break;
         case HTML_O_NOHREF:
-            bNoHRef = TRUE;
+            bNoHRef = sal_True;
             break;
         case HTML_O_ALT:
             aAlt = pOption->GetString();
@@ -196,7 +196,7 @@ IMAPOBJ_SETEVENT:
     if( bNoHRef )
         aHRef.Erase();
 
-    BOOL bNewArea = TRUE;
+    sal_Bool bNewArea = sal_True;
     switch( nShape )
     {
     case IMAP_OBJ_RECTANGLE:
@@ -225,9 +225,9 @@ IMAPOBJ_SETEVENT:
     case IMAP_OBJ_POLYGON:
         if( aCoords.Count() >=6 )
         {
-            USHORT nCount = aCoords.Count() / 2;
+            sal_uInt16 nCount = aCoords.Count() / 2;
             Polygon aPoly( nCount );
-            for( USHORT i=0; i<nCount; i++ )
+            for( sal_uInt16 i=0; i<nCount; i++ )
                 aPoly[i] = Point( aCoords[2*i], aCoords[2*i+1] );
             IMapPolygonObject aMapPObj( aPoly, aHRef, aAlt, String(), aTarget, aName,
                                         !bNoHRef );
@@ -237,7 +237,7 @@ IMAPOBJ_SETEVENT:
         }
         break;
     default:
-        bNewArea = FALSE;
+        bNewArea = sal_False;
     }
 
     return bNewArea;
@@ -251,7 +251,7 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     if( pDLMedium )
         return;
 
-    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, FALSE );
+    pDLMedium = new SfxMedium( rURL, SFX_STREAM_READONLY, sal_False );
     if( pSh )
     {
         // Register the medium, so that it can be stopped.
@@ -259,13 +259,13 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 
     // Push Download (Note: Can also be synchronous).
-    if ( TRUE /*pMedium->GetDoneLink() == Link()*/ )
+    if ( sal_True /*pMedium->GetDoneLink() == Link()*/ )
         pDLMedium->DownLoad();
     else
     {
         // Set Downloading-Flag to TRUE. When we get into the Pending-status
         // we will then also have Data-Available-Links.
-        SetDownloadingFile( TRUE );
+        SetDownloadingFile( sal_True );
         pDLMedium->DownLoad( STATIC_LINK( this, SfxHTMLParser, FileDownloadDone ) );
 
         // If the Downloading-Flag is still set downloading will be done
@@ -283,11 +283,11 @@ void SfxHTMLParser::StartFileDownload( const String& rURL, int nToken,
     }
 }
 
-BOOL SfxHTMLParser::FinishFileDownload( String& rStr )
+sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr )
 {
     String aStr;
 
-    BOOL bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
+    sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
     if( bOK )
     {
         SvStream* pStream = pDLMedium->GetInStream();
@@ -321,7 +321,7 @@ IMPL_STATIC_LINK( SfxHTMLParser, FileDownloadDone, void*, EMPTYARG )
 {
     // The Download is now completed. also the Data-Available-Link
     // must or are allowed to be passed through.
-    pThis->SetDownloadingFile( FALSE );
+    pThis->SetDownloadingFile( sal_False );
 
     // ... and call once, thus will continue reading.
     pThis->CallAsyncCallLink();
@@ -336,7 +336,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader )
     if( pHTTPHeader )
     {
         SvKeyValue aKV;
-        for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont;
+        for( sal_Bool bCont = pHTTPHeader->GetFirst( aKV ); bCont;
              bCont = pHTTPHeader->GetNext( aKV ) )
         {
             if( aKV.GetKey().EqualsIgnoreCaseAscii(
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index 7ad918cd04fb..219e41c5cd53 100644..100755
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -31,14 +31,14 @@
 
 #include <tools/simplerm.hxx>
 
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
 #include <sfx2/app.hxx>
 
 // -----------------------------------------------------------------------
 
 static ResMgr* pMgr=NULL;
 
-SfxResId::SfxResId( USHORT nId ) :
+SfxResId::SfxResId( sal_uInt16 nId ) :
 
     ResId( nId, *GetResMgr() )
 {
@@ -50,7 +50,7 @@ SfxResId::SfxResId( USHORT nId ) :
 //
 //============================================================================
 
-SfxSimpleResId::SfxSimpleResId(USHORT nID):
+SfxSimpleResId::SfxSimpleResId(sal_uInt16 nID):
     m_sText( SFX_APP()->GetSimpleResManager()->ReadString(nID) )
 {}