[Libreoffice-commits] core.git: sc/source

[Noel Grandin]

 sc/source/ui/inc/inscodlg.hxx      |    2 +-
 sc/source/ui/inc/scui_def.hxx      |   12 +++++++++---
 sc/source/ui/miscdlgs/inscodlg.cxx |   18 +++++++++---------
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 275f777e824f56881184b8c4463c3766064c2335
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Mar 22 14:46:35 2017 +0200

    convert INS_CONT constants to o3tl::typed_flags enum
    
    Change-Id: Ic59dad906c58ee765f36fac685c038c79bca9f3b
    Reviewed-on: https://gerrit.libreoffice.org/35557
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx
index 0927360680c5..0e6378c9c828 100644
--- a/sc/source/ui/inc/inscodlg.hxx
+++ b/sc/source/ui/inc/inscodlg.hxx
@@ -89,7 +89,7 @@ private:
 
     static bool         bPreviousAllCheck;
     static InsertDeleteFlags nPreviousChecks;
-    static sal_uInt16   nPreviousChecks2;
+    static InsertContentsFlags nPreviousChecks2;
     static ScPasteFunc  nPreviousFormulaChecks;
     static sal_uInt16   nPreviousMoveMode;          // enum InsCellCmd
 
diff --git a/sc/source/ui/inc/scui_def.hxx b/sc/source/ui/inc/scui_def.hxx
index 027f2031e2a6..96261bd3fd3d 100644
--- a/sc/source/ui/inc/scui_def.hxx
+++ b/sc/source/ui/inc/scui_def.hxx
@@ -27,9 +27,15 @@
 #define FDS_OPT_HORZ        1   // from filldlg.hxx
 #define FDS_OPT_VERT        2  // from filldlg.hxx
 
-#define INS_CONT_NOEMPTY    0x0100 //from inscodlg.hxx
-#define INS_CONT_TRANS      0x0200 //from inscodlg.hxx
-#define INS_CONT_LINK       0x0400 //from inscodlg.hxx
+enum class InsertContentsFlags {
+    NONE       = 0x00,
+    NoEmpty    = 0x01, //from inscodlg.hxx
+    Trans      = 0x02, //from inscodlg.hxx
+    Link       = 0x04  //from inscodlg.hxx
+};
+namespace o3tl {
+    template<> struct typed_flags<InsertContentsFlags> : is_typed_flags<InsertContentsFlags, 0x07> {};
+}
 
 #define SC_CELL_SHIFT_DISABLE_DOWN  0x01 //from inscodlg.hxx
 #define SC_CELL_SHIFT_DISABLE_RIGHT 0x02 //from inscodlg.hxx
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index fd451fa241e0..5a29e9c7a528 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -26,7 +26,7 @@
 bool       ScInsertContentsDlg::bPreviousAllCheck = false;
 InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks   = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING);
 ScPasteFunc  ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE;
-sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
+InsertContentsFlags ScInsertContentsDlg::nPreviousChecks2 = InsertContentsFlags::NONE;
 sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;   // enum InsCellCmd
 
 ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
@@ -74,7 +74,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     {
         ScInsertContentsDlg::nPreviousChecks = nCheckDefaults;
         ScInsertContentsDlg::bPreviousAllCheck = false;
-        ScInsertContentsDlg::nPreviousChecks2 = 0;
+        ScInsertContentsDlg::nPreviousChecks2 = InsertContentsFlags::NONE;
     }
 
     mpBtnInsAll->Check     ( ScInsertContentsDlg::bPreviousAllCheck );
@@ -109,9 +109,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
         case INS_CELLSRIGHT: mpRbMoveRight->Check(); break;
     }
 
-    mpBtnSkipEmptyCells->Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0);
-    mpBtnTranspose->Check( ( ScInsertContentsDlg::nPreviousChecks2    & INS_CONT_TRANS ) != 0);
-    mpBtnLink->Check( ( ScInsertContentsDlg::nPreviousChecks2             & INS_CONT_LINK  ) != 0);
+    mpBtnSkipEmptyCells->Check( bool( ScInsertContentsDlg::nPreviousChecks2 & InsertContentsFlags::NoEmpty ));
+    mpBtnTranspose->Check( bool( ScInsertContentsDlg::nPreviousChecks2    & InsertContentsFlags::Trans ));
+    mpBtnLink->Check( bool( ScInsertContentsDlg::nPreviousChecks2             & InsertContentsFlags::Link  ));
 
     DisableChecks( mpBtnInsAll->IsChecked() );
 
@@ -349,13 +349,13 @@ ScInsertContentsDlg::~ScInsertContentsDlg()
 
 void ScInsertContentsDlg::dispose()
 {
-    ScInsertContentsDlg::nPreviousChecks2 = 0;
+    ScInsertContentsDlg::nPreviousChecks2 = InsertContentsFlags::NONE;
     if(mpBtnSkipEmptyCells->IsChecked())
-        ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_NOEMPTY;
+        ScInsertContentsDlg::nPreviousChecks2 |= InsertContentsFlags::NoEmpty;
     if( mpBtnTranspose->IsChecked())
-        ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_TRANS;
+        ScInsertContentsDlg::nPreviousChecks2 |= InsertContentsFlags::Trans;
     if( mpBtnLink->IsChecked() )
-        ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_LINK;
+        ScInsertContentsDlg::nPreviousChecks2 |= InsertContentsFlags::Link;
 
     if (!bFillMode)     // in FillMode, None is checked and all three options are disabled
     {