mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: sal_Bool->bool

Browse Source 
Change-Id: I8eac9bfecbf8ecc4aa5dd2b098bb57aab3dd424e
This commit is contained in:
Noel Grandin
2014-03-11 12:00:14 +02:00
parent 86ffac74e3
commit fae4102573
8 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/verttexttbxctrl.hxx
View File

@@ -27,14 +27,14 @@
*/ */
class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl 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: public:
SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxVertCTLTextTbxCtrl(); ~SvxVertCTLTextTbxCtrl();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState ); const SfxPoolItem* pState );
void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} void SetVert(bool bSet) {bCheckVertical = bSet;}
}; };

18
include/svx/view3d.hxx
View File

@@ -63,7 +63,7 @@ protected:
// Migrate selections // Migrate selections
Impl3DMirrorConstructOverlay* mpMirrorOverlay; Impl3DMirrorConstructOverlay* mpMirrorOverlay;
sal_Bool bDoubleSided; bool bDoubleSided;
void InitView(); void InitView();
@@ -108,7 +108,7 @@ public:
// Means to create all Extrudes in a certain depth order. // Means to create all Extrudes in a certain depth order.
void DoDepthArrange(E3dScene* pScene, double fDepth); void DoDepthArrange(E3dScene* pScene, double fDepth);
void ConvertMarkedToPolyObj(sal_Bool bLineToArea); void ConvertMarkedToPolyObj(bool bLineToArea);
E3dScene* SetCurrent3DObj(E3dObject* p3DObj); E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation(); void Start3DCreation();
@@ -242,18 +242,12 @@ public:
bool IsBreak3DObjPossible() const; bool IsBreak3DObjPossible() const;
void Break3DObj(); void Break3DObj();
sal_Bool DoubleSided () const bool DoubleSided () const { return bDoubleSided; }
{
return bDoubleSided;
}
sal_Bool &DoubleSided () bool &DoubleSided () { return bDoubleSided; }
{
return bDoubleSided;
}
SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const; SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, bool bOnly3DAttr=false) const;
void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False); void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, bool bOnly3DAttr=false);
}; };
#endif // INCLUDED_SVX_VIEW3D_HXX #endif // INCLUDED_SVX_VIEW3D_HXX

6
include/svx/viewpt3d.hxx
View File

@@ -70,7 +70,7 @@ class SVX_DLLPUBLIC Viewport3D
basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten; basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten;
// wird mit der Transformation berechnet // 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 fWRatio; // Device/View-Seitenverhaeltnisse
double fHRatio; double fHRatio;
@@ -95,11 +95,11 @@ class SVX_DLLPUBLIC Viewport3D
double GetFarClipDist() const { return fFarClipDist; } double GetFarClipDist() const { return fFarClipDist; }
void SetProjection(ProjectionType ePrj) void SetProjection(ProjectionType ePrj)
{ eProjection = ePrj; bTfValid = sal_False; } { eProjection = ePrj; bTfValid = false; }
ProjectionType GetProjection() const { return(eProjection); } ProjectionType GetProjection() const { return(eProjection); }
void SetAspectMapping(AspectMapType eAsp) void SetAspectMapping(AspectMapType eAsp)
{ eAspectMapping = eAsp; bTfValid = sal_False; } { eAspectMapping = eAsp; bTfValid = false; }
AspectMapType GetAspectMapping() { return eAspectMapping; } AspectMapType GetAspectMapping() { return eAspectMapping; }
void SetViewWindow(double fX, double fY, double fW, double fH); void SetViewWindow(double fX, double fY, double fW, double fH);

2
sd/source/ui/view/drviews2.cxx
View File

@@ -673,7 +673,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else else
{ {
WaitObject aWait( (Window*)GetActiveWindow() ); WaitObject aWait( (Window*)GetActiveWindow() );
mpDrawView->ConvertMarkedToPolyObj(sal_False); mpDrawView->ConvertMarkedToPolyObj(false);
} }
} }

4
svx/source/engine3d/view3d.cxx
View File

