removetooltypes01: #i112600# Remove tools types from sw

5 files changed, 97 insertions, 97 deletions

diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 40400f591753..66c2b7d67b7e 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -119,13 +119,13 @@ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
 }
 void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
                            uno::Reference< XPropertySet > & xProps,
-                           USHORT nId, const String& rValue)
+                           sal_uInt16 nId, const String& rValue)
 {
     lcl_SetProp( xInfo, xProps, SW_PROP_NAME_STR(nId), rValue);
 }
 void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
                            uno::Reference< XPropertySet > & xProps,
-                           USHORT nId, sal_Int16 nValue )
+                           sal_uInt16 nId, sal_Int16 nValue )
 {
     OUString uPropName(C2U(SW_PROP_NAME_STR(nId)));
     if(xInfo->hasPropertyByName(uPropName))
@@ -139,7 +139,7 @@ void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
 void lcl_SetBOOLProp(
                 uno::Reference< beans::XPropertySetInfo > & xInfo,
                 uno::Reference< beans::XPropertySet > & xProps,
-                USHORT nId, sal_Bool bValue )
+                sal_uInt16 nId, sal_Bool bValue )
 {
     OUString uPropName(C2U(SW_PROP_NAME_STR(nId)));
     if(xInfo->hasPropertyByName(uPropName))
@@ -159,7 +159,7 @@ IMPL_LINK( SwMultiTOXTabDialog, CreateExample_Hdl, void*, EMPTYARG )
         SwXTextDocument* pDoc = reinterpret_cast<SwXTextDocument*>(xDocTunnel->getSomething(SwXTextDocument::getUnoTunnelId()));
 
         if( pDoc )
-            pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), TRUE );
+            pDoc->GetDocShell()->_LoadStyles( *rSh.GetView().GetDocShell(), sal_True );
 
          uno::Reference< lang::XMultiServiceFactory >  xFact(
                                              xModel, uno::UNO_QUERY);
@@ -251,7 +251,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
 
             if(xSectPr.is())
             {
-                BOOL bTemp = i == nTOXIndex;
+                sal_Bool bTemp = i == nTOXIndex;
                 aVal.setValue(&bTemp, ::getBooleanCppuType());
                 xSectPr->setPropertyValue(uIsVisible, aVal);
             }
@@ -421,7 +421,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
                         if(TOKEN_TAB_STOP == aToken.eTokenType)
                         {
                             pPropValArr[2].Name = C2U("TabStopRightAligned");
-                            BOOL bTemp = SVX_TAB_ADJUST_END == aToken.eTabAlign;
+                            sal_Bool bTemp = SVX_TAB_ADJUST_END == aToken.eTabAlign;
                             pPropValArr[2].Value.setValue(&bTemp, ::getBooleanCppuType());
                             pPropValArr[3].Name = C2U("TabStopFillCharacter");
                             pPropValArr[3].Value <<= OUString(aToken.cTabFillChar);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index a453a46988ee..4d7763143725 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -233,7 +233,7 @@ public:
 
     sal_Bool                        IsModified()const;
 
-    virtual String GetCellText( long nRow, USHORT nColumn ) const;
+    virtual String GetCellText( long nRow, sal_uInt16 nColumn ) const;
 };
 
 class SwAutoMarkDlg_Impl : public ModalDialog
@@ -536,7 +536,7 @@ SwTOXDescription* SwMultiTOXTabDialog::CreateTOXDescFromTOXBase(
         pDesc->SetIndexOptions(pCurTOX->GetOptions());
     pDesc->SetMainEntryCharStyle(pCurTOX->GetMainEntryCharStyle());
     if(pDesc->GetTOXType() != TOX_INDEX)
-        pDesc->SetLevel((BYTE)pCurTOX->GetLevel());
+        pDesc->SetLevel((sal_uInt8)pCurTOX->GetLevel());
     pDesc->SetCreateFromObjectNames(pCurTOX->IsFromObjectNames());
     pDesc->SetSequenceName(pCurTOX->GetSequenceName());
     pDesc->SetCaptionDisplay(pCurTOX->GetCaptionDisplay());
@@ -571,7 +571,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
 
             SvtPathOptions aOpt;
             // 6.0 (extension .sxw)
-            BOOL bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
+            sal_Bool bExist = aOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE );
 
 #ifndef MAC_WITHOUT_EXT
             if( !bExist )
