summaryrefslogtreecommitdiff
path: root/svx/source/engine3d
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-13 16:27:50 +0100
commit006b8504d7c633a61b4953151e71b83fda8e204d (patch)
tree80bcda35b0c8e37304e4a08d952a4bba130a4c9b /svx/source/engine3d
parent2ccbdca418fccd80bcab976a8033a1c62dc60da2 (diff)
removetooltypes01: #i112600# remove tooltypes from svx
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r--svx/source/engine3d/camera3d.cxx2
-rw-r--r--svx/source/engine3d/deflt3d.cxx26
-rw-r--r--svx/source/engine3d/extrud3d.cxx6
-rw-r--r--svx/source/engine3d/polysc3d.cxx2
-rw-r--r--svx/source/engine3d/scene3d.cxx22
-rw-r--r--svx/source/engine3d/viewpt3d2.cxx16
6 files changed, 37 insertions, 37 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/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/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/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/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