[Libreoffice-commits] core.git: basctl/source basegfx/source chart2/inc chart2/source connectivity/source dbaccess/source include/basic include/editeng
Noel Grandin
noel at peralex.com
Wed Aug 17 07:44:25 UTC 2016
basctl/source/basicide/idetemp.hxx | 1
basctl/source/inc/scriptdocument.hxx | 3 -
basegfx/source/range/b2drangeclipper.cxx | 10 ----
chart2/inc/ChartView.hxx | 3 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 4 -
chart2/source/view/inc/GL3DBarChart.hxx | 1
connectivity/source/drivers/mork/MorkParser.hxx | 14 ------
connectivity/source/inc/RowFunctionParser.hxx | 3 -
dbaccess/source/filter/xml/xmlEnums.hxx | 7 ---
dbaccess/source/ui/inc/QEnumTypes.hxx | 1
dbaccess/source/ui/inc/dbadmin.hxx | 1
dbaccess/source/ui/inc/linkeddocuments.hxx | 6 --
include/basic/basmgr.hxx | 2
include/basic/sbxdef.hxx | 8 ---
include/editeng/bulletitem.hxx | 4 +
include/editeng/eedata.hxx | 8 ---
include/editeng/outliner.hxx | 9 +---
include/editeng/svxenum.hxx | 27 +-----------
18 files changed, 12 insertions(+), 100 deletions(-)
New commits:
commit d5de00cc73ca6b60f586c13f22d7b78470984dea
Author: Noel Grandin <noel at peralex.com>
Date: Thu Aug 11 15:46:21 2016 +0200
loplugin:unusedenumconstants in basctl..editeng
Change-Id: I49a23a197969d58a3a2d6b2be1fbe4a647c7fa08
diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx
index b70e654..178c1e5 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -36,7 +36,6 @@ enum SvxChooseControlEnum
SVX_SNAP_PREVIEW,
SVX_SNAP_SELECT,
SVX_SNAP_URLBUTTON,
- SVX_SNAP_NOTHING,
SVX_SNAP_IMAGECONTROL,
SVX_SNAP_PROGRESSBAR,
SVX_SNAP_HFIXEDLINE,
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index 4a162f8..1a02436 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -139,9 +139,6 @@ namespace basctl
the application-wide scripts/dialogs.
*/
AllWithApplication,
- /** real documents only
- */
- DocumentsOnly,
/** real documents only, sorted lexicographically by their title (using the sys locale's default
collator)
*/
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 3814437..41dfb46 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -59,16 +59,6 @@ namespace basegfx
class ActiveEdge
{
public:
- /** The two possible active rectangle edges differ by one
- coordinate value - the upper edge has the lower, the
- lower edge the higher value.
- */
- enum EdgeType {
- /// edge with lower coordinate value
- UPPER=0,
- /// edge with higher coordinate value
- LOWER=1
- };
enum EdgeDirection {
/// edge proceeds to the left
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 12421dc..7fadb39 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -58,8 +58,7 @@ struct CreateShapeParam2D;
enum TimeBasedMode
{
MANUAL,
- AUTOMATIC,
- AUTOMATIC_WRAP
+ AUTOMATIC
};
struct TimeBasedInfo
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 61eb885..2258949 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -139,9 +139,7 @@ enum
PROP_DIAGRAM_DATATABLEHBORDER,
PROP_DIAGRAM_DATATABLEVBORDER,
PROP_DIAGRAM_DATATABLEOUTLINE,
- PROP_DIAGRAM_EXTERNALDATA,
-
- PROP_DIAGRAM_ROUNDED_EDGE
+ PROP_DIAGRAM_EXTERNALDATA
};
void lcl_AddPropertiesToVector(
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index 9269ce2..d04c397 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -50,7 +50,6 @@ enum RenderEventType
EVENT_SHOW_SCROLL,
EVENT_SHOW_SELECT,
EVENT_AUTO_FLY,
- EVENT_DIE,
EVENT_SELECTBAR_UPDEDATE
};
diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx
index 972f914..b435574 100644
--- a/connectivity/source/drivers/mork/MorkParser.hxx
+++ b/connectivity/source/drivers/mork/MorkParser.hxx
@@ -59,23 +59,9 @@ enum MorkErrors
{
NoError = 0,
FailedToOpen,
- UnsupportedVersion,
DefectedFormat
};
-// Mork term types
-enum MorkTerm
-{
- NoneTerm = 0,
- DictTerm,
- GroupTerm,
- TableTerm,
- RowTerm,
- CellTerm,
- CommentTerm,
- LiteralTerm
-};
-
/// Class MorkParser
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index d74d880..ed547ed 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -32,10 +32,7 @@ namespace connectivity
enum ExpressionFunct
{
FUNC_CONST,
-
ENUM_FUNC_EQUATION,
-
- UNARY_FUNC_COLUMN,
ENUM_FUNC_AND,
ENUM_FUNC_OR
};
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx
index 99beaf8..de87caa 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.hxx
@@ -125,13 +125,6 @@ namespace dbaxml
XML_TOK_AS_TEMPLATE ,
XML_TOK_COMPONENT_NAME
};
- enum XMLType
- {
- XML_TYPE_FORMS,
- XML_TYPE_REPORTS,
- XML_TYPE_QUERIES,
- XML_TYPE_TABLES
- };
enum XMLQueryTable
{
XML_TOK_QUERY_NAME,
diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx
index e81302e..9f49df7 100644
--- a/dbaccess/source/ui/inc/QEnumTypes.hxx
+++ b/dbaccess/source/ui/inc/QEnumTypes.hxx
@@ -56,7 +56,6 @@ namespace dbaui
FULL_JOIN=0,
LEFT_JOIN,
RIGHT_JOIN,
- UNION_JOIN,
CROSS_JOIN,
INNER_JOIN
};
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 69db88c..5ab342e 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -116,7 +116,6 @@ private:
enum ApplyResult
{
AR_LEAVE_MODIFIED, // something was modified and has successfully been committed
- AR_LEAVE_UNCHANGED, // no changes were made
AR_KEEP // don't leave the page (e.g. because an error occurred)
};
/** apply all changes made
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index 33274ca..b935ca7 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -92,12 +92,6 @@ namespace dbaui
void newQueryWithPilot();
void newTableWithPilot();
- enum RESULT
- {
- ERROR,
- SUCCESS,
- CANCEL
- };
private:
css::uno::Reference< css::lang::XComponent >
impl_open(
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 22ab8fd..c6a5401 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -34,14 +34,12 @@ class SotStorage;
enum class BasicErrorReason
{
- OPENSTORAGE = 0x0001,
OPENLIBSTORAGE = 0x0002,
OPENMGRSTREAM = 0x0004,
OPENLIBSTREAM = 0x0008,
LIBNOTFOUND = 0x0010,
STORAGENOTFOUND = 0x0020,
BASICLOADERROR = 0x0040,
- NOSTORAGENAME = 0x0080,
STDLIB = 0x0100
};
diff --git a/include/basic/sbxdef.hxx b/include/basic/sbxdef.hxx
index da560672..f9fb5cc 100644
--- a/include/basic/sbxdef.hxx
+++ b/include/basic/sbxdef.hxx
@@ -58,10 +58,6 @@ enum SbxDataType {
SbxUSHORT = 18, // * unsigned short (sal_uInt16)
SbxULONG = 19, // * unsigned long (sal_uInt32)
-//deprecated: // old 64bit types kept for backward compatibility in file I/O
- SbxLONG64 = 20, // moved to SbxSALINT64 as 64bit int
- SbxULONG64 = 21, // moved to SbxSALUINT64 as 64bit int
-
SbxINT = 22, // * signed machine-dependent int
SbxUINT = 23, // * unsigned machine-dependent int
@@ -86,10 +82,6 @@ enum SbxDataType {
SbxARRAY = 0x2000, // array
SbxBYREF = 0x4000, // access by reference
- SbxSV1 = 128, // first defined data type for StarView
- SbxMEMORYSTREAM, // SvMemoryStream
- SbxSTORAGE, // SotStorage
-
SbxUSER1 = 256, // first user defined data type
SbxUSERn = 2047 // last user defined data type
};
diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx
index 4c711c8..9116222 100644
--- a/include/editeng/bulletitem.hxx
+++ b/include/editeng/bulletitem.hxx
@@ -25,7 +25,9 @@
#include <vcl/font.hxx>
-// Styles
+/**
+ * these must match the values in css::style::NumberingType
+ */
enum class SvxBulletStyle
{
ABC_BIG = 0,
diff --git a/include/editeng/eedata.hxx b/include/editeng/eedata.hxx
index 0eef2bd..ad0ab7b 100644
--- a/include/editeng/eedata.hxx
+++ b/include/editeng/eedata.hxx
@@ -41,14 +41,6 @@ namespace EEngineData
typedef std::vector< WrongSpellClass > WrongSpellVector;
- // text marking vector containing the EOC, EOW and EOS TEXT definitions
- enum TextMarkingType
- {
- EndOfCaracter = 0,
- EndOfWord = 1,
- EndOfSentence = 2
- };
-
} // end of namespace EditEngine
#endif // INCLUDED_EDITENG_EEDATA_HXX
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index fe12127..90df8d6 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -197,8 +197,7 @@ private:
Text = 0,
Bullet = 1,
Hypertext = 2, // Outside OutputArea
- Outside = 3, // Outside OutputArea
- DontKnow = 4
+ Outside = 3 // Outside OutputArea
};
EDITENG_DLLPRIVATE void ImplExpandOrCollaps( sal_Int32 nStartPara, sal_Int32 nEndPara, bool bExpand );
@@ -569,13 +568,11 @@ enum class OutlinerMode {
TextObject = 0x0001,
TitleObject = 0x0002,
OutlineObject = 0x0003,
- OutlineView = 0x0004,
- Subtitle = 0x0101,
- Note = 0x0201
+ OutlineView = 0x0004
};
namespace o3tl
{
- template<> struct typed_flags<OutlinerMode> : is_typed_flags<OutlinerMode, 0x030f> {};
+ template<> struct typed_flags<OutlinerMode> : is_typed_flags<OutlinerMode, 0x000f> {};
}
#define OUTLINERMODE_USERMASK (OutlinerMode)0x00FF
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 7c8530c..16147c2 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -70,8 +70,7 @@ enum class SvxInterLineSpaceRule
{
Off,
Prop,
- Fix,
- End
+ Fix
};
enum SvxAdjust
@@ -139,20 +138,6 @@ enum SvxDrawAlignEnum
SVX_OBJECT_ALIGN_DOWN
};
-enum SvxDrawBezierEnum
-{
- SVX_BEZIER_MOVE,
- SVX_BEZIER_INSERT,
- SVX_BEZIER_DELETE,
- SVX_BEZIER_CUTLINE,
- SVX_BEZIER_CONVERT,
- SVX_BEZIER_EDGE,
- SVX_BEZIER_SMOOTH,
- SVX_BEZIER_SYMMTR,
- SVX_BEZIER_CLOSE,
- SVX_BEZIER_ELIMINATE_POINTS
-};
-
enum class SvxSpellArea
{
Body = 0,
@@ -161,13 +146,9 @@ enum class SvxSpellArea
Other
};
-enum SvxFrameAnchor
-{
- SVX_FLY_AT_CNTNT, // Paragraph-based frame
- SVX_FLY_IN_CNTNT, // Character-based frame
- SVX_FLY_PAGE // Page-based frame
-};
-
+/**
+ * these must match the values in css::style::NumberingType
+ */
enum SvxExtNumType
{
SVX_NUM_CHARS_UPPER_LETTER, // Counts from a-z, aa - az, ba - bz, ...
More information about the Libreoffice-commits
mailing list