@@ -674,7 +674,7 @@ long  SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
     long nData = (long)pEntry->GetUserData();
     if(nData != USHRT_MAX)
     {
-        long  nPos = pHeaderBar->GetItemRect( static_cast< USHORT >(101 + nData) ).TopLeft().X();
+        long  nPos = pHeaderBar->GetItemRect( static_cast< sal_uInt16 >(101 + nData) ).TopLeft().X();
         nData = nPos;
     }
     else
@@ -1022,7 +1022,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
     pIndexEntryWrapper = new IndexEntrySupplierWrapper();
 
     aLanguageLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN,
-                                 FALSE, FALSE, FALSE );
+                                 sal_False, sal_False, sal_False );
 
     sAddStyleContent = aAddStylesCB.GetText();
 
@@ -1246,7 +1246,7 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
         aFromObjectNamesRB.Check(rDesc.IsCreateFromObjectNames());
         aFromCaptionsRB.Check(!rDesc.IsCreateFromObjectNames());
         aCaptionSequenceLB.SelectEntry(rDesc.GetSequenceName());
-        aDisplayTypeLB.SelectEntryPos( static_cast< USHORT >(rDesc.GetCaptionDisplay()) );
+        aDisplayTypeLB.SelectEntryPos( static_cast< sal_uInt16 >(rDesc.GetCaptionDisplay()) );
         RadioButtonHdl(&aFromCaptionsRB);
 
     }
@@ -1277,11 +1277,11 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
     LanguageHdl(0);
     for( long nCnt = 0; nCnt < aSortAlgorithmLB.GetEntryCount(); ++nCnt )
     {
-        const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData( (USHORT)nCnt );
+        const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData( (sal_uInt16)nCnt );
         DBG_ASSERT(pEntryData, "no entry data available");
         if( pEntryData && *pEntryData == rDesc.GetSortAlgorithm())
         {
-            aSortAlgorithmLB.SelectEntryPos( (USHORT)nCnt );
+            aSortAlgorithmLB.SelectEntryPos( (sal_uInt16)nCnt );
             break;
         }
     }
@@ -1360,7 +1360,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
                     nOLEData |= nData;
                 }
             }
-            rDesc.SetOLEOptions((USHORT)nOLEData);
+            rDesc.SetOLEOptions((sal_uInt16)nOLEData);
         }
         break;
         case TOX_AUTHORITIES:
@@ -1385,7 +1385,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
 
     rDesc.SetContentOptions(nContentOptions);
     rDesc.SetIndexOptions(nIndexOptions);
-    rDesc.SetLevel( static_cast< BYTE >(aLevelNF.GetValue()) );
+    rDesc.SetLevel( static_cast< sal_uInt8 >(aLevelNF.GetValue()) );
 
     rDesc.SetReadonly(aReadOnlyCB.IsChecked());
 
@@ -1655,16 +1655,16 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
     if( 0 != (pUserData = aSortAlgorithmLB.GetEntryData( aSortAlgorithmLB.GetSelectEntryPos())) )
         sOldString = *(String*)pUserData;
     void* pDel;
-    USHORT nEnd = aSortAlgorithmLB.GetEntryCount();
-    for( USHORT n = 0; n < nEnd; ++n )
+    sal_uInt16 nEnd = aSortAlgorithmLB.GetEntryCount();
+    for( sal_uInt16 n = 0; n < nEnd; ++n )
         if( 0 != ( pDel = aSortAlgorithmLB.GetEntryData( n )) )
             delete (String*)pDel;
     aSortAlgorithmLB.Clear();
 
-    USHORT nInsPos;
+    sal_uInt16 nInsPos;
     String sAlg, sUINm;
