convert ColorPickerMode to scoped enum

and drop unused Add constant

Change-Id: I4e4f0d35e4d081883b78e0205ffd7086c9cadf04
Reviewed-on: https://gerrit.libreoffice.org/46587
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 5 insertions, 4 deletions

diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx
index af7c27c6b441..69def8510b35 100644
--- a/include/svtools/colrdlg.hxx
+++ b/include/svtools/colrdlg.hxx
@@ -28,8 +28,9 @@ namespace vcl { class Window; }
 
 namespace svtools
 {
-    // SELECT is the default
-    enum ColorPickerMode { ColorPickerMode_SELECT = 0, ColorPickerMode_ADD = 1, ColorPickerMode_MODIFY = 2 };
+    // Select is the default.
+    // These values must match the constants used in ColorPickerDialog in cui/source/dialogs/colorpicker.cxx
+    enum class ColorPickerMode { Select = 0, Modify = 2 };
 }
 
 class SVT_DLLPUBLIC SvColorDialog final
@@ -41,14 +42,14 @@ public:
     void            SetColor( const Color& rColor );
     const Color&    GetColor() const { return maColor;}
 
-    void            SetMode( sal_Int16 eMode );
+    void            SetMode( svtools::ColorPickerMode eMode );
 
     short           Execute();
 
 private:
     VclPtr<vcl::Window> mpParent;
     Color               maColor;
-    sal_Int16           meMode;
+    svtools::ColorPickerMode meMode;
 };
 
 #endif // INCLUDED_SVTOOLS_COLRDLG_HXX