1 files changed, 23 insertions, 23 deletions

diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 265a53dc6646..3e6db5e1bf1e 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -65,14 +65,14 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
     :SfxTabPage     (pParent, rId, rAttrSet),
     m_pCurFld       (0),
     m_pWrtShell     (0),
-    m_nPageId       ( static_cast< USHORT >(rId.GetId()) ),
+    m_nPageId       ( static_cast< sal_uInt16 >(rId.GetId()) ),
     m_nTypeSel      (LISTBOX_ENTRY_NOTFOUND),
     m_nSelectionSel (LISTBOX_ENTRY_NOTFOUND),
-    m_bFldEdit      (FALSE),
-    m_bInsert           (TRUE),
-    m_bFldDlgHtmlMode   (FALSE),
-    m_bRefresh          (FALSE),
-    m_bFirstHTMLInit    (TRUE)
+    m_bFldEdit      (sal_False),
+    m_bInsert           (sal_True),
+    m_bFldDlgHtmlMode   (sal_False),
+    m_bRefresh          (sal_False),
+    m_bFirstHTMLInit    (sal_True)
 {
 //  FreeResource();
 }
@@ -92,7 +92,7 @@ SwFldPage::~SwFldPage()
 void SwFldPage::Init()
 {
     SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current();
-    BOOL bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON);
+    sal_Bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON);
 
     m_bFldEdit = 0 == GetTabDialog();
 
@@ -107,7 +107,7 @@ void SwFldPage::Init()
         // Bereichslistbox initialisieren
         if( m_bFldDlgHtmlMode && m_bFirstHTMLInit )
         {
-            m_bFirstHTMLInit = FALSE;
+            m_bFirstHTMLInit = sal_False;
             SwWrtShell *pSh = m_pWrtShell;
             if(! pSh)
                 pSh = ::GetActiveWrtShell();
@@ -136,27 +136,27 @@ void SwFldPage::ActivatePage()
      Beschreibung: Kompletter Reset; neues Feld editieren
  --------------------------------------------------------------------*/
 
-void SwFldPage::EditNewField( BOOL bOnlyActivate )
+void SwFldPage::EditNewField( sal_Bool bOnlyActivate )
 {
     if( !bOnlyActivate )
     {
         m_nTypeSel = LISTBOX_ENTRY_NOTFOUND;
     }
     m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND;
-    m_bRefresh = TRUE;
+    m_bRefresh = sal_True;
     Reset(*(SfxItemSet*)0);
-    m_bRefresh = FALSE;
+    m_bRefresh = sal_False;
 }
 
 /*--------------------------------------------------------------------
      Beschreibung: Feld einfuegen
  --------------------------------------------------------------------*/
 
-BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
-                            const String& rPar2, ULONG nFormatId,
-                            sal_Unicode cSeparator, BOOL bIsAutomaticLanguage)
+sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const String& rPar1,
+                            const String& rPar2, sal_uLong nFormatId,
+                            sal_Unicode cSeparator, sal_Bool bIsAutomaticLanguage)
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
     SwView* pView = GetActiveView();
     SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr();
 
@@ -171,7 +171,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
                 pView->GetViewFrame()->GetBindings().GetRecorder();
         if ( xRecorder.is() )
         {
-            BOOL bRecordDB = TYP_DBFLD == nTypeId ||
+            sal_Bool bRecordDB = TYP_DBFLD == nTypeId ||
                             TYP_DBSETNUMBERFLD == nTypeId ||
                             TYP_DBNUMSETFLD == nTypeId ||
                             TYP_DBNEXTSETFLD == nTypeId ||
@@ -210,12 +210,12 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
 
         String sPar1(rPar1);
         String sPar2(rPar2);
-        BOOL bDBChanged = FALSE;
+        sal_Bool bDBChanged = sal_False;
         switch( nTypeId )
         {
         case TYP_DATEFLD:
         case TYP_TIMEFLD:
-            nSubType = static_cast< USHORT >(((nTypeId == TYP_DATEFLD) ? DATEFLD : TIMEFLD) |
+            nSubType = static_cast< sal_uInt16 >(((nTypeId == TYP_DATEFLD) ? DATEFLD : TIMEFLD) |
                        ((nSubType == DATE_VAR) ? 0 : FIXEDFLD));
             break;
 
@@ -233,7 +233,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
                 sPar1 = rPar1.Copy(nPos);
 
                 ((SwDBNameInfField*)pTmpFld)->SetDBData(aData);
-                bDBChanged = TRUE;
+                bDBChanged = sal_True;
             }
             break;
 
@@ -261,14 +261,14 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1,
                         break;
                     }
                 }
-                bDBChanged = TRUE;
+                bDBChanged = sal_True;
             }
             break;
 
         case TYP_SEQFLD:
             {
                 SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pTmpFld->GetTyp();
-                pTyp->SetOutlineLvl( static_cast< BYTE >(nSubType & 0xff));
+                pTyp->SetOutlineLvl( static_cast< sal_uInt8 >(nSubType & 0xff));
                 pTyp->SetDelimiter(cSeparator);
 
                 nSubType = nsSwGetSetExpType::GSE_SEQ;
@@ -345,7 +345,7 @@ void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2,
 
 void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
 {
-    USHORT nPos = 0;
+    sal_uInt16 nPos = 0;
     ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 };
     ListBox** ppLB = aLBArr;
     for( int i = 0; i < coLBCount; ++i, ++ppLB )
@@ -383,7 +383,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
      Beschreibung: "Einfuegen"-Button Enablen/Disablen
  --------------------------------------------------------------------*/
 
-void SwFldPage::EnableInsert(BOOL bEnable)
+void SwFldPage::EnableInsert(sal_Bool bEnable)
 {
     SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog();