1 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index 8682e1d34462..1e6133d7703d 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -39,7 +39,7 @@
 #include "drawbase.hxx"
 #include "conform.hxx"
 
-extern BOOL bNoInterrupt;       // in mainwn.cxx
+extern sal_Bool bNoInterrupt;       // in mainwn.cxx
 
 /*************************************************************************
 |*
@@ -51,7 +51,7 @@ extern BOOL bNoInterrupt;       // in mainwn.cxx
 ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
     SwDrawBase(pWrtShell, pEditWin, pSwView)
 {
-    m_bInsForm = TRUE;
+    m_bInsForm = sal_True;
 }
 
 /*************************************************************************
@@ -61,9 +61,9 @@ ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, S
 \************************************************************************/
 
 
-BOOL ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     SdrView *pSdrView = m_pSh->GetDrawView();
 
@@ -72,13 +72,13 @@ BOOL ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 
     if (rMEvt.IsMod2())
     {
-        pSdrView->SetCreate1stPointAsCenter(TRUE);
-        pSdrView->SetResizeAtCenter(TRUE);
+        pSdrView->SetCreate1stPointAsCenter(sal_True);
+        pSdrView->SetResizeAtCenter(sal_True);
     }
     else
     {
-        pSdrView->SetCreate1stPointAsCenter(FALSE);
-        pSdrView->SetResizeAtCenter(FALSE);
+        pSdrView->SetCreate1stPointAsCenter(sal_False);
+        pSdrView->SetResizeAtCenter(sal_False);
     }
 
     SdrViewEvent aVEvt;
@@ -88,16 +88,16 @@ BOOL ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
     if (rMEvt.IsLeft() && !m_pWin->IsDrawAction() &&
         (eHit == SDRHIT_UNMARKEDOBJECT || eHit == SDRHIT_NONE || m_pSh->IsDrawCreate()))
     {
-        bNoInterrupt = TRUE;
+        bNoInterrupt = sal_True;
         m_pWin->CaptureMouse();
 
         m_pWin->SetPointer(Pointer(POINTER_DRAW_RECT));
 
         m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
-        bReturn = m_pSh->BeginCreate( static_cast< UINT16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, m_aStartPos);
+        bReturn = m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, m_aStartPos);
 
         if (bReturn)
-            m_pWin->SetDrawAction(TRUE);
+            m_pWin->SetDrawAction(sal_True);
     }
     else
         bReturn = SwDrawBase::MouseButtonDown(rMEvt);
@@ -112,7 +112,7 @@ BOOL ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
 \************************************************************************/
 
 
-void ConstFormControl::Activate(const USHORT nSlotId)
+void ConstFormControl::Activate(const sal_uInt16 nSlotId)
 {
     m_pWin->SetSdrDrawMode( static_cast<SdrObjKind>(nSlotId) );
     SwDrawBase::Activate(nSlotId);
@@ -136,8 +136,8 @@ void ConstFormControl::CreateDefaultObject()
         m_pSh->MakeDrawView();
 
     SdrView *pSdrView = m_pSh->GetDrawView();
-    pSdrView->SetDesignMode(TRUE);
-    m_pSh->BeginCreate( static_cast< UINT16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, aStartPos);
+    pSdrView->SetDesignMode(sal_True);
+    m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, aStartPos);
     m_pSh->MoveCreate(aEndPos);
     m_pSh->EndCreate(SDRCREATE_FORCEEND);
 }