Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 22 insertions, 22 deletions

diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 2b046c4de795..4b8d24c63792 100644..100755
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -99,7 +99,7 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
     if( pArgs )
     {
         const SfxPoolItem*  pPoolItem = NULL;
-        if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, TRUE, &pPoolItem ) )
+        if( SFX_ITEM_SET == pArgs->GetItemState( SID_ADD_MOTION_PATH, sal_True, &pPoolItem ) )
             maTargets = ( ( const SfxUnoAnyItem* ) pPoolItem )->GetValue();
     }
 }
@@ -110,9 +110,9 @@ void FuConstructBezierPolygon::DoExecute( SfxRequest& rReq )
 |*
 \************************************************************************/
 
-BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
+sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 {
-    BOOL bReturn = FuConstruct::MouseButtonDown(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseButtonDown(rMEvt);
 
     SdrViewEvent aVEvt;
     SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -130,11 +130,11 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
     {
         // Texteingabe hier nicht zulassen
         aVEvt.eEvent = SDREVENT_BEGDRAGOBJ;
-        mpView->EnableExtendedMouseEventDispatcher(FALSE);
+        mpView->EnableExtendedMouseEventDispatcher(sal_False);
     }
     else
     {
-        mpView->EnableExtendedMouseEventDispatcher(TRUE);
+        mpView->EnableExtendedMouseEventDispatcher(sal_True);
     }
 
     if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
@@ -167,9 +167,9 @@ BOOL FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
+sal_Bool FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
 {
-    BOOL bReturn = FuConstruct::MouseMove(rMEvt);
+    sal_Bool bReturn = FuConstruct::MouseMove(rMEvt);
     return(bReturn);
 }
 
@@ -179,15 +179,15 @@ BOOL FuConstructBezierPolygon::MouseMove(const MouseEvent& rMEvt)
 |*
 \************************************************************************/
 
-BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
+sal_Bool FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
 {
-    BOOL bReturn = FALSE;
-    BOOL bCreated = FALSE;
+    sal_Bool bReturn = sal_False;
+    sal_Bool bCreated = sal_False;
 
     SdrViewEvent aVEvt;
     mpView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt);
 
-    ULONG nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
+    sal_uLong nCount = mpView->GetSdrPageView()->GetObjList()->GetObjCount();
 
     if (mpView->IsInsObjPoint())
     {
@@ -200,15 +200,15 @@ BOOL FuConstructBezierPolygon::MouseButtonUp(const MouseEvent& rMEvt )
 
     if (aVEvt.eEvent == SDREVENT_ENDCREATE)
     {
-        bReturn = TRUE;
+        bReturn = sal_True;
 
         if (nCount == (mpView->GetSdrPageView()->GetObjList()->GetObjCount() - 1))
         {
-            bCreated = TRUE;
+            bCreated = sal_True;
         }
 
         // Trick, um FuDraw::DoubleClick nicht auszuloesen
-        bMBDown = FALSE;
+        bMBDown = sal_False;
 
     }
 
@@ -261,14 +261,14 @@ BOOL FuConstructBezierPolygon::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 FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
+sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
 {
-    BOOL bReturn = FuConstruct::KeyInput(rKEvt);
+    sal_Bool bReturn = FuConstruct::KeyInput(rKEvt);
 
     return(bReturn);
 }
@@ -281,7 +281,7 @@ BOOL FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
 
 void FuConstructBezierPolygon::Activate()
 {
-    mpView->EnableExtendedMouseEventDispatcher(TRUE);
+    mpView->EnableExtendedMouseEventDispatcher(sal_True);
 
     SdrObjKind eKind;
 
@@ -332,7 +332,7 @@ void FuConstructBezierPolygon::Activate()
         break;
     }
 
-    mpView->SetCurrentObj((UINT16)eKind);
+    mpView->SetCurrentObj((sal_uInt16)eKind);
 
     FuConstruct::Activate();
 }
@@ -345,7 +345,7 @@ void FuConstructBezierPolygon::Activate()
 
 void FuConstructBezierPolygon::Deactivate()
 {
-    mpView->EnableExtendedMouseEventDispatcher(FALSE);
+    mpView->EnableExtendedMouseEventDispatcher(sal_False);
 
     FuConstruct::Deactivate();
 }
@@ -374,7 +374,7 @@ void FuConstructBezierPolygon::SelectionHasChanged()
 |*
 \************************************************************************/
 
-void FuConstructBezierPolygon::SetEditMode(USHORT nMode)
+void FuConstructBezierPolygon::SetEditMode(sal_uInt16 nMode)
 {
     nEditMode = nMode;
     ForcePointer();