[Libreoffice-commits] core.git: include/tools

[Stephan Bergmann]

 include/tools/fontenum.hxx |   38 --------------------------------------
 include/tools/poly.hxx     |    3 ---
 2 files changed, 41 deletions(-)

New commits:
commit da260fbb18ee9debd776468a8b8c4437dee420bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 10 07:57:53 2015 +0200

    Remove unused "#ifndef ENUM_*_DECLARED" wrapping
    
    Change-Id: I6f207a1692e4fcd2fbecd0420f5ed798e4504667

diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx
index be64956..ffdc26a 100644
--- a/include/tools/fontenum.hxx
+++ b/include/tools/fontenum.hxx
@@ -21,46 +21,26 @@
 
 #include <sal/types.h>
 
-#ifndef ENUM_FONTFAMILY_DECLARED
-#define ENUM_FONTFAMILY_DECLARED
 enum FontFamily { FAMILY_DONTKNOW, FAMILY_DECORATIVE, FAMILY_MODERN,
                   FAMILY_ROMAN, FAMILY_SCRIPT, FAMILY_SWISS, FAMILY_SYSTEM, FontFamily_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTPITCH_DECLARED
-#define ENUM_FONTPITCH_DECLARED
 enum FontPitch { PITCH_DONTKNOW, PITCH_FIXED, PITCH_VARIABLE, FontPitch_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_TEXTALIGN_DECLARED
-#define ENUM_TEXTALIGN_DECLARED
 enum TextAlign { ALIGN_TOP, ALIGN_BASELINE, ALIGN_BOTTOM, TextAlign_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTWEIGHT_DECLARED
-#define ENUM_FONTWEIGHT_DECLARED
 enum FontWeight { WEIGHT_DONTKNOW, WEIGHT_THIN, WEIGHT_ULTRALIGHT,
                   WEIGHT_LIGHT, WEIGHT_SEMILIGHT, WEIGHT_NORMAL,
                   WEIGHT_MEDIUM, WEIGHT_SEMIBOLD, WEIGHT_BOLD,
                   WEIGHT_ULTRABOLD, WEIGHT_BLACK, FontWeight_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTWIDTH_DECLARED
-#define ENUM_FONTWIDTH_DECLARED
 enum FontWidth { WIDTH_DONTKNOW, WIDTH_ULTRA_CONDENSED, WIDTH_EXTRA_CONDENSED,
                  WIDTH_CONDENSED, WIDTH_SEMI_CONDENSED, WIDTH_NORMAL,
                  WIDTH_SEMI_EXPANDED, WIDTH_EXPANDED, WIDTH_EXTRA_EXPANDED,
                  WIDTH_ULTRA_EXPANDED,
                  FontWidth_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTITALIC_DECLARED
-#define ENUM_FONTITALIC_DECLARED
 enum FontItalic { ITALIC_NONE, ITALIC_OBLIQUE, ITALIC_NORMAL, ITALIC_DONTKNOW, FontItalic_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTUNDERLINE_DECLARED
-#define ENUM_FONTUNDERLINE_DECLARED
 enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
                      UNDERLINE_DOTTED, UNDERLINE_DONTKNOW,
                      UNDERLINE_DASH, UNDERLINE_LONGDASH,
@@ -72,18 +52,11 @@ enum FontUnderline { UNDERLINE_NONE, UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
                      UNDERLINE_BOLDDASHDOT, UNDERLINE_BOLDDASHDOTDOT,
                      UNDERLINE_BOLDWAVE,
                      FontUnderline_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTSTRIKEOUT_DECLARED
-#define ENUM_FONTSTRIKEOUT_DECLARED
 enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE,
                      STRIKEOUT_DONTKNOW, STRIKEOUT_BOLD,
                      STRIKEOUT_SLASH, STRIKEOUT_X,
                      FontStrikeout_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
-
-#ifndef ENUM_FONTEMPHASISMARK_DECLARED
-#define ENUM_FONTEMPHASISMARK_DECLARED
 
 typedef sal_uInt16 FontEmphasisMark;
 #define EMPHASISMARK_NONE           ((FontEmphasisMark)0x0000)
@@ -101,23 +74,12 @@ typedef sal_uInt16 FontEmphasisMark;
 #define EMPHASISMARK_SIDE_DOTS      (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE)
 #define EMPHASISMARK_CIRCLE_ABOVE   (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE)
 
-#endif
-
-#ifndef ENUM_FONTTYPE_DECLARED
-#define ENUM_FONTTYPE_DECLARED
 enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE,
                 FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-#endif
 
-#ifndef ENUM_FONTEMBEDDEDBITMAP_DECLARED
-#define ENUM_FONTEMBEDDEDBITMAP_DECLARED
 enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE };
-#endif
 
-#ifndef ENUM_FONTANTIALIAS_DECLARED
-#define ENUM_FONTANTIALIAS_DECLARED
 enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
-#endif
 
 #endif
 
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 83381be..99481a7 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -49,8 +49,6 @@ enum PolyStyle
     POLY_CHORD = 3
 };
 
-#ifndef ENUM_POLYFLAGS_DECLARED
-#define ENUM_POLYFLAGS_DECLARED
 enum PolyFlags
 {
     POLY_NORMAL,
@@ -58,7 +56,6 @@ enum PolyFlags
     POLY_CONTROL,
     POLY_SYMMTR
 };
-#endif
 
 class SAL_WARN_UNUSED PolyOptimizeData
 {