diff options
| -rwxr-xr-x | compilerplugins/clang/unusedenumconstants.py | 2 | ||||
| -rw-r--r-- | include/svx/paraprev.hxx | 14 | ||||
| -rw-r--r-- | svx/source/dialog/paraprev.cxx | 14 |
3 files changed, 16 insertions, 14 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index 50be7db08f74..065b0dce43b1 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -108,6 +108,7 @@ for d in definitionSet: "vcl/inc/CommonSalLayout.hxx", # VerticalOrientation "include/tools/fontenum.hxx", # part of GDI file format "svx/inc/galobj.hxx", # GalSoundType + "include/svx/msdffdef.hxx", # unit test code "cppu/source/uno/check.cxx", # general weird nonsense going on @@ -142,6 +143,7 @@ for d in definitionSet: "sw/source/uibase/inc/swcont.hxx", # RegionMode, from UI; ContentTypeId, from UI(registry) "sw/inc/toxe.hxx", # ToxAuthorityType (from UI) "include/svx/sxekitm.hxx", # SdrEdgeKind (from UI) + "include/svx/paraprev.hxx", # SvxPrevLineSpace (from UI) # represents constants from an external API "opencl/inc/opencl_device_selection.h", "vcl/inc/sft.hxx", diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index 65af55602416..7b326487c0f3 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -23,14 +23,14 @@ #include <editeng/svxenum.hxx> #include <svx/svxdllapi.h> -enum SvxPrevLineSpace +enum class SvxPrevLineSpace { - SVX_PREV_LINESPACE_1 = 0, - SVX_PREV_LINESPACE_15, - SVX_PREV_LINESPACE_2, - SVX_PREV_LINESPACE_PROP, - SVX_PREV_LINESPACE_MIN, - SVX_PREV_LINESPACE_DURCH + N1 = 0, + N15, + N2, + Prop, + Min, + Leading }; class SVX_DLLPUBLIC SvxParaPrevWindow : public vcl::Window diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 817429bcadad..ef7013c59505 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -31,7 +31,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) : nLower ( 0 ), eAdjust ( SVX_ADJUST_LEFT ), eLastLine ( SVX_ADJUST_LEFT ), - eLine ( SVX_PREV_LINESPACE_1 ), + eLine ( SvxPrevLineSpace::N1 ), nLineVal ( 0 ) { @@ -118,17 +118,17 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) { switch (eLine) { - case SVX_PREV_LINESPACE_1: + case SvxPrevLineSpace::N1: break; - case SVX_PREV_LINESPACE_15: + case SvxPrevLineSpace::N15: aPnt.Y() += nH / 2; break; - case SVX_PREV_LINESPACE_2: + case SvxPrevLineSpace::N2: aPnt.Y() += nH; break; - case SVX_PREV_LINESPACE_PROP: - case SVX_PREV_LINESPACE_MIN: - case SVX_PREV_LINESPACE_DURCH: + case SvxPrevLineSpace::Prop: + case SvxPrevLineSpace::Min: + case SvxPrevLineSpace::Leading: break; } } |