[Libreoffice-commits] core.git: vcl/inc vcl/source

[Julien Nabet (via logerrit)]

 vcl/inc/hyperlabel.hxx         |    2 --
 vcl/source/control/roadmap.cxx |    7 ++++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit b1f5acf5d740cfc686159b94eb333586e8ffe67d
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Nov 10 15:32:32 2019 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Nov 10 16:21:59 2019 +0100

    replace define by constexpr in vcl/roadmap
    
    + move LABELBASEMAPHEIGHT in vcl/source/control/roadmap.cxx (only file where it's used)
    
    Change-Id: I22498bc7f6fa3f09a86f15844836a0b9bb3d7eb2
    Reviewed-on: https://gerrit.libreoffice.org/82389
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/inc/hyperlabel.hxx b/vcl/inc/hyperlabel.hxx
index c7ab4124e7d7..c43dbb469df7 100644
--- a/vcl/inc/hyperlabel.hxx
+++ b/vcl/inc/hyperlabel.hxx
@@ -23,8 +23,6 @@
 
 #include <vcl/fixed.hxx>
 
-#define LABELBASEMAPHEIGHT      8
-
 namespace vcl
 {
     class HyperLabelImpl;
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index b7ecae751497..8d228e629c4b 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -26,9 +26,10 @@
 #include <tools/color.hxx>
 #include <rtl/ustring.hxx>
 
-#define ROADMAP_INDENT_X        4
-#define ROADMAP_INDENT_Y        27
-#define ROADMAP_ITEM_DISTANCE_Y 6
+constexpr long LABELBASEMAPHEIGHT = 8;
+constexpr long ROADMAP_INDENT_X = 4;
+constexpr long ROADMAP_INDENT_Y = 27;
+constexpr long ROADMAP_ITEM_DISTANCE_Y = 6;
 
 namespace vcl
 {