accfixes: merged to m100

19 files changed, 487 insertions, 563 deletions

diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 813f25c1f75b..d64f7aeaa3a0 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -43,7 +43,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook
     fResetFocalLength(fFocalLen),
     fResetBankAngle(fBankAng),
     fBankAngle(fBankAng),
-    bAutoAdjustProjection(TRUE)
+    bAutoAdjustProjection(sal_True)
 {
     SetVPD(0);
     SetPosition(rPos);
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index b78d464d4897..6329ca2a3203 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -87,7 +87,7 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dCubeObj::GetObjIdentifier() const
+sal_uInt16 E3dCubeObj::GetObjIdentifier() const
 {
     return E3D_CUBEOBJ_ID;
 }
@@ -98,7 +98,7 @@ UINT16 E3dCubeObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -147,7 +147,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
     }
 }
 
-void E3dCubeObj::SetPosIsCenter(BOOL bNew)
+void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
 {
     if(bPosIsCenter != bNew)
     {
@@ -156,7 +156,7 @@ void E3dCubeObj::SetPosIsCenter(BOOL bNew)
     }
 }
 
-void E3dCubeObj::SetSideFlags(UINT16 nNew)
+void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
 {
     if(nSideFlags != nNew)
     {
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index 9e703abd7d0b..e8473033ccf3 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -49,14 +49,14 @@ E3dDefaultAttributes::E3dDefaultAttributes()
 void E3dDefaultAttributes::Reset()
 {
     // Compound-Objekt
-    bDefaultCreateNormals = TRUE;
-    bDefaultCreateTexture = TRUE;
+    bDefaultCreateNormals = sal_True;
+    bDefaultCreateTexture = sal_True;
 
     // Cube-Objekt
     aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0);
     aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0);
     nDefaultCubeSideFlags = CUBE_FULL;
-    bDefaultCubePosIsCenter = FALSE;
+    bDefaultCubePosIsCenter = sal_False;
 
     // Sphere-Objekt
     aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0);
@@ -64,18 +64,18 @@ void E3dDefaultAttributes::Reset()
 
     // Lathe-Objekt
     nDefaultLatheEndAngle = 3600;
-    bDefaultLatheSmoothed = TRUE;
-    bDefaultLatheSmoothFrontBack = FALSE;
-    bDefaultLatheCharacterMode = FALSE;
-    bDefaultLatheCloseFront = TRUE;
-    bDefaultLatheCloseBack = TRUE;
+    bDefaultLatheSmoothed = sal_True;
+    bDefaultLatheSmoothFrontBack = sal_False;
+    bDefaultLatheCharacterMode = sal_False;
+    bDefaultLatheCloseFront = sal_True;
+    bDefaultLatheCloseBack = sal_True;
 
     // Extrude-Objekt
-    bDefaultExtrudeSmoothed = TRUE;
-    bDefaultExtrudeSmoothFrontBack = FALSE;
-    bDefaultExtrudeCharacterMode = FALSE;
-    bDefaultExtrudeCloseFront = TRUE;
-    bDefaultExtrudeCloseBack = TRUE;
+    bDefaultExtrudeSmoothed = sal_True;
+    bDefaultExtrudeSmoothFrontBack = sal_False;
+    bDefaultExtrudeCharacterMode = sal_False;
+    bDefaultExtrudeCloseFront = sal_True;
+    bDefaultExtrudeCloseBack = sal_True;
 }
 
 // eof
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index fd44db7b02d9..6fadec8cc9dc 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -57,11 +57,11 @@ E3dDragMethod::E3dDragMethod (
     SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   SdrDragMethod(_rView),
     meConstraint(eConstr),
     mbMoveFull(bFull),
-    mbMovedAtAll(FALSE)
+    mbMovedAtAll(sal_False)
 {
     // Fuer alle in der selektion befindlichen 3D-Objekte
     // eine Unit anlegen
@@ -175,7 +175,7 @@ bool E3dDragMethod::BeginSdrDrag()
         Show();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -218,7 +218,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
             getSdrDragView().EndUndo();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -321,7 +321,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod);
 E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
     const SdrMarkList& rMark,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   E3dDragMethod(_rView, rMark, eConstr, bFull)
 {
     // Zentrum aller selektierten Objekte in Augkoordinaten holen
@@ -421,7 +421,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
             }
             long nSnap = 0;
 
-            if(!getSdrDragView().IsRotateAllowed(FALSE))
+            if(!getSdrDragView().IsRotateAllowed(sal_False))
                 nSnap = 90;
 
             if(nSnap != 0)
@@ -514,7 +514,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
     const SdrMarkList& rMark,
     SdrHdlKind eDrgHdl,
     E3dDragConstraint eConstr,
-    BOOL bFull)
+    sal_Bool bFull)
 :   E3dDragMethod(_rView, rMark, eConstr, bFull),
     meWhatDragHdl(eDrgHdl)
 {
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 6c9a541b8c7c..97658f4dcd68 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -52,9 +52,9 @@ E3dUndoAction::~E3dUndoAction ()
 |* Repeat gibt es nicht
 |*
 \************************************************************************/
-BOOL E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
+sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /************************************************************************/
@@ -116,7 +116,7 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel,
     E3dObject*  pInObject,
     const SfxItemSet& rNewSet,
     const SfxItemSet& rOldSet,
-    BOOL bUseSubObj)
+    sal_Bool bUseSubObj)
 :   SdrUndoAction( rModel ),
     pObject      ( pInObject ),
     pView        ( p3dView ),
@@ -164,9 +164,9 @@ void E3dAttributesUndoAction::Redo()
 |* Mehrfaches Undo nicht moeglich
 |*
 \************************************************************************/
-BOOL E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
+sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
 {
-    return FALSE;
+    return sal_False;
 }
 
 /*************************************************************************
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 423a846d86a1..b3fdd6fd9b00 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -116,7 +116,7 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dExtrudeObj::GetObjIdentifier() const
+sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const
 {
     return E3D_EXTRUDEOBJ_ID;
 }
@@ -190,9 +190,9 @@ void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dExtrudeObj::IsBreakObjPossible()
+sal_Bool E3dExtrudeObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dExtrudeObj::GetBreakObj()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index bb159b47a516..f1766f01c3ea 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -235,7 +235,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
         aImgLightOn         ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ),
         aImgLightOff        ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ),
 
-        bUpdate             ( FALSE ),
+        bUpdate             ( sal_False ),
         eViewType           ( VIEWTYPE_GEO ),
 
         pModel              ( NULL ),
@@ -252,7 +252,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
 //      pPool               ( NULL ),
         mpImpl              ( new Svx3DWinImpl() ),
         mpRemember2DAttributes(NULL),
-        bOnly3DChanged      ( FALSE )
+        bOnly3DChanged      ( sal_False )
 {
     String accname(SVX_RES(STR_COLOR_LIGHT_PRE));
     aCtlLightPreview.SetAccessibleName(accname);
@@ -414,7 +414,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_INIT, TRUE );
+        SfxBoolItem aItem( SID_3D_INIT, sal_True );
         pDispatcher->Execute(
             SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
@@ -571,18 +571,18 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
     while(nWhich)
     {
-        SfxItemState eState = rAttrs.GetItemState(nWhich, FALSE);
+        SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False);
         if(SFX_ITEM_DONTCARE == eState)
             mpRemember2DAttributes->InvalidateItem(nWhich);
         else if(SFX_ITEM_SET == eState)
-            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, FALSE));
+            mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False));
 
         nWhich = aIter.NextWhich();
     }
 
     // construct field values
     const SfxPoolItem* pItem;
-    //BOOL bUpdate = FALSE;
+    //sal_Bool bUpdate = sal_False;
 
     // evtl. PoolUnit ermitteln
     if( !mpImpl->pPool )
@@ -595,16 +595,16 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
 
 // Segmentanzahl aenderbar ? und andere Stati
-    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, FALSE, &pItem );
+    SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem );
     if( SFX_ITEM_SET == eState )
     {
-        UINT32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
-        //BOOL bLathe   = (BOOL) ( nState & 1 );
-        BOOL bExtrude = (BOOL) ( nState & 2 );
-        BOOL bSphere  = (BOOL) ( nState & 4 );
-        BOOL bCube    = (BOOL) ( nState & 8 );
+        sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
+        //sal_Bool bLathe   = (sal_Bool) ( nState & 1 );
+        sal_Bool bExtrude = (sal_Bool) ( nState & 2 );
+        sal_Bool bSphere  = (sal_Bool) ( nState & 4 );
+        sal_Bool bCube    = (sal_Bool) ( nState & 8 );
 
-        BOOL bChart = (BOOL) ( nState & 32 ); // Chart
+        sal_Bool bChart = (sal_Bool) ( nState & 32 ); // Chart
 
         if( !bChart )
         {
@@ -642,41 +642,41 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         else
         {
             // Geometrie
-            aFtHorizontal.Enable( FALSE );
-            aNumHorizontal.Enable( FALSE );
+            aFtHorizontal.Enable( sal_False );
+            aNumHorizontal.Enable( sal_False );
             aNumHorizontal.SetEmptyFieldValue();
-            aFtVertical.Enable( FALSE );
-            aNumVertical.Enable( FALSE );
+            aFtVertical.Enable( sal_False );
+            aNumVertical.Enable( sal_False );
             aNumVertical.SetEmptyFieldValue();
-            aFLSegments.Enable( FALSE );
-            aFtEndAngle.Enable( FALSE );
-            aMtrEndAngle.Enable( FALSE );
+            aFLSegments.Enable( sal_False );
+            aFtEndAngle.Enable( sal_False );
+            aMtrEndAngle.Enable( sal_False );
             aMtrEndAngle.SetEmptyFieldValue();
-            aFtDepth.Enable( FALSE );
-            aMtrDepth.Enable( FALSE );
+            aFtDepth.Enable( sal_False );
+            aMtrDepth.Enable( sal_False );
             aMtrDepth.SetEmptyFieldValue();
 
             // Darstellung
-            aBtnShadow3d.Enable( FALSE );
-            aFtSlant.Enable( FALSE );
-            aMtrSlant.Enable( FALSE );
-            aFLShadow.Enable( FALSE );
+            aBtnShadow3d.Enable( sal_False );
+            aFtSlant.Enable( sal_False );
+            aMtrSlant.Enable( sal_False );
+            aFLShadow.Enable( sal_False );
 
-            aFtDistance.Enable( FALSE );
-            aMtrDistance.Enable( FALSE );
+            aFtDistance.Enable( sal_False );
+            aMtrDistance.Enable( sal_False );
             aMtrDistance.SetEmptyFieldValue();
-            aFtFocalLeng.Enable( FALSE );
-            aMtrFocalLength.Enable( FALSE );
+            aFtFocalLeng.Enable( sal_False );
+            aMtrFocalLength.Enable( sal_False );
             aMtrFocalLength.SetEmptyFieldValue();
-            aFLCamera.Enable( FALSE );
+            aFLCamera.Enable( sal_False );
 
             // Unterer Bereich
-            aBtnConvertTo3D.Enable( FALSE );
-            aBtnLatheObject.Enable( FALSE );
+            aBtnConvertTo3D.Enable( sal_False );
+            aBtnLatheObject.Enable( sal_False );
         }
     }
 // Bitmapfuellung ? -> Status
-    BOOL bBitmap(FALSE);
+    sal_Bool bBitmap(sal_False);
     eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
     if(eState != SFX_ITEM_DONTCARE)
     {
@@ -716,8 +716,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             {
                 aNumHorizontal.SetValue( nValue );
                 // evtl. am Ende...
-                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumHorizontal.IsEmptyFieldValue() )
                 aNumHorizontal.SetValue( nValue );
@@ -727,7 +727,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumHorizontal.IsEmptyFieldValue() )
             {
                 aNumHorizontal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -738,13 +738,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
-            if( nValue != (UINT32) aNumVertical.GetValue() )
+            sal_uInt32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
+            if( nValue != (sal_uInt32) aNumVertical.GetValue() )
             {
                 aNumVertical.SetValue( nValue );
                 // evtl. am Ende...
-                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (UINT16)nValue );
-                bUpdate = TRUE;
+                //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue );
+                bUpdate = sal_True;
             }
             else if( aNumVertical.IsEmptyFieldValue() )
                 aNumVertical.SetValue( nValue );
@@ -754,7 +754,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aNumVertical.IsEmptyFieldValue() )
             {
                 aNumVertical.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -765,15 +765,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
-            UINT32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
+            sal_uInt32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
+            sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
             if( nValue != nValue2 )
             {
                 if( eFUnit != aMtrDepth.GetUnit() )
                     SetFieldUnit( aMtrDepth, eFUnit );
 
                 SetMetricValue( aMtrDepth, nValue, ePoolUnit );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrDepth.IsEmptyFieldValue() )
                 aMtrDepth.SetValue( aMtrDepth.GetValue() );
@@ -783,7 +783,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrDepth.IsEmptyFieldValue() )
             {
                 aMtrDepth.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -792,11 +792,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+        sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
         if( bValue != aBtnDoubleSided.IsChecked() )
         {
             aBtnDoubleSided.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnDoubleSided.GetState() == STATE_DONTKNOW )
             aBtnDoubleSided.Check( bValue );
@@ -806,7 +806,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnDoubleSided.GetState() != STATE_DONTKNOW )
         {
             aBtnDoubleSided.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -816,11 +816,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
             if( nValue != aMtrPercentDiagonal.GetValue() )
             {
                 aMtrPercentDiagonal.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrPercentDiagonal.IsEmptyFieldValue() )
                 aMtrPercentDiagonal.SetValue( nValue );
@@ -830,7 +830,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
             {
                 aMtrPercentDiagonal.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -841,11 +841,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
             if( nValue != aMtrBackscale.GetValue() )
             {
                 aMtrBackscale.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             else if( aMtrBackscale.IsEmptyFieldValue() )
                 aMtrBackscale.SetValue( nValue );
@@ -855,7 +855,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrBackscale.IsEmptyFieldValue() )
             {
                 aMtrBackscale.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -866,11 +866,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
+            sal_Int32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
             if( nValue != aMtrEndAngle.GetValue() )
             {
                 aMtrEndAngle.SetValue( nValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -878,7 +878,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( !aMtrEndAngle.IsEmptyFieldValue() )
             {
                 aMtrEndAngle.SetEmptyFieldValue();
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -887,7 +887,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
 
         if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) ||
             ( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) ||
@@ -896,7 +896,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsObj.Check( nValue == 0 );
             aBtnNormalsFlat.Check( nValue == 1 );
             aBtnNormalsSphere.Check( nValue == 2 );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -905,10 +905,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             aBtnNormalsFlat.IsChecked() ||
             aBtnNormalsSphere.IsChecked() )
         {
-            aBtnNormalsObj.Check( FALSE );
-            aBtnNormalsFlat.Check( FALSE );
-            aBtnNormalsSphere.Check( FALSE );
-            bUpdate = TRUE;
+            aBtnNormalsObj.Check( sal_False );
+            aBtnNormalsFlat.Check( sal_False );
+            aBtnNormalsSphere.Check( sal_False );
+            bUpdate = sal_True;
         }
     }
 
@@ -916,11 +916,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+        sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
         if( bValue != aBtnNormalsInvert.IsChecked() )
         {
             aBtnNormalsInvert.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnNormalsInvert.GetState() == STATE_DONTKNOW )
             aBtnNormalsInvert.Check( bValue );
@@ -930,7 +930,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnNormalsInvert.GetState() != STATE_DONTKNOW )
         {
             aBtnNormalsInvert.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -938,11 +938,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+        sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
         if( bValue != aBtnTwoSidedLighting.IsChecked() )
         {
             aBtnTwoSidedLighting.Check( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnTwoSidedLighting.GetState() == STATE_DONTKNOW )
             aBtnTwoSidedLighting.Check( bValue );
@@ -952,7 +952,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnTwoSidedLighting.GetState() != STATE_DONTKNOW )
         {
             aBtnTwoSidedLighting.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -961,11 +961,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
         if( nValue != aLbShademode.GetSelectEntryPos() )
         {
             aLbShademode.SelectEntryPos( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -973,7 +973,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbShademode.GetSelectEntryCount() != 0 )
         {
             aLbShademode.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -981,13 +981,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        BOOL bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+        sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
         if( bValue != aBtnShadow3d.IsChecked() )
         {
             aBtnShadow3d.Check( bValue );
             aFtSlant.Enable( bValue );
             aMtrSlant.Enable( bValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         else if( aBtnShadow3d.GetState() == STATE_DONTKNOW )
             aBtnShadow3d.Check( bValue );
@@ -997,7 +997,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnShadow3d.GetState() != STATE_DONTKNOW )
         {
             aBtnShadow3d.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1005,11 +1005,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
         if( nValue != aMtrSlant.GetValue() )
         {
             aMtrSlant.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1017,7 +1017,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrSlant.IsEmptyFieldValue() )
         {
             aMtrSlant.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1025,15 +1025,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrDistance.GetUnit() )
                 SetFieldUnit( aMtrDistance, eFUnit );
 
             SetMetricValue( aMtrDistance, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1041,7 +1041,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrDepth.IsEmptyFieldValue() )
         {
             aMtrDepth.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1049,15 +1049,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         if( nValue != nValue2 )
         {
             if( eFUnit != aMtrFocalLength.GetUnit() )
                 SetFieldUnit( aMtrFocalLength, eFUnit );
 
             SetMetricValue( aMtrFocalLength, nValue, ePoolUnit );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1065,7 +1065,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrFocalLength.IsEmptyFieldValue() )
         {
             aMtrFocalLength.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1081,7 +1081,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1089,7 +1089,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight1.GetSelectEntryCount() != 0 )
         {
             aLbLight1.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (an/aus)
@@ -1101,7 +1101,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight1 )) )
         {
             SetUILightState( aBtnLight1, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight1.GetState() == STATE_DONTKNOW )
             aBtnLight1.Check( aBtnLight1.IsChecked() );
@@ -1111,14 +1111,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight1.GetState() != STATE_DONTKNOW )
         {
             aBtnLight1.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 1 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 2 (Farbe)
@@ -1130,7 +1130,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1138,7 +1138,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight2.GetSelectEntryCount() != 0 )
         {
             aLbLight2.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (an/aus)
@@ -1150,7 +1150,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight2 )) )
         {
             SetUILightState( aBtnLight2, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight2.GetState() == STATE_DONTKNOW )
             aBtnLight2.Check( aBtnLight2.IsChecked() );
@@ -1160,14 +1160,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight2.GetState() != STATE_DONTKNOW )
         {
             aBtnLight2.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 2 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 3 (Farbe)
@@ -1179,7 +1179,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1187,7 +1187,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight3.GetSelectEntryCount() != 0 )
         {
             aLbLight3.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (an/aus)
@@ -1199,7 +1199,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight3)) )
         {
             SetUILightState( aBtnLight3, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight3.GetState() == STATE_DONTKNOW )
             aBtnLight3.Check( aBtnLight3.IsChecked() );
@@ -1209,14 +1209,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight3.GetState() != STATE_DONTKNOW )
         {
             aBtnLight3.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 3 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 4 (Farbe)
@@ -1228,7 +1228,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1236,7 +1236,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight4.GetSelectEntryCount() != 0 )
         {
             aLbLight4.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (an/aus)
@@ -1248,7 +1248,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight4 )) )
         {
             SetUILightState( aBtnLight4, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight4.GetState() == STATE_DONTKNOW )
             aBtnLight4.Check( aBtnLight4.IsChecked() );
@@ -1258,14 +1258,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight4.GetState() != STATE_DONTKNOW )
         {
             aBtnLight4.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 4 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 5 (Farbe)
@@ -1277,7 +1277,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1285,7 +1285,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight5.GetSelectEntryCount() != 0 )
         {
             aLbLight5.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (an/aus)
@@ -1297,7 +1297,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight5 )) )
         {
             SetUILightState( aBtnLight5, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight5.GetState() == STATE_DONTKNOW )
             aBtnLight5.Check( aBtnLight5.IsChecked() );
@@ -1307,14 +1307,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight5.GetState() != STATE_DONTKNOW )
         {
             aBtnLight5.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 5 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 6 (Farbe)
@@ -1326,7 +1326,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1334,7 +1334,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight6.GetSelectEntryCount() != 0 )
         {
             aLbLight6.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (an/aus)
@@ -1346,7 +1346,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight6 )) )
         {
             SetUILightState( aBtnLight6, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight6.GetState() == STATE_DONTKNOW )
             aBtnLight6.Check( aBtnLight6.IsChecked() );
@@ -1356,14 +1356,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight6.GetState() != STATE_DONTKNOW )
         {
             aBtnLight6.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 6 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 7 (Farbe)
@@ -1375,7 +1375,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1383,7 +1383,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight7.GetSelectEntryCount() != 0 )
         {
             aLbLight7.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (an/aus)
@@ -1395,7 +1395,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight7 )) )
         {
             SetUILightState( aBtnLight7 , bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight7.GetState() == STATE_DONTKNOW )
             aBtnLight7.Check( aBtnLight7.IsChecked() );
@@ -1405,14 +1405,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight7.GetState() != STATE_DONTKNOW )
         {
             aBtnLight7.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 7 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Licht 8 (Farbe)
@@ -1424,7 +1424,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1432,7 +1432,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbLight8.GetSelectEntryCount() != 0 )
         {
             aLbLight8.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (an/aus)
@@ -1444,7 +1444,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( !bOn && GetUILightState( aBtnLight8 )) )
         {
             SetUILightState( aBtnLight8, bOn );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnLight8.GetState() == STATE_DONTKNOW )
             aBtnLight8.Check( aBtnLight8.IsChecked() );
@@ -1454,14 +1454,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnLight8.GetState() != STATE_DONTKNOW )
         {
             aBtnLight8.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     // Licht 8 (Richtung)
     eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     // Umgebungslicht
@@ -1473,7 +1473,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1481,7 +1481,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbAmbientlight.GetSelectEntryCount() != 0 )
         {
             aLbAmbientlight.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1493,14 +1493,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
 
             if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexColor.IsChecked() && nValue == 3 ) )
             {
                 aBtnTexLuminance.Check( nValue == 1 );
                 aBtnTexColor.Check( nValue == 3 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1508,9 +1508,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexLuminance.IsChecked() ||
                 aBtnTexColor.IsChecked() )
             {
-                aBtnTexLuminance.Check( FALSE );
-                aBtnTexColor.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexLuminance.Check( sal_False );
+                aBtnTexColor.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1518,7 +1518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
 
             if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) ||
                 ( !aBtnTexModulate.IsChecked() && nValue == 2 ) )
@@ -1526,7 +1526,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexReplace.Check( nValue == 1 );
                 aBtnTexModulate.Check( nValue == 2 );
                 //aBtnTexBlend.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1534,10 +1534,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexReplace.IsChecked() ||
                 aBtnTexModulate.IsChecked() )
             {
-                aBtnTexReplace.Check( FALSE );
-                aBtnTexModulate.Check( FALSE );
-                //aBtnTexBlend.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexReplace.Check( sal_False );
+                aBtnTexModulate.Check( sal_False );
+                //aBtnTexBlend.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1545,7 +1545,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
 
             if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelX.IsChecked() && nValue == 1 ) ||
@@ -1554,7 +1554,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectX.Check( nValue == 0 );
                 aBtnTexParallelX.Check( nValue == 1 );
                 aBtnTexCircleX.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1563,10 +1563,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelX.IsChecked() ||
                 aBtnTexCircleX.IsChecked() )
             {
-                aBtnTexObjectX.Check( FALSE );
-                aBtnTexParallelX.Check( FALSE );
-                aBtnTexCircleX.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectX.Check( sal_False );
+                aBtnTexParallelX.Check( sal_False );
+                aBtnTexCircleX.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1574,7 +1574,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            UINT16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
+            sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
 
             if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) ||
                 ( !aBtnTexParallelY.IsChecked() && nValue == 1 ) ||
@@ -1583,7 +1583,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexObjectY.Check( nValue == 0 );
                 aBtnTexParallelY.Check( nValue == 1 );
                 aBtnTexCircleY.Check( nValue == 2 );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
         else
@@ -1592,10 +1592,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
                 aBtnTexParallelY.IsChecked() ||
                 aBtnTexCircleY.IsChecked() )
             {
-                aBtnTexObjectY.Check( FALSE );
-                aBtnTexParallelY.Check( FALSE );
-                aBtnTexCircleY.Check( FALSE );
-                bUpdate = TRUE;
+                aBtnTexObjectY.Check( sal_False );
+                aBtnTexParallelY.Check( sal_False );
+                aBtnTexCircleY.Check( sal_False );
+                bUpdate = sal_True;
             }
         }
 
@@ -1603,11 +1603,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
         if( eState != SFX_ITEM_DONTCARE )
         {
-            BOOL bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+            sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
             if( bValue != aBtnTexFilter.IsChecked() )
             {
                 aBtnTexFilter.Check( bValue );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
             if( aBtnTexFilter.GetState() == STATE_DONTKNOW )
                 aBtnTexFilter.Check( bValue );
@@ -1617,7 +1617,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             if( aBtnTexFilter.GetState() != STATE_DONTKNOW )
             {
                 aBtnTexFilter.SetState( STATE_DONTKNOW );
-                bUpdate = TRUE;
+                bUpdate = sal_True;
             }
         }
     }
@@ -1635,7 +1635,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1643,7 +1643,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatColor.GetSelectEntryCount() != 0 )
         {
             aLbMatColor.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1656,7 +1656,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1664,7 +1664,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatEmission.GetSelectEntryCount() != 0 )
         {
             aLbMatEmission.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1677,7 +1677,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aColor != pLb->GetSelectEntryColor() )
         {
             LBSelectColor( pLb, aColor );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1685,7 +1685,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aLbMatSpecular.GetSelectEntryCount() != 0 )
         {
             aLbMatSpecular.SetNoSelection();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1693,11 +1693,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
     if( eState != SFX_ITEM_DONTCARE )
     {
-        UINT16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
+        sal_uInt16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
         if( nValue != aMtrMatSpecularIntensity.GetValue() )
         {
             aMtrMatSpecularIntensity.SetValue( nValue );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
     else
@@ -1705,7 +1705,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
         {
             aMtrMatSpecularIntensity.SetEmptyFieldValue();
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1720,7 +1720,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
             ( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
         {
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
         if( aBtnPerspective.GetState() == STATE_DONTKNOW )
             aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
@@ -1730,7 +1730,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         if( aBtnPerspective.GetState() != STATE_DONTKNOW )
         {
             aBtnPerspective.SetState( STATE_DONTKNOW );
-            bUpdate = TRUE;
+            bUpdate = sal_True;
         }
     }
 
@@ -1740,7 +1740,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
         // diese und entscheide
 
 
-        bUpdate = TRUE;
+        bUpdate = sal_True;
     }
 
     if( bUpdate || bOnly3DChanged )
@@ -1750,12 +1750,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
 
         // set LineStyle hard to XLINE_NONE when it's not set so that
         // the default (XLINE_SOLID) is not used for 3d preview
-        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, FALSE))
+        if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False))
             aSet.Put(XLineStyleItem(XLINE_NONE));
 
         // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
         // the default (Blue7) is not used for 3d preview
-        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, FALSE))
+        if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
             aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
 
         aCtlPreview.Set3DAttributes(aSet);
@@ -1803,11 +1803,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
 
         while(nWhich)
         {
-            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, FALSE);
+            SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False);
             if(SFX_ITEM_DONTCARE == eState)
                 rAttrs.InvalidateItem(nWhich);
             else if(SFX_ITEM_SET == eState)
-                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, FALSE));
+                rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False));
 
             nWhich = aIter.NextWhich();
         }
@@ -1817,7 +1817,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Perspektive
     if( aBtnPerspective.GetState() != STATE_DONTKNOW )
     {
-        UINT16 nValue;
+        sal_uInt16 nValue;
         if( aBtnPerspective.IsChecked() )
             nValue = PR_PERSPECTIVE;
         else
@@ -1851,7 +1851,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Anzahl Segmente (vertikal)
     if( !aNumVertical.IsEmptyFieldValue() )
     {
-        UINT32 nValue = static_cast<UINT32>(aNumVertical.GetValue());
+        sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue());
         rAttrs.Put(Svx3DVerticalSegmentsItem(nValue));
     }
     else
@@ -1860,7 +1860,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefe
     if( !aMtrDepth.IsEmptyFieldValue() )
     {
-        UINT32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
+        sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
         rAttrs.Put(Svx3DDepthItem(nValue));
     }
     else
@@ -1870,7 +1870,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     TriState eState = aBtnDoubleSided.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DDoubleSidedItem(bValue));
     }
     else
@@ -1879,7 +1879,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Kantenrundung
     if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16) aMtrPercentDiagonal.GetValue();
+        sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue();
         rAttrs.Put(Svx3DPercentDiagonalItem(nValue));
     }
     else
@@ -1888,7 +1888,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Tiefenskalierung
     if( !aMtrBackscale.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrBackscale.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue();
         rAttrs.Put(Svx3DBackscaleItem(nValue));
     }
     else
@@ -1897,14 +1897,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Endwinkel
     if( !aMtrEndAngle.IsEmptyFieldValue() )
     {
-        UINT16 nValue = (UINT16)aMtrEndAngle.GetValue();
+        sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue();
         rAttrs.Put(Svx3DEndAngleItem(nValue));
     }
     else
         rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE);
 
     // Normalentyp
-    UINT16 nValue = 99;
+    sal_uInt16 nValue = 99;
     if( aBtnNormalsObj.IsChecked() )
         nValue = 0;
     else if( aBtnNormalsFlat.IsChecked() )
@@ -1921,7 +1921,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnNormalsInvert.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DNormalsInvertItem(bValue));
     }
     else
@@ -1931,7 +1931,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTwoSidedLighting.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
     }
     else
@@ -1951,7 +1951,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnShadow3d.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DShadow3DItem(bValue));
         rAttrs.Put(SdrShadowItem(bValue));
     }
@@ -1964,7 +1964,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Neigung (Schatten)
     if( !aMtrSlant.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrSlant.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue();
         rAttrs.Put(Svx3DShadowSlantItem(nValue2));
     }
     else
@@ -1973,7 +1973,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Distanz
     if( !aMtrDistance.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
         rAttrs.Put(Svx3DDistanceItem(nValue2));
     }
     else
@@ -1982,7 +1982,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Brennweite
     if( !aMtrFocalLength.IsEmptyFieldValue() )
     {
-        UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+        sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
         rAttrs.Put(Svx3DFocalLengthItem(nValue2));
     }
     else
@@ -2006,7 +2006,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight1.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight1 );
+        sal_Bool bValue = GetUILightState( aBtnLight1 );
         rAttrs.Put(Svx3DLightOnOff1Item(bValue));
 
         // Licht 1 (Richtung)
@@ -2031,7 +2031,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight2.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight2 );
+        sal_Bool bValue = GetUILightState( aBtnLight2 );
         rAttrs.Put(Svx3DLightOnOff2Item(bValue));
 
         // Licht 2 (Richtung)
@@ -2055,7 +2055,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight3.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight3 );
+        sal_Bool bValue = GetUILightState( aBtnLight3 );
         rAttrs.Put(Svx3DLightOnOff3Item(bValue));
 
         // Licht 3 (Richtung)
@@ -2079,7 +2079,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight4.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight4 );
+        sal_Bool bValue = GetUILightState( aBtnLight4 );
         rAttrs.Put(Svx3DLightOnOff4Item(bValue));
 
         // Licht 4 (Richtung)
@@ -2103,7 +2103,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight5.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight5 );
+        sal_Bool bValue = GetUILightState( aBtnLight5 );
         rAttrs.Put(Svx3DLightOnOff5Item(bValue));
 
         // Licht 5 (Richtung)
@@ -2127,7 +2127,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight6.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight6 );
+        sal_Bool bValue = GetUILightState( aBtnLight6 );
         rAttrs.Put(Svx3DLightOnOff6Item(bValue));
 
         // Licht 6 (Richtung)
@@ -2151,7 +2151,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight7.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight7 );
+        sal_Bool bValue = GetUILightState( aBtnLight7 );
         rAttrs.Put(Svx3DLightOnOff7Item(bValue));
 
         // Licht 7 (Richtung)
@@ -2175,7 +2175,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnLight8.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = GetUILightState( aBtnLight8 );
+        sal_Bool bValue = GetUILightState( aBtnLight8 );
         rAttrs.Put(Svx3DLightOnOff8Item(bValue));
 
         // Licht 8 (Richtung)
@@ -2257,7 +2257,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     eState = aBtnTexFilter.GetState();
     if( eState != STATE_DONTKNOW )
     {
-        BOOL bValue = STATE_CHECK == eState;
+        sal_Bool bValue = STATE_CHECK == eState;
         rAttrs.Put(Svx3DTextureFilterItem(bValue));
     }
     else
@@ -2297,7 +2297,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
     // Glanzpunkt Intensitaet
     if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
     {
-        UINT16 nValue2 = (UINT16) aMtrMatSpecularIntensity.GetValue();
+        sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue();
         rAttrs.Put(Svx3DMaterialSpecularIntensityItem(nValue2));
     }
     else
@@ -2408,7 +2408,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
@@ -2427,7 +2427,7 @@ IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG )
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
     if (pDispatcher != NULL)
     {
-        SfxBoolItem aItem( SID_3D_ASSIGN, TRUE );
+        SfxBoolItem aItem( SID_3D_ASSIGN, sal_True );
         pDispatcher->Execute(
             SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
     }
@@ -2443,7 +2443,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
     if( pBtn )
     {
         // Da das permanente Updaten der Preview zu teuer waere
-        BOOL bUpdatePreview = aBtnLight.IsChecked();
+        sal_Bool bUpdatePreview = aBtnLight.IsChecked();
 
         aBtnGeo.Check( &aBtnGeo == pBtn );
         aBtnRepresentation.Check( &aBtnRepresentation == pBtn );
@@ -2707,11 +2707,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 {
-    BOOL bUpdatePreview = FALSE;
+    sal_Bool bUpdatePreview = sal_False;
 
     if( pBtn )
     {
-        USHORT nSId = 0;
+        sal_uInt16 nSId = 0;
 
         if( pBtn == &aBtnConvertTo3D )
         {
@@ -2729,7 +2729,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj );
             aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat );
             aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnLight1 ||
                  pBtn == &aBtnLight2 ||
@@ -2754,51 +2754,51 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 
                 if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() )
                 {
-                    aBtnLight1.Check( FALSE );
+                    aBtnLight1.Check( sal_False );
                     aLbLight1.Hide();
                 }
                 if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() )
                 {
-                    aBtnLight2.Check( FALSE );
+                    aBtnLight2.Check( sal_False );
                     aLbLight2.Hide();
                 }
                 if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() )
                 {
-                    aBtnLight3.Check( FALSE );
+                    aBtnLight3.Check( sal_False );
                     aLbLight3.Hide();
                 }
                 if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() )
                 {
-                    aBtnLight4.Check( FALSE );
+                    aBtnLight4.Check( sal_False );
                     aLbLight4.Hide();
                 }
                 if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() )
                 {
-                    aBtnLight5.Check( FALSE );
+                    aBtnLight5.Check( sal_False );
                     aLbLight5.Hide();
                 }
                 if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() )
                 {
-                    aBtnLight6.Check( FALSE );
+                    aBtnLight6.Check( sal_False );
                     aLbLight6.Hide();
                 }
                 if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() )
                 {
-                    aBtnLight7.Check( FALSE );
+                    aBtnLight7.Check( sal_False );
                     aLbLight7.Hide();
                 }
                 if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() )
                 {
-                    aBtnLight8.Check( FALSE );
+                    aBtnLight8.Check( sal_False );
                     aLbLight8.Hide();
                 }
             }
-            BOOL bEnable = GetUILightState( *(ImageButton*)pBtn );
+            sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn );
             aBtnLightColor.Enable( bEnable );
             pLb->Enable( bEnable );
 
             ClickLightHdl( pBtn );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Texturen
         else if( pBtn == &aBtnTexLuminance ||
@@ -2806,7 +2806,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
         {
             aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance );
             aBtnTexColor.Check( pBtn == &aBtnTexColor );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexReplace ||
                  pBtn == &aBtnTexModulate )// ||
@@ -2815,7 +2815,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexReplace.Check( pBtn == &aBtnTexReplace );
             aBtnTexModulate.Check( pBtn == &aBtnTexModulate );
             //aBtnTexBlend.Check( pBtn == &aBtnTexBlend );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelX ||
                  pBtn == &aBtnTexCircleX ||
@@ -2824,7 +2824,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX );
             aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX );
             aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnTexParallelY ||
                  pBtn == &aBtnTexCircleY ||
@@ -2833,20 +2833,20 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY );
             aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY );
             aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pBtn == &aBtnShadow3d  )
         {
             pBtn->Check( !pBtn->IsChecked() );
             aFtSlant.Enable( pBtn->IsChecked() );
             aMtrSlant.Enable( pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Sonstige (keine Gruppen)
         else if( pBtn != NULL )
         {
             pBtn->Check( !pBtn->IsChecked() );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
         if( nSId > 0 )
@@ -2854,12 +2854,12 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
             SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
             if (pDispatcher != NULL)
             {
-                SfxBoolItem aItem( nSId, TRUE );
+                SfxBoolItem aItem( nSId, sal_True );
                 pDispatcher->Execute(
                     nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
             }
         }
-        else if( bUpdatePreview == TRUE )
+        else if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -2901,7 +2901,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
     if( p )
     {
         Color aColor;
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( p == &aLbMatFavorites )
@@ -2909,9 +2909,9 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             Color aColObj( COL_WHITE );
             Color aColEmis( COL_BLACK );
             Color aColSpec( COL_WHITE );
-            USHORT nSpecIntens = 20;
+            sal_uInt16 nSpecIntens = 20;
 
-            USHORT nPos = aLbMatFavorites.GetSelectEntryPos();
+            sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos();
             switch( nPos )
             {
                 case 1: // Metall
@@ -2964,19 +2964,19 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
             LBSelectColor( &aLbMatSpecular, aColSpec );
             aMtrMatSpecularIntensity.SetValue( nSpecIntens );
 
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbMatColor ||
                  p == &aLbMatEmission ||
                  p == &aLbMatSpecular )
         {
             aLbMatFavorites.SelectEntryPos( 0 );
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         // Beleuchtung
         else if( p == &aLbAmbientlight )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbLight1 ||
                  p == &aLbLight2 ||
@@ -2987,12 +2987,12 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
                  p == &aLbLight7 ||
                  p == &aLbLight8 )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( p == &aLbShademode )
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -3003,27 +3003,27 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
 {
     if( pField )
     {
-        BOOL bUpdatePreview = FALSE;
+        sal_Bool bUpdatePreview = sal_False;
 
         // Material
         if( pField == &aMtrMatSpecularIntensity )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumHorizontal )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aNumVertical )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
         else if( pField == &aMtrSlant )
         {
-            bUpdatePreview = TRUE;
+            bUpdatePreview = sal_True;
         }
 
-        if( bUpdatePreview == TRUE )
+        if( bUpdatePreview == sal_True )
             UpdatePreview();
     }
     return( 0L );
@@ -3036,7 +3036,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 
     if( pBtn )
     {
-        USHORT nLightSource = GetLightSource( pBtn );
+        sal_uInt16 nLightSource = GetLightSource( pBtn );
         ColorLB* pLb = GetLbByButton( pBtn );
         Color aColor( pLb->GetSelectEntryColor() );
         SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes());
@@ -3066,7 +3066,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
 // -----------------------------------------------------------------------
 IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
 {
-    //USHORT nItemId = aCtlFavorites.GetSelectItemId();
+    //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId();
 
     //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 );
     //Update( *pSet );
@@ -3112,45 +3112,45 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
         // Zustand: Keine Lampe selektiert
         if( aBtnLight1.IsChecked() )
         {
-            aBtnLight1.Check( FALSE );
-            aLbLight1.Enable( FALSE );
+            aBtnLight1.Check( sal_False );
+            aLbLight1.Enable( sal_False );
         }
         else if( aBtnLight2.IsChecked() )
         {
-            aBtnLight2.Check( FALSE );
-            aLbLight2.Enable( FALSE );
+            aBtnLight2.Check( sal_False );
+            aLbLight2.Enable( sal_False );
         }
         else if( aBtnLight3.IsChecked() )
         {
-            aBtnLight3.Check( FALSE );
-            aLbLight3.Enable( FALSE );
+            aBtnLight3.Check( sal_False );
+            aLbLight3.Enable( sal_False );
         }
         else if( aBtnLight4.IsChecked() )
         {
-            aBtnLight4.Check( FALSE );
-            aLbLight4.Enable( FALSE );
+            aBtnLight4.Check( sal_False );
+            aLbLight4.Enable( sal_False );
         }
         else if( aBtnLight5.IsChecked() )
         {
-            aBtnLight5.Check( FALSE );
-            aLbLight5.Enable( FALSE );
+            aBtnLight5.Check( sal_False );
+            aLbLight5.Enable( sal_False );
         }
         else if( aBtnLight6.IsChecked() )
         {
-            aBtnLight6.Check( FALSE );
-            aLbLight6.Enable( FALSE );
+            aBtnLight6.Check( sal_False );
+            aLbLight6.Enable( sal_False );
         }
         else if( aBtnLight7.IsChecked() )
         {
-            aBtnLight7.Check( FALSE );
-            aLbLight7.Enable( FALSE );
+            aBtnLight7.Check( sal_False );
+            aLbLight7.Enable( sal_False );
         }
         else if( aBtnLight8.IsChecked() )
         {
-            aBtnLight8.Check( FALSE );
-            aLbLight8.Enable( FALSE );
+            aBtnLight8.Check( sal_False );
+            aLbLight8.Enable( sal_False );
         }
-        aBtnLightColor.Enable( FALSE );
+        aBtnLightColor.Enable( sal_False );
     }
 
     return( 0L );
@@ -3158,11 +3158,11 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 // Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist
-// Liefert TRUE zurueck, falls Farbe hinzugefuegt wurde
+// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde
 // -----------------------------------------------------------------------
-BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
+sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     pLb->SetNoSelection();
     pLb->SelectEntry( rColor );
@@ -3170,17 +3170,17 @@ BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
     {
         String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
 
-        aStr += String::CreateFromInt32((INT32)rColor.GetRed());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
-        aStr += String::CreateFromInt32((INT32)rColor.GetGreen());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
         aStr += sal_Unicode(' ');
         aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
-        aStr += String::CreateFromInt32((INT32)rColor.GetBlue());
+        aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
 
-        USHORT nPos = pLb->InsertEntry( rColor, aStr );
+        sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr );
         pLb->SelectEntryPos( nPos );
-        bRet = TRUE;
+        bRet = sal_True;
     }
     return( bRet );
 }
@@ -3197,12 +3197,12 @@ void Svx3DWin::UpdatePreview()
         SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
         }
         // Flag zuruecksetzen
-        bOnly3DChanged = FALSE;
+        bOnly3DChanged = sal_False;
     }
 
     // ItemSet besorgen
@@ -3257,9 +3257,9 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc )
 }
 
 // -----------------------------------------------------------------------
-USHORT Svx3DWin::GetLightSource( const PushButton* pBtn )
+sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 {
-    USHORT nLight = 8;
+    sal_uInt16 nLight = 8;
 
     if( pBtn == NULL )
     {
@@ -3354,7 +3354,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 |*
 \************************************************************************/
 __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
-                                                         USHORT nId,
+                                                         sal_uInt16 nId,
                                                          SfxBindings* pBindings,
                                                          SfxChildWinInfo* pInfo ) :
     SfxChildWindow( _pParent, nId )
@@ -3372,7 +3372,7 @@ __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
 |* ControllerItem fuer 3DStatus
 |*
 \************************************************************************/
-Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
+Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
                                 Svx3DWin* pWin,
                                 SfxBindings* _pBindings) :
     SfxControllerItem( _nId, *_pBindings ),
@@ -3381,7 +3381,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
 }
 
 // -----------------------------------------------------------------------
-void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
+void __EXPORT Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
                         SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
 {
 }
@@ -3392,22 +3392,22 @@ void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
 |*
 \************************************************************************/
 
-SvxConvertTo3DItem::SvxConvertTo3DItem(UINT16 _nId, SfxBindings* _pBindings)
+SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
 :   SfxControllerItem(_nId, *_pBindings),
-    bState(FALSE)
+    bState(sal_False)
 {
 }
 
-void SvxConvertTo3DItem::StateChanged(UINT16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
+void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
 {
-    BOOL bNewState = (eState != SFX_ITEM_DISABLED);
+    sal_Bool bNewState = (eState != SFX_ITEM_DISABLED);
     if(bNewState != bState)
     {
         bState = bNewState;
         SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
         if (pDispatcher != NULL)
         {
-            SfxBoolItem aItem( SID_3D_STATE, TRUE );
+            SfxBoolItem aItem( SID_3D_STATE, sal_True );
             pDispatcher->Execute(
                 SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
         }
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 4d88dce0fb4d..284394cc202c 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -130,7 +130,7 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dLatheObj::GetObjIdentifier() const
+sal_uInt16 E3dLatheObj::GetObjIdentifier() const
 {
     return E3D_LATHEOBJ_ID;
 }
@@ -158,7 +158,7 @@ void E3dLatheObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-SdrObject *E3dLatheObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -248,9 +248,9 @@ void E3dLatheObj::TakeObjNamePlural(XubString& rName) const
 |*
 \************************************************************************/
 
-BOOL E3dLatheObj::IsBreakObjPossible()
+sal_Bool E3dLatheObj::IsBreakObjPossible()
 {
-    return TRUE;
+    return sal_True;
 }
 
 SdrAttrObj* E3dLatheObj::GetBreakObj()
diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk
deleted file mode 100644
index 71916df4a83c..000000000000
--- a/svx/source/engine3d/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=svx
-TARGET=engine3d
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
-LIB1OBJFILES= \
-        $(SLO)$/e3dsceneupdater.obj \
-        $(SLO)$/helperminimaldepth3d.obj	\
-        $(SLO)$/helperhittest3d.obj			\
-        $(SLO)$/obj3d.obj 		\
-        $(SLO)$/scene3d.obj		\
-        $(SLO)$/polysc3d.obj	\
-        $(SLO)$/cube3d.obj		\
-        $(SLO)$/sphere3d.obj	\
-        $(SLO)$/extrud3d.obj    \
-        $(SLO)$/lathe3d.obj		\
-        $(SLO)$/polygn3d.obj 	\
-        $(SLO)$/svx3ditems.obj	\
-        $(SLO)$/deflt3d.obj		\
-        $(SLO)$/e3dundo.obj     \
-        $(SLO)$/viewpt3d2.obj	\
-        $(SLO)$/camera3d.obj	\
-        $(SLO)$/objfac3d.obj 	\
-        $(SLO)$/dragmt3d.obj	\
-        $(SLO)$/view3d.obj		\
-        $(SLO)$/view3d1.obj
-
-LIB2TARGET= $(SLB)$/$(TARGET).lib
-LIB2OBJFILES= \
-        $(SLO)$/float3d.obj
-
-SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES)
-
-SRS1NAME=engine3d
-SRC1FILES=\
-        string3d.src	\
-        float3d.src
-
-.INCLUDE :  target.mk
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index c9ceb1ef78a6..64f43790513d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -117,7 +117,7 @@ E3dObjList::~E3dObjList()
 {
 }
 
-void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     // Owner holen
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject");
@@ -136,7 +136,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
     }
 }
 
-void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -151,7 +151,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
     }
 }
 
-SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
 {
     DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -168,7 +168,7 @@ SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
     return pRetval;
 }
 
-SdrObject* E3dObjList::RemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum)
 {
     OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent");
     //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -256,9 +256,9 @@ void E3dObject::SetSelected(bool bNew)
 |*
 \************************************************************************/
 
-BOOL E3dObject::IsBreakObjPossible()
+sal_Bool E3dObject::IsBreakObjPossible()
 {
-    return FALSE;
+    return sal_False;
 }
 
 SdrAttrObj* E3dObject::GetBreakObj()
@@ -294,7 +294,7 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself)
 |*
 \************************************************************************/
 
-UINT32 E3dObject::GetObjInventor() const
+sal_uInt32 E3dObject::GetObjInventor() const
 {
     return E3dInventor;
 }
@@ -305,7 +305,7 @@ UINT32 E3dObject::GetObjInventor() const
 |*
 \************************************************************************/
 
-UINT16 E3dObject::GetObjIdentifier() const
+sal_uInt16 E3dObject::GetObjIdentifier() const
 {
     return E3D_OBJECT_ID;
 }
@@ -318,19 +318,19 @@ UINT16 E3dObject::GetObjIdentifier() const
 
 void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
-    rInfo.bResizeFreeAllowed    = TRUE;
-    rInfo.bResizePropAllowed    = TRUE;
-    rInfo.bRotateFreeAllowed    = TRUE;
-    rInfo.bRotate90Allowed      = TRUE;
-    rInfo.bMirrorFreeAllowed    = FALSE;
-    rInfo.bMirror45Allowed      = FALSE;
-    rInfo.bMirror90Allowed      = FALSE;
-    rInfo.bShearAllowed         = FALSE;
-    rInfo.bEdgeRadiusAllowed    = FALSE;
-    rInfo.bCanConvToPath        = FALSE;
+    rInfo.bResizeFreeAllowed    = sal_True;
+    rInfo.bResizePropAllowed    = sal_True;
+    rInfo.bRotateFreeAllowed    = sal_True;
+    rInfo.bRotate90Allowed      = sal_True;
+    rInfo.bMirrorFreeAllowed    = sal_False;
+    rInfo.bMirror45Allowed      = sal_False;
+    rInfo.bMirror90Allowed      = sal_False;
+    rInfo.bShearAllowed         = sal_False;
+    rInfo.bEdgeRadiusAllowed    = sal_False;
+    rInfo.bCanConvToPath        = sal_False;
 
     // no transparence for 3d objects
-    rInfo.bTransparenceAllowed = FALSE;
+    rInfo.bTransparenceAllowed = sal_False;
 
     // gradient depends on fillstyle
     // BM *** check if SetItem is NULL ***
@@ -344,10 +344,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     // also bei Durchdringugnen auch gegeneinander geschnitten werden
     // muessten. Auch die Texturkoorinaten waeren ein ungeloestes
     // Problem.
-    rInfo.bCanConvToPoly = FALSE;
-    rInfo.bCanConvToContour = FALSE;
-    rInfo.bCanConvToPathLineToArea = FALSE;
-    rInfo.bCanConvToPolyLineToArea = FALSE;
+    rInfo.bCanConvToPoly = sal_False;
+    rInfo.bCanConvToContour = sal_False;
+    rInfo.bCanConvToPathLineToArea = sal_False;
+    rInfo.bCanConvToPolyLineToArea = sal_False;
 }
 
 /*************************************************************************
@@ -951,7 +951,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // SendRepaintBroadcast();
     double fWinkelInRad = nWink/100 * F_PI180;
@@ -963,7 +963,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
 }
 
 /*************************************************************************/
@@ -1127,7 +1127,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
 |*
 \************************************************************************/
 
-UINT16 E3dCompoundObject::GetObjIdentifier() const
+sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
 {
     return E3D_COMPOUNDOBJ_ID;
 }
@@ -1207,7 +1207,7 @@ void E3dCompoundObject::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dCompoundObject::SetCreateNormals(BOOL bNew)
+void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
 {
     if(bCreateNormals != bNew)
     {
@@ -1216,7 +1216,7 @@ void E3dCompoundObject::SetCreateNormals(BOOL bNew)
     }
 }
 
-void E3dCompoundObject::SetCreateTexture(BOOL bNew)
+void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
 {
     if(bCreateTexture != bNew)
     {
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 493e5260cd7e..be9edd9bf60f 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -44,14 +44,14 @@
 |*
 \************************************************************************/
 
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
 
 E3dObjFactory::E3dObjFactory()
 {
     if ( !bInit )
     {
         SdrObjFactory::InsertMakeObjectHdl(LINK(this, E3dObjFactory, MakeObject));
-        bInit = TRUE;
+        bInit = sal_True;
     }
 }
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 0ec26903d2c0..7086aace6659 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -54,7 +54,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
 E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -78,7 +78,7 @@ E3dPolygonObj::E3dPolygonObj(
     E3dDefaultAttributes& rDefault,
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -101,7 +101,7 @@ E3dPolygonObj::E3dPolygonObj(
     const basegfx::B3DPolyPolygon& rPolyPoly3D,
     const basegfx::B3DPolyPolygon& rPolyNormals3D,
     const basegfx::B2DPolyPolygon& rPolyTexture2D,
-    BOOL bLinOnly)
+    sal_Bool bLinOnly)
 :   E3dCompoundObject(rDefault),
     bLineOnly(bLinOnly)
 {
@@ -188,7 +188,7 @@ void E3dPolygonObj::CreateDefaultTexture()
 
         // Entscheiden, welche Koordinaten als Source fuer das
         // Mapping benutzt werden sollen
-        UINT16 nSourceMode = 0;
+        sal_uInt16 nSourceMode = 0;
 
         // Groessten Freiheitsgrad ermitteln
         if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ()))
@@ -265,7 +265,7 @@ E3dPolygonObj::~E3dPolygonObj()
 |*
 \************************************************************************/
 
-UINT16 E3dPolygonObj::GetObjIdentifier() const
+sal_uInt16 E3dPolygonObj::GetObjIdentifier() const
 {
     return E3D_POLYGONOBJ_ID;
 }
@@ -318,7 +318,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText
 |*
 \************************************************************************/
 
-SdrObject *E3dPolygonObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
@@ -349,7 +349,7 @@ void E3dPolygonObj::operator=(const SdrObject& rObj)
 |*
 \************************************************************************/
 
-void E3dPolygonObj::SetLineOnly(BOOL bNew)
+void E3dPolygonObj::SetLineOnly(sal_Bool bNew)
 {
     if(bNew != bLineOnly)
     {
diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx
index 212f5ccae44a..2ee7f795afc2 100644
--- a/svx/source/engine3d/polysc3d.cxx
+++ b/svx/source/engine3d/polysc3d.cxx
@@ -66,7 +66,7 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dPolyScene::GetObjIdentifier() const
+sal_uInt16 E3dPolyScene::GetObjIdentifier() const
 {
     return E3D_POLYSCENE_ID;
 }
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index f209ee93487a..7fc40f1abc60 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -329,7 +329,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const
 |*
 \************************************************************************/
 
-UINT16 E3dScene::GetObjIdentifier() const
+sal_uInt16 E3dScene::GetObjIdentifier() const
 {
     return E3D_SCENE_ID;
 }
@@ -751,7 +751,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
     // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
     // dafuer gibt es den
-    SetGlueReallyAbsolute(TRUE);
+    SetGlueReallyAbsolute(sal_True);
 
     // So dass war die Szene, ab jetzt kommen die Objekte in der Szene
     // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen
@@ -770,7 +770,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
     SetRectsDirty();    // Veranlasst eine Neuberechnung aller BoundRects
     NbcRotateGluePoints(rRef,nWink,sn,cs);  // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
                                             // zum Urpsung des Blattes
-    SetGlueReallyAbsolute(FALSE);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+    SetGlueReallyAbsolute(sal_False);  // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
     SetRectsDirty();
 }
 
@@ -805,7 +805,7 @@ void E3dScene::RecalcSnapRect()
 |*
 \************************************************************************/
 
-BOOL E3dScene::IsBreakObjPossible()
+sal_Bool E3dScene::IsBreakObjPossible()
 {
     // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind
     SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS);
@@ -815,10 +815,10 @@ BOOL E3dScene::IsBreakObjPossible()
         E3dObject* pObj = (E3dObject*) a3DIterator.Next();
         DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!");
         if(!pObj->IsBreakObjPossible())
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
@@ -831,7 +831,7 @@ basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const
 
 void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec)
 {
-    UINT16 nSceneShadowSlant = (UINT16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
+    sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5);
     GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant));
 }
 
@@ -847,7 +847,7 @@ FASTBOOL E3dScene::BegCreate(SdrDragStat& rStat)
     aRect1.Justify();
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
-    return TRUE;
+    return sal_True;
 }
 
 FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
@@ -858,8 +858,8 @@ FASTBOOL E3dScene::MovCreate(SdrDragStat& rStat)
     rStat.SetActionRect(aRect1);
     NbcSetSnapRect(aRect1);
     SetBoundRectDirty();
-    bSnapRectDirty=TRUE;
-    return TRUE;
+    bSnapRectDirty=sal_True;
+    return sal_True;
 }
 
 FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -874,7 +874,7 @@ FASTBOOL E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
 FASTBOOL E3dScene::BckCreate(SdrDragStat& /*rStat*/)
 {
-    return FALSE;
+    return sal_False;
 }
 
 void E3dScene::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 316c353ad7bb..2c1d4ea0480f 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -117,7 +117,7 @@ void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
 |*
 \************************************************************************/
 
-UINT16 E3dSphereObj::GetObjIdentifier() const
+sal_uInt16 E3dSphereObj::GetObjIdentifier() const
 {
     return E3D_SPHEREOBJ_ID;
 }
@@ -128,7 +128,7 @@ UINT16 E3dSphereObj::GetObjIdentifier() const
 |*
 \************************************************************************/
 
-SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
 {
     return NULL;
 }
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 68ce67febc25..ef108bb902ae 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -66,7 +66,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
 :   SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
 {}
 
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
 {}
 
@@ -74,7 +74,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
 // #i28528#
 // Added extra Item (Bool) for chart2 to be able to show reduced line geometry
 
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
 {}
 
@@ -102,7 +102,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
 {}
 
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
 {}
 
@@ -114,7 +114,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
 {}
 
-Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
 {}
 
@@ -142,7 +142,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
 :   SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
 {}
 
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
 {}
 
@@ -158,7 +158,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
 :   SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
 {}
 
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
 {}
 
@@ -198,35 +198,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
 :   SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
 {}
 
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
 {}
 
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
 {}
 
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
 {}
 
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
 {}
 
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
 {}
 
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
 {}
 
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
 {}
 
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
 {}
 
@@ -273,7 +273,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
 {}
 
@@ -298,7 +298,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
 {}
 
@@ -323,7 +323,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
 {}
 
@@ -348,7 +348,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
 {}
 
@@ -373,7 +373,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 // #107245#
 
-Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal)
 :   SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
 {}
 
@@ -398,13 +398,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
 //////////////////////////////////////////////////////////////////////////////
 
 // Svx3DNormalsKindItem: use drawing::NormalsKind
-sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::NormalsKind)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::NormalsKind eVar;
     if(!(rVal >>= eVar))
@@ -419,13 +419,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -440,13 +440,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -461,13 +461,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureKindItem: use drawing::TextureKind
-sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureKind)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureKind eVar;
     if(!(rVal >>= eVar))
@@ -482,13 +482,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DTextureModeItem: use drawing:TextureMode
-sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::TextureMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::TextureMode eVar;
     if(!(rVal >>= eVar))
@@ -503,13 +503,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DPerspectiveItem: use drawing::ProjectionMode
-sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ProjectionMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ProjectionMode eVar;
     if(!(rVal >>= eVar))
@@ -524,13 +524,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
 }
 
 // Svx3DShadeModeItem: use drawing::ShadeMode
-sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
 {
     rVal <<= (drawing::ShadeMode)GetValue();
     return sal_True;
 }
 
-sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
 {
     drawing::ShadeMode eVar;
     if(!(rVal >>= eVar))
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index c69abb362754..9d54fe3882e3 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -254,7 +254,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) :
 void E3dView::DrawMarkedObj(OutputDevice& rOut) const
 {
     // Existieren 3D-Objekte, deren Szenen nicht selektiert sind?
-    BOOL bSpecialHandling = FALSE;
+    sal_Bool bSpecialHandling = sal_False;
     E3dScene *pScene = NULL;
 
     long nCnt = GetMarkedObjectCount();
@@ -266,14 +266,14 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // zugehoerige Szene
             pScene = ((E3dCompoundObject*)pObj)->GetScene();
             if(pScene && !IsObjMarked(pScene))
-                bSpecialHandling = TRUE;
+                bSpecialHandling = sal_True;
         }
         // Alle SelectionFlags zuruecksetzen
         if(pObj && pObj->ISA(E3dObject))
         {
             pScene = ((E3dObject*)pObj)->GetScene();
             if(pScene)
-                pScene->SetSelected(FALSE);
+                pScene->SetSelected(sal_False);
         }
     }
 
@@ -290,7 +290,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
 
@@ -304,7 +304,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             {
                 // Objekt markieren
                 E3dObject* p3DObj = (E3dObject*)pObj;
-                p3DObj->SetSelected(TRUE);
+                p3DObj->SetSelected(sal_True);
                 pScene = p3DObj->GetScene();
                 pM = GetSdrMarkByIndex(nObjs);
             }
@@ -315,9 +315,9 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
             // code from parent
             SortMarkedObjects();
 
-            pScene->SetDrawOnlySelected(TRUE);
+            pScene->SetDrawOnlySelected(sal_True);
             pScene->SingleObjectPainter(rOut); // #110094#-17
-            pScene->SetDrawOnlySelected(FALSE);
+            pScene->SetDrawOnlySelected(sal_False);
         }
 
         // SelectionFlag zuruecksetzen
@@ -329,7 +329,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
                 // zugehoerige Szene
                 pScene = ((E3dCompoundObject*)pObj)->GetScene();
                 if(pScene)
-                    pScene->SetSelected(FALSE);
+                    pScene->SetSelected(sal_False);
             }
         }
     }
@@ -424,7 +424,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
 
             if(pScene && !IsObjMarked(pScene) && GetSdrPageView())
             {
-                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), FALSE, TRUE);
+                ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True);
             }
         }
     }
@@ -473,9 +473,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
 |*
 \************************************************************************/
 
-BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
-    BOOL bRetval = FALSE;
+    sal_Bool bRetval = sal_False;
 
     // Liste holen
     Point aPos(rPos);
@@ -483,7 +483,7 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
     ImpGetPasteObjList(aPos, pDstList);
 
     if(!pDstList)
-        return FALSE;
+        return sal_False;
 
     // Owner der Liste holen
     SdrObject* pOwner = pDstList->GetOwnerObj();
@@ -526,9 +526,9 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
 }
 
 // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
+sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
 {
-    BOOL bRetval(FALSE);
+    sal_Bool bRetval(sal_False);
 
     if(pSrcScene && pDstScene)
     {
@@ -623,7 +623,7 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
                     pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer());
                     pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
                     pDstScene->Insert3DObj(pNewCompoundObj);
-                    bRetval = TRUE;
+                    bRetval = sal_True;
 
                     // Undo anlegen
                     if( GetModel()->IsUndoEnabled() )
@@ -642,11 +642,11 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
 |*
 \************************************************************************/
 
-BOOL E3dView::IsConvertTo3DObjPossible() const
+sal_Bool E3dView::IsConvertTo3DObjPossible() const
 {
-    BOOL bAny3D(FALSE);
-    BOOL bGroupSelected(FALSE);
-    BOOL bRetval(TRUE);
+    sal_Bool bAny3D(sal_False);
+    sal_Bool bGroupSelected(sal_False);
+    sal_Bool bRetval(sal_True);
 
     for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++)
     {
@@ -659,20 +659,20 @@ BOOL E3dView::IsConvertTo3DObjPossible() const
 
     bRetval = !bAny3D
         && (
-           IsConvertToPolyObjPossible(FALSE)
-        || IsConvertToPathObjPossible(FALSE)
+           IsConvertToPolyObjPossible(sal_False)
+        || IsConvertToPathObjPossible(sal_False)
         || IsImportMtfPossible());
     return bRetval;
 }
 
-void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
-    BOOL& rGroupSelected) const
+void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
+    sal_Bool& rGroupSelected) const
 {
     if(pObj)
     {
         if(pObj->ISA(E3dObject))
         {
-            rAny3D = TRUE;
+            rAny3D = sal_True;
         }
         else
         {
@@ -684,7 +684,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
                     SdrObject* pNewObj = aIter.Next();
                     ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected);
                 }
-                rGroupSelected = TRUE;
+                rGroupSelected = sal_True;
             }
         }
     }
@@ -744,7 +744,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
     }
 }
 
-void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     // Einzelnes PathObject, dieses umwanden
     SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -753,9 +753,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     {
         E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
         if(bExtrude)
-            aDefault.SetDefaultExtrudeCharacterMode(TRUE);
+            aDefault.SetDefaultExtrudeCharacterMode(sal_True);
         else
-            aDefault.SetDefaultLatheCharacterMode(TRUE);
+            aDefault.SetDefaultLatheCharacterMode(sal_True);
 
         // ItemSet des Ursprungsobjektes holen
         SfxItemSet aSet(pObj->GetMergedItemSet());
@@ -771,10 +771,10 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
             // Das SdrPathObj ist nicht gefuellt, lasse die
             // vordere und hintere Flaeche weg. Ausserdem ist
             // eine beidseitige Darstellung notwendig.
-            aDefault.SetDefaultExtrudeCloseFront(FALSE);
-            aDefault.SetDefaultExtrudeCloseBack(FALSE);
+            aDefault.SetDefaultExtrudeCloseFront(sal_False);
+            aDefault.SetDefaultExtrudeCloseBack(sal_False);
 
-            aSet.Put(Svx3DDoubleSidedItem(TRUE));
+            aSet.Put(Svx3DDoubleSidedItem(sal_True));
 
             // Fuellattribut setzen
             aSet.Put(XFillStyleItem(XFILL_SOLID));
@@ -813,7 +813,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
     }
 }
 
