rebase to DEV300_m100

1 files changed, 56 insertions, 56 deletions

diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 7980668c0b9a..6fa8b0552f35 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -214,11 +214,11 @@ void SdrCreateView::ImpClearVars()
     nAktIdent=OBJ_NONE;
     pAktCreate=NULL;
     pCreatePV=NULL;
-    bAutoTextEdit=FALSE;
-    b1stPointAsCenter=FALSE;
+    bAutoTextEdit=sal_False;
+    b1stPointAsCenter=sal_False;
     aAktCreatePointer=Pointer(POINTER_CROSS);
-    bUseIncompatiblePathCreateInterface=FALSE;
-    bAutoClosePolys=TRUE;
+    bUseIncompatiblePathCreateInterface=sal_False;
+    bAutoClosePolys=sal_True;
     nAutoCloseDistPix=5;
     nFreeHandMinDistPix=10;
 
@@ -249,7 +249,7 @@ void SdrCreateView::ImpDelCreateAttr()
 {
 }
 
-BOOL SdrCreateView::IsAction() const
+sal_Bool SdrCreateView::IsAction() const
 {
     return SdrDragView::IsAction() || pAktCreate!=NULL;
 }
@@ -296,26 +296,26 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-BOOL SdrCreateView::CheckEdgeMode()
+sal_Bool SdrCreateView::CheckEdgeMode()
 {
-    UINT32 nInv=nAktInvent;
-    UINT16 nIdn=nAktIdent;
+    sal_uInt32 nInv=nAktInvent;
+    sal_uInt16 nIdn=nAktIdent;
     if (pAktCreate!=NULL)
     {
         nInv=pAktCreate->GetObjInventor();
         nIdn=pAktCreate->GetObjIdentifier();
         // wird vom EdgeObj gemanaged
-        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
+        if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False;
     }
 
     if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE)
     {
         ImpClearConnectMarker();
-        return FALSE;
+        return sal_False;
     }
     else
     {
-        // TRUE heisst: MouseMove soll Connect checken
+        // sal_True heisst: MouseMove soll Connect checken
         return !IsAction();
     }
 }
@@ -348,7 +348,7 @@ void SdrCreateView::HideConnectMarker()
     ImpClearConnectMarker();
 }
 
-BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
 {
     if(CheckEdgeMode() && pWin)
     {
@@ -358,7 +358,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
         {
             // Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!!
             Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel()));
-            BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
+            sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
             SdrObjConnection aCon;
             if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin);
             SetConnectMarker(aCon,*pPV);
@@ -367,22 +367,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
     return SdrDragView::MouseMove(rMEvt,pWin);
 }
 
-BOOL SdrCreateView::IsTextTool() const
+sal_Bool SdrCreateView::IsTextTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
 }
 
-BOOL SdrCreateView::IsEdgeTool() const
+sal_Bool SdrCreateView::IsEdgeTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
 }
 
-BOOL SdrCreateView::IsMeasureTool() const
+sal_Bool SdrCreateView::IsMeasureTool() const
 {
     return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
 }
 
-void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
+void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
 {
     if (nAktInvent!=nInvent || nAktIdent!=nIdent)
     {
@@ -416,10 +416,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
     ImpSetGlueVisible3(IsEdgeTool());
 }
 
-BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut,
+sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
     short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     UnmarkAllObj();
     BrkAction();
 
@@ -442,7 +442,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             aLay = aMeasureLayer;
         }
 
-        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE);
+        SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True);
         if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
         if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer))
         {
@@ -465,14 +465,14 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
             }
 
             Point aPnt(rPnt);
-            if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) &&
-                                            nAktIdent!=USHORT(OBJ_FREELINE) &&
-                                            nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
+            if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
+                                            nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
                 aPnt=GetSnapPos(aPnt,pCreatePV);
             }
             if (pAktCreate!=NULL)
             {
-                BOOL bStartEdit=FALSE; // nach Ende von Create automatisch TextEdit starten
+                sal_Bool bStartEdit=sal_False; // nach Ende von Create automatisch TextEdit starten
                 if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
 
                 // #101618# SW uses a naked SdrObject for frame construction. Normally, such an
@@ -492,7 +492,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
 
                     pAktCreate->SetMergedItemSet(aSet);
 
-                    bStartEdit=TRUE;
+                    bStartEdit=sal_True;
                 }
                 if (nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
                     nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT))
@@ -506,7 +506,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
 
                     pAktCreate->SetMergedItemSet(aSet);
 
-                    bStartEdit=TRUE;
+                    bStartEdit=sal_True;
                 }
                 if (!rLogRect.IsEmpty()) pAktCreate->NbcSetLogicRect(rLogRect);
 
