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

loplugin:unusedenumconstants in unotools..xmlhelp

Browse Source 
Change-Id: Id7ddc0fc1f57c5e8e7fb002e31d54fb8e9f8ffab
Reviewed-on: https://gerrit.libreoffice.org/28050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-08-11 14:06:49 +02:00
committed by Noel Grandin
parent 9532f45ff0
commit d64395704e
22 changed files with 29 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/unotools/configitem.hxx
View File

@@ -63,9 +63,7 @@ namespace utl
CONFIG_NAME_PLAINTEXT_NAME, // unescaped local node name, for user display etc. CONFIG_NAME_PLAINTEXT_NAME, // unescaped local node name, for user display etc.
CONFIG_NAME_LOCAL_NAME, // local node name, for use in XNameAccess etc. ("Item", "Q & A") CONFIG_NAME_LOCAL_NAME, // local node name, for use in XNameAccess etc. ("Item", "Q & A")
CONFIG_NAME_LOCAL_PATH, // one-level relative path, for use when building paths etc. ("Item", "Typ['Q &amp; A']") CONFIG_NAME_LOCAL_PATH, // one-level relative path, for use when building paths etc. ("Item", "Typ['Q &amp; A']")
CONFIG_NAME_FULL_PATH, // full absolute path. ("/org.openoffice.Sample/Group/Item", "/org.openoffice.Sample/Set/Typ['Q &amp; A']") CONFIG_NAME_FULL_PATH // full absolute path. ("/org.openoffice.Sample/Group/Item", "/org.openoffice.Sample/Set/Typ['Q &amp; A']")
CONFIG_NAME_DEFAULT = CONFIG_NAME_LOCAL_PATH // default format
}; };
class ConfigChangeListener_Impl; class ConfigChangeListener_Impl;

11
include/unotools/configvaluecontainer.hxx
View File