-    nEnd = static_cast< USHORT >(aSeq.getLength());
-    for( USHORT nCnt = 0; nCnt < nEnd; ++nCnt )
+    nEnd = static_cast< sal_uInt16 >(aSeq.getLength());
+    for( sal_uInt16 nCnt = 0; nCnt < nEnd; ++nCnt )
     {
         sUINm = pIndexRes->GetTranslation( sAlg = aSeq[ nCnt ] );
         nInsPos = aSortAlgorithmLB.InsertEntry( sUINm );
@@ -2019,7 +2019,7 @@ void    SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt )
         SvLBoxEntry* pEntry = GetEntry( aPos );
         if( pEntry )
         {
-            USHORT nLevel = static_cast< USHORT >(GetModel()->GetAbsPos(pEntry));
+            sal_uInt16 nLevel = static_cast< sal_uInt16 >(GetModel()->GetAbsPos(pEntry));
             String sEntry = pParent->GetLevelHelp(++nLevel);
             if('*' == sEntry)
                 sEntry = GetEntryText(pEntry);
@@ -2178,7 +2178,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     aCommaSeparatedCB.SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl));
     aRelToStyleCB.SetClickHdl(LINK(this, SwTOXEntryTabPage, ModifyHdl));
 
-    FieldUnit aMetric = ::GetDfltMetric(FALSE);
+    FieldUnit aMetric = ::GetDfltMetric(sal_False);
     SetMetric(aTabPosMF, aMetric);
 
     aSortDocPosRB.Check();
@@ -2208,7 +2208,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
                                aEntryOutlineLevelFT.GetPosPixel().X();
 
     //fill the types in
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0; i < AUTH_FIELD_END; i++)
     {
         String sTmp(SW_RES(STR_AUTH_FIELD_START + i));
@@ -2326,9 +2326,9 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/)
     m_pCurrentForm = pTOXDlg->GetForm(aCurType);
     if( !( aLastTOXType == aCurType ))
     {
-        BOOL bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
-        BOOL bToxIsIndex =       TOX_INDEX == aCurType.eType;
-        BOOL bToxIsContent =     TOX_CONTENT == aCurType.eType;
+        sal_Bool bToxIsAuthorities = TOX_AUTHORITIES == aCurType.eType;
+        sal_Bool bToxIsIndex =       TOX_INDEX == aCurType.eType;
+        sal_Bool bToxIsContent =     TOX_CONTENT == aCurType.eType;
 
         aLevelLB.Clear();
         for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++)
@@ -2636,7 +2636,7 @@ IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn)
     String sText;
     FormTokenType eTokenType = TOKEN_ENTRY_NO;
     String sCharStyle;
