emfio/source/reader/wmfreader.cxx | 163 +++++++++++++++++++-------------------
1 file changed, 83 insertions(+), 80 deletions(-)
New commits:
commit 6e7f06c297b3bd7f57797158c55ed0e11fe14317
Author: Hossein <hoss...@libreoffice.org>
AuthorDate: Sun Nov 21 17:58:03 2021 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Mon Nov 22 07:06:51 2021 +0100
Convert #define to enum
* Converted multiple symbolic constants using #define in wmfreader.cxx
to enum
Change-Id: Ie55f27414c230cd624cacb805897933707244ed6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122734
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/emfio/source/reader/wmfreader.cxx
b/emfio/source/reader/wmfreader.cxx
index 41f7564c1295..eeb6e106cf00 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -39,88 +39,91 @@
#include <vcl/BitmapTools.hxx>
#include <osl/thread.h>
-// MS Windows defines
-#define W_META_SETBKCOLOR 0x0201
-#define W_META_SETBKMODE 0x0102
-#define W_META_SETMAPMODE 0x0103
-#define W_META_SETROP2 0x0104
-#define W_META_SETRELABS 0x0105
-#define W_META_SETPOLYFILLMODE 0x0106
-#define W_META_SETSTRETCHBLTMODE 0x0107
-#define W_META_SETTEXTCHAREXTRA 0x0108
-#define W_META_SETTEXTCOLOR 0x0209
-#define W_META_SETTEXTJUSTIFICATION 0x020A
-#define W_META_SETWINDOWORG 0x020B
-#define W_META_SETWINDOWEXT 0x020C
-#define W_META_SETVIEWPORTORG 0x020D
-#define W_META_SETVIEWPORTEXT 0x020E
-#define W_META_OFFSETWINDOWORG 0x020F
-#define W_META_SCALEWINDOWEXT 0x0410
-#define W_META_OFFSETVIEWPORTORG 0x0211
-#define W_META_SCALEVIEWPORTEXT 0x0412
-#define W_META_LINETO 0x0213
-#define W_META_MOVETO 0x0214
-#define W_META_EXCLUDECLIPRECT 0x0415
-#define W_META_INTERSECTCLIPRECT 0x0416
-#define W_META_ARC 0x0817
-#define W_META_ELLIPSE 0x0418
-#define W_META_FLOODFILL 0x0419
-#define W_META_PIE 0x081A
-#define W_META_RECTANGLE 0x041B
-#define W_META_ROUNDRECT 0x061C
-#define W_META_PATBLT 0x061D
-#define W_META_SAVEDC 0x001E
-#define W_META_SETPIXEL 0x041F
-#define W_META_OFFSETCLIPRGN 0x0220
-#define W_META_TEXTOUT 0x0521
-#define W_META_BITBLT 0x0922
-#define W_META_STRETCHBLT 0x0B23
-#define W_META_POLYGON 0x0324
-#define W_META_POLYLINE 0x0325
-#define W_META_ESCAPE 0x0626
-#define W_META_RESTOREDC 0x0127
-#define W_META_FILLREGION 0x0228
-#define W_META_FRAMEREGION 0x0429
-#define W_META_INVERTREGION 0x012A
-#define W_META_PAINTREGION 0x012B
-#define W_META_SELECTCLIPREGION 0x012C
-#define W_META_SELECTOBJECT 0x012D
-#define W_META_SETTEXTALIGN 0x012E
-#define W_META_DRAWTEXT 0x062F
-#define W_META_CHORD 0x0830
-#define W_META_SETMAPPERFLAGS 0x0231
-#define W_META_EXTTEXTOUT 0x0a32
-#define W_META_SETDIBTODEV 0x0d33
-#define W_META_SELECTPALETTE 0x0234
-#define W_META_REALIZEPALETTE 0x0035
-#define W_META_ANIMATEPALETTE 0x0436
-#define W_META_SETPALENTRIES 0x0037
-#define W_META_POLYPOLYGON 0x0538
-#define W_META_RESIZEPALETTE 0x0139
-#define W_META_DIBBITBLT 0x0940
-#define W_META_DIBSTRETCHBLT 0x0b41
-#define W_META_DIBCREATEPATTERNBRUSH 0x0142
-#define W_META_STRETCHDIB 0x0f43
-#define W_META_EXTFLOODFILL 0x0548
-#define W_META_RESETDC 0x014C
-#define W_META_STARTDOC 0x014D
-#define W_META_STARTPAGE 0x004F
-#define W_META_ENDPAGE 0x0050
-#define W_META_ABORTDOC 0x0052
-#define W_META_ENDDOC 0x005E
-#define W_META_DELETEOBJECT 0x01f0
-#define W_META_CREATEPALETTE 0x00f7
-#define W_META_CREATEBRUSH 0x00F8
-#define W_META_CREATEPATTERNBRUSH 0x01F9
-#define W_META_CREATEPENINDIRECT 0x02FA
-#define W_META_CREATEFONTINDIRECT 0x02FB
-#define W_META_CREATEBRUSHINDIRECT 0x02FC
-#define W_META_CREATEBITMAPINDIRECT 0x02FD
-#define W_META_CREATEBITMAP 0x06FE
-#define W_META_CREATEREGION 0x06FF
-
namespace
{
+ // MS Windows defines
+ enum WMFRecords
+ {
+ W_META_SETBKCOLOR = 0x0201,
+ W_META_SETBKMODE = 0x0102,
+ W_META_SETMAPMODE = 0x0103,
+ W_META_SETROP2 = 0x0104,
+ W_META_SETRELABS = 0x0105,
+ W_META_SETPOLYFILLMODE = 0x0106,
+ W_META_SETSTRETCHBLTMODE = 0x0107,
+ W_META_SETTEXTCHAREXTRA = 0x0108,
+ W_META_SETTEXTCOLOR = 0x0209,
+ W_META_SETTEXTJUSTIFICATION = 0x020A,
+ W_META_SETWINDOWORG = 0x020B,
+ W_META_SETWINDOWEXT = 0x020C,
+ W_META_SETVIEWPORTORG = 0x020D,
+ W_META_SETVIEWPORTEXT = 0x020E,
+ W_META_OFFSETWINDOWORG = 0x020F,
+ W_META_SCALEWINDOWEXT = 0x0410,
+ W_META_OFFSETVIEWPORTORG = 0x0211,
+ W_META_SCALEVIEWPORTEXT = 0x0412,
+ W_META_LINETO = 0x0213,
+ W_META_MOVETO = 0x0214,
+ W_META_EXCLUDECLIPRECT = 0x0415,
+ W_META_INTERSECTCLIPRECT = 0x0416,
+ W_META_ARC = 0x0817,
+ W_META_ELLIPSE = 0x0418,
+ W_META_FLOODFILL = 0x0419,
+ W_META_PIE = 0x081A,
+ W_META_RECTANGLE = 0x041B,
+ W_META_ROUNDRECT = 0x061C,
+ W_META_PATBLT = 0x061D,
+ W_META_SAVEDC = 0x001E,
+ W_META_SETPIXEL = 0x041F,
+ W_META_OFFSETCLIPRGN = 0x0220,
+ W_META_TEXTOUT = 0x0521,
+ W_META_BITBLT = 0x0922,
+ W_META_STRETCHBLT = 0x0B23,
+ W_META_POLYGON = 0x0324,
+ W_META_POLYLINE = 0x0325,
+ W_META_ESCAPE = 0x0626,
+ W_META_RESTOREDC = 0x0127,
+ W_META_FILLREGION = 0x0228,
+ W_META_FRAMEREGION = 0x0429,
+ W_META_INVERTREGION = 0x012A,
+ W_META_PAINTREGION = 0x012B,
+ W_META_SELECTCLIPREGION = 0x012C,
+ W_META_SELECTOBJECT = 0x012D,
+ W_META_SETTEXTALIGN = 0x012E,
+ W_META_DRAWTEXT = 0x062F,
+ W_META_CHORD = 0x0830,
+ W_META_SETMAPPERFLAGS = 0x0231,
+ W_META_EXTTEXTOUT = 0x0a32,
+ W_META_SETDIBTODEV = 0x0d33,
+ W_META_SELECTPALETTE = 0x0234,
+ W_META_REALIZEPALETTE = 0x0035,
+ W_META_ANIMATEPALETTE = 0x0436,
+ W_META_SETPALENTRIES = 0x0037,
+ W_META_POLYPOLYGON = 0x0538,
+ W_META_RESIZEPALETTE = 0x0139,
+ W_META_DIBBITBLT = 0x0940,
+ W_META_DIBSTRETCHBLT = 0x0b41,
+ W_META_DIBCREATEPATTERNBRUSH = 0x0142,
+ W_META_STRETCHDIB = 0x0f43,
+ W_META_EXTFLOODFILL = 0x0548,
+ W_META_RESETDC = 0x014C,
+ W_META_STARTDOC = 0x014D,
+ W_META_STARTPAGE = 0x004F,
+ W_META_ENDPAGE = 0x0050,
+ W_META_ABORTDOC = 0x0052,
+ W_META_ENDDOC = 0x005E,
+ W_META_DELETEOBJECT = 0x01f0,
+ W_META_CREATEPALETTE = 0x00f7,
+ W_META_CREATEBRUSH = 0x00F8,
+ W_META_CREATEPATTERNBRUSH = 0x01F9,
+ W_META_CREATEPENINDIRECT = 0x02FA,
+ W_META_CREATEFONTINDIRECT = 0x02FB,
+ W_META_CREATEBRUSHINDIRECT = 0x02FC,
+ W_META_CREATEBITMAPINDIRECT = 0x02FD,
+ W_META_CREATEBITMAP = 0x06FE,
+ W_META_CREATEREGION = 0x06FF
+ };
+
void GetWinExtMax(const Point& rSource, tools::Rectangle& rPlaceableBound,
const sal_Int16 nMapMode)
{
Point aSource(rSource);
