1 files changed, 28 insertions, 28 deletions

diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index ddae68d8b9ab..51d6c56f15b6 100644..100755
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -82,7 +82,7 @@ FunctionReference FuEditGluePoints::Create( ViewShell* pViewSh, ::sd::Window* pW
 void FuEditGluePoints::DoExecute( SfxRequest& rReq )
 {
     FuDraw::DoExecute( rReq );
-    mpView->SetInsGluePointMode(FALSE);
+    mpView->SetInsGluePointMode(sal_False);
     mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar(
         ToolBarManager::TBG_FUNCTION,
         ToolBarManager::msGluePointsToolBar);
@@ -98,7 +98,7 @@ FuEditGluePoints::~FuEditGluePoints()
 {
     mpView->BrkAction();
     mpView->UnmarkAllGluePoints();
-    mpView->SetInsGluePointMode(FALSE);
+    mpView->SetInsGluePointMode(sal_False);
 }
 
 /*************************************************************************
@@ -107,25 +107,25 @@ FuEditGluePoints::~FuEditGluePoints()
 |*
 \************************************************************************/
 
-BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
 {
     mpView->SetActualWin( mpWindow );
 
-    BOOL bReturn = FuDraw::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
 
     if (mpView->IsAction())
     {
         if (rMEvt.IsRight())
             mpView->BckAction();
 
-        return TRUE;
+        return sal_True;
     }
 
     if (rMEvt.IsLeft())
     {
-        bReturn = TRUE;
-        USHORT nHitLog = USHORT ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
-        USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+        bReturn = sal_True;
+        sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
+        sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
         mpWindow->CaptureMouse();
 
         SdrViewEvent aVEvt;
@@ -200,7 +200,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
                mpView->UnmarkAllObj();
             }
 
-            BOOL bMarked = FALSE;
+            sal_Bool bMarked = sal_False;
 
             if (!rMEvt.IsMod1())
             {
@@ -251,7 +251,7 @@ BOOL FuEditGluePoints::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
 {
     mpView->SetActualWin( mpWindow );
 
@@ -267,7 +267,7 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
 
     ForcePointer(&rMEvt);
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -276,21 +276,21 @@ BOOL FuEditGluePoints::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
+sal_Bool FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
 {
     mpView->SetActualWin( mpWindow );
 
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if (mpView->IsAction())
     {
-        bReturn = TRUE;
+        bReturn = sal_True;
         mpView->EndAction();
     }
 
     FuDraw::MouseButtonUp(rMEvt);
 
-    USHORT nDrgLog = USHORT ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
+    sal_uInt16 nDrgLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(DRGPIX,0)).Width() );
     Point aPos = mpWindow->PixelToLogic( rMEvt.GetPosPixel() );
 
     if (Abs(aMDPos.X() - aPos.X()) < nDrgLog &&
@@ -316,16 +316,16 @@ BOOL FuEditGluePoints::MouseButtonUp(const MouseEvent& rMEvt)
 |*
 |* Tastaturereignisse bearbeiten
 |*
-|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert TRUE, andernfalls
-|* FALSE.
+|* Wird ein KeyEvent bearbeitet, so ist der Return-Wert sal_True, andernfalls
+|* sal_False.
 |*
 \************************************************************************/
 
-BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
 {
     mpView->SetActualWin( mpWindow );
 
-    BOOL bReturn = FuDraw::KeyInput(rKEvt);
+    sal_Bool bReturn = FuDraw::KeyInput(rKEvt);
 
     return bReturn;
 }
@@ -336,7 +336,7 @@ BOOL FuEditGluePoints::KeyInput(const KeyEvent& rKEvt)
 |*
 \************************************************************************/
 
-BOOL FuEditGluePoints::Command(const CommandEvent& rCEvt)
+sal_Bool FuEditGluePoints::Command(const CommandEvent& rCEvt)
 {
     mpView->SetActualWin( mpWindow );
     return FuPoor::Command( rCEvt );
@@ -362,7 +362,7 @@ void FuEditGluePoints::Activate()
 
 void FuEditGluePoints::Deactivate()
 {
-    mpView->SetGluePointEditMode( FALSE );
+    mpView->SetGluePointEditMode( sal_False );
     FuDraw::Deactivate();
 }
 
@@ -414,44 +414,44 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq)
         {
             const SfxItemSet* pSet = rReq.GetArgs();
             const SfxPoolItem& rItem = pSet->Get(SID_GLUE_PERCENT);
-            BOOL bPercent = ((const SfxBoolItem&) rItem).GetValue();
+            sal_Bool bPercent = ((const SfxBoolItem&) rItem).GetValue();
             mpView->SetMarkedGluePointsPercent(bPercent);
         }
         break;
 
         case SID_GLUE_HORZALIGN_CENTER:
         {
-            mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_CENTER);
+            mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_CENTER);
         }
         break;
 
         case SID_GLUE_HORZALIGN_LEFT:
         {
-            mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_LEFT);
+            mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_LEFT);
         }
         break;
 
         case SID_GLUE_HORZALIGN_RIGHT:
         {
-            mpView->SetMarkedGluePointsAlign(FALSE, SDRHORZALIGN_RIGHT);
+            mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_RIGHT);
         }
         break;
 
         case SID_GLUE_VERTALIGN_CENTER:
         {
-            mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_CENTER);
+            mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_CENTER);
         }
         break;
 
         case SID_GLUE_VERTALIGN_TOP:
         {
-            mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_TOP);
+            mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_TOP);
         }
         break;
 
         case SID_GLUE_VERTALIGN_BOTTOM:
         {
-            mpView->SetMarkedGluePointsAlign(TRUE, SDRVERTALIGN_BOTTOM);
+            mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_BOTTOM);
         }
         break;
     }