convert SHOWEXTRAS constants to scoped enum

Change-Id: I84bff53e55fc93ad423835ebc3bf129546dfb7c3

3 files changed, 11 insertions, 11 deletions

diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index ca6764967282..237f8eb7eb7c 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/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();
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index b3fcb3dd50ca..7fb1d0c4cfb6 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/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();
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index e51854ebe18e..d114453f1ce3 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/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 )
                     {