convert SHOWEXTRAS constants to scoped enum

Change-Id: I84bff53e55fc93ad423835ebc3bf129546dfb7c3

dbaccess/source/ui/dlg/UserAdmin.cxx

@@ -193,7 +193,7 @@ IMPL_LINK( OUserAdmin, UserHdl, PushButton *, pButton )
         if(pButton == m_pNEWUSER)
         {
             SfxPasswordDialog aPwdDlg(this);
-            aPwdDlg.ShowExtras(SHOWEXTRAS_ALL);
+            aPwdDlg.ShowExtras(SfxShowExtras::ALL);
             if(aPwdDlg.Execute())
             {
                 Reference<XDataDescriptorFactory> xUserFactory(m_xUsers,UNO_QUERY);

filter/source/pdf/impdialog.cxx

@@ -1194,7 +1194,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
     SfxPasswordDialog aPwdDialog( this, &msUserPwdTitle );
     aPwdDialog.SetMinLen( 0 );
     aPwdDialog.ShowMinLengthText(false);
-    aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 | SHOWEXTRAS_CONFIRM2 );
+    aPwdDialog.ShowExtras( SfxShowExtras::CONFIRM | SfxShowExtras::PASSWORD2 | SfxShowExtras::CONFIRM2 );
     aPwdDialog.SetText(msStrSetPwd);
     aPwdDialog.SetGroup2Text(msOwnerPwdTitle);
     aPwdDialog.AllowAsciiOnly();

include/sfx2/passwd.hxx

@@ -27,15 +27,23 @@
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <sfx2/app.hxx>
+#include <o3tl/typed_flags_set.hxx>
 
 // defines ---------------------------------------------------------------
 
-#define SHOWEXTRAS_NONE      ((sal_uInt16)0x0000)
-#define SHOWEXTRAS_USER      ((sal_uInt16)0x0001)
-#define SHOWEXTRAS_CONFIRM   ((sal_uInt16)0x0002)
-#define SHOWEXTRAS_PASSWORD2 ((sal_uInt16)0x0004)
-#define SHOWEXTRAS_CONFIRM2  ((sal_uInt16)0x0008)
-#define SHOWEXTRAS_ALL       ((sal_uInt16)(SHOWEXTRAS_USER | SHOWEXTRAS_CONFIRM))
+enum class SfxShowExtras
+{
+    NONE      = 0x0000,
+    USER      = 0x0001,
+    CONFIRM   = 0x0002,
+    PASSWORD2 = 0x0004,
+    CONFIRM2  = 0x0008,
+    ALL       = USER | CONFIRM
+};
+namespace o3tl
+{
+    template<> struct typed_flags<SfxShowExtras> : is_typed_flags<SfxShowExtras, 0x0f> {};
+}
 
 // class SfxPasswordDialog -----------------------------------------------
 
@@ -65,7 +73,7 @@ private:
     OUString        maEmptyPwdStr;
     OUString        maMainPwdStr;
     sal_uInt16      mnMinLen;
-    sal_uInt16      mnExtras;
+    SfxShowExtras  mnExtras;
 
     bool            mbAsciiOnly;
     DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit*);
@@ -105,7 +113,7 @@ public:
     {
         mpPassword1ED->SetHelpId( rId );
     }
-    void ShowExtras(sal_uInt16 nExtras)
+    void ShowExtras(SfxShowExtras nExtras)
     {
         mnExtras = nExtras;
     }

sc/source/ui/docshell/docsh4.cxx

@@ -1137,7 +1137,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJus
         pDlg->SetHelpId( GetStaticInterface()->GetSlot(SID_CHG_PROTECT)->GetCommand() );
         pDlg->SetEditHelpId( HID_CHG_PROTECT );
         if ( !bProtected )
-            pDlg->ShowExtras( SHOWEXTRAS_CONFIRM );
+            pDlg->ShowExtras( SfxShowExtras::CONFIRM );
         if ( pDlg->Execute() == RET_OK )
             aPassword = pDlg->GetPassword();
         pDlg.reset();

sc/source/ui/view/tabvwsh3.cxx

@@ -1002,7 +1002,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
                     pDlg->SetMinLen( 0 );
                     pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() );
                     pDlg->SetEditHelpId( HID_PASSWD_DOC );
