From aa753f01ba4631614bb88ee7d3a3e6b222208b3e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 26 Mar 2013 10:18:14 +0100 Subject: -Wunused-macros Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed --- vcl/generic/fontmanager/parseAFM.cxx | 2 - vcl/generic/glyphs/graphite_serverfont.cxx | 4 -- vcl/source/control/prgsbar.cxx | 3 - vcl/source/filter/sgvmain.cxx | 3 + vcl/source/filter/sgvspln.cxx | 22 ------ vcl/source/filter/sgvtext.cxx | 20 ------ vcl/source/filter/wmf/emfwr.cxx | 67 ------------------ vcl/source/filter/wmf/wmfwr.cxx | 108 ----------------------------- vcl/source/fontsubset/ttcr.cxx | 5 -- vcl/source/gdi/jobset.cxx | 2 +- vcl/source/gdi/pngwrite.cxx | 2 - vcl/source/glyphs/graphite_layout.cxx | 4 -- vcl/source/helper/lazydelete.cxx | 5 -- vcl/source/helper/threadex.cxx | 2 - vcl/unx/generic/app/saldisp.cxx | 3 +- vcl/unx/generic/printer/ppdparser.cxx | 2 + vcl/unx/gtk/a11y/atktextattributes.cxx | 1 - vcl/unx/gtk/window/gloactiongroup.cxx | 2 - vcl/unx/kde/kdedata.cxx | 8 --- 19 files changed, 7 insertions(+), 258 deletions(-) (limited to 'vcl') diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx index e970f19fe851..c3cb145722e2 100644 --- a/vcl/generic/fontmanager/parseAFM.cxx +++ b/vcl/generic/fontmanager/parseAFM.cxx @@ -89,8 +89,6 @@ #define lineterm EOL /* line terminating character */ #define normalEOF 1 /* return code from parsing routines used only */ /* in this module */ -#define Space "space" /* used in string comparison to look for the width */ -/* of the space character to init the widths array */ #define False "false" /* used in string comparison to check the value of */ /* boolean keys (e.g. IsFixedPitch) */ diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 9678da6a52b4..903b1457f7d3 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - // Header files // diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 04f99bfd030f..000d8212c6b7 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define _SV_PRGSBAR_CXX - #include #include #include diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index a29952486095..6977ed2ca197 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -29,6 +29,8 @@ #include "sgvspln.hxx" #include +#if defined OSL_BIGENDIAN + #define SWAPPOINT(p) { \ p.x=OSL_SWAPWORD(p.x); \ p.y=OSL_SWAPWORD(p.y); } @@ -79,6 +81,7 @@ SWAPPOINT(t.ShdVers); \ SWAPAREA(t.BackF); } +#endif //////////////////////////////////////////////////////////////////////////////////////////////////// // diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx index 2449b743ce11..a648ac264a33 100644 --- a/vcl/source/filter/sgvspln.cxx +++ b/vcl/source/filter/sgvspln.cxx @@ -58,19 +58,8 @@ extern "C" { /* MACH_EPS ist die kleinste positive, auf der Maschine darstellbare Zahl x, die der Bedingung genuegt: 1.0 + x > 1.0 */ -#define EPSQUAD 4.930380657631324e-032 -#define EPSROOT 1.490116119384766e-008 - -#define POSMAX 8.98846567431158e+307 /* groesste positive Zahl */ -#define POSMIN 5.56268464626800e-309 /* kleinste positive Zahl */ #define MAXROOT 9.48075190810918e+153 -#define BASIS 2 /* Basis der Zahlendarst. */ -#ifndef PI -#define PI 3.141592653589793e+000 -#endif -#define EXP_1 2.718281828459045e+000 - #else /*------------------ sonst -----------------------*/ double exp (double); @@ -110,29 +99,18 @@ short basis() /* BASIS maschinenunabhaengig bestimmen */ #define MACH_EPS masch() -#define EPSQUAD MACH_EPS * MACH_EPS -#define EPSROOT sqrt(MACH_EPS) #define POSMAX pow ((double) BASIS, MAXEXPON) -#define POSMIN pow ((double) BASIS, MINEXPON) #define MAXROOT sqrt(POSMAX) -#define PI 4.0 * atan (1.0) -#define EXP_1 exp(1.0) - #endif /*-------------- ENDE ifdef ----------------------*/ - -#define NEGMAX -POSMIN /* groesste negative Zahl */ -#define NEGMIN -POSMAX /* kleinste negative Zahl */ - /* Definition von Funktionsmakros: */ #define abs(X) ((X) >= 0 ? (X) : -(X)) /* Absolutbetrag von X */ #define sign(X, Y) (Y < 0 ? -abs(X) : abs(X)) /* Vorzeichen von */ /* Y mal abs(X) */ -#define sqr(X) ((X) * (X)) /* Quadrat von X */ /*------------------- ENDE FILE u_const.h --------------------------*/ diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index e73c517d45af..db9bd3b68407 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -47,26 +47,13 @@ extern SgfFontLst* pSgfFonts; ///////////////////////////////////////////////////////////////////////////////// // AbsBase.Pas -// die folgenden Werte sind in % vom maximalen Schriftgrad der Zeile */ -#define UndlSpace 5 /* Untersteichungsabstand von der Baseline */ -#define UndlWidth 6 /* Untersteichungsdicke */ -#define UndlSpac2 7 /* Zwischenraum bei doppelter Unterstreichung */ -#define StrkSpace 25 /* Abstand der Durchstreichlinie von der Baseline*/ -#define StrkWidth 5 /* Durchstreichungsliniendicke */ -#define StrkSpac2 7 /* Zwischenraum bei doppelter Durchstreichung */ -#define OutlWidth 2 /* Strichstaerke ist 2% vom Schriftgrad */ - // vvv Sonderzeichen im TextBuffer vvv #define TextEnd 0 /* ^@ Ende der Zeichenkette */ #define HardSpace 6 /* ^F Hartspace (wird nicht umbrochen) ,' ' */ -#define GrafText 7 /* ^G Im Text eingebundene Grafik (future) */ -#define Tabulator 9 /* ^I Tabulatorzeichen, Pfeil */ -#define LineFeed 10 /* ^J Neue Zeile */ #define SoftTrennK 11 /* ^K Zeichen fuer k-c-Austausch bei Trennung, 'k' */ #define AbsatzEnd 13 /* ^M Neuer Absatz =CR */ #define HardTrenn 16 /* ^P Hartes Trennzeichen (wird nicht umbrochen), '-' */ #define SoftTrennAdd 19 /* ^S Zusatz-Zeichen Trennung von z.b."Schiff-fahrt" */ -#define Paragraf 21 /* ^U Zeichen welches fuer Paragraf-Zeichen */ #define Escape 27 /* ^[ Escapesequenz einleiten */ #define SoftTrenn 31 /* ^_ Weiches Trennzeichen, '-' nur Zeilenende */ #define MaxEscValLen 8 @@ -148,7 +135,6 @@ extern SgfFontLst* pSgfFonts; //============================================================================== -#define GradDiv 2 #define CharTopToBase 100 /* wegen Apostrophe und Umlaute mehr als 75% */ #define CharTopToBtm 120 /* Zeilenhoehe ist groesser als Schriftgrad */ // bei Avanti-Bold 'ue' eigentlich sogar 130% @@ -179,7 +165,6 @@ extern SgfFontLst* pSgfFonts; #define TextSh3DBit 0x0800 /* 3D-Schatten 2.0 */ #define TextSh4DBit 0x1000 /* 4D-Schatten 2.0 */ #define TextShEbBit 0x2000 /* Embossed-Schatten 2.0 */ -#define FontAtrBits (TextBoldBit | TextRSlnBit) #define THJustLeft 0x00 #define THJustCenter 0x01 @@ -187,10 +172,6 @@ extern SgfFontLst* pSgfFonts; #define THJustBlock 0x03 #define THJustDrvOut 0x04 /* Austreibend Formatiert */ #define THJustLocked 0x05 /* A l s S p e r r s c h r i f t */ -#define TVJustTop 0x00 /* Future */ -#define TVJustCenter 0x10 /* Future */ -#define TVJustBottom 0x20 /* Future */ -#define TVJustBlock 0x30 /* Future */ #define MaxCharSlant 4200 /* Maximal 42deg kursiv ! */ @@ -529,7 +510,6 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT ///////////////////////////////////////////////////////////////////////////////// // iFont.Pas -#define DefaultSlant 1500 /* Default: Italic ist 15deg */ #define SuperSubFact 60 /* SuperScript/SubScript: 60% vom Schriftgrad */ #define DefaultSpace 40 /* Default: Space ist 40% vom SchriftGrad */ diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index ae495945fac8..beed2a3b9471 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -24,111 +24,50 @@ #include #include -#define WIN_EMR_HEADER 1 -#define WIN_EMR_POLYBEZIER 2 #define WIN_EMR_POLYGON 3 #define WIN_EMR_POLYLINE 4 #define WIN_EMR_POLYBEZIERTO 5 #define WIN_EMR_POLYLINETO 6 -#define WIN_EMR_POLYPOLYLINE 7 #define WIN_EMR_POLYPOLYGON 8 #define WIN_EMR_SETWINDOWEXTEX 9 #define WIN_EMR_SETWINDOWORGEX 10 #define WIN_EMR_SETVIEWPORTEXTEX 11 #define WIN_EMR_SETVIEWPORTORGEX 12 -#define WIN_EMR_SETBRUSHORGEX 13 #define WIN_EMR_EOF 14 #define WIN_EMR_SETPIXELV 15 -#define WIN_EMR_SETMAPPERFLAGS 16 #define WIN_EMR_SETMAPMODE 17 #define WIN_EMR_SETBKMODE 18 -#define WIN_EMR_SETPOLYFILLMODE 19 #define WIN_EMR_SETROP2 20 -#define WIN_EMR_SETSTRETCHBLTMODE 21 #define WIN_EMR_SETTEXTALIGN 22 -#define WIN_EMR_SETCOLORADJUSTMENT 23 #define WIN_EMR_SETTEXTCOLOR 24 -#define WIN_EMR_SETBKCOLOR 25 -#define WIN_EMR_OFFSETCLIPRGN 26 #define WIN_EMR_MOVETOEX 27 -#define WIN_EMR_SETMETARGN 28 -#define WIN_EMR_EXCLUDECLIPRECT 29 #define WIN_EMR_INTERSECTCLIPRECT 30 -#define WIN_EMR_SCALEVIEWPORTEXTEX 31 -#define WIN_EMR_SCALEWINDOWEXTEX 32 #define WIN_EMR_SAVEDC 33 #define WIN_EMR_RESTOREDC 34 -#define WIN_EMR_SETWORLDTRANSFORM 35 -#define WIN_EMR_MODIFYWORLDTRANSFORM 36 #define WIN_EMR_SELECTOBJECT 37 #define WIN_EMR_CREATEPEN 38 #define WIN_EMR_CREATEBRUSHINDIRECT 39 #define WIN_EMR_DELETEOBJECT 40 -#define WIN_EMR_ANGLEARC 41 #define WIN_EMR_ELLIPSE 42 #define WIN_EMR_RECTANGLE 43 #define WIN_EMR_ROUNDRECT 44 -#define WIN_EMR_ARC 45 -#define WIN_EMR_CHORD 46 -#define WIN_EMR_PIE 47 -#define WIN_EMR_SELECTPALETTE 48 -#define WIN_EMR_CREATEPALETTE 49 -#define WIN_EMR_SETPALETTEENTRIES 50 -#define WIN_EMR_RESIZEPALETTE 51 -#define WIN_EMR_REALIZEPALETTE 52 -#define WIN_EMR_EXTFLOODFILL 53 #define WIN_EMR_LINETO 54 -#define WIN_EMR_ARCTO 55 -#define WIN_EMR_POLYDRAW 56 -#define WIN_EMR_SETARCDIRECTION 57 -#define WIN_EMR_SETMITERLIMIT 58 #define WIN_EMR_BEGINPATH 59 #define WIN_EMR_ENDPATH 60 #define WIN_EMR_CLOSEFIGURE 61 #define WIN_EMR_FILLPATH 62 -#define WIN_EMR_STROKEANDFILLPATH 63 #define WIN_EMR_STROKEPATH 64 -#define WIN_EMR_FLATTENPATH 65 -#define WIN_EMR_WIDENPATH 66 -#define WIN_EMR_SELECTCLIPPATH 67 -#define WIN_EMR_ABORTPATH 68 #define WIN_EMR_GDICOMMENT 70 -#define WIN_EMR_FILLRGN 71 -#define WIN_EMR_FRAMERGN 72 -#define WIN_EMR_INVERTRGN 73 -#define WIN_EMR_PAINTRGN 74 -#define WIN_EMR_EXTSELECTCLIPRGN 75 -#define WIN_EMR_BITBLT 76 -#define WIN_EMR_STRETCHBLT 77 -#define WIN_EMR_MASKBLT 78 -#define WIN_EMR_PLGBLT 79 -#define WIN_EMR_SETDIBITSTODEVICE 80 #define WIN_EMR_STRETCHDIBITS 81 #define WIN_EMR_EXTCREATEFONTINDIRECTW 82 -#define WIN_EMR_EXTTEXTOUTA 83 #define WIN_EMR_EXTTEXTOUTW 84 -#define WIN_EMR_POLYBEZIER16 85 -#define WIN_EMR_POLYGON16 86 -#define WIN_EMR_POLYLINE16 87 -#define WIN_EMR_POLYBEZIERTO16 88 -#define WIN_EMR_POLYLINETO16 89 -#define WIN_EMR_POLYPOLYLINE16 90 -#define WIN_EMR_POLYPOLYGON16 91 -#define WIN_EMR_POLYDRAW16 92 -#define WIN_EMR_CREATEMONOBRUSH 93 -#define WIN_EMR_CREATEDIBPATTERNBRUSHPT 94 -#define WIN_EMR_EXTCREATEPEN 95 -#define WIN_EMR_POLYTEXTOUTA 96 -#define WIN_EMR_POLYTEXTOUTW 97 #define WIN_SRCCOPY 0x00CC0020L #define WIN_SRCPAINT 0x00EE0086L #define WIN_SRCAND 0x008800C6L #define WIN_SRCINVERT 0x00660046L -#define WIN_EMR_COMMENT_EMFSPOOL 0x00000000L #define WIN_EMR_COMMENT_EMFPLUS 0x2B464D45L -#define WIN_EMR_COMMENT_PUBLIC 0x43494447L #define HANDLE_INVALID 0xffffffff #define MAXHANDLES 65000 @@ -138,18 +77,12 @@ #define TEXT_SELECT 0x00000004 /* Text Alignment Options */ -#define TA_NOUPDATECP 0 -#define TA_UPDATECP 1 - -#define TA_LEFT 0 #define TA_RIGHT 2 -#define TA_CENTER 6 #define TA_TOP 0 #define TA_BOTTOM 8 #define TA_BASELINE 24 #define TA_RTLREADING 256 -#define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING) #define MM_ANISOTROPIC 8 diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index c9baef6b36f5..4f10ee17828e 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -34,110 +34,48 @@ //====================== 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 #define W_TRANSPARENT 1 #define W_OPAQUE 2 -#define W_R2_BLACK 1 -#define W_R2_NOTMERGEPEN 2 -#define W_R2_MASKNOTPEN 3 -#define W_R2_NOTCOPYPEN 4 -#define W_R2_MASKPENNOT 5 #define W_R2_NOT 6 #define W_R2_XORPEN 7 -#define W_R2_NOTMASKPEN 8 -#define W_R2_MASKPEN 9 -#define W_R2_NOTXORPEN 10 -#define W_R2_NOP 11 -#define W_R2_MERGENOTPEN 12 #define W_R2_COPYPEN 13 -#define W_R2_MERGEPENNOT 14 -#define W_R2_MERGEPEN 15 -#define W_R2_WHITE 16 #define W_TA_NOUPDATECP 0x0000 -#define W_TA_UPDATECP 0x0001 #define W_TA_LEFT 0x0000 #define W_TA_RIGHT 0x0002 -#define W_TA_CENTER 0x0006 #define W_TA_TOP 0x0000 #define W_TA_BOTTOM 0x0008 #define W_TA_BASELINE 0x0018 @@ -147,17 +85,7 @@ #define W_SRCPAINT 0x00EE0086L #define W_SRCAND 0x008800C6L #define W_SRCINVERT 0x00660046L -#define W_SRCERASE 0x00440328L -#define W_NOTSRCCOPY 0x00330008L -#define W_NOTSRCERASE 0x001100A6L -#define W_MERGECOPY 0x00C000CAL -#define W_MERGEPAINT 0x00BB0226L -#define W_PATCOPY 0x00F00021L -#define W_PATPAINT 0x00FB0A09L -#define W_PATINVERT 0x005A0049L #define W_DSTINVERT 0x00550009L -#define W_BLACKNESS 0x00000042L -#define W_WHITENESS 0x00FF0062L #define W_PS_SOLID 0 #define W_PS_DASH 1 @@ -165,30 +93,10 @@ #define W_PS_DASHDOT 3 #define W_PS_DASHDOTDOT 4 #define W_PS_NULL 5 -#define W_PS_INSIDEFRAME 6 #define W_LF_FACESIZE 32 #define W_ANSI_CHARSET 0 -#define W_DEFAULT_CHARSET 1 -#define W_SYMBOL_CHARSET 2 -#define W_SHIFTJIS_CHARSET 128 -#define W_HANGEUL_CHARSET 129 -#define W_GB2312_CHARSET 134 -#define W_CHINESEBIG5_CHARSET 136 -#define W_OEM_CHARSET 255 -/*WINVER >= 0x0400*/ -#define W_JOHAB_CHARSET 130 -#define W_HEBREW_CHARSET 177 -#define W_ARABIC_CHARSET 178 -#define W_GREEK_CHARSET 161 -#define W_TURKISH_CHARSET 162 -#define W_VIETNAMESE_CHARSET 163 -#define W_THAI_CHARSET 222 -#define W_EASTEUROPE_CHARSET 238 -#define W_RUSSIAN_CHARSET 204 -#define W_MAC_CHARSET 77 -#define W_BALTIC_CHARSET 186 #define W_DEFAULT_PITCH 0x00 #define W_FIXED_PITCH 0x01 @@ -203,33 +111,17 @@ #define W_FW_DONTCARE 0 #define W_FW_THIN 100 -#define W_FW_EXTRALIGHT 200 #define W_FW_LIGHT 300 #define W_FW_NORMAL 400 #define W_FW_MEDIUM 500 #define W_FW_SEMIBOLD 600 #define W_FW_BOLD 700 -#define W_FW_EXTRABOLD 800 -#define W_FW_HEAVY 900 #define W_FW_ULTRALIGHT 200 -#define W_FW_REGULAR 400 -#define W_FW_DEMIBOLD 600 #define W_FW_ULTRABOLD 800 #define W_FW_BLACK 900 #define W_BS_SOLID 0 #define W_BS_HOLLOW 1 -#define W_BS_HATCHED 2 -#define W_BS_PATTERN 3 -#define W_BS_INDEXED 4 -#define W_BS_DIBPATTERN 5 - -#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 W_MFCOMMENT 15 diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx index d4ada5421213..2e069c382745 100644 --- a/vcl/source/fontsubset/ttcr.cxx +++ b/vcl/source/fontsubset/ttcr.cxx @@ -58,12 +58,7 @@ namespace vcl #define T_hhea 0x68686561 #define T_hmtx 0x686D7478 #define T_cmap 0x636D6170 -#define T_vhea 0x76686561 -#define T_vmtx 0x766D7478 -#define T_OS2 0x4F532F32 #define T_post 0x706F7374 -#define T_kern 0x6B65726E -#define T_cvt 0x63767420 typedef struct { sal_uInt32 tag; diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx index dd72bf874cdd..9b9b960c5cba 100644 --- a/vcl/source/gdi/jobset.cxx +++ b/vcl/source/gdi/jobset.cxx @@ -27,7 +27,6 @@ DBG_NAME( JobSetup ) -#define JOBSET_FILEFORMAT2 3780 #define JOBSET_FILE364_SYSTEM ((sal_uInt16)0xFFFF) #define JOBSET_FILE605_SYSTEM ((sal_uInt16)0xFFFE) @@ -326,6 +325,7 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ) DBG_ASSERTWARNING( rOStream.GetVersion(), "JobSetup::<< - Solar-Version not set on rOStream" ); // We do not have a new FileFormat at this point in time + // #define JOBSET_FILEFORMAT2 3780 // if ( rOStream.GetVersion() < JOBSET_FILEFORMAT2 ) { sal_uInt16 nLen = 0; diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 8d204efd5445..8d9a9929ba56 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -37,8 +37,6 @@ #define PNGCHUNK_PLTE 0x504c5445 #define PNGCHUNK_IDAT 0x49444154 #define PNGCHUNK_IEND 0x49454e44 -#define PNGCHUNK_bKGD 0x624b4744 -#define PNGCHUNK_gAMA 0x67414d41 #define PNGCHUNK_pHYs 0x70485973 #define PNGCHUNK_tRNS 0x74524e53 diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 6bebcf260273..8b19c31eeec7 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -20,10 +20,6 @@ // Description: An implementation of the SalLayout interface that uses the // Graphite engine. - -// We need this to enable namespace support in libgrengine headers. -#define GR_NAMESPACE - // Enable lots of debug info #if OSL_DEBUG_LEVEL > 1 #include diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index c89a9f02a2ff..df4e93d91bac 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -17,9 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef LAZYDELETE_CXX -#define LAZYDELETE_CXX - #include "vcl/window.hxx" #include "vcl/menu.hxx" #include "vcl/lazydelete.hxx" @@ -113,6 +110,4 @@ void DeleteOnDeinitBase::ImplDeleteOnDeInit() } // namespace vcl -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx index 2f32c78d467e..85fe63c1736f 100644 --- a/vcl/source/helper/threadex.cxx +++ b/vcl/source/helper/threadex.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#define THREADEX_IMPLEMENTATION #include #include diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 87b48468eccd..0662899dba6e 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -863,7 +863,6 @@ rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const break; #if !defined (SunXK_Undo) - #define SunXK_Stop 0x0000FF69 // XK_Cancel #define SunXK_Props 0x1005FF70 #define SunXK_Front 0x1005FF71 #define SunXK_Copy 0x1005FF72 @@ -1116,7 +1115,7 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const break; // - - - - - Sun X-Server keyboard ??? - - - - - - - - - - - - case XK_L1: // XK_F11: - nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop, + nKey = KEY_F11; // on a sun keyboard this actually is usally SunXK_Stop = 0x0000FF69 (XK_Cancel), // but VCL doesn't have a key defintion for that break; case XK_L2: // XK_F12: diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 1e621f18c2ae..de65253f3f2a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -264,7 +264,9 @@ using ::rtl::OUString; using ::rtl::OStringBuffer; using ::rtl::OUStringHash; +#if OSL_DEBUG_LEVEL > 2 #define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() ) +#endif namespace { diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index afc609a3bc7f..23738f9009b9 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -161,7 +161,6 @@ get_value( const uno::Sequence< beans::PropertyValue >& rAttributeList, } #define get_bool_value( list, index ) get_value( list, index, Bool2String ) -#define get_short_value( list, index ) get_value( list, index, Short2String ) #define get_height_value( list, index ) get_value( list, index, Float2String ) #define get_justification_value( list, index ) get_value( list, index, Adjust2Justification ) #define get_cmm_value( list, index ) get_value( list, index, CMM2UnitString ) diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index b7fd592cef3e..f2effd7fccc8 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -23,8 +23,6 @@ #define G_TYPE_LO_ACTION (g_lo_action_get_type ()) #define G_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_LO_ACTION, GLOAction)) -#define G_IS_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ - G_TYPE_LO_ACTION)) struct _GLOAction { diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx index 5151350b72e2..4eb00ffe25be 100644 --- a/vcl/unx/kde/kdedata.cxx +++ b/vcl/unx/kde/kdedata.cxx @@ -46,14 +46,6 @@ #include -#if ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "TDE" -#define THIS_DESKENV_NAME_LOW "tde" -#else // ENABLE_TDE -#define THIS_DESKENV_NAME_CAP "KDE" -#define THIS_DESKENV_NAME_LOW "kde" -#endif // ENABLE_TDE - /* #i59042# override KApplications method for session management * since it will interfere badly with our own. */ -- cgit