-    USHORT  nChapterFormat = CF_NUMBER; // i89791
+    sal_uInt16  nChapterFormat = CF_NUMBER; // i89791
     if(pBtn == &aEntryNoPB)
     {
         sText.AssignAscii(SwForm::aFormEntryNum);
@@ -2962,7 +2962,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox*, pBox)
 
 IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, NumericField*, pField)
 {
-    const sal_uInt16 nLevel = static_cast<BYTE>(pField->GetValue());
+    const sal_uInt16 nLevel = static_cast<sal_uInt8>(pField->GetValue());
 
     Control* pCtrl = aTokenWIN.GetActiveControl();
     DBG_ASSERT(pCtrl, "no active control?");
@@ -3056,7 +3056,7 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox)
 void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh)
 {
     SwDocShell* pDocSh = rSh.GetView().GetDocShell();
-    ::FillCharStyleListBox(aCharStyleLB, pDocSh, TRUE, TRUE);
+    ::FillCharStyleListBox(aCharStyleLB, pDocSh, sal_True, sal_True);
     const String sDefault(SW_RES(STR_POOLCOLL_STANDARD));
     for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
     {
@@ -3141,7 +3141,7 @@ SwTokenWindow::~SwTokenWindow()
         pControl->SetLoseFocusHdl( Link() );
     }
 
-    for( ULONG i = aControlList.Count(); i; )
+    for( sal_uLong i = aControlList.Count(); i; )
     {
         Control* pControl = aControlList.Remove( --i );
         delete pControl;
@@ -3157,7 +3157,7 @@ void    SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
     if(pForm)
     {
         //apply current level settings to the form
-        for( ULONG i = aControlList.Count(); i; )
+        for( sal_uLong i = aControlList.Count(); i; )
         {
             Control* pControl = aControlList.Remove( --i );
             delete pControl;
@@ -3437,9 +3437,9 @@ void    SwTokenWindow::InsertAtSelection(
          Selection aSel = ((SwTOXEdit*)pActiveCtrl)->GetSelection();
         aSel.Justify();
         String sEditText = ((SwTOXEdit*)pActiveCtrl)->GetText();
-        String sLeft = sEditText.Copy( 0, static_cast< USHORT >(aSel.A()) );
-        String sRight = sEditText.Copy( static_cast< USHORT >(aSel.B()),
-                                        static_cast< USHORT >(sEditText.Len() - aSel.B()));
+        String sLeft = sEditText.Copy( 0, static_cast< sal_uInt16 >(aSel.A()) );
+        String sRight = sEditText.Copy( static_cast< sal_uInt16 >(aSel.B()),
+                                        static_cast< sal_uInt16 >(sEditText.Len() - aSel.B()));
 
         ((SwTOXEdit*)pActiveCtrl)->SetText(sLeft);
         ((SwTOXEdit*)pActiveCtrl)->AdjustSize();
@@ -3646,7 +3646,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
         else
         {
             //find the first completely visible control (left edge visible)
-            for(ULONG i = aControlList.Count(); i; i-- )
+            for(sal_uLong i = aControlList.Count(); i; i-- )
             {
                 Control* pCtrl = aControlList.GetObject(i - 1);
                 long nCtrlWidth = pCtrl->GetSizePixel().Width();
@@ -3732,11 +3732,11 @@ sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const
     return bRet;
 }
 //---------------------------------------------------
-BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl,
+sal_Bool SwTokenWindow::CreateQuickHelp(Control* pCtrl,
             const SwFormToken& rToken,
             const HelpEvent& rHEvt)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     if( rHEvt.GetMode() & HELPMODE_QUICK )
     {
         sal_Bool bBalloon = Help::IsBalloonHelpEnabled();
@@ -3775,7 +3775,7 @@ BOOL SwTokenWindow::CreateQuickHelp(Control* pCtrl,
         else
             Help::ShowQuickHelp( this, aItemRect, sEntry,
                 QUICKHELP_LEFT|QUICKHELP_VCENTER );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return bRet;
 }
@@ -4229,17 +4229,17 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId,
 sal_Bool    SwEntryBrowseBox::SeekRow( long nRow )
 {
     nCurrentRow = nRow;
-    return TRUE;
+    return sal_True;
 }
 /* -----------------------------19.01.00 15:32--------------------------------
 
  ---------------------------------------------------------------------------*/
-String SwEntryBrowseBox::GetCellText(long nRow, USHORT nColumn) const
+String SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const
 {
     const String* pRet = &aEmptyStr;
     if(aEntryArr.Count() > nRow)
     {
-        AutoMarkEntry* pEntry = aEntryArr[ static_cast< USHORT >(nRow) ];
+        AutoMarkEntry* pEntry = aEntryArr[ static_cast< sal_uInt16 >(nRow) ];
         switch(nColumn)
         {
             case  ITEM_SEARCH       :pRet = &pEntry->sSearch; break;
@@ -4277,7 +4277,7 @@ void    SwEntryBrowseBox::PaintCell(OutputDevice& rDev,
 sal_Bool SwEntryBrowseBox::SaveModified()
 {
     SetModified();
-    USHORT nRow = static_cast< USHORT >(GetCurRow());
+    sal_uInt16 nRow = static_cast< sal_uInt16 >(GetCurRow());
     sal_uInt16 nCol = GetCurColumnId();
 
     String sNew;
@@ -4364,7 +4364,7 @@ void    SwEntryBrowseBox::ReadEntries(SvStream& rInStr)
                 if( !pToInsert )
                     pToInsert = new AutoMarkEntry;
 
-                USHORT nSttPos = 0;
+                sal_uInt16 nSttPos = 0;
                 pToInsert->sSearch      = sLine.GetToken(0, ';', nSttPos );
                 pToInsert->sAlternative = sLine.GetToken(0, ';', nSttPos );
                 pToInsert->sPrimKey     = sLine.GetToken(0, ';', nSttPos );
@@ -4480,7 +4480,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const String& rAutoMarkU
         aEntriesBB.RowInserted(0, 1, sal_True);
     else
     {
-        SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ, FALSE );
+        SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ, sal_False );
         if( aMed.GetInStream() && !aMed.GetInStream()->GetError() )
             aEntriesBB.ReadEntries( *aMed.GetInStream() );
         else
@@ -4507,7 +4507,7 @@ IMPL_LINK(SwAutoMarkDlg_Impl, OkHdl, OKButton*, EMPTYARG)
         SfxMedium aMed( sAutoMarkURL,
                         bCreateMode ? STREAM_WRITE
                                     : STREAM_WRITE| STREAM_TRUNC,
-                        FALSE );
+                        sal_False );
         SvStream* pStrm = aMed.GetOutStream();
         pStrm->SetStreamCharSet( RTL_TEXTENCODING_MS_1253 );
         if( !pStrm->GetError() )
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index c17f4b683906..0433f83a2a18 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -59,8 +59,8 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr& rTOXMgr ) :
 {
     aTOXLB.SetSelectHdl(LINK(this, SwMultiTOXMarkDlg, SelectHdl));
 
-    USHORT nSize = rMgr.GetTOXMarkCount();
-    for(USHORT i=0; i < nSize; ++i)
+    sal_uInt16 nSize = rMgr.GetTOXMarkCount();
+    for(sal_uInt16 i=0; i < nSize; ++i)
         aTOXLB.InsertEntry(rMgr.GetTOXMark(i)->GetText());
 
     aTOXLB.SelectEntryPos(0);
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 54d1fab4cc0c..92b3f649ae9a 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -158,11 +158,11 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
     bNewMark(bNewDlg),
     bSelected(sal_False),
 
-    bPhoneticED0_ChangedByUser(FALSE),
-    bPhoneticED1_ChangedByUser(FALSE),
-    bPhoneticED2_ChangedByUser(FALSE),
+    bPhoneticED0_ChangedByUser(sal_False),
+    bPhoneticED1_ChangedByUser(sal_False),
+    bPhoneticED2_ChangedByUser(sal_False),
     nLangForPhoneticReading(2052),
-    bIsPhoneticReadingEnabled(FALSE),
+    bIsPhoneticReadingEnabled(sal_False),
     xExtendedIndexEntrySupplier(NULL),
     pTOXMgr(0),
     pSh(&rWrtShell)
@@ -373,10 +373,10 @@ void    SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
     //no phonetic reading if no global cjk support
     if( !xExtendedIndexEntrySupplier.is() )
     {
-        bIsPhoneticReadingEnabled = FALSE;
+        bIsPhoneticReadingEnabled = sal_False;
         return;
     }
-    bIsPhoneticReadingEnabled = TRUE;
+    bIsPhoneticReadingEnabled = sal_True;
 
     //get the current language
     if(!bNewMark) //if dialog is opened to iterate existing marks
@@ -401,8 +401,8 @@ void    SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
     }
     else //if dialog is opened to create a new mark
     {
-        USHORT nScriptType = pSh->GetScriptType();
-        USHORT nWhich;
+        sal_uInt16 nScriptType = pSh->GetScriptType();
+        sal_uInt16 nWhich;
         switch(nScriptType)
         {
             case SCRIPTTYPE_ASIAN: nWhich = RES_CHRATR_CJK_LANGUAGE; break;
@@ -517,7 +517,7 @@ void SwIndexMarkDlg::InsertUpdate()
 /*--------------------------------------------------------------------
      Beschreibung:  Marke einfuegen
  --------------------------------------------------------------------*/
-static void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSensitive)
+static void lcl_SelectSameStrings(SwWrtShell& rSh, sal_Bool bWordOnly, sal_Bool bCaseSensitive)
 {
     rSh.Push();
 
@@ -532,12 +532,12 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, BOOL bWordOnly, BOOL bCaseSen
                             : TransliterationModules_IGNORE_CASE) );
 
     rSh.ClearMark();
-    BOOL bCancel;
+    sal_Bool bCancel;
 
     //todo/mba: assuming that notes should not be searched
-    BOOL bSearchInNotes = FALSE;
+    sal_Bool bSearchInNotes = sal_False;
     rSh.Find( aSearchOpt,  bSearchInNotes, DOCPOS_START, DOCPOS_END, bCancel,
-                        (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), FALSE );
+                        (FindRanges)(FND_IN_SELALL|FND_IN_BODYONLY), sal_False );
 }
 
 
@@ -574,9 +574,9 @@ void SwIndexMarkDlg::InsertMark()
     }
     if (aOrgStr != aEntryED.GetText())
         aDesc.SetAltStr(aEntryED.GetText());
-    BOOL bApplyAll = aApplyToAllCB.IsChecked();
-    BOOL bWordOnly = aSearchCaseWordOnlyCB.IsChecked();
-    BOOL bCaseSensitive = aSearchCaseSensitiveCB.IsChecked();
+    sal_Bool bApplyAll = aApplyToAllCB.IsChecked();
+    sal_Bool bWordOnly = aSearchCaseWordOnlyCB.IsChecked();
+    sal_Bool bCaseSensitive = aSearchCaseSensitiveCB.IsChecked();
 
     pSh->StartAllAction();
     // hier muessen alle gleichen Strings selektiert werden
@@ -589,7 +589,7 @@ void SwIndexMarkDlg::InsertMark()
     SwTOXMgr aMgr(pSh);
     aMgr.InsertTOXMark(aDesc);
     if(bApplyAll)
-        pSh->Pop(FALSE);
+        pSh->Pop(sal_False);
 
     pSh->EndAllAction();
 }
@@ -818,11 +818,11 @@ IMPL_LINK( SwIndexMarkDlg, ModifyHdl, ListBox *, pBox )
     }
     else //aEntryED  !!aEntryED is not a ListBox but a Edit
     {
-        BOOL bHasText = (aEntryED.GetText().Len()>0);
+        sal_Bool bHasText = (aEntryED.GetText().Len()>0);
         if(!bHasText)
         {
             aPhoneticED0.SetText(aEmptyStr);
-            bPhoneticED0_ChangedByUser = FALSE;
+            bPhoneticED0_ChangedByUser = sal_False;
         }
         else if(!bPhoneticED0_ChangedByUser)
             aPhoneticED0.SetText(GetDefaultPhoneticReading(aEntryED.GetText()));
@@ -1038,15 +1038,15 @@ IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox )
             aKey2DCB.SetText(aEmptyStr);
             aPhoneticED1.SetText(aEmptyStr);
             aPhoneticED2.SetText(aEmptyStr);
-            bPhoneticED1_ChangedByUser = FALSE;
-            bPhoneticED2_ChangedByUser = FALSE;
+            bPhoneticED1_ChangedByUser = sal_False;
+            bPhoneticED2_ChangedByUser = sal_False;
         }
         else
         {
             if(pBox->IsInDropDown())
             {
                 //reset bPhoneticED1_ChangedByUser if a completly new string is selected
-                bPhoneticED1_ChangedByUser = FALSE;
+                bPhoneticED1_ChangedByUser = sal_False;
             }
             if(!bPhoneticED1_ChangedByUser)
                 aPhoneticED1.SetText(GetDefaultPhoneticReading(pBox->GetText()));
@@ -1059,14 +1059,14 @@ IMPL_LINK( SwIndexMarkDlg, KeyDCBModifyHdl, ComboBox *, pBox )
         if(!(pBox->GetText().Len()>0))
         {
             aPhoneticED2.SetText(aEmptyStr);
-            bPhoneticED2_ChangedByUser = FALSE;
+            bPhoneticED2_ChangedByUser = sal_False;
         }
         else
         {
             if(pBox->IsInDropDown())
             {
                 //reset bPhoneticED1_ChangedByUser if a completly new string is selected
-                bPhoneticED2_ChangedByUser = FALSE;
+                bPhoneticED2_ChangedByUser = sal_False;
             }
             if(!bPhoneticED2_ChangedByUser)
                 aPhoneticED2.SetText(GetDefaultPhoneticReading(pBox->GetText()));
@@ -1103,7 +1103,7 @@ void    SwIndexMarkDlg::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark)
     pTOXMgr = new SwTOXMgr(pSh);
     if(pCurTOXMark)
     {
-        for(USHORT i = 0; i < pTOXMgr->GetTOXMarkCount(); i++)
+        for(sal_uInt16 i = 0; i < pTOXMgr->GetTOXMarkCount(); i++)
             if(pTOXMgr->GetTOXMark(i) == pCurTOXMark)
             {
                 pTOXMgr->SetCurTOXMark(i);
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index 8564000d26ac..dd22ad00e540 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -56,13 +56,13 @@ SwTOXMgr::SwTOXMgr(SwWrtShell* pShell):
  --------------------------------------------------------------------*/
 
 
-USHORT SwTOXMgr::GetTOXMarks()
+sal_uInt16 SwTOXMgr::GetTOXMarks()
 {
     return pSh->GetCurTOXMarks(aCurMarks);
 }
 
 
-SwTOXMark* SwTOXMgr::GetTOXMark(USHORT nId)
+SwTOXMark* SwTOXMgr::GetTOXMark(sal_uInt16 nId)
 {
     if(aCurMarks.Count() > 0)
         return aCurMarks[nId];
@@ -98,7 +98,7 @@ void    SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc)
             ASSERT(rDesc.GetLevel() > 0 && rDesc.GetLevel() <= MAXLEVEL,
                                             ungueltiger Level InsertTOCMark);
             pMark = new SwTOXMark(pSh->GetTOXType(TOX_CONTENT, 0));
-            pMark->SetLevel( static_cast< USHORT >(rDesc.GetLevel()) );
+            pMark->SetLevel( static_cast< sal_uInt16 >(rDesc.GetLevel()) );
 
             if(rDesc.GetAltStr())
                 pMark->SetAlternativeText(*rDesc.GetAltStr());
@@ -132,10 +132,10 @@ void    SwTOXMgr::InsertTOXMark(const SwTOXMarkDescription& rDesc)
         {
             ASSERT(rDesc.GetLevel() > 0 && rDesc.GetLevel() <= MAXLEVEL,
                                             ungueltiger Level InsertTOCMark);
-            USHORT nId = rDesc.GetTOUName() ?
+            sal_uInt16 nId = rDesc.GetTOUName() ?
                 GetUserTypeID(*rDesc.GetTOUName()) : 0;
             pMark = new SwTOXMark(pSh->GetTOXType(TOX_USER, nId));
-            pMark->SetLevel( static_cast< USHORT >(rDesc.GetLevel()) );
+            pMark->SetLevel( static_cast< sal_uInt16 >(rDesc.GetLevel()) );
 
             if(rDesc.GetAltStr())
                 pMark->SetAlternativeText(*rDesc.GetAltStr());
@@ -195,13 +195,13 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
         pCurTOXMark->SetMainEntry(rDesc.IsMainEntry());
     }
     else
-        pCurTOXMark->SetLevel( static_cast< USHORT >(rDesc.GetLevel()) );
+        pCurTOXMark->SetLevel( static_cast< sal_uInt16 >(rDesc.GetLevel()) );
 
     if(rDesc.GetAltStr())
     {
         // JP 26.08.96: Bug 30344 - entweder der Text aus dem Doc oder
         //                          ein Alternativ-Text, beides gibts nicht!
-        BOOL bReplace = pCurTOXMark->IsAlternativeText();
+        sal_Bool bReplace = pCurTOXMark->IsAlternativeText();
         if( bReplace )
             pCurTOXMark->SetAlternativeText( *rDesc.GetAltStr() );
         else
@@ -219,7 +219,7 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
     // Bug 36207 pCurTOXMark zeigt hier in den Wald!
     if(!pCurTOXMark)
     {
-        pSh->Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE );
+        pSh->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
         pSh->GetCurTOXMarks(aCurMarks);
         SetCurTOXMark(0);
     }
@@ -231,10 +231,10 @@ void SwTOXMgr::UpdateTOXMark(const SwTOXMarkDescription& rDesc)
  --------------------------------------------------------------------*/
 
 
-USHORT SwTOXMgr::GetUserTypeID(const String& rStr)
+sal_uInt16 SwTOXMgr::GetUserTypeID(const String& rStr)
 {
-    USHORT nSize = pSh->GetTOXTypeCount(TOX_USER);
-    for(USHORT i=0; i < nSize; ++i)
+    sal_uInt16 nSize = pSh->GetTOXTypeCount(TOX_USER);
+    for(sal_uInt16 i=0; i < nSize; ++i)
     {
         const SwTOXType* pTmp = pSh->GetTOXType(TOX_USER, i);
         if(pTmp && pTmp->GetTypeName() == rStr)
@@ -250,7 +250,7 @@ USHORT SwTOXMgr::GetUserTypeID(const String& rStr)
  --------------------------------------------------------------------*/
 
 
-void SwTOXMgr::NextTOXMark(BOOL bSame)
+void SwTOXMgr::NextTOXMark(sal_Bool bSame)
 {
     ASSERT(pCurTOXMark, "kein aktuelles TOXMark");
     if( pCurTOXMark )
@@ -261,7 +261,7 @@ void SwTOXMgr::NextTOXMark(BOOL bSame)
 }
 
 
-void SwTOXMgr::PrevTOXMark(BOOL bSame)
+void SwTOXMgr::PrevTOXMark(sal_Bool bSame)
 {
     ASSERT(pCurTOXMark, "kein aktuelles TOXMark");
     if( pCurTOXMark )
@@ -279,12 +279,12 @@ const SwTOXBase* SwTOXMgr::GetCurTOX()
     return pSh->GetCurTOX();
 }
 
-const SwTOXType* SwTOXMgr::GetTOXType(TOXTypes eTyp, USHORT nId) const
+const SwTOXType* SwTOXMgr::GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const
 {
     return pSh->GetTOXType(eTyp, nId);
 }
 
-void SwTOXMgr::SetCurTOXMark(USHORT nId)
+void SwTOXMgr::SetCurTOXMark(sal_uInt16 nId)
 {
     pCurTOXMark = (nId < aCurMarks.Count()) ? aCurMarks[nId] : 0;
 }
@@ -293,12 +293,12 @@ void SwTOXMgr::SetCurTOXMark(USHORT nId)
 
  --------------------------------------------------*/
 
-BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
+sal_Bool SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
                                     SwTOXBase** ppBase,
                                     const SfxItemSet* pSet)
 {
-    SwWait aWait( *pSh->GetView().GetDocShell(), TRUE );
-    BOOL bRet = TRUE;
+    SwWait aWait( *pSh->GetView().GetDocShell(), sal_True );
+    sal_Bool bRet = sal_True;
     const SwTOXBase* pCurTOX = ppBase && *ppBase ? *ppBase : GetCurTOX();
     SwTOXBase* pTOX = (SwTOXBase*)pCurTOX;
 
@@ -343,9 +343,9 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
         {
             if(!pCurTOX || (ppBase && !(*ppBase)))
             {
-                USHORT nPos  = 0;
-                USHORT nSize = pSh->GetTOXTypeCount(eCurTOXType);
-                for(USHORT i=0; rDesc.GetTOUName() && i < nSize; ++i)
+                sal_uInt16 nPos  = 0;
+                sal_uInt16 nSize = pSh->GetTOXTypeCount(eCurTOXType);
+                for(sal_uInt16 i=0; rDesc.GetTOUName() && i < nSize; ++i)
                 {   const SwTOXType* pType = pSh->GetTOXType(TOX_USER, i);
                     if(pType->GetTypeName() == *rDesc.GetTOUName())
                     {   nPos = i;
@@ -417,14 +417,14 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
 
     DBG_ASSERT(pNewTOX, "no TOXBase created!" );
     if(!pNewTOX)
-        return FALSE;
+        return sal_False;
 
     pNewTOX->SetFromChapter(rDesc.IsFromChapter());
     pNewTOX->SetSequenceName(rDesc.GetSequenceName());
     pNewTOX->SetCaptionDisplay(rDesc.GetCaptionDisplay());
     pNewTOX->SetProtected(rDesc.IsReadonly());
 
-    for(USHORT nLevel = 0; nLevel < MAXLEVEL; nLevel++)
+    for(sal_uInt16 nLevel = 0; nLevel < MAXLEVEL; nLevel++)
         pNewTOX->SetStyleNames(rDesc.GetStyleNames(nLevel), nLevel);
 
     if(rDesc.GetTitle())
@@ -482,7 +482,7 @@ void SwTOXDescription::SetSortKeys(SwTOXSortKey eKey1,
                             SwTOXSortKey eKey3)
 {
     SwTOXSortKey aArr[3];
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     if(AUTH_FIELD_END > eKey1.eField)
         aArr[nPos++] = eKey1;
     if(AUTH_FIELD_END > eKey2.eField)
@@ -500,7 +500,7 @@ void SwTOXDescription::SetSortKeys(SwTOXSortKey eKey1,
  --------------------------------------------------*/
 void SwTOXDescription::ApplyTo(SwTOXBase& rTOXBase)
 {
-    for(USHORT i = 0; i < MAXLEVEL; i++)
+    for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
         rTOXBase.SetStyleNames(GetStyleNames(i), i);
     rTOXBase.SetTitle(GetTitle() ? *GetTitle() : aEmptyStr);
     rTOXBase.SetCreate(GetContentOptions());