-                    pDlg->ShowExtras( SHOWEXTRAS_CONFIRM );
+                    pDlg->ShowExtras( SfxShowExtras::CONFIRM );
 
                     if (pDlg->Execute() == RET_OK)
                     {

sfx2/source/dialog/passwd.cxx

@@ -65,9 +65,9 @@ IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
 
 IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
 {
-    bool bConfirmFailed = ( ( mnExtras & SHOWEXTRAS_CONFIRM ) == SHOWEXTRAS_CONFIRM ) &&
-                            ( GetConfirm() != GetPassword() );
-    if( ( mnExtras & SHOWEXTRAS_CONFIRM2 ) == SHOWEXTRAS_CONFIRM2 && ( GetConfirm2() != GetPassword2() ) )
+    bool bConfirmFailed = bool( mnExtras & SfxShowExtras::CONFIRM ) &&
+                          ( GetConfirm() != GetPassword() );
+    if( ( mnExtras & SfxShowExtras::CONFIRM2 ) && ( GetConfirm2() != GetPassword2() ) )
         bConfirmFailed = true;
     if ( bConfirmFailed )
     {
@@ -89,7 +89,7 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou
     , maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1))
     , maEmptyPwdStr(SFX2_RESSTR(STR_PASSWD_EMPTY))
     , mnMinLen(5)
-    , mnExtras(0)
+    , mnExtras(SfxShowExtras::NONE)
     , mbAsciiOnly(false)
 {
     get(mpPassword1Box, "password1frame");
@@ -175,25 +175,25 @@ short SfxPasswordDialog::Execute()
     mpConfirm2FT->Hide();
     mpConfirm2ED->Hide();
 
-    if (mnExtras != SHOWEXTRAS_NONE)
+    if (mnExtras != SfxShowExtras::NONE)
         mpPassword1FT->Show();
-    if (mnExtras & SHOWEXTRAS_USER)
+    if (mnExtras & SfxShowExtras::USER)
     {
         mpUserFT->Show();
         mpUserED->Show();
     }
-    if (mnExtras & SHOWEXTRAS_CONFIRM)
+    if (mnExtras & SfxShowExtras::CONFIRM)
     {
         mpConfirm1FT->Show();
         mpConfirm1ED->Show();
     }
-    if (mnExtras & SHOWEXTRAS_PASSWORD2)
+    if (mnExtras & SfxShowExtras::PASSWORD2)
     {
         mpPassword2Box->Show();
         mpPassword2FT->Show();
         mpPassword2ED->Show();
     }
-    if (mnExtras & SHOWEXTRAS_CONFIRM2)
+    if (mnExtras & SfxShowExtras::CONFIRM2)
     {
         mpConfirm2FT->Show();
         mpConfirm2ED->Show();

sfx2/source/dialog/securitypage.cxx

@@ -102,7 +102,7 @@ static bool lcl_GetPassword(
     SfxPasswordDialog aPasswdDlg( pParent );
     aPasswdDlg.SetMinLen( 1 );
     if (bProtect)
-        aPasswdDlg.ShowExtras( SHOWEXTRAS_CONFIRM );
+        aPasswdDlg.ShowExtras( SfxShowExtras::CONFIRM );
     if (RET_OK == aPasswdDlg.Execute() && !aPasswdDlg.GetPassword().isEmpty())
     {
         rPassword = aPasswdDlg.GetPassword();

sfx2/source/doc/docinsert.cxx

@@ -191,7 +191,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl)
                 {
                     // ask for the password
                     SfxPasswordDialog aPasswordDlg( NULL );
-                    aPasswordDlg.ShowExtras( SHOWEXTRAS_CONFIRM );
+                    aPasswordDlg.ShowExtras( SfxShowExtras::CONFIRM );
                     short nRet = aPasswordDlg.Execute();
                     if ( RET_OK == nRet )
                     {

sw/source/ui/dialog/uiregionsw.cxx

@@ -1233,7 +1233,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
             if(!pRepr->GetTempPasswd().getLength() || bChange)
             {
                 SfxPasswordDialog aPasswdDlg(this);
-                aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
+                aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM);
                 if(RET_OK == aPasswdDlg.Execute())
                 {
                     const OUString sNewPasswd( aPasswdDlg.GetPassword() );
@@ -1671,7 +1671,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton )
         if(!m_aNewPasswd.getLength() || bChange)
         {
             SfxPasswordDialog aPasswdDlg(this);
-            aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
+            aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM);
             if(RET_OK == aPasswdDlg.Execute())
             {
                 const OUString sNewPasswd( aPasswdDlg.GetPassword() );

sw/source/uibase/uiview/view2.cxx

@@ -626,7 +626,7 @@ void SwView::Execute(SfxRequest &rReq)
             SfxPasswordDialog aPasswdDlg( pParent );
             aPasswdDlg.SetMinLen( 1 );
             if(!aPasswd.getLength())
-                aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
+                aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM);
             if (aPasswdDlg.Execute())
             {
                 sal_uInt16 nOn = nsRedlineMode_t::REDLINE_ON;