diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-05 12:24:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-06 07:46:11 +0100 |
| commit | 97ebc98f0e956712d242e13f15531742f844a738 (patch) | |
| tree | f8f59969604c4cac28a3efba17c4c281752fa62f /sw/source/ui | |
| parent | 4b363760b9f196e139ee367d54252c4d6cbe25f3 (diff) | |
convert some macros to local functions
Change-Id: If2c89f0f53615f6200b6cd1fb6267cc9b47df927
Reviewed-on: https://gerrit.libreoffice.org/62884
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 76c5ce2be016..4a88c34dea9e 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -170,8 +170,8 @@ static RelationMap const aAsCharRelationMap[] = }; // site anchored -#define HORI_PAGE_REL (LB::RelPageFrame|LB::RelPagePrintArea|LB::RelPageLeft| \ - LB::RelPageRight) +static constexpr auto HORI_PAGE_REL = LB::RelPageFrame | LB::RelPagePrintArea | LB::RelPageLeft | + LB::RelPageRight; static FrameMap const aHPageMap[] = { @@ -202,8 +202,8 @@ static FrameMap const aVPageHtmlMap[] = }; // frame anchored -#define HORI_FRAME_REL (LB::FlyRelPageFrame|LB::FlyRelPagePrintArea| \ - LB::FlyRelPageLeft|LB::FlyRelPageRight) +static constexpr auto HORI_FRAME_REL = LB::FlyRelPageFrame | LB::FlyRelPagePrintArea | + LB::FlyRelPageLeft | LB::FlyRelPageRight; static FrameMap const aHFrameMap[] = { @@ -237,9 +237,9 @@ static FrameMap const aVFlyHtmlMap[] = }; // paragraph anchored -#define HORI_PARA_REL (LB::Frame|LB::PrintArea|LB::RelPageLeft|LB::RelPageRight| \ - LB::RelPageFrame|LB::RelPagePrintArea|LB::RelFrameLeft| \ - LB::RelFrameRight) +static constexpr auto HORI_PARA_REL = LB::Frame | LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | + LB::RelPageFrame | LB::RelPagePrintArea | LB::RelFrameLeft | + LB::RelFrameRight; static FrameMap const aHParaMap[] = { @@ -264,8 +264,8 @@ static FrameMap const aHParaHtmlAbsMap[] = }; // allow vertical alignment at page areas -#define VERT_PARA_REL (LB::VertFrame|LB::VertPrintArea| \ - LB::RelPageFrame|LB::RelPagePrintArea) +static constexpr auto VERT_PARA_REL = LB::VertFrame | LB::VertPrintArea | + LB::RelPageFrame | LB::RelPagePrintArea; static FrameMap const aVParaMap[] = { @@ -281,9 +281,9 @@ static FrameMap const aVParaHtmlMap[] = }; // anchored relative to the character -#define HORI_CHAR_REL (LB::Frame|LB::PrintArea|LB::RelPageLeft|LB::RelPageRight| \ - LB::RelPageFrame|LB::RelPagePrintArea|LB::RelFrameLeft| \ - LB::RelFrameRight|LB::RelChar) +static constexpr auto HORI_CHAR_REL = LB::Frame|LB::PrintArea | LB::RelPageLeft | LB::RelPageRight | + LB::RelPageFrame | LB::RelPagePrintArea | LB::RelFrameLeft | + LB::RelFrameRight | LB::RelChar; static FrameMap const aHCharMap[] = { @@ -309,8 +309,8 @@ static FrameMap const aHCharHtmlAbsMap[] = }; // allow vertical alignment at page areas -#define VERT_CHAR_REL (LB::VertFrame|LB::VertPrintArea| \ - LB::RelPageFrame|LB::RelPagePrintArea) +static constexpr auto VERT_CHAR_REL = LB::VertFrame | LB::VertPrintArea | + LB::RelPageFrame | LB::RelPagePrintArea; static FrameMap const aVCharMap[] = { |