@@ -543,8 +543,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
                 pDragWin=pOut;
                 if (pAktCreate->BegCreate(aDragStat))
                 {
-                    ShowCreateObj(/*pOut,TRUE*/);
-                    bRet=TRUE;
+                    ShowCreateObj(/*pOut,sal_True*/);
+                    bRet=sal_True;
                 }
                 else
                 {
@@ -558,7 +558,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
     return bRet;
 }
 
-BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L);
 }
@@ -577,7 +577,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi
     return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject);
 }
 
-BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
+sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
     OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
 {
     return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
@@ -604,9 +604,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
         if(bDidLimit && IsOrtho())
         {
             if(aDragStat.IsOrtho8Possible())
-                OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False);
             else if(aDragStat.IsOrtho4Possible())
-                OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE);
+                OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False);
         }
 
         if (aPnt==aDragStat.GetNow()) return;
@@ -628,24 +628,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
     }
 }
 
-BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
+sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
 {
-    BOOL bRet=FALSE;
+    sal_Bool bRet=sal_False;
     SdrObject* pObjMerk=pAktCreate;
     SdrPageView* pPVMerk=pCreatePV;
 
     if (pAktCreate!=NULL)
     {
-        ULONG nAnz=aDragStat.GetPointAnz();
+        sal_uIntPtr nAnz=aDragStat.GetPointAnz();
 
         if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND)
         {
             BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht)
-            return FALSE; // FALSE=Event nicht ausgewertet
+            return sal_False; // sal_False=Event nicht ausgewertet
         }
 
-        BOOL bPntsEq=nAnz>1;
-        ULONG i=1;
+        sal_Bool bPntsEq=nAnz>1;
+        sal_uIntPtr i=1;
         Point aP0=aDragStat.GetPoint(0);
         while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
 
@@ -670,7 +670,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
                 else
                 {
-                    nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+                    nLayer = rAd.GetLayerID(aAktLayer, sal_True);
                 }
 
                 if(SDRLAYER_NOTFOUND == nLayer)
@@ -681,7 +681,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 pObj->SetLayer(nLayer);
 
                 // #83403# recognize creation of a new 3D object inside a 3D scene
-                BOOL bSceneIntoScene(FALSE);
+                sal_Bool bSceneIntoScene(sal_False);
 
                 if(pObjMerk
                     && pObjMerk->ISA(E3dScene)
@@ -689,7 +689,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                     && pCreatePV->GetAktGroup()
                     && pCreatePV->GetAktGroup()->ISA(E3dScene))
                 {
-                    BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
+                    sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
                         (E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0));
 
                     if(bDidInsert)
@@ -697,8 +697,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                         // delete object, it's content is cloned and inserted
                         SdrObject::Free( pObjMerk );
                         pObjMerk = 0L;
-                        bRet = FALSE;
-                        bSceneIntoScene = TRUE;
+                        bRet = sal_False;
+                        bSceneIntoScene = sal_True;
                     }
                 }
 
@@ -709,7 +709,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 }
 
                 pCreatePV=NULL;
-                bRet=TRUE; // TRUE=Event ausgewertet
+                bRet=sal_True; // sal_True=Event ausgewertet
             }
             else
             {
@@ -729,7 +729,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
                 HideCreateObj();
                 ShowCreateObj();
                 aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj()
-                bRet=TRUE;
+                bRet=sal_True;
             }
         }
         if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate())
@@ -780,7 +780,7 @@ void SdrCreateView::BrkCreateObj()
     }
 }
 
-void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
+void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
 {
     if(IsCreateObj() && !aDragStat.IsShown())
     {
@@ -889,7 +889,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
             }
         }
 
-        aDragStat.SetShown(TRUE);
+        aDragStat.SetShown(sal_True);
     }
 }
 
@@ -902,19 +902,19 @@ void SdrCreateView::HideCreateObj()
         mpCreateViewExtraData->HideOverlay();
 
         //DrawCreateObj(pOut,bFull);
-        aDragStat.SetShown(FALSE);
+        aDragStat.SetShown(sal_False);
     }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /* new interface src537 */
-BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
 {
     if(pAktCreate)
     {
         rTargetSet.Put(pAktCreate->GetMergedItemSet());
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -922,13 +922,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co
     }
 }
 
-BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
 {
     if(pAktCreate)
     {
         pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll);
 
-        return TRUE;
+        return sal_True;
     }
     else
     {
@@ -936,11 +936,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
     }
 }
 
-SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const
 {
     if (pAktCreate!=NULL)
     {
-        //rOk=TRUE;
+        //rOk=sal_True;
         return pAktCreate->GetStyleSheet();
     }
     else
@@ -949,12 +949,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV
     }
 }
 
-BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
 {
     if (pAktCreate!=NULL)
     {
         pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
-        return TRUE;
+        return sal_True;
     }
     else
     {