@@ -1534,8 +1534,8 @@ void E3dView::InitView ()
nVDefaultSegments = 12; nVDefaultSegments = 12;
aDefaultLightColor = RGB_Color(COL_WHITE); aDefaultLightColor = RGB_Color(COL_WHITE);
aDefaultAmbientColor = RGB_Color(COL_BLACK); aDefaultAmbientColor = RGB_Color(COL_BLACK);
bDoubleSided = sal_False; bDoubleSided = false;
mpMirrorOverlay = 0L; mpMirrorOverlay = 0L;
} }
bool E3dView::IsBreak3DObjPossible() const bool E3dView::IsBreak3DObjPossible() const

6
svx/source/engine3d/view3d1.cxx
View File

@@ -42,7 +42,7 @@
#include <svx/svdogrp.hxx> #include <svx/svdogrp.hxx>
#include <svx/e3dsceneupdater.hxx> #include <svx/e3dsceneupdater.hxx>
void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) void E3dView::ConvertMarkedToPolyObj(bool bLineToArea)
{ {
SdrObject* pNewObj = NULL; 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 // Creating itemset with corresponding field
SfxItemSet aSet( SfxItemSet aSet(
@@ -151,7 +151,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/
return(aSet); 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); sal_uInt32 nSelectedItems(0L);

14
svx/source/engine3d/viewpt3d2.cxx
View File

@@ -32,7 +32,7 @@ Viewport3D::Viewport3D() :
eAspectMapping(AS_NO_MAPPING), eAspectMapping(AS_NO_MAPPING),
aDeviceRect(Point(0,0), Size(-1,-1)), aDeviceRect(Point(0,0), Size(-1,-1)),
aViewPoint (0, 0, 5000), aViewPoint (0, 0, 5000),
bTfValid(0), bTfValid(false),
fWRatio (1.0), fWRatio (1.0),
fHRatio (1.0) fHRatio (1.0)
{ {
@@ -123,7 +123,7 @@ void Viewport3D::MakeTransform(void)
aViewTf *= aTemp; aViewTf *= aTemp;
} }
bTfValid = sal_True; bTfValid = true;
} }
} }
@@ -181,7 +181,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP)
{ {
aVRP = rNewVRP; aVRP = rNewVRP;
bTfValid = sal_False; bTfValid = false;
} }
// Set View Plane Normal // Set View Plane Normal
@@ -190,7 +190,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
{ {
aVPN = rNewVPN; aVPN = rNewVPN;
aVPN.normalize(); aVPN.normalize();
bTfValid = sal_False; bTfValid = false;
} }
// Set View Up Vector // Set View Up Vector
@@ -198,7 +198,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV)
{ {
aVUV = rNewVUV; aVUV = rNewVUV;
bTfValid = sal_False; bTfValid = false;
} }
// Set Center Of Projection // Set Center Of Projection
@@ -208,7 +208,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
aPRP = rNewPRP; aPRP = rNewPRP;
aPRP.setX(0.0); aPRP.setX(0.0);
aPRP.setY(0.0); aPRP.setY(0.0);
bTfValid = sal_False; bTfValid = false;
} }
// Set View Plane Distance // Set View Plane Distance
@@ -216,7 +216,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
void Viewport3D::SetVPD(double fNewVPD) void Viewport3D::SetVPD(double fNewVPD)
{ {
fVPD = fNewVPD; fVPD = fNewVPD;
bTfValid = sal_False; bTfValid = false;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
svx/source/tbxctrls/verttexttbxctrl.cxx
View File

@@ -33,21 +33,21 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
{ {
SetVert(sal_False); SetVert(false);
addStatusListener( OUString( ".uno:CTLFontState" )); addStatusListener( OUString( ".uno:CTLFontState" ));
} }
SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
{ {
SetVert(sal_True); SetVert(true);
addStatusListener( OUString( ".uno:VerticalTextState" )); addStatusListener( OUString( ".uno:VerticalTextState" ));
} }
/* ---------------------------------------------------------------------------*/ /* ---------------------------------------------------------------------------*/
SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ), SfxToolBoxControl( nSlotId, nId, rTbx ),
bCheckVertical(sal_True) bCheckVertical(true)
{ {
} }