Use bool
Change-Id: I2d06ae03650b318a1318d0e2b026352e22404fdd
This commit is contained in:
Stephan Bergmann
@@ -34,7 +34,7 @@ namespace drawinglayer
|
||||
basegfx::B2DRange maGraphicRange;
|
||||
|
||||
// bitfield
|
||||
unsigned mbTiling : 1;
|
||||
bool mbTiling : 1;
|
||||
|
||||
// tiling definitions, offsets in X/Y in percent for each 2nd row.
|
||||
// If both are set, Y is ignored (X has precedence)
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace drawinglayer
|
||||
sal_uInt32 mnMinimalDiscreteDistance;
|
||||
|
||||
// bitfield
|
||||
unsigned mbFillBackground : 1;
|
||||
bool mbFillBackground : 1;
|
||||
|
||||
ImpFillHatchAttribute(
|
||||
HatchStyle eStyle,
|
||||
|
||||
@@ -36,13 +36,13 @@ namespace drawinglayer
|
||||
sal_uInt16 mnWeight; // Font weight
|
||||
|
||||
/// bitfield
|
||||
unsigned mbSymbol : 1; // Symbol Font Flag
|
||||
unsigned mbVertical : 1; // Vertical Text Flag
|
||||
unsigned mbItalic : 1; // Italic Flag
|
||||
unsigned mbOutline : 1; // Outline Flag
|
||||
unsigned mbRTL : 1; // RTL Flag
|
||||
unsigned mbBiDiStrong : 1; // BiDi Flag
|
||||
unsigned mbMonospaced : 1;
|
||||
bool mbSymbol : 1; // Symbol Font Flag
|
||||
bool mbVertical : 1; // Vertical Text Flag
|
||||
bool mbItalic : 1; // Italic Flag
|
||||
bool mbOutline : 1; // Outline Flag
|
||||
bool mbRTL : 1; // RTL Flag
|
||||
bool mbBiDiStrong : 1; // BiDi Flag
|
||||
bool mbMonospaced : 1;
|
||||
|
||||
ImpFontAttribute(
|
||||
const OUString& rFamilyName,
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace drawinglayer
|
||||
basegfx::B2DPolyPolygon maPolyPolygon; // the StartEndGeometry PolyPolygon
|
||||
|
||||
// bitfield
|
||||
unsigned mbCentered : 1; // use centered to ineStart/End point?
|
||||
bool mbCentered : 1; // use centered to ineStart/End point?
|
||||
|
||||
ImpLineStartEndAttribute(
|
||||
double fWidth,
|
||||
|
||||
@@ -40,9 +40,9 @@ namespace drawinglayer
|
||||
basegfx::B2DVector maRectPoint;
|
||||
|
||||
// bitfield
|
||||
unsigned mbTiling : 1;
|
||||
unsigned mbStretch : 1;
|
||||
unsigned mbLogSize : 1;
|
||||
bool mbTiling : 1;
|
||||
bool mbStretch : 1;
|
||||
bool mbLogSize : 1;
|
||||
|
||||
ImpSdrFillGraphicAttribute(
|
||||
const Graphic& rFillGraphic,
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace drawinglayer
|
||||
basegfx::B3DVector maDirection;
|
||||
|
||||
// bitfield
|
||||
unsigned mbSpecular : 1;
|
||||
bool mbSpecular : 1;
|
||||
|
||||
ImpSdr3DLightAttribute(
|
||||
const basegfx::BColor& rColor,
|
||||
|
||||
@@ -37,10 +37,10 @@ namespace drawinglayer
|
||||
double mfEndWidth; // 1/100th mm
|
||||
|
||||
// bitfield
|
||||
unsigned mbStartActive : 1L; // start of Line is active
|
||||
unsigned mbEndActive : 1L; // end of Line is active
|
||||
unsigned mbStartCentered : 1L; // Line is centered on line start point
|
||||
unsigned mbEndCentered : 1L; // Line is centered on line end point
|
||||
bool mbStartActive : 1; // start of Line is active
|
||||
bool mbEndActive : 1; // end of Line is active
|
||||
bool mbStartCentered : 1; // Line is centered on line start point
|
||||
bool mbEndCentered : 1; // Line is centered on line end point
|
||||
|
||||
ImpSdrLineStartEndAttribute(
|
||||
const basegfx::B2DPolyPolygon& rStartPolyPolygon,
|
||||
|
||||
@@ -39,11 +39,11 @@ namespace drawinglayer
|
||||
MaterialAttribute3D maMaterial; // object, specular and emissive colors, SpecularIntensity
|
||||
|
||||
// bitfield
|
||||
unsigned mbNormalsInvert : 1; // invert normals
|
||||
unsigned mbDoubleSided : 1; // surfaces are double sided
|
||||
unsigned mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene
|
||||
unsigned mbTextureFilter : 1; // filter texture to make more smooth
|
||||
unsigned mbReducedLineGeometry : 1; // use reduced line geometry (object specific)
|
||||
bool mbNormalsInvert : 1; // invert normals
|
||||
bool mbDoubleSided : 1; // surfaces are double sided
|
||||
bool mbShadow3D : 1; // display shadow in 3D (if on), params for that are at scene
|
||||
bool mbTextureFilter : 1; // filter texture to make more smooth
|
||||
bool mbReducedLineGeometry : 1; // use reduced line geometry (object specific)
|
||||
|
||||
ImpSdr3DObjectAttribute(
|
||||
::com::sun::star::drawing::NormalsKind aNormalsKind,
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace drawinglayer
|
||||
::com::sun::star::drawing::ShadeMode maShadeMode;
|
||||
|
||||
// bitfield
|
||||
unsigned mbTwoSidedLighting : 1;
|
||||
bool mbTwoSidedLighting : 1;
|
||||
|
||||
public:
|
||||
ImpSdrSceneAttribute(
|
||||
|
||||
@@ -153,12 +153,12 @@ private:
|
||||
|
||||
// bitfield
|
||||
// some boolean flags for line span interpolator usages
|
||||
unsigned mbModifyColor : 1;
|
||||
unsigned mbUseTex : 1;
|
||||
unsigned mbHasTexCoor : 1;
|
||||
unsigned mbHasInvTexCoor : 1;
|
||||
unsigned mbUseNrm : 1;
|
||||
unsigned mbUseCol : 1;
|
||||
bool mbModifyColor : 1;
|
||||
bool mbUseTex : 1;
|
||||
bool mbHasTexCoor : 1;
|
||||
bool mbHasInvTexCoor : 1;
|
||||
bool mbUseNrm : 1;
|
||||
bool mbUseCol : 1;
|
||||
|
||||
void getTextureCoor(basegfx::B2DPoint& rTarget) const
|
||||
{
|
||||
|
||||
@@ -65,7 +65,7 @@ namespace drawinglayer
|
||||
/** flag if this is a text or graphic animation. Necessary since SdrViews need to differentiate
|
||||
between both types if they are on/off
|
||||
*/
|
||||
unsigned mbIsTextAnimation : 1;
|
||||
bool mbIsTextAnimation : 1;
|
||||
|
||||
public:
|
||||
/// constructor
|
||||
|
||||
@@ -76,7 +76,7 @@ namespace drawinglayer
|
||||
/** flag if given 3D geometry is already cheched for shadow definitions and 2d shadows
|
||||
are created in maShadowPrimitives
|
||||
*/
|
||||
unsigned mbShadow3DChecked : 1;
|
||||
bool mbShadow3DChecked : 1;
|
||||
|
||||
/// private helpers
|
||||
bool impGetShadow3D(const geometry::ViewInformation2D& rViewInformation) const;
|
||||
|
||||
@@ -61,7 +61,7 @@ namespace drawinglayer
|
||||
|
||||
/// bitfield
|
||||
/// flag to allow keeping the aspect ratio
|
||||
unsigned mbKeepAspectRatio : 1;
|
||||
bool mbKeepAspectRatio : 1;
|
||||
|
||||
protected:
|
||||
/// local decomposition. Implementation will just return children
|
||||
|
||||
@@ -78,7 +78,7 @@ namespace drawinglayer
|
||||
/** flag if given 3D geometry is already cheched for shadow definitions and 2d shadows
|
||||
are created in maShadowPrimitives
|
||||
*/
|
||||
unsigned mbShadow3DChecked : 1;
|
||||
bool mbShadow3DChecked : 1;
|
||||
|
||||
/// the last used NewDiscreteSize and NewUnitVisiblePart definitions for decomposition
|
||||
double mfOldDiscreteSizeX;
|
||||
|
||||
@@ -62,11 +62,11 @@ namespace drawinglayer
|
||||
TextRelief meTextRelief;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbUnderlineAbove : 1;
|
||||
unsigned mbWordLineMode : 1;
|
||||
unsigned mbEmphasisMarkAbove : 1;
|
||||
unsigned mbEmphasisMarkBelow : 1;
|
||||
unsigned mbShadow : 1;
|
||||
bool mbUnderlineAbove : 1;
|
||||
bool mbWordLineMode : 1;
|
||||
bool mbEmphasisMarkAbove : 1;
|
||||
bool mbEmphasisMarkBelow : 1;
|
||||
bool mbShadow : 1;
|
||||
|
||||
/// helper methods
|
||||
void impCreateGeometryContent(
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace drawinglayer
|
||||
attribute::MaterialAttribute3D maMaterial;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbDoubleSided : 1;
|
||||
bool mbDoubleSided : 1;
|
||||
|
||||
public:
|
||||
/// constructor
|
||||
|
||||
@@ -59,12 +59,12 @@ namespace drawinglayer
|
||||
geometry::ViewInformation3D* mpLastRLGViewInformation;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbSmoothNormals : 1; // Plane self
|
||||
unsigned mbSmoothHorizontalNormals : 1; // always
|
||||
unsigned mbSmoothLids : 1; // Front/back
|
||||
unsigned mbCharacterMode : 1;
|
||||
unsigned mbCloseFront : 1;
|
||||
unsigned mbCloseBack : 1;
|
||||
bool mbSmoothNormals : 1; // Plane self
|
||||
bool mbSmoothHorizontalNormals : 1; // always
|
||||
bool mbSmoothLids : 1; // Front/back
|
||||
bool mbCharacterMode : 1;
|
||||
bool mbCloseFront : 1;
|
||||
bool mbCloseBack : 1;
|
||||
|
||||
/// create slices
|
||||
void impCreateSlices();
|
||||
|
||||
@@ -61,12 +61,12 @@ namespace drawinglayer
|
||||
geometry::ViewInformation3D* mpLastRLGViewInformation;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbSmoothNormals : 1; // Plane self
|
||||
unsigned mbSmoothHorizontalNormals : 1; // always
|
||||
unsigned mbSmoothLids : 1; // Front/back
|
||||
unsigned mbCharacterMode : 1;
|
||||
unsigned mbCloseFront : 1;
|
||||
unsigned mbCloseBack : 1;
|
||||
bool mbSmoothNormals : 1; // Plane self
|
||||
bool mbSmoothHorizontalNormals : 1; // always
|
||||
bool mbSmoothLids : 1; // Front/back
|
||||
bool mbCharacterMode : 1;
|
||||
bool mbCloseFront : 1;
|
||||
bool mbCloseBack : 1;
|
||||
|
||||
/// create slices
|
||||
void impCreateSlices();
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace drawinglayer
|
||||
double mfShadowTransparence;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbShadow3D : 1;
|
||||
bool mbShadow3D : 1;
|
||||
|
||||
public:
|
||||
/// constructor
|
||||
|
||||
@@ -48,10 +48,10 @@ namespace drawinglayer
|
||||
|
||||
/// bitfield
|
||||
/// flag if texture shall be modulated with white interpolated color
|
||||
unsigned mbModulate : 1;
|
||||
bool mbModulate : 1;
|
||||
|
||||
/// flag if texture shall be filtered
|
||||
unsigned mbFilter : 1;
|
||||
bool mbFilter : 1;
|
||||
|
||||
public:
|
||||
/// constructor
|
||||
|
||||
@@ -52,8 +52,8 @@ namespace drawinglayer
|
||||
double mfDiscreteHitTolerance;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbHit : 1;
|
||||
unsigned mbHitToleranceUsed : 1;
|
||||
bool mbHit : 1;
|
||||
bool mbHitToleranceUsed : 1;
|
||||
|
||||
/* this flag decides if primitives which are embedded to an
|
||||
UnifiedTransparencePrimitive2D and are invisible will be taken into account for
|
||||
@@ -61,10 +61,10 @@ namespace drawinglayer
|
||||
completely invisible and normally their content exists of hairline
|
||||
primitives describing the object's contour
|
||||
*/
|
||||
unsigned mbUseInvisiblePrimitiveContent : 1;
|
||||
bool mbUseInvisiblePrimitiveContent : 1;
|
||||
|
||||
/// flag to concentraze on text hits only
|
||||
unsigned mbHitTextOnly : 1;
|
||||
bool mbHitTextOnly : 1;
|
||||
|
||||
/// tooling methods
|
||||
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace drawinglayer
|
||||
basegfx::B2DPolyPolygonVector maExtractedLineFills;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbInLineGeometry : 1;
|
||||
bool mbInLineGeometry : 1;
|
||||
|
||||
/// tooling methods
|
||||
void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
|
||||
|
||||
@@ -100,9 +100,9 @@ namespace drawinglayer
|
||||
sal_uInt32 mnTransparenceCounter;
|
||||
|
||||
/// bitfield
|
||||
unsigned mbModulate : 1;
|
||||
unsigned mbFilter : 1;
|
||||
unsigned mbSimpleTextureActive : 1;
|
||||
bool mbModulate : 1;
|
||||
bool mbFilter : 1;
|
||||
bool mbSimpleTextureActive : 1;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
// rendering support
|
||||
|
||||
@@ -70,13 +70,13 @@ namespace drawinglayer
|
||||
|
||||
/// bitfield
|
||||
/// flag if shadow plane projection preparation leaded to valid results
|
||||
unsigned mbShadowProjectionIsValid : 1;
|
||||
bool mbShadowProjectionIsValid : 1;
|
||||
|
||||
/// flag if conversion is switched on
|
||||
unsigned mbConvert : 1;
|
||||
bool mbConvert : 1;
|
||||
|
||||
/// flag if conversion shall use projection
|
||||
unsigned mbUseProjection : 1;
|
||||
bool mbUseProjection : 1;
|
||||
|
||||
/// local helpers
|
||||
basegfx::B2DPolygon impDoShadowProjection(const basegfx::B3DPolygon& rSource);
|
||||
|
||||
@@ -143,7 +143,7 @@ namespace drawinglayer
|
||||
GeoTexSvxHatch* mp2;
|
||||
|
||||
// bitfield
|
||||
unsigned mbFillBackground : 1;
|
||||
bool mbFillBackground : 1;
|
||||
|
||||
// helpers
|
||||
bool impIsOnHatch(const basegfx::B2DPoint& rUV) const;
|
||||
|
||||
Reference in New Issue
Block a user