convert InsertDeleteFlags to use o3tl::typed_flags

Change-Id: I3f6a97195d3364b2a0964f62f11e9c0de9493d64

2 files changed, 42 insertions, 42 deletions

diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index 3ab1ecb854f4..c61a7a233d83 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -24,9 +24,9 @@
 #include "miscdlgs.hrc"
 
 bool       ScDeleteContentsDlg::bPreviousAllCheck = false;
-InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING  |
-                                                 IDF_NOTE     | IDF_FORMULA |
-                                                 IDF_VALUE);
+InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks   = (InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING  |
+                                                 InsertDeleteFlags::NOTE     | InsertDeleteFlags::FORMULA |
+                                                 InsertDeleteFlags::VALUE);
 
 ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent,
                                           InsertDeleteFlags nCheckDefaults ) :
@@ -44,26 +44,26 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent,
     get( aBtnDelObjects, "objects" );
     get( aBtnOk, "ok" );
 
-    if ( nCheckDefaults != IDF_NONE )
+    if ( nCheckDefaults != InsertDeleteFlags::NONE )
     {
         ScDeleteContentsDlg::nPreviousChecks = nCheckDefaults;
         ScDeleteContentsDlg::bPreviousAllCheck = false;
     }
 
     aBtnDelAll->Check     ( ScDeleteContentsDlg::bPreviousAllCheck );
