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

convert SvxPrevLineSpace to scoped enum

Browse Source 
Change-Id: I5903169e1d7728a2f1e547efdff82a75e8d7b6a7
This commit is contained in:
Noel Grandin
2017-02-14 09:49:14 +02:00
parent 6abc4f4d86
commit 2b2cd4b06e
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/unusedenumconstants.py
View File

@@ -108,6 +108,7 @@ for d in definitionSet:
"vcl/inc/CommonSalLayout.hxx", # VerticalOrientation "vcl/inc/CommonSalLayout.hxx", # VerticalOrientation
"include/tools/fontenum.hxx", # part of GDI file format "include/tools/fontenum.hxx", # part of GDI file format
"svx/inc/galobj.hxx", # GalSoundType "svx/inc/galobj.hxx", # GalSoundType
"include/svx/msdffdef.hxx",
# 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
@@ -142,6 +143,7 @@ for d in definitionSet:
"sw/source/uibase/inc/swcont.hxx", # RegionMode, from UI; ContentTypeId, from UI(registry) "sw/source/uibase/inc/swcont.hxx", # RegionMode, from UI; ContentTypeId, from UI(registry)
"sw/inc/toxe.hxx", # ToxAuthorityType (from UI) "sw/inc/toxe.hxx", # ToxAuthorityType (from UI)
"include/svx/sxekitm.hxx", # SdrEdgeKind (from UI) "include/svx/sxekitm.hxx", # SdrEdgeKind (from UI)
"include/svx/paraprev.hxx", # SvxPrevLineSpace (from UI)
# represents constants from an external API # represents constants from an external API
"opencl/inc/opencl_device_selection.h", "opencl/inc/opencl_device_selection.h",
"vcl/inc/sft.hxx", "vcl/inc/sft.hxx",

14
include/svx/paraprev.hxx
View File

@@ -23,14 +23,14 @@
#include <editeng/svxenum.hxx> #include <editeng/svxenum.hxx>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
enum SvxPrevLineSpace enum class SvxPrevLineSpace
{ {
SVX_PREV_LINESPACE_1 = 0, N1 = 0,
SVX_PREV_LINESPACE_15, N15,
SVX_PREV_LINESPACE_2, N2,
SVX_PREV_LINESPACE_PROP, Prop,
SVX_PREV_LINESPACE_MIN, Min,
SVX_PREV_LINESPACE_DURCH Leading
}; };
class SVX_DLLPUBLIC SvxParaPrevWindow : public vcl::Window class SVX_DLLPUBLIC SvxParaPrevWindow : public vcl::Window

14
svx/source/dialog/paraprev.cxx
View File

@@ -31,7 +31,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) :
nLower ( 0 ), nLower ( 0 ),
eAdjust ( SVX_ADJUST_LEFT ), eAdjust ( SVX_ADJUST_LEFT ),
eLastLine ( SVX_ADJUST_LEFT ), eLastLine ( SVX_ADJUST_LEFT ),
eLine ( SVX_PREV_LINESPACE_1 ), eLine ( SvxPrevLineSpace::N1 ),
nLineVal ( 0 ) nLineVal ( 0 )
{ {
@@ -118,17 +118,17 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext)
{ {
switch (eLine) switch (eLine)
{ {
case SVX_PREV_LINESPACE_1: case SvxPrevLineSpace::N1:
break; break;
case SVX_PREV_LINESPACE_15: case SvxPrevLineSpace::N15:
aPnt.Y() += nH / 2; aPnt.Y() += nH / 2;
break; break;
case SVX_PREV_LINESPACE_2: case SvxPrevLineSpace::N2:
aPnt.Y() += nH; aPnt.Y() += nH;
break; break;
case SVX_PREV_LINESPACE_PROP: case SvxPrevLineSpace::Prop:
case SVX_PREV_LINESPACE_MIN: case SvxPrevLineSpace::Min:
case SVX_PREV_LINESPACE_DURCH: case SvxPrevLineSpace::Leading:
break; break;
} }
} }