-void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
 {
     if(pObj)
     {
@@ -831,7 +831,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
             ImpChangeSomeAttributesFor3DConversion(pObj);
 
         // convert completely to path objects
-        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(FALSE, FALSE);
+        SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False);
 
         if(pNewObj1)
         {
@@ -849,7 +849,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
                 ImpChangeSomeAttributesFor3DConversion2(pNewObj1);
 
             // convert completely to path objects
-            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, TRUE);
+            SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True);
 
             if(pNewObj2)
             {
@@ -884,7 +884,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
+void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
 {
     if(AreObjectsMarked())
     {
@@ -951,7 +951,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
             // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse
             // erweitern
-            for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+            for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
             {
                 SdrMark* pMark = GetSdrMarkByIndex(a);
                 SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -991,7 +991,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
 
         // Ueber die Selektion gehen und in 3D wandeln, komplett mit
         // Umwandeln in SdrPathObject, auch Schriften
-        for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+        for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
         {
             SdrMark* pMark = GetSdrMarkByIndex(a);
             SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1021,8 +1021,8 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
             // und alle alten Objekte weghauen
             SdrObject* pRepObj = GetMarkedObjectByIndex(0);
             SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0);
-            MarkObj(pRepObj, pPV, TRUE);
-            ReplaceObjectAtView(pRepObj, *pPV, pScene, FALSE);
+            MarkObj(pRepObj, pPV, sal_True);
+            ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False);
             DeleteMarked();
             MarkObj(pScene, pPV);
 
@@ -1109,7 +1109,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
         SdrObjListIter aIter(*pSubList, IM_FLAT);
         E3dDepthLayer* pBaseLayer = NULL;
         E3dDepthLayer* pLayer = NULL;
-        INT32 nNumLayers = 0;
+        sal_Int32 nNumLayers = 0;
 
         while(aIter.IsMore())
         {
@@ -1156,12 +1156,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 
                                     if(aCompareColor == aLocalColor)
                                     {
-                                        bOverlap = FALSE;
+                                        bOverlap = sal_False;
                                     }
                                 }
                                 else if(eLocalFillStyle == XFILL_NONE)
                                 {
-                                    bOverlap = FALSE;
+                                    bOverlap = sal_False;
                                 }
                             }
                         }
@@ -1246,7 +1246,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
 |*
 \************************************************************************/
 
-BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
+sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     SdrHdl* pHdl, short nMinMov,
     SdrDragMethod* pForcedMeth)
 {
@@ -1257,25 +1257,25 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
     }
     else
     {
-        BOOL bOwnActionNecessary;
+        sal_Bool bOwnActionNecessary;
         if (pHdl == NULL)
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else if (pHdl->IsVertexHdl() || pHdl->IsCornerHdl())
         {
-           bOwnActionNecessary = TRUE;
+           bOwnActionNecessary = sal_True;
         }
         else
         {
-           bOwnActionNecessary = FALSE;
+           bOwnActionNecessary = sal_False;
         }
 
         if(bOwnActionNecessary && GetMarkedObjectCount() >= 1)
         {
             E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ;
-            BOOL bThereAreRootScenes = FALSE;
-            BOOL bThereAre3DObjects = FALSE;
+            sal_Bool bThereAreRootScenes = sal_False;
+            sal_Bool bThereAre3DObjects = sal_False;
             long nCnt = GetMarkedObjectCount();
             for(long nObjs = 0;nObjs < nCnt;nObjs++)
             {
@@ -1283,9 +1283,9 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
                 if(pObj)
                 {
                     if(pObj->ISA(E3dScene) && ((E3dScene*)pObj)->GetScene() == pObj)
-                        bThereAreRootScenes = TRUE;
+                        bThereAreRootScenes = sal_True;
                     if(pObj->ISA(E3dObject))
-                        bThereAre3DObjects = TRUE;
+                        bThereAre3DObjects = sal_True;
                 }
             }
             if( bThereAre3DObjects )
@@ -1361,7 +1361,7 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
 |*
 \************************************************************************/
 
-BOOL E3dView::HasMarkedScene()
+sal_Bool E3dView::HasMarkedScene()
 {
     return (GetMarkedScene() != NULL);
 }
@@ -1374,9 +1374,9 @@ BOOL E3dView::HasMarkedScene()
 
 E3dScene* E3dView::GetMarkedScene()
 {
-    ULONG nCnt = GetMarkedObjectCount();
+    sal_uIntPtr nCnt = GetMarkedObjectCount();
 
-    for ( ULONG i = 0; i < nCnt; i++ )
+    for ( sal_uIntPtr i = 0; i < nCnt; i++ )
         if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
             return (E3dScene*) GetMarkedObjectByIndex(i);
 
@@ -1422,7 +1422,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ)
 {
     Camera3D aCam(pScene->GetCamera());
 
-    aCam.SetAutoAdjustProjection(FALSE);
+    aCam.SetAutoAdjustProjection(sal_False);
     aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
     basegfx::B3DPoint aLookAt;
 
@@ -1586,14 +1586,14 @@ void E3dView::MovAction(const Point& rPnt)
 /*************************************************************************
 |*
 |* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen
-|*          [FG] Mit dem Parameterwert TRUE (SDefault: FALSE) wird einfach ein
+|*          [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein
 |*               Rotationskoerper erzeugt, ohne den Benutzer die Lage der
 |*               Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls
 |*               ein Objekt selektiert ist. (keine Initialisierung noetig)
 |*
 \************************************************************************/
 
-void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
+void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
 {
     ResetCreationActive();
 
@@ -1610,7 +1610,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
             basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
         else
         {
@@ -1623,7 +1623,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
             basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y());
             basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y());
 
-            ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+            ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
         }
     }
 }
@@ -1675,7 +1675,7 @@ void E3dView::InitView ()
     nVDefaultSegments        = 12;
     aDefaultLightColor       = RGB_Color(COL_WHITE);
     aDefaultAmbientColor     = RGB_Color(COL_BLACK);
-    bDoubleSided             = FALSE;
+    bDoubleSided             = sal_False;
     mpMirrorOverlay = 0L;
 }
 
@@ -1685,13 +1685,13 @@ void E3dView::InitView ()
 |*
 \************************************************************************/
 
-BOOL E3dView::IsBreak3DObjPossible() const
+sal_Bool E3dView::IsBreak3DObjPossible() const
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG i = 0;
+        sal_uIntPtr i = 0;
 
         while (i < nCount)
         {
@@ -1700,11 +1700,11 @@ BOOL E3dView::IsBreak3DObjPossible() const
             if (pObj && pObj->ISA(E3dObject))
             {
                 if(!(((E3dObject*)pObj)->IsBreakObjPossible()))
-                    return FALSE;
+                    return sal_False;
             }
             else
             {
-                return FALSE;
+                return sal_False;
             }
 
             i++;
@@ -1712,10 +1712,10 @@ BOOL E3dView::IsBreak3DObjPossible() const
     }
     else
     {
-        return FALSE;
+        return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -1729,10 +1729,10 @@ void E3dView::Break3DObj()
     if(IsBreak3DObjPossible())
     {
         // ALLE selektierten Objekte werden gewandelt
-        UINT32 nCount = GetMarkedObjectCount();
+        sal_uInt32 nCount = GetMarkedObjectCount();
 
         BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
-        for(UINT32 a=0;a<nCount;a++)
+        for(sal_uInt32 a=0;a<nCount;a++)
         {
             E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);
             BreakSingle3DObj(pObj);
@@ -1775,11 +1775,11 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
 
 void E3dView::MergeScenes ()
 {
-    ULONG nCount = GetMarkedObjectCount();
+    sal_uIntPtr nCount = GetMarkedObjectCount();
 
     if (nCount > 0)
     {
-        ULONG     nObj    = 0;
+        sal_uIntPtr     nObj    = 0;
         SdrObject *pObj   = GetMarkedObjectByIndex(nObj);
         E3dScene  *pScene = new E3dPolyScene(Get3DDefaultAttributes());
         basegfx::B3DRange aBoundVol;
@@ -1898,29 +1898,29 @@ void E3dView::CheckPossibilities()
     // Weitere Flags bewerten
     if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible)
     {
-        INT32 nMarkCnt = GetMarkedObjectCount();
-        BOOL bCoumpound = FALSE;
-        BOOL b3DObject = FALSE;
-        for(INT32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
+        sal_Int32 nMarkCnt = GetMarkedObjectCount();
+        sal_Bool bCoumpound = sal_False;
+        sal_Bool b3DObject = sal_False;
+        for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
         {
             SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
             if(pObj && pObj->ISA(E3dCompoundObject))
-                bCoumpound = TRUE;
+                bCoumpound = sal_True;
             if(pObj && pObj->ISA(E3dObject))
-                b3DObject = TRUE;
+                b3DObject = sal_True;
         }
 
         // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert.
         // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja,
         // das Gruppieren verbieten.
         if(bGroupPossible && bCoumpound)
-            bGroupPossible = FALSE;
+            bGroupPossible = sal_False;
 
         if(bUnGroupPossible && b3DObject)
-            bUnGroupPossible = FALSE;
+            bUnGroupPossible = sal_False;
 
         if(bGrpEnterPossible && bCoumpound)
-            bGrpEnterPossible = FALSE;
+            bGrpEnterPossible = sal_False;
     }
 }
 
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 121696d8ed6b..6dd4dd816450 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -58,7 +58,7 @@
 |*
 \************************************************************************/
 
-void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
 {
     SdrObject* pNewObj = NULL;
 
@@ -68,7 +68,7 @@ void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
 
         if (pObj && pObj->ISA(E3dPolyScene))
         {
-            BOOL bBezier = FALSE;
+            sal_Bool bBezier = sal_False;
             pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea);
 
             if (pNewObj)
@@ -118,7 +118,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
     }
 }
 
-SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) const
+SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const
 {
     // ItemSet mit entspr. Bereich anlegen
     SfxItemSet aSet(
@@ -137,7 +137,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
     else
     {
         // get attributes from all selected objects
-        MergeAttrFromMarked(aSet, FALSE);
+        MergeAttrFromMarked(aSet, sal_False);
 
         // calc flags for SID_ATTR_3D_INTERN
         const SdrMarkList& rMarkList = GetMarkedObjectList();
@@ -179,7 +179,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
 |*
 \************************************************************************/
 
-void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, BOOL bReplaceAll)
+void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll)
 {
     sal_uInt32 nSelectedItems(0L);
 
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index ce5ffd7ba90e..bbfe84fafbf2 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -185,7 +185,7 @@ void Viewport3D::MakeTransform(void)
             aViewTf *= aTemp;
         }
 
-        bTfValid = TRUE;
+        bTfValid = sal_True;
     }
 }
 
@@ -313,7 +313,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const
 void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
 {
     aVRP = rNewVRP;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -326,7 +326,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 {
     aVPN = rNewVPN;
     aVPN.normalize();
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -338,7 +338,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
 void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV)
 {
     aVUV = rNewVUV;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -352,7 +352,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
     aPRP = rNewPRP;
     aPRP.setX(0.0);
     aPRP.setY(0.0);
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -364,7 +364,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
 void Viewport3D::SetVPD(double fNewVPD)
 {
     fVPD = fNewVPD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -376,7 +376,7 @@ void Viewport3D::SetVPD(double fNewVPD)
 void Viewport3D::SetNearClipDist(double fNewNCD)
 {
     fNearClipDist = fNewNCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 /*************************************************************************
@@ -388,7 +388,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD)
 void Viewport3D::SetFarClipDist(double fNewFCD)
 {
     fFarClipDist = fNewFCD;
-    bTfValid = FALSE;
+    bTfValid = sal_False;
 }
 
 // eof