-    aBtnDelStrings->Check ( IS_SET( IDF_STRING,
+    aBtnDelStrings->Check ( IS_SET( InsertDeleteFlags::STRING,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelNumbers->Check ( IS_SET( IDF_VALUE,
+    aBtnDelNumbers->Check ( IS_SET( InsertDeleteFlags::VALUE,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelDateTime->Check( IS_SET( IDF_DATETIME,
+    aBtnDelDateTime->Check( IS_SET( InsertDeleteFlags::DATETIME,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelFormulas->Check( IS_SET( IDF_FORMULA,
+    aBtnDelFormulas->Check( IS_SET( InsertDeleteFlags::FORMULA,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelNotes->Check   ( IS_SET( IDF_NOTE,
+    aBtnDelNotes->Check   ( IS_SET( InsertDeleteFlags::NOTE,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelAttrs->Check   ( IS_SET( IDF_ATTRIB,
+    aBtnDelAttrs->Check   ( IS_SET( InsertDeleteFlags::ATTRIB,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
-    aBtnDelObjects->Check ( IS_SET( IDF_OBJECTS,
+    aBtnDelObjects->Check ( IS_SET( InsertDeleteFlags::OBJECTS,
                                    ScDeleteContentsDlg::nPreviousChecks ) );
 
     DisableChecks( aBtnDelAll->IsChecked() );
@@ -92,27 +92,27 @@ void ScDeleteContentsDlg::dispose()
 
 InsertDeleteFlags ScDeleteContentsDlg::GetDelContentsCmdBits() const
 {
-    ScDeleteContentsDlg::nPreviousChecks = IDF_NONE;
+    ScDeleteContentsDlg::nPreviousChecks = InsertDeleteFlags::NONE;
 
     if ( aBtnDelStrings->IsChecked() )
-        ScDeleteContentsDlg::nPreviousChecks  = IDF_STRING;
+        ScDeleteContentsDlg::nPreviousChecks  = InsertDeleteFlags::STRING;
     if ( aBtnDelNumbers->IsChecked() )
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_VALUE;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::VALUE;
     if ( aBtnDelDateTime->IsChecked())
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_DATETIME;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::DATETIME;
     if ( aBtnDelFormulas->IsChecked())
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_FORMULA;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::FORMULA;
     if ( aBtnDelNotes->IsChecked()   )
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_NOTE;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::NOTE;
     if ( aBtnDelAttrs->IsChecked()   )
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_ATTRIB;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::ATTRIB;
     if ( aBtnDelObjects->IsChecked() )
-        ScDeleteContentsDlg::nPreviousChecks |= IDF_OBJECTS;
+        ScDeleteContentsDlg::nPreviousChecks |= InsertDeleteFlags::OBJECTS;
 
     ScDeleteContentsDlg::bPreviousAllCheck = aBtnDelAll->IsChecked();
 
     return ( (ScDeleteContentsDlg::bPreviousAllCheck)
-                ? IDF_ALL
+                ? InsertDeleteFlags::ALL
                 : ScDeleteContentsDlg::nPreviousChecks );
 }
 
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index e68c15962c08..5a29f2e8852c 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -24,7 +24,7 @@
 #include "miscdlgs.hrc"
 
 bool       ScInsertContentsDlg::bPreviousAllCheck = false;
-InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks   = (IDF_VALUE | IDF_DATETIME | IDF_STRING);
+InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks   = (InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::STRING);
 ScPasteFunc  ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE;
 sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
 sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;   // enum InsCellCmd
@@ -40,7 +40,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     bMoveDownDisabled( false ),
     bMoveRightDisabled( false ),
     bUsedShortCut   ( false ),
-    nShortCutInsContentsCmdBits( IDF_NONE ),
+    nShortCutInsContentsCmdBits( InsertDeleteFlags::NONE ),
     nShortCutFormulaCmdBits(ScPasteFunc::NONE),
     bShortCutSkipEmptyCells(false),
     bShortCutTranspose(false),
@@ -73,7 +73,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     if ( pStrTitle )
         SetText( *pStrTitle );
 
-    if ( nCheckDefaults != IDF_NONE )
+    if ( nCheckDefaults != InsertDeleteFlags::NONE )
     {
         ScInsertContentsDlg::nPreviousChecks = nCheckDefaults;
         ScInsertContentsDlg::bPreviousAllCheck = false;
@@ -81,19 +81,19 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
     }
 
     mpBtnInsAll->Check     ( ScInsertContentsDlg::bPreviousAllCheck );
-    mpBtnInsStrings->Check ( IS_SET( IDF_STRING,
+    mpBtnInsStrings->Check ( IS_SET( InsertDeleteFlags::STRING,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsNumbers->Check ( IS_SET( IDF_VALUE,
+    mpBtnInsNumbers->Check ( IS_SET( InsertDeleteFlags::VALUE,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsDateTime->Check( IS_SET( IDF_DATETIME,
+    mpBtnInsDateTime->Check( IS_SET( InsertDeleteFlags::DATETIME,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsFormulas->Check( IS_SET( IDF_FORMULA,
+    mpBtnInsFormulas->Check( IS_SET( InsertDeleteFlags::FORMULA,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsNotes->Check   ( IS_SET( IDF_NOTE,
+    mpBtnInsNotes->Check   ( IS_SET( InsertDeleteFlags::NOTE,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsAttrs->Check   ( IS_SET( IDF_ATTRIB,
+    mpBtnInsAttrs->Check   ( IS_SET( InsertDeleteFlags::ATTRIB,
                                    ScInsertContentsDlg::nPreviousChecks ) );
-    mpBtnInsObjects->Check ( IS_SET( IDF_OBJECTS,
+    mpBtnInsObjects->Check ( IS_SET( InsertDeleteFlags::OBJECTS,
                                    ScInsertContentsDlg::nPreviousChecks ) );
 
     switch( ScInsertContentsDlg::nPreviousFormulaChecks )
@@ -128,22 +128,22 @@ ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window*       pParent,
 
 InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const
 {
-    ScInsertContentsDlg::nPreviousChecks = IDF_NONE;
+    ScInsertContentsDlg::nPreviousChecks = InsertDeleteFlags::NONE;
 
     if ( mpBtnInsStrings->IsChecked() )
-        ScInsertContentsDlg::nPreviousChecks = IDF_STRING;
+        ScInsertContentsDlg::nPreviousChecks = InsertDeleteFlags::STRING;
     if ( mpBtnInsNumbers->IsChecked() )
-        ScInsertContentsDlg::nPreviousChecks |= IDF_VALUE;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::VALUE;
     if ( mpBtnInsDateTime->IsChecked())
-        ScInsertContentsDlg::nPreviousChecks |= IDF_DATETIME;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::DATETIME;
     if ( mpBtnInsFormulas->IsChecked())
-        ScInsertContentsDlg::nPreviousChecks |= IDF_FORMULA;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::FORMULA;
     if ( mpBtnInsNotes->IsChecked()   )
-        ScInsertContentsDlg::nPreviousChecks |= IDF_NOTE;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::NOTE;
     if ( mpBtnInsAttrs->IsChecked()   )
-        ScInsertContentsDlg::nPreviousChecks |= IDF_ATTRIB;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::ATTRIB;
     if ( mpBtnInsObjects->IsChecked() )
-        ScInsertContentsDlg::nPreviousChecks |= IDF_OBJECTS;
+        ScInsertContentsDlg::nPreviousChecks |= InsertDeleteFlags::OBJECTS;
 
     ScInsertContentsDlg::bPreviousAllCheck = mpBtnInsAll->IsChecked();
 
@@ -151,7 +151,7 @@ InsertDeleteFlags ScInsertContentsDlg::GetInsContentsCmdBits() const
         return nShortCutInsContentsCmdBits;
 
     return ( (ScInsertContentsDlg::bPreviousAllCheck)
-                ? IDF_ALL
+                ? InsertDeleteFlags::ALL
                 : ScInsertContentsDlg::nPreviousChecks );
 }
 
@@ -311,7 +311,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     if ( pBtn == mpBtnShortCutPasteValuesOnly )
     {
         bUsedShortCut = true;
-        nShortCutInsContentsCmdBits = IDF_STRING | IDF_VALUE | IDF_DATETIME;
+        nShortCutInsContentsCmdBits = InsertDeleteFlags::STRING | InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME;
         nShortCutFormulaCmdBits = ScPasteFunc::NONE;
         bShortCutSkipEmptyCells = false;
         bShortCutTranspose = false;
@@ -322,7 +322,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     else if ( pBtn == mpBtnShortCutPasteValuesFormats )
     {
         bUsedShortCut = true;
-        nShortCutInsContentsCmdBits = IDF_STRING | IDF_VALUE | IDF_DATETIME | IDF_ATTRIB;
+        nShortCutInsContentsCmdBits = InsertDeleteFlags::STRING | InsertDeleteFlags::VALUE | InsertDeleteFlags::DATETIME | InsertDeleteFlags::ATTRIB;
         nShortCutFormulaCmdBits = ScPasteFunc::NONE;
         bShortCutSkipEmptyCells = false;
         bShortCutTranspose = false;
@@ -333,7 +333,7 @@ IMPL_LINK_TYPED( ScInsertContentsDlg, ShortCutHdl, Button*, pBtn, void )
     else if ( pBtn == mpBtnShortCutPasteTranspose )
     {
         bUsedShortCut = true;
-        nShortCutInsContentsCmdBits = IDF_ALL;
+        nShortCutInsContentsCmdBits = InsertDeleteFlags::ALL;
         nShortCutFormulaCmdBits = ScPasteFunc::NONE;
         bShortCutSkipEmptyCells = false;
         bShortCutTranspose = true;