summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-03-29 14:11:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-03-30 06:26:26 +0000
commit90305526ee48c855f9a2b3b4d730ea0bfb079119 (patch)
tree629f00210bb52847ef8aae9f14bf81143b5c489b
parenta34b33d2b900d3d1ea1ac806bc584846dc9d3fbe (diff)
loplugin:unusedenumconstants
Change-Id: I628a0114e56ec25926bd08d159c61cfecb719a1c Reviewed-on: https://gerrit.libreoffice.org/35854 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--accessibility/source/extended/AccessibleGridControl.cxx9
-rw-r--r--basic/source/classes/sbunoobj.cxx1
-rwxr-xr-xcompilerplugins/clang/unusedenumconstants.py1
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx2
-rw-r--r--include/oox/core/binarycodec.hxx3
-rw-r--r--include/svtools/accessibletable.hxx11
-rw-r--r--include/svtools/fileview.hxx1
-rw-r--r--include/tools/errinf.hxx1
-rw-r--r--oox/source/core/binarycodec.cxx3
-rw-r--r--sc/source/filter/oox/biffcodec.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx2
-rw-r--r--svtools/source/misc/ehdl.cxx4
12 files changed, 11 insertions, 29 deletions
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index df348e911417..07d108592ff6 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -266,13 +266,16 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
css::uno::Reference< css::accessibility::XAccessible > xRet;
switch( nChildIndex )
{
- case TCINDEX_COLUMNHEADERBAR:
+ /** Child index of the column header bar (first row). */
+ case 0:
xRet = implGetHeaderBar( TCTYPE_COLUMNHEADERBAR );
break;
- case TCINDEX_ROWHEADERBAR:
+ /** Child index of the row header bar ("handle column"). */
+ case 1:
xRet = implGetHeaderBar( TCTYPE_ROWHEADERBAR );
break;
- case TCINDEX_TABLE:
+ /** Child index of the data table. */
+ case 2:
xRet = implGetTable();
break;
}
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 971d7b475d0d..ee16722056b0 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1503,7 +1503,6 @@ void processAutomationParams( SbxArray* pParams, Sequence< Any >& args, bool bOL
enum class INVOKETYPE
{
GetProp = 0,
- SetProp,
Func
};
Any invokeAutomationMethod( const OUString& Name, Sequence< Any >& args, SbxArray* pParams, sal_uInt32 nParamCount, Reference< XInvocation >& rxInvocation, INVOKETYPE invokeType )
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 7835287b82ca..5c360e230e72 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -118,6 +118,7 @@ def is_ignore(srcLoc):
"basic/source/inc/opcodes.hxx", # SbiOpcode
"sc/source/filter/inc/flttypes.hxx", # BiffTyp
"sc/inc/optutil.hxx", # ScOptionsUtil::KeyBindingType
+ "include/sfx2/chalign.hxx", # SfxChildAlignment
# unit test code
"cppu/source/uno/check.cxx",
# general weird nonsense going on
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 813ac916746f..7467d59623ae 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -220,8 +220,6 @@ void OApplicationController::deleteObjects( ElementType _eType, const std::vecto
aDlg->EnableAllButton();
eResult = aDlg->Execute();
- if (eResult == svtools::QUERYDELETE_CANCEL)
- return;
sDialogPosition = aDlg->GetWindowState( );
}
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 003455d8405c..911d6d925df3 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -54,8 +54,7 @@ public:
/** Enumerates codec types supported by this XOR codec implementation. */
enum CodecType
{
- CODEC_WORD, ///< MS Word XOR codec.
- CODEC_EXCEL ///< MS Excel XOR codec.
+ Excel ///< MS Excel XOR codec.
};
public:
diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx
index 8dd059f9bd88..fd17a67736c8 100644
--- a/include/svtools/accessibletable.hxx
+++ b/include/svtools/accessibletable.hxx
@@ -30,17 +30,6 @@ namespace svt{ namespace table
typedef sal_Int32 RowPos;
-
-enum AccessibleTableType
-{
- /** Child index of the column header bar (first row). */
- TCINDEX_COLUMNHEADERBAR = 0,
- /** Child index of the row header bar ("handle column"). */
- TCINDEX_ROWHEADERBAR = 1,
- /** Child index of the data table. */
- TCINDEX_TABLE = 2
-};
-
enum AccessibleTableControlObjType
{
TCTYPE_GRIDCONTROL, /// The GridControl itself.
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 89b392ac648c..3cd1e836fab6 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -206,7 +206,6 @@ namespace svtools {
enum QueryDeleteResult_Impl
{
- QUERYDELETE_CANCEL = RET_CANCEL,
QUERYDELETE_YES = RET_YES,
QUERYDELETE_ALL = -1
};
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 319dfc08ca80..0cd64efa33f2 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -55,7 +55,6 @@ enum class ErrorHandlerFlags
MessageError = 0x1000,
MessageWarning = 0x2000,
MessageInfo = 0x3000,
- MessageQuery = 0x4000,
MAX = USHRT_MAX,
};
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 10c3a2c8941a..545be4e452c4 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -151,8 +151,7 @@ void BinaryCodec_XOR::initKey( const sal_uInt8 pnPassData[ 16 ] )
size_t nRotateSize = 0;
switch( meCodecType )
{
- case CODEC_WORD: nRotateSize = 7; break;
- case CODEC_EXCEL: nRotateSize = 2; break;
+ case CodecType::Excel: nRotateSize = 2; break;
// compiler will warn, if new codec type is introduced and not handled here
}
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 2f490f2ea2d5..19a8399cd04f 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -54,7 +54,7 @@ BiffDecoderBase::~BiffDecoderBase()
BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) :
BiffDecoderBase(), // must be called to prevent compiler warning
- maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ),
+ maCodec( ::oox::core::BinaryCodec_XOR::CodecType::Excel ),
maEncryptionData( rDecoder.maEncryptionData ),
mnKey( rDecoder.mnKey ),
mnHash( rDecoder.mnHash )
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index bcbf2c775acf..dbca494e3578 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -733,7 +733,7 @@ void ViewTabListBox_Impl::DeleteEntries()
OUString aURL;
OString sDialogPosition;
- while ( pEntry && ( eResult != svtools::QUERYDELETE_CANCEL ) )
+ while ( pEntry )
{
SvTreeListEntry *pCurEntry = pEntry;
pEntry = NextSelected( pEntry );
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 829ff50d4e3e..aa2a7faa48c0 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -106,10 +106,6 @@ static ErrorHandlerFlags aWndFunc(
pBox.reset(VclPtr<InfoBox>::Create(pWin, aErr));
break;
- case ErrorHandlerFlags::MessageQuery:
- pBox.reset(VclPtr<QueryBox>::Create(pWin, eBits, aErr));
- break;
-
default:
{
SAL_WARN( "svtools.misc", "no MessBox type");