@@ -26,17 +26,6 @@
#include <memory> #include <memory>
enum class CVCFlags
{
LAZY_UPDATE = 0x0000,
UPDATE_ACCESS = 0x0001,
IMMEDIATE_UPDATE = 0x0002,
};
namespace o3tl
{
template<> struct typed_flags<CVCFlags> : is_typed_flags<CVCFlags, 0x03> {};
}
namespace utl namespace utl
{ {

2
include/unotools/eventcfg.hxx
View File

@@ -31,8 +31,6 @@
enum class GlobalEventId enum class GlobalEventId
{ {
STARTAPP,
CLOSEAPP,
DOCCREATED, DOCCREATED,
CREATEDOC, CREATEDOC,
LOADFINISHED, LOADFINISHED,

1
include/unotools/extendedsecurityoptions.hxx
View File

@@ -50,7 +50,6 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions : public utl
{ {
OPEN_NEVER = 0, OPEN_NEVER = 0,
OPEN_WITHSECURITYCHECK, OPEN_WITHSECURITYCHECK,
OPEN_ALWAYS
}; };
SvtExtendedSecurityOptions(); SvtExtendedSecurityOptions();

3
include/unotools/itemholderbase.hxx
View File

@@ -33,7 +33,6 @@ struct ItemHolderMutexBase
enum EItem enum EItem
{ {
E_ACCESSIBILITYOPTIONS , // 2 E_ACCESSIBILITYOPTIONS , // 2
E_ADDXMLTOSTORAGEOPTIONS ,
E_APEARCFG , // 2 E_APEARCFG , // 2
E_CJKOPTIONS , // 2 E_CJKOPTIONS , // 2
@@ -70,8 +69,6 @@ enum EItem
E_PRINTFILEOPTIONS , // 2 E_PRINTFILEOPTIONS , // 2
E_PRINTWARNINGOPTIONS , E_PRINTWARNINGOPTIONS ,
E_REGOPTIONS ,
E_SAVEOPTIONS , E_SAVEOPTIONS ,
E_SEARCHOPT , E_SEARCHOPT ,
E_SECURITYOPTIONS , E_SECURITYOPTIONS ,

7
include/unotools/securityoptions.hxx
View File

@@ -79,13 +79,6 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSecurityOptions : public utl::detail
E_BLOCKUNTRUSTEDREFERERLINKS E_BLOCKUNTRUSTEDREFERERLINKS
}; };
enum MacroAction
{
MA_DONTRUN = 0,
MA_CONFIRM,
MA_RUN
};
typedef css::uno::Sequence< OUString > Certificate; typedef css::uno::Sequence< OUString > Certificate;
/* /*

21
include/vcl/bitmap.hxx
View File

@@ -75,12 +75,11 @@ enum class BmpVectorizeFlags
{ {
Inner = 0x0001, Inner = 0x0001,
Outer = 0x0002, Outer = 0x0002,
BoundOnly = 0x0004, ReduceEdges = 0x0004,
ReduceEdges = 0x0008,
}; };
namespace o3tl 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 ) #define BMP_COL_TRANS Color( 252, 3, 251 )
@@ -115,21 +114,7 @@ enum BmpCombine
enum BmpReduce enum BmpReduce
{ {
BMP_REDUCE_SIMPLE = 0, BMP_REDUCE_SIMPLE = 0,
BMP_REDUCE_POPULAR = 1, 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
}; };
enum BmpFilter enum BmpFilter

2
include/vcl/commandevent.hxx
View File

@@ -236,10 +236,8 @@ enum class MediaCommand
VolumeMute = 16,// Mute the volume. VolumeMute = 16,// Mute the volume.
VolumeUp = 17,// Raise the volume. VolumeUp = 17,// Raise the volume.
Menu = 18,// Button Menu pressed. Menu = 18,// Button Menu pressed.
MenuHold = 19,// Button Menu (long) pressed.
PlayHold = 20,// Button Play (long) pressed. PlayHold = 20,// Button Play (long) pressed.
NextTrackHold = 21,// Button Right holding pressed. NextTrackHold = 21,// Button Right holding pressed.
PreviousTrackHold = 22,// Button Left holding pressed.
}; };
class VCL_DLLPUBLIC CommandMediaData class VCL_DLLPUBLIC CommandMediaData

6
include/vcl/inputctx.hxx
View File

@@ -30,13 +30,11 @@ enum class InputContextFlags
{ {
NONE = 0x0000, NONE = 0x0000,
Text = 0x0001, Text = 0x0001,
ExtText = 0x0002, ExtText = 0x0002
ExtTextOn = 0x0004,
ExtTextOff = 0x0008,
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<InputContextFlags> : is_typed_flags<InputContextFlags, 0x000f> {}; template<> struct typed_flags<InputContextFlags> : is_typed_flags<InputContextFlags, 0x0003> {};
} }

3
include/vcl/outdev.hxx
View File

@@ -209,8 +209,7 @@ enum class DrawGridFlags
NONE = 0x0000, NONE = 0x0000,
Dots = 0x0001, Dots = 0x0001,
HorzLines = 0x0002, HorzLines = 0x0002,
VertLines = 0x0004, VertLines = 0x0004
Lines = HorzLines | VertLines,
}; };
namespace o3tl namespace o3tl
{ {

5
include/vcl/outdevstate.hxx
View File

@@ -68,11 +68,10 @@ enum class ComplexTextLayoutFlags
TextOriginLeft = 0x0004, TextOriginLeft = 0x0004,
TextOriginRight = 0x0008, TextOriginRight = 0x0008,
ComplexDisabled = 0x0100, ComplexDisabled = 0x0100,
LigaturesEnabled = 0x0200, LigaturesEnabled = 0x0200
SubstituteDigits = 0x0400
}; };
namespace o3tl { namespace o3tl {
template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x070f> {}; template<> struct typed_flags<ComplexTextLayoutFlags> : is_typed_flags<ComplexTextLayoutFlags, 0x030f> {};
} }
class OutDevState class OutDevState

9
include/vcl/settings.hxx
View File

@@ -204,14 +204,13 @@ namespace o3tl
enum class SelectionOptions enum class SelectionOptions
{ {
NONE = 0x0000, NONE = 0x0000,
Word = 0x0001, Focus = 0x0001,
Focus = 0x0002, Invert = 0x0002,
Invert = 0x0004, ShowFirst = 0x0004,
ShowFirst = 0x0008,
}; };
namespace o3tl 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 enum class DisplayOptions

3
include/vcl/vclenum.hxx
View File

@@ -125,10 +125,7 @@ enum VclResponseType
RET_NO = 3, RET_NO = 3,
RET_RETRY = 4, RET_RETRY = 4,
RET_IGNORE = 5, RET_IGNORE = 5,
RET_ACCEPT = 6,
RET_CLOSE = 7, RET_CLOSE = 7,
RET_APPLY = 8,
RET_NONE = 9,
RET_HELP = 10 RET_HELP = 10
}; };

10
include/vcl/window.hxx
View File

@@ -342,8 +342,7 @@ enum class StateChangedType : sal_uInt16
ExtendedStyle = 17, ExtendedStyle = 17,
Mirroring = 18, Mirroring = 18,
Layout = 19, Layout = 19,
ControlFocus = 20, ControlFocus = 20
User = 10000
}; };
// GetFocusFlags // GetFocusFlags
@@ -378,13 +377,12 @@ enum class DrawFlags
NoDisable = 0x0008, NoDisable = 0x0008,
NoMnemonic = 0x0010, NoMnemonic = 0x0010,
NoSelection = 0x0020, NoSelection = 0x0020,
NoFocus = 0x0040, NoBackground = 0x0040,
NoBackground = 0x0080, NoRollover = 0x0080,
NoRollover = 0x0100,
}; };
namespace o3tl namespace o3tl
{ {
template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x01ff> {}; template<> struct typed_flags<DrawFlags> : is_typed_flags<DrawFlags, 0x00ff> {};
} }
// DialogControl-Flags // DialogControl-Flags

3
ucb/source/ucp/file/bc.hxx
View File

@@ -258,8 +258,7 @@ namespace fileaccess {
enum state { NameForInsertionSet = 1, enum state { NameForInsertionSet = 1,
JustInserted = 2, JustInserted = 2,
Deleted = 4, Deleted = 4,
FullFeatured = 8, FullFeatured = 8 };
Connected = 16 };
bool m_bFolder; bool m_bFolder;
sal_uInt16 m_nState; sal_uInt16 m_nState;

2
unotools/source/config/eventcfg.cxx
View File

@@ -47,8 +47,6 @@ static const char ROOTNODE_EVENTS[] = "Office.Events/ApplicationEvents";
static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames = static o3tl::enumarray<GlobalEventId, const char*> pEventAsciiNames =
{ {
"OnStartApp",
"OnCloseApp",
"OnCreate", "OnCreate",
"OnNew", "OnNew",
"OnLoadFinished", "OnLoadFinished",

29
unotools/source/config/pathoptions.cxx
View File

@@ -46,6 +46,7 @@
#include "itemholder1.hxx" #include "itemholder1.hxx"
#include <set>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
@@ -68,18 +69,11 @@ using namespace com::sun::star::lang;
#define STRPOS_NOTFOUND -1 #define STRPOS_NOTFOUND -1
enum VarNameProperty
{
VAR_NEEDS_SYSTEM_PATH,
VAR_NEEDS_FILEURL
};
typedef std::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap; typedef std::unordered_map<OUString, sal_Int32, OUStringHash> NameToHandleMap;
typedef std::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap; typedef std::unordered_map<sal_Int32, sal_Int32> EnumToHandleMap;
typedef std::unordered_map<OUString, VarNameProperty, OUStringHash> typedef std::set<OUString> VarNameSet;
VarNameToEnumMap;
// class SvtPathOptions_Impl --------------------------------------------- // class SvtPathOptions_Impl ---------------------------------------------
class SvtPathOptions_Impl class SvtPathOptions_Impl
@@ -91,7 +85,7 @@ class SvtPathOptions_Impl
Reference< XStringSubstitution > m_xSubstVariables; Reference< XStringSubstitution > m_xSubstVariables;
Reference< XMacroExpander > m_xMacroExpander; Reference< XMacroExpander > m_xMacroExpander;
mutable EnumToHandleMap m_aMapEnumToPropHandle; mutable EnumToHandleMap m_aMapEnumToPropHandle;
VarNameToEnumMap m_aMapVarNamesToEnum; VarNameSet m_aSystemPathVarNames;
LanguageTag m_aLanguageTag; LanguageTag m_aLanguageTag;
OUString m_aEmptyString; OUString m_aEmptyString;
@@ -174,7 +168,6 @@ struct PropertyStruct
struct VarNameAttribute struct VarNameAttribute
{ {
const char* pVarName; // The name of the path variable const char* pVarName; // The name of the path variable
VarNameProperty eVarProperty; // Which return value is needed by this path variable
}; };
static const PropertyStruct aPropNames[] = static const PropertyStruct aPropNames[] =
@@ -208,10 +201,10 @@ static const PropertyStruct aPropNames[] =
static const VarNameAttribute aVarNameAttribute[] = static const VarNameAttribute aVarNameAttribute[] =
{ {
{ SUBSTITUTE_INSTPATH, VAR_NEEDS_SYSTEM_PATH }, // $(instpath) { SUBSTITUTE_INSTPATH }, // $(instpath)
{ SUBSTITUTE_PROGPATH, VAR_NEEDS_SYSTEM_PATH }, // $(progpath) { SUBSTITUTE_PROGPATH }, // $(progpath)
{ SUBSTITUTE_USERPATH, VAR_NEEDS_SYSTEM_PATH }, // $(userpath) { SUBSTITUTE_USERPATH }, // $(userpath)
{ SUBSTITUTE_PATH, VAR_NEEDS_SYSTEM_PATH }, // $(path) { SUBSTITUTE_PATH }, // $(path)
}; };
// class SvtPathOptions_Impl --------------------------------------------- // class SvtPathOptions_Impl ---------------------------------------------
@@ -343,8 +336,8 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
aSubString = aSubString.toAsciiLowerCase(); aSubString = aSubString.toAsciiLowerCase();
// Look for special variable that needs a system path. // Look for special variable that needs a system path.
VarNameToEnumMap::const_iterator pIter = m_aMapVarNamesToEnum.find( aSubString ); VarNameSet::const_iterator pIter = m_aSystemPathVarNames.find( aSubString );
if ( pIter != m_aMapVarNamesToEnum.end() ) if ( pIter != m_aSystemPathVarNames.end() )
bConvertLocal = true; bConvertLocal = true;
nPosition += nLength; nPosition += nLength;
@@ -429,9 +422,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
nCount = sizeof( aVarNameAttribute ) / sizeof( VarNameAttribute ); nCount = sizeof( aVarNameAttribute ) / sizeof( VarNameAttribute );
for ( i = 0; i < nCount; i++ ) for ( i = 0; i < nCount; i++ )
{ {
m_aMapVarNamesToEnum.insert( VarNameToEnumMap::value_type( m_aSystemPathVarNames.insert( OUString::createFromAscii( aVarNameAttribute[i].pVarName ) );
OUString::createFromAscii( aVarNameAttribute[i].pVarName ),
aVarNameAttribute[i].eVarProperty ));
} }
// Set language type! // Set language type!

1
unotools/source/ucbhelper/ucblockbytes.cxx
View File

@@ -282,7 +282,6 @@ public:
enum ReplyType { enum ReplyType {
NOREPLY, NOREPLY,
EXIT, EXIT,
RETRY,
REQUESTHANDLED REQUESTHANDLED
}; };

1
vcl/inc/listbox.hxx
View File

@@ -37,7 +37,6 @@ enum LB_EVENT_TYPE
{ {
LET_MBDOWN, LET_MBDOWN,
LET_TRACKING, LET_TRACKING,
LET_TRACKING_END,
LET_KEYMOVE, LET_KEYMOVE,
LET_KEYSPACE LET_KEYSPACE
}; };

3
vcl/inc/salwtype.hxx
View File

@@ -220,8 +220,7 @@ typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalEvent nEvent, const void* p
enum class SalObjEvent { enum class SalObjEvent {
GetFocus = 1, GetFocus = 1,
LoseFocus = 2, LoseFocus = 2,
ToTop = 3, ToTop = 3
Count = 4
}; };
typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject,

2
vcl/inc/unx/wmadaptor.hxx
View File

@@ -88,7 +88,6 @@ public:
WIN_APP_STATE, WIN_APP_STATE,
WIN_EXPANDED_SIZE, WIN_EXPANDED_SIZE,
WIN_ICONS, WIN_ICONS,
WIN_WORKSPACE_NAMES,
WIN_CLIENT_LIST, WIN_CLIENT_LIST,
// atoms for general WM hints // atoms for general WM hints
@@ -107,7 +106,6 @@ public:
SAL_USEREVENT, SAL_USEREVENT,
SAL_EXTTEXTEVENT, SAL_EXTTEXTEVENT,
SAL_GETTIMEEVENT, SAL_GETTIMEEVENT,
DTWM_IS_RUNNING,
VCL_SYSTEM_SETTINGS, VCL_SYSTEM_SETTINGS,
XSETTINGS, XSETTINGS,
XEMBED, XEMBED,

1
xmlhelp/source/treeview/tvread.cxx
View File

@@ -82,7 +82,6 @@ namespace treeview {
} }
enum Kind { enum Kind {
tree_view,
tree_node, tree_node,
tree_leaf, tree_leaf,
other other