diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-11 14:06:49 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-15 05:51:53 +0000 |
commit | d64395704e1a41e8f39e70a219ce3be90928e04d (patch) | |
tree | f04fd671709347e82752f2faa3aab30c9a0a9faf /include/vcl | |
parent | 9532f45ff009f67940c77dccd463f3088866b75e (diff) |
loplugin:unusedenumconstants in unotools..xmlhelp
Change-Id: Id7ddc0fc1f57c5e8e7fb002e31d54fb8e9f8ffab
Reviewed-on: https://gerrit.libreoffice.org/28050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/bitmap.hxx | 21 | ||||
-rw-r--r-- | include/vcl/commandevent.hxx | 2 | ||||
-rw-r--r-- | include/vcl/inputctx.hxx | 6 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 3 | ||||
-rw-r--r-- | include/vcl/outdevstate.hxx | 5 | ||||
-rw-r--r-- | include/vcl/settings.hxx | 9 | ||||
-rw-r--r-- | include/vcl/vclenum.hxx | 3 | ||||
-rw-r--r-- | include/vcl/window.hxx | 10 |
8 files changed, 16 insertions, 43 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 31811b9c4fd0..99113b81d0ef 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -75,12 +75,11 @@ enum class BmpVectorizeFlags { Inner = 0x0001, Outer = 0x0002, - BoundOnly = 0x0004, - ReduceEdges = 0x0008, + ReduceEdges = 0x0004, }; namespace o3tl { - template<> struct typed_flags<BmpVectorizeFlags> : is_typed_flags<BmpVectorizeFlags, 0x0f> {}; + template<> struct typed_flags<BmpVectorizeFlags> : is_typed_flags<BmpVectorizeFlags, 0x07> {}; } #define BMP_COL_TRANS Color( 252, 3, 251 ) @@ -115,21 +114,7 @@ enum BmpCombine enum BmpReduce { BMP_REDUCE_SIMPLE = 0, - BMP_REDUCE_POPULAR = 1, - BMP_REDUCE_MEDIAN = 2 -}; - -enum BmpEmboss -{ - BMP_EMBOSS_TOPLEFT = 0, - BMP_EMBOSS_TOP = 1, - BMP_EMBOSS_TOPRIGHT = 2, - BMP_EMBOSS_LEFT = 3, - BMP_EMBOSS_MIDDLE = 4, - BMP_EMBOSS_RIGHT = 5, - BMP_EMBOSS_BOTTOMLEFT = 6, - BMP_EMBOSS_BOTTOM = 7, - BMP_EMBOSS_BOTTOMRIGHT = 8 + BMP_REDUCE_POPULAR = 1 }; enum BmpFilter diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index bd5f40a58a24..eb8fab19c5de 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -236,10 +236,8 @@ enum class MediaCommand VolumeMute = 16,// Mute the volume. VolumeUp = 17,// Raise the volume. Menu = 18,// Button Menu pressed. - MenuHold = 19,// Button Menu (long) pressed. PlayHold = 20,// Button Play (long) pressed. NextTrackHold = 21,// Button Right holding pressed. - PreviousTrackHold = 22,// Button Left holding pressed. }; class VCL_DLLPUBLIC CommandMediaData diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx index 49f0c8f260b3..95c860e1a902 100644 --- a/include/vcl/inputctx.hxx +++ b/include/vcl/inputctx.hxx @@ -30,13 +30,11 @@ enum class InputContextFlags { NONE = 0x0000, Text = 0x0001, - ExtText = 0x0002, - ExtTextOn = 0x0004, - ExtTextOff = 0x0008, + ExtText = 0x0002 }; namespace o3tl { - template<> struct typed_flags<InputContextFlags> : is_typed_flags<InputContextFlags, 0x000f> {}; + template<> struct typed_flags<InputContextFlags> : is_typed_flags<InputContextFlags, 0x0003> {}; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 9bfc0d6b4fc1..f52afed141f5 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -209,8 +209,7 @@ enum class DrawGridFlags NONE = 0x0000, Dots = 0x0001, HorzLines = 0x0002, - VertLines = 0x0004, - Lines = HorzLines | VertLines, + VertLines = 0x0004 }; namespace o3tl { diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx index adf915d42059..4a509a15e063 100644 --- a/include/vcl/outdevstate.hxx +++ b/include/vcl/outdevstate.hxx @@ -68,11 +68,10 @@ enum class ComplexTextLayoutFlags TextOriginLeft = 0x0004, TextOriginRight = 0x0008, ComplexDisabled = 0x0100, - LigaturesEnabled = 0x0200, - SubstituteDigits = 0x0400 + LigaturesEnabled = 0x0200 }; namespace o3tl { - template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x070f> {}; + template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x030f> {}; } class OutDevState diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 93b78d292f62..f4a7e340f668 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -204,14 +204,13 @@ namespace o3tl enum class SelectionOptions { NONE = 0x0000, - Word = 0x0001, - Focus = 0x0002, - Invert = 0x0004, - ShowFirst = 0x0008, + Focus = 0x0001, + Invert = 0x0002, + ShowFirst = 0x0004, }; namespace o3tl { - template<> struct typed_flags<SelectionOptions> : is_typed_flags<SelectionOptions, 0x000f> {}; + template<> struct typed_flags<SelectionOptions> : is_typed_flags<SelectionOptions, 0x0007> {}; } enum class DisplayOptions diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index d6d918031649..aa2aaaaa46af 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -125,10 +125,7 @@ enum VclResponseType RET_NO = 3, RET_RETRY = 4, RET_IGNORE = 5, - RET_ACCEPT = 6, RET_CLOSE = 7, - RET_APPLY = 8, - RET_NONE = 9, RET_HELP = 10 }; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index bab4395c9a63..ef5135bd1be1 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -342,8 +342,7 @@ enum class StateChangedType : sal_uInt16 ExtendedStyle = 17, Mirroring = 18, Layout = 19, - ControlFocus = 20, - User = 10000 + ControlFocus = 20 }; // GetFocusFlags @@ -378,13 +377,12 @@ enum class DrawFlags NoDisable = 0x0008, NoMnemonic = 0x0010, NoSelection = 0x0020, - NoFocus = 0x0040, - NoBackground = 0x0080, - NoRollover = 0x0100, + NoBackground = 0x0040, + NoRollover = 0x0080, }; namespace o3tl { - template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x01ff> {}; + template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x00ff> {}; } // DialogControl-Flags |