summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx6
-rw-r--r--include/vcl/vclenum.hxx15
-rw-r--r--svx/source/svdraw/svdfmtf.cxx4
-rw-r--r--vcl/source/gdi/hatch.cxx4
-rw-r--r--vcl/source/outdev/hatch.cxx4
-rw-r--r--vcl/workben/outdevgrind.cxx2
8 files changed, 21 insertions, 26 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 4407647a7e24..2c5b8d122d1c 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -904,17 +904,17 @@ namespace
switch(rHatch.GetStyle())
{
- default : // case HATCH_SINGLE :
+ default : // case HatchStyle::Single :
{
aHatchStyle = drawinglayer::attribute::HatchStyle::Single;
break;
}
- case HATCH_DOUBLE :
+ case HatchStyle::Double :
{
aHatchStyle = drawinglayer::attribute::HatchStyle::Double;
break;
}
- case HATCH_TRIPLE :
+ case HatchStyle::Triple :
{
aHatchStyle = drawinglayer::attribute::HatchStyle::Triple;
break;
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index d35d7804b8a9..a42be99958e4 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1537,9 +1537,9 @@ namespace drawinglayer
// process(rCandidate.get2DDecomposition(getViewInformation2D()));
const ::tools::PolyPolygon aToolsPolyPolygon(basegfx::tools::adaptiveSubdivideByAngle(aLocalPolyPolygon));
const HatchStyle aHatchStyle(
- attribute::HatchStyle::Single == rFillHatchAttribute.getStyle() ? HATCH_SINGLE :
- attribute::HatchStyle::Double == rFillHatchAttribute.getStyle() ? HATCH_DOUBLE :
- HATCH_TRIPLE);
+ attribute::HatchStyle::Single == rFillHatchAttribute.getStyle() ? HatchStyle::Single :
+ attribute::HatchStyle::Double == rFillHatchAttribute.getStyle() ? HatchStyle::Double :
+ HatchStyle::Triple);
mpOutputDevice->DrawHatch(aToolsPolyPolygon,
Hatch(aHatchStyle,
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 365563811e30..c77f6365d7a5 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -1122,7 +1122,7 @@ namespace drawinglayer
mpOutputDevice->SetLineColor(Color(aHatchColor));
// get hatch style
- HatchStyle eHatchStyle(HATCH_SINGLE);
+ HatchStyle eHatchStyle(HatchStyle::Single);
switch(rFillHatchAttributes.getStyle())
{
@@ -1132,12 +1132,12 @@ namespace drawinglayer
}
case attribute::HatchStyle::Double :
{
- eHatchStyle = HATCH_DOUBLE;
+ eHatchStyle = HatchStyle::Double;
break;
}
case attribute::HatchStyle::Triple :
{
- eHatchStyle = HATCH_TRIPLE;
+ eHatchStyle = HatchStyle::Triple;
break;
}
}
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index a6931b354d4e..dc3e8d772755 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -45,17 +45,12 @@ enum GradientStyle
GradientStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
-// to avoid conflicts with enum's declared otherwise
-#define HATCH_SINGLE HatchStyle_SINGLE
-#define HATCH_DOUBLE HatchStyle_DOUBLE
-#define HATCH_TRIPLE HatchStyle_TRIPLE
-
-enum HatchStyle
+enum class HatchStyle
{
- HATCH_SINGLE = 0,
- HATCH_DOUBLE = 1,
- HATCH_TRIPLE = 2,
- HatchStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
+ Single = 0,
+ Double = 1,
+ Triple = 2,
+ FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
enum class LineStyle
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 146eaab14b38..aad00cae4399 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -1131,13 +1131,13 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaHatchAction& rAct )
switch(rHatch.GetStyle())
{
- case HATCH_TRIPLE :
+ case HatchStyle::Triple :
{
eStyle = css::drawing::HatchStyle_TRIPLE;
break;
}
- case HATCH_DOUBLE :
+ case HatchStyle::Double :
{
eStyle = css::drawing::HatchStyle_DOUBLE;
break;
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index cc12e5df5e76..3e7975c82b7c 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -24,7 +24,7 @@
ImplHatch::ImplHatch() :
maColor ( COL_BLACK ),
- meStyle ( HATCH_SINGLE ),
+ meStyle ( HatchStyle::Single ),
mnDistance ( 1 ),
mnAngle ( 0 )
{
@@ -114,7 +114,7 @@ SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch )
{
VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
- rOStm.WriteUInt16( rHatch.mpImplHatch->meStyle );
+ rOStm.WriteUInt16( (sal_uInt16)rHatch.mpImplHatch->meStyle );
WriteColor( rOStm, rHatch.mpImplHatch->maColor );
rOStm.WriteInt32( rHatch.mpImplHatch->mnDistance ).WriteUInt16( rHatch.mpImplHatch->mnAngle );
diff --git a/vcl/source/outdev/hatch.cxx b/vcl/source/outdev/hatch.cxx
index ca8ccd1b4240..39312eabea63 100644
--- a/vcl/source/outdev/hatch.cxx
+++ b/vcl/source/outdev/hatch.cxx
@@ -184,7 +184,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch&
}
while( ( aPt1.X() <= aEndPt1.X() ) && ( aPt1.Y() <= aEndPt1.Y() ) );
- if( ( rHatch.GetStyle() == HATCH_DOUBLE ) || ( rHatch.GetStyle() == HATCH_TRIPLE ) )
+ if( ( rHatch.GetStyle() == HatchStyle::Double ) || ( rHatch.GetStyle() == HatchStyle::Triple ) )
{
// Double hatch
CalcHatchValues( aRect, nWidth, rHatch.GetAngle() + 900, aPt1, aPt2, aInc, aEndPt1 );
@@ -196,7 +196,7 @@ void OutputDevice::DrawHatch( const tools::PolyPolygon& rPolyPoly, const Hatch&
}
while( ( aPt1.X() <= aEndPt1.X() ) && ( aPt1.Y() <= aEndPt1.Y() ) );
- if( rHatch.GetStyle() == HATCH_TRIPLE )
+ if( rHatch.GetStyle() == HatchStyle::Triple )
{
// Triple hatch
CalcHatchValues( aRect, nWidth, rHatch.GetAngle() + 450, aPt1, aPt2, aInc, aEndPt1 );
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 01bbefca691d..805ef46d21ba 100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx
@@ -140,7 +140,7 @@ void setupMethodStubs( functor_vector_type& res )
const Image aImage( aBitmapEx );
const Gradient aGradient(GradientStyle_ELLIPTICAL,aBlackColor,aWhiteColor);
- const Hatch aHatch(HatchStyle_TRIPLE,aBlackColor,4,450);
+ const Hatch aHatch(HatchStyle::Triple,aBlackColor,4,450);
const Wallpaper aWallpaper( aWhiteColor );
GDIMetaFile aMtf;
generated by cgit (git 2.34.1) at 2025-02-25 03:24:52 +0000