diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-11 12:00:14 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-14 07:50:31 +0200 |
commit | fae4102573d184696a1fe1394258ec9ad3a895dc (patch) | |
tree | acb48c8543b3b80b872efd9aa7027c9589c4eb35 | |
parent | 86ffac74e3e0a725abe6b0f79946b3381828bc8e (diff) |
svx: sal_Bool->bool
Change-Id: I8eac9bfecbf8ecc4aa5dd2b098bb57aab3dd424e
-rw-r--r-- | include/svx/verttexttbxctrl.hxx | 4 | ||||
-rw-r--r-- | include/svx/view3d.hxx | 18 | ||||
-rw-r--r-- | include/svx/viewpt3d.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/engine3d/view3d1.cxx | 6 | ||||
-rw-r--r-- | svx/source/engine3d/viewpt3d2.cxx | 14 | ||||
-rw-r--r-- | svx/source/tbxctrls/verttexttbxctrl.cxx | 6 |
8 files changed, 27 insertions, 33 deletions
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx index 7f9279a1d5dc..e502fea5a2c2 100644 --- a/include/svx/verttexttbxctrl.hxx +++ b/include/svx/verttexttbxctrl.hxx @@ -27,14 +27,14 @@ */ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { - sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked + bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked public: SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxVertCTLTextTbxCtrl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} + void SetVert(bool bSet) {bCheckVertical = bSet;} }; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index db502f55f785..8c444b804c4d 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -63,7 +63,7 @@ protected: // Migrate selections Impl3DMirrorConstructOverlay* mpMirrorOverlay; - sal_Bool bDoubleSided; + bool bDoubleSided; void InitView(); @@ -108,7 +108,7 @@ public: // Means to create all Extrudes in a certain depth order. void DoDepthArrange(E3dScene* pScene, double fDepth); - void ConvertMarkedToPolyObj(sal_Bool bLineToArea); + void ConvertMarkedToPolyObj(bool bLineToArea); E3dScene* SetCurrent3DObj(E3dObject* p3DObj); void Start3DCreation(); @@ -242,18 +242,12 @@ public: bool IsBreak3DObjPossible() const; void Break3DObj(); - sal_Bool DoubleSided () const - { - return bDoubleSided; - } + bool DoubleSided () const { return bDoubleSided; } - sal_Bool &DoubleSided () - { - return bDoubleSided; - } + bool &DoubleSided () { return bDoubleSided; } - SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False); + SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, bool bOnly3DAttr=false) const; + void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, bool bOnly3DAttr=false); }; #endif // INCLUDED_SVX_VIEW3D_HXX diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index 621f01e7b469..0239c17119f1 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -70,7 +70,7 @@ class SVX_DLLPUBLIC Viewport3D basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten; // wird mit der Transformation berechnet - sal_Bool bTfValid; // Flag, ob Transformation gueltig ist + bool bTfValid; // Flag, ob Transformation gueltig ist double fWRatio; // Device/View-Seitenverhaeltnisse double fHRatio; @@ -95,11 +95,11 @@ class SVX_DLLPUBLIC Viewport3D double GetFarClipDist() const { return fFarClipDist; } void SetProjection(ProjectionType ePrj) - { eProjection = ePrj; bTfValid = sal_False; } + { eProjection = ePrj; bTfValid = false; } ProjectionType GetProjection() const { return(eProjection); } void SetAspectMapping(AspectMapType eAsp) - { eAspectMapping = eAsp; bTfValid = sal_False; } + { eAspectMapping = eAsp; bTfValid = false; } AspectMapType GetAspectMapping() { return eAspectMapping; } void SetViewWindow(double fX, double fY, double fW, double fH); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 1477e494036c..e985b2ac4703 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -673,7 +673,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) else { WaitObject aWait( (Window*)GetActiveWindow() ); - mpDrawView->ConvertMarkedToPolyObj(sal_False); + mpDrawView->ConvertMarkedToPolyObj(false); } } diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 39d47f285360..9659771a960a 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -1534,8 +1534,8 @@ void E3dView::InitView () nVDefaultSegments = 12; aDefaultLightColor = RGB_Color(COL_WHITE); aDefaultAmbientColor = RGB_Color(COL_BLACK); - bDoubleSided = sal_False; - mpMirrorOverlay = 0L; + bDoubleSided = false; + mpMirrorOverlay = 0L; } bool E3dView::IsBreak3DObjPossible() const diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index c601a5fd76d7..8fb1883093c4 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -42,7 +42,7 @@ #include <svx/svdogrp.hxx> #include <svx/e3dsceneupdater.hxx> -void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) +void E3dView::ConvertMarkedToPolyObj(bool bLineToArea) { SdrObject* pNewObj = NULL; @@ -96,7 +96,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) } } -SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const +SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) const { // Creating itemset with corresponding field SfxItemSet aSet( @@ -151,7 +151,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/ return(aSet); } -void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll) +void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, bool bReplaceAll) { sal_uInt32 nSelectedItems(0L); diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index 084f6550d1a9..9deafdf9fb1f 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -32,7 +32,7 @@ Viewport3D::Viewport3D() : eAspectMapping(AS_NO_MAPPING), aDeviceRect(Point(0,0), Size(-1,-1)), aViewPoint (0, 0, 5000), - bTfValid(0), + bTfValid(false), fWRatio (1.0), fHRatio (1.0) { @@ -123,7 +123,7 @@ void Viewport3D::MakeTransform(void) aViewTf *= aTemp; } - bTfValid = sal_True; + bTfValid = true; } } @@ -181,7 +181,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect) void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) { aVRP = rNewVRP; - bTfValid = sal_False; + bTfValid = false; } // Set View Plane Normal @@ -190,7 +190,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) { aVPN = rNewVPN; aVPN.normalize(); - bTfValid = sal_False; + bTfValid = false; } // Set View Up Vector @@ -198,7 +198,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) { aVUV = rNewVUV; - bTfValid = sal_False; + bTfValid = false; } // Set Center Of Projection @@ -208,7 +208,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) aPRP = rNewPRP; aPRP.setX(0.0); aPRP.setY(0.0); - bTfValid = sal_False; + bTfValid = false; } // Set View Plane Distance @@ -216,7 +216,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) void Viewport3D::SetVPD(double fNewVPD) { fVPD = fNewVPD; - bTfValid = sal_False; + bTfValid = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 2721c9aaf254..74e980a0a323 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -33,21 +33,21 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem); SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - SetVert(sal_False); + SetVert(false); addStatusListener( OUString( ".uno:CTLFontState" )); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - SetVert(sal_True); + SetVert(true); addStatusListener( OUString( ".uno:VerticalTextState" )); } /* ---------------------------------------------------------------------------*/ SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - bCheckVertical(sal_True) + bCheckVertical(true) { } |