diff options
author | Noel Grandin <noel@peralex.com> | 2014-12-23 09:47:48 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-08 10:39:36 +0200 |
commit | 45ec1d9b56cec41596f806ebf845ebfcd30c9f46 (patch) | |
tree | e368da6d3ae2c8a5c8e214b99dd0f95861d0fc78 /vcl | |
parent | 0748a5f8298e2ea817e131234f5e99300ed7f9f7 (diff) |
brute-force find-and-remove of unused #define constants.
Change-Id: I7223530ae37297a76654cd00cc1fedb56dbe3adb
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/cvtsvm.hxx | 3 | ||||
-rw-r--r-- | vcl/inc/jobset.h | 3 | ||||
-rw-r--r-- | vcl/inc/osx/salnativewidgets.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/win/saldata.hxx | 5 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/transupp.h | 1 | ||||
-rw-r--r-- | vcl/source/filter/sgfbram.hxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.hxx | 1 | ||||
-rw-r--r-- | vcl/source/filter/wmf/winmtf.hxx | 46 |
9 files changed, 0 insertions, 67 deletions
diff --git a/vcl/inc/cvtsvm.hxx b/vcl/inc/cvtsvm.hxx index 5c5e006fdfa1..5f2b69933c68 100644 --- a/vcl/inc/cvtsvm.hxx +++ b/vcl/inc/cvtsvm.hxx @@ -43,12 +43,10 @@ #define GDI_TEXT_ACTION 13 #define GDI_TEXTARRAY_ACTION 14 #define GDI_STRETCHTEXT_ACTION 15 -#define GDI_ICON_ACTION 16 #define GDI_BITMAP_ACTION 17 #define GDI_BITMAPSCALE_ACTION 18 #define GDI_PEN_ACTION 19 #define GDI_FONT_ACTION 20 -#define GDI_BACKBRUSH_ACTION 21 #define GDI_FILLBRUSH_ACTION 22 #define GDI_MAPMODE_ACTION 23 #define GDI_CLIPREGION_ACTION 24 @@ -57,7 +55,6 @@ #define GDI_POP_ACTION 27 #define GDI_MOVECLIPREGION_ACTION 28 #define GDI_ISECTCLIPREGION_ACTION 29 -#define GDI_MTF_ACTION 30 #define GDI_BITMAPSCALEPART_ACTION 32 #define GDI_GRADIENT_ACTION 33 diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index e1ba5bbe629e..9ce9c5cbc899 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -25,12 +25,9 @@ #include <unordered_map> // see com.sun.star.portal.client.JobSetupSystem.idl: -#define JOBSETUP_SYSTEM_DONTKNOW 0 #define JOBSETUP_SYSTEM_WINDOWS 1 -#define JOBSETUP_SYSTEM_OS2 2 #define JOBSETUP_SYSTEM_UNIX 3 #define JOBSETUP_SYSTEM_MAC 4 -#define JOBSETUP_SYSTEM_JAVA 5 struct ImplJobSetup { diff --git a/vcl/inc/osx/salnativewidgets.h b/vcl/inc/osx/salnativewidgets.h index 2a987627e82a..1ba697afafa2 100644 --- a/vcl/inc/osx/salnativewidgets.h +++ b/vcl/inc/osx/salnativewidgets.h @@ -27,8 +27,6 @@ //standard height of the AHIG //tabs #define TAB_HEIGHT_NORMAL 20 -#define TAB_HEIGHT_SMALL 17 -#define TAB_HEIGHT_MINI 15 #define TAB_TEXT_OFFSET 12 #define VCL_TAB_TEXT_OFFSET 2 diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2eca3a3c269f..358a77946e9a 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -56,9 +56,7 @@ namespace vcl_sal { class WMAdaptor; } // dither brush each time #define PROPERTY_BUG_FillPolygon_Tile 0x00010000 // always Toggle Fillstyle #define PROPERTY_BUG_DrawLine 0x00020000 // a DrawLine is one point to short -#define PROPERTY_BUG_Bitmap_Bit_Order 0x00100000 -#define PROPERTY_FEATURE_SharedMemory 0x02000000 #define PROPERTY_FEATURE_TrustedSolaris 0x04000000 #define PROPERTY_DEFAULT 0x00000FCB diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 2c0731eaa623..c850c7eb799a 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -201,18 +201,13 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 ); #define SAL_FRAME_WNDEXTRA sizeof( DWORD ) #define SAL_FRAME_THIS 0 -#define SAL_FRAME_CLASSNAMEA "SALFRAME" #define SAL_FRAME_CLASSNAMEW L"SALFRAME" -#define SAL_SUBFRAME_CLASSNAMEA "SALSUBFRAME" #define SAL_SUBFRAME_CLASSNAMEW L"SALSUBFRAME" #define SAL_TMPSUBFRAME_CLASSNAMEW L"SALTMPSUBFRAME" #define SAL_OBJECT_WNDEXTRA sizeof( DWORD ) #define SAL_OBJECT_THIS 0 #define SAL_OBJECT_CLASSNAMEA "SALOBJECT" -#define SAL_OBJECT_CLASSNAMEW L"SALOBJECT" #define SAL_OBJECT_CHILDCLASSNAMEA "SALOBJECTCHILD" -#define SAL_OBJECT_CHILDCLASSNAMEW L"SALOBJECTCHILD" -#define SAL_COM_CLASSNAMEA "SALCOMWND" #define SAL_COM_CLASSNAMEW L"SALCOMWND" #define SAL_MOUSELEAVE_TIMEOUT 300 diff --git a/vcl/source/filter/jpeg/transupp.h b/vcl/source/filter/jpeg/transupp.h index 4dbbc2ae9bc6..d556228691a6 100644 --- a/vcl/source/filter/jpeg/transupp.h +++ b/vcl/source/filter/jpeg/transupp.h @@ -205,7 +205,6 @@ typedef enum { JCOPYOPT_ALL /* copy all optional markers */ } JCOPY_OPTION; -#define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */ /* Setup decompression object to save desired markers in memory */ EXTERN(void) jcopy_markers_setup diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx index 501b2f26b635..9e0eeedcd7c3 100644 --- a/vcl/source/filter/sgfbram.hxx +++ b/vcl/source/filter/sgfbram.hxx @@ -27,12 +27,8 @@ #define SgfSimpVect 2 /* Simple vectorformat */ #define SgfPostScrp 3 /* Postscript file */ #define SgfStarDraw 7 /* StarDraw SGV-file */ -#define SgfDontKnow 255 /* Unknown or no SGF/SGV */ // constants for SgfHeader.SwGrCol -#define SgfBlckWhit 1 /* black/white image SimpVector, */ -#define SgfGrayscal 2 /* image with greyscale StarDraw and */ -#define Sgf16Colors 3 /* colour image (16 colours) Bit Image */ #define SgfVectFarb 4 /* use colours in lines */ #define SgfVectGray 5 /* use greyscale for lines only for */ #define SgfVectWdth 6 /* use line widths for lines SimpVector */ diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 7958ec8c340b..521a21a100f7 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -268,7 +268,6 @@ public: }; #define TextOutlBit 0x01 /* 1=Sourcecode for outliner (ignored byDrawObjekt()) */ #define TextFitSBit 0x02 /* Bit1: 1=Text-Fit2Size, also outliner (2.0) */ -#define TextDrftBit 0x04 /* Bit2: 1=DraftDraw (2.0) */ #define TextFitZBit 0x08 /* Bit3: 1=Fit2Size line by line (2.0) */ #define TextFitBits (TextFitSBit | TextFitZBit) diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 8eae6155977c..7d96353f92c1 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -31,7 +31,6 @@ #define ERROR 0 #define NULLREGION 1 -#define SIMPLEREGION 2 #define COMPLEXREGION 3 #define RGN_AND 1 @@ -63,34 +62,19 @@ enum class BkMode #define DKGRAY_BRUSH 3 #define BLACK_BRUSH 4 #define NULL_BRUSH 5 -#define HOLLOW_BRUSH NULL_BRUSH #define WHITE_PEN 6 #define BLACK_PEN 7 #define NULL_PEN 8 -#define OEM_FIXED_FONT 10 #define ANSI_FIXED_FONT 11 #define ANSI_VAR_FONT 12 -#define SYSTEM_FONT 13 -#define DEVICE_DEFAULT_FONT 14 -#define DEFAULT_PALETTE 15 #define SYSTEM_FIXED_FONT 16 #define R2_BLACK 1 -#define R2_NOTMERGEPEN 2 #define R2_MASKNOTPEN 3 -#define R2_NOTCOPYPEN 4 -#define R2_MASKPENNOT 5 #define R2_NOT 6 #define R2_XORPEN 7 -#define R2_NOTMASKPEN 8 -#define R2_MASKPEN 9 -#define R2_NOTXORPEN 10 #define R2_NOP 11 -#define R2_MERGENOTPEN 12 #define R2_COPYPEN 13 -#define R2_MERGEPENNOT 14 -#define R2_MERGEPEN 15 -#define R2_WHITE 16 /* Mapping modes */ #define MM_TEXT 1 @@ -105,18 +89,15 @@ enum class BkMode /* Graphics modes */ #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 -#define GM_LAST 2 /* StretchBlt() modes */ #define BLACKONWHITE 1 #define WHITEONBLACK 2 #define COLORONCOLOR 3 #define HALFTONE 4 -#define MAXSTRETCHBLTMODE 4 #define STRETCH_ANDSCANS BLACKONWHITE #define STRETCH_ORSCANS WHITEONBLACK #define STRETCH_DELETESCANS COLORONCOLOR -#define STRETCH_HALFTONE HALFTONE #define LF_FACESIZE 32 @@ -154,14 +135,8 @@ struct WMF_EXTERNALHEADER; #define SRCAND 0x008800C6L #define SRCINVERT 0x00660046L #define SRCERASE 0x00440328L -#define NOTSRCCOPY 0x00330008L -#define NOTSRCERASE 0x001100A6L -#define MERGECOPY 0x00C000CAL -#define MERGEPAINT 0x00BB0226L #define PATCOPY 0x00F00021L -#define PATPAINT 0x00FB0A09L #define PATINVERT 0x005A0049L -#define DSTINVERT 0x00550009L #define BLACKNESS 0x00000042L #define WHITENESS 0x00FF0062L @@ -172,23 +147,16 @@ struct WMF_EXTERNALHEADER; #define PS_DASHDOTDOT 4 #define PS_NULL 5 #define PS_INSIDEFRAME 6 -#define PS_USERSTYLE 7 -#define PS_ALTERNATE 8 #define PS_STYLE_MASK 15 #define PS_ENDCAP_ROUND 0x000 #define PS_ENDCAP_SQUARE 0x100 #define PS_ENDCAP_FLAT 0x200 -#define PS_ENDCAP_MASK 0xF00 #define PS_JOIN_ROUND 0x0000 #define PS_JOIN_BEVEL 0x1000 #define PS_JOIN_MITER 0x2000 -#define PS_JOIN_MASK 0xF000 -#define PS_COSMETIC 0x00000 -#define PS_GEOMETRIC 0x10000 -#define PS_TYPE_MASK 0xF0000 #define ANSI_CHARSET 0 #define DEFAULT_CHARSET 1 @@ -211,14 +179,10 @@ struct WMF_EXTERNALHEADER; #define MAC_CHARSET 77 #define BALTIC_CHARSET 186 -#define ETO_OPAQUE 0x0002 #define ETO_CLIPPED 0x0004 /*WINVER >= 0x0400*/ #define ETO_GLYPH_INDEX 0x0010 #define ETO_RTLREADING 0x0080 -#define ETO_NUMERICSLOCAL 0x0400 -#define ETO_NUMERICSLATIN 0x0800 -#define ETO_IGNORELANGUAGE 0x1000 /*_WIN32_WINNT >= 0x0500*/ #define ETO_PDY 0x2000 @@ -234,7 +198,6 @@ struct WMF_EXTERNALHEADER; #define FF_SCRIPT 0x40 #define FF_DECORATIVE 0x50 -#define FW_DONTCARE 0 #define FW_THIN 100 #define FW_EXTRALIGHT 200 #define FW_LIGHT 300 @@ -243,10 +206,7 @@ struct WMF_EXTERNALHEADER; #define FW_SEMIBOLD 600 #define FW_BOLD 700 #define FW_EXTRABOLD 800 -#define FW_HEAVY 900 #define FW_ULTRALIGHT 200 -#define FW_REGULAR 400 -#define FW_DEMIBOLD 600 #define FW_ULTRABOLD 800 #define FW_BLACK 900 @@ -262,12 +222,6 @@ struct WMF_EXTERNALHEADER; #define BS_DIBPATTERN8X8 8 #define BS_MONOPATTERN 9 -#define W_HS_HORIZONTAL 0 -#define W_HS_VERTICAL 1 -#define W_HS_FDIAGONAL 2 -#define W_HS_BDIAGONAL 3 -#define W_HS_CROSS 4 -#define W_HS_DIAGCROSS 5 #define RDH_RECTANGLES 1 |