mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:unusedenumconstants in vcl

Browse Source 
- drop TTCR_GLYPHSEQ
- drop ImageType::Invalid
- give preedit_data_t a default constructor, so my plugin spots that the
eState field is being initalised to DontKnow effectively by a memset
- document ToolbarIconSize::Small as unused, but can't remove since
it might be stored in a user-setting somewhere

Change-Id: I94b34bba83a04de16f95e4faec95b4bd29f3c652
Reviewed-on: https://gerrit.libreoffice.org/33887
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-02-03 15:59:06 +02:00
parent 005ef926c6
commit 8b2ffb280b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.py
View File

@@ -89,6 +89,7 @@ for d in definitionSet:
"sw/source/filter/inc/wwstyles.hxx", "sw/source/filter/inc/wwstyles.hxx",
"sw/source/filter/ww8/fields.hxx", "sw/source/filter/ww8/fields.hxx",
"vcl/source/fontsubset/cff.cxx", "vcl/source/fontsubset/cff.cxx",
"include/vcl/settings.hxx", # stored in a setting, can't remove it without potentially triggering UBSAN
# unit test code # unit test code
"cppu/source/uno/check.cxx", "cppu/source/uno/check.cxx",
# general weird nonsense going on # general weird nonsense going on
@@ -97,6 +98,7 @@ for d in definitionSet:
# Windows or OSX only # Windows or OSX only
"include/canvas/rendering/icolorbuffer.hxx", "include/canvas/rendering/icolorbuffer.hxx",
"include/vcl/commandevent.hxx", "include/vcl/commandevent.hxx",
"vcl/inc/unx/gendata.hxx",
# must match some other enum # must match some other enum
"include/editeng/bulletitem.hxx", "include/editeng/bulletitem.hxx",
"include/editeng/svxenum.hxx", "include/editeng/svxenum.hxx",

2
include/vcl/settings.hxx
View File

@@ -227,7 +227,7 @@ namespace o3tl
enum class ToolbarIconSize enum class ToolbarIconSize
{ {
Unknown = 0, Unknown = 0,
Small = 1, Small = 1, // unused
Large = 2, Large = 2,
Size32 = 3, Size32 = 3,
}; };

6
vcl/inc/unx/i18n_cb.hxx
View File

@@ -63,13 +63,15 @@ enum class PreeditStatus {
StartPending StartPending
}; };
typedef struct { struct preedit_data_t {
SalFrame* pFrame; SalFrame* pFrame;
PreeditStatus eState; PreeditStatus eState;
preedit_text_t aText; preedit_text_t aText;
SalExtTextInputEvent aInputEv; SalExtTextInputEvent aInputEv;
std::vector< ExtTextInputAttr > aInputFlags; std::vector< ExtTextInputAttr > aInputFlags;
} preedit_data_t;
preedit_data_t() : eState(PreeditStatus::DontKnow) {}
};
#endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX #endif // INCLUDED_VCL_INC_UNX_I18N_CB_HXX

1
vcl/inc/unx/printergfx.hxx
View File

@@ -128,7 +128,6 @@ public:
}; };
enum class ImageType { enum class ImageType {
Invalid = 0,
TrueColorImage, TrueColorImage,
MonochromeImage, MonochromeImage,
PaletteImage, PaletteImage,

13
vcl/source/fontsubset/ttcr.hxx
View File

@@ -48,13 +48,12 @@ namespace vcl
/** Error codes for most functions */ /** Error codes for most functions */
enum TTCRErrCodes { enum TTCRErrCodes {
TTCR_OK = 0, /**< no error */ TTCR_OK, /**< no error */
TTCR_ZEROGLYPHS = 1, /**< At least one glyph should be defined */ TTCR_ZEROGLYPHS, /**< At least one glyph should be defined */
TTCR_UNKNOWN = 2, /**< Unknown TrueType table */ TTCR_UNKNOWN, /**< Unknown TrueType table */
TTCR_GLYPHSEQ = 3, /**< Glyph IDs are not sequential in the glyf table */ TTCR_NONAMES, /**< 'name' table does not contain any names */
TTCR_NONAMES = 4, /**< 'name' table does not contain any names */ TTCR_NAMETOOLONG, /**< 'name' table is too long (string data > 64K) */
TTCR_NAMETOOLONG = 5, /**< 'name' table is too long (string data > 64K) */ TTCR_POSTFORMAT /**< unsupported format of a 'post' table */
TTCR_POSTFORMAT = 6 /**< unsupported format of a 'post' table */
}; };
/** /**