#92380#,#91564# New dialog with unique hid and fixed text

1 files changed, 8 insertions, 35 deletions

diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index ecc90ac83473..77894461d6a1 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: passworddlg.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mav $ $Date: 2001-06-26 13:35:41 $
+ *  last change: $Author: mav $ $Date: 2001-10-11 06:53:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,19 +82,7 @@
 
 IMPL_LINK( MasterPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
 {
-    // todo: compare both passwords and show message box if there are not equal!!
-    if( nDialogMode != ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE
-     || aEDMasterPassword.GetText() == aEDMasterPasswordRepeat.GetText() )
-        EndDialog( RET_OK );
-    else
-    {
-        String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, pResourceMgr ));
-        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
-        aErrorBox.Execute();
-        aEDMasterPassword.SetText( String() );
-        aEDMasterPasswordRepeat.SetText( String() );
-        aEDMasterPassword.GrabFocus();
-    }
+    EndDialog( RET_OK );
     return 1;
 }
 
@@ -109,38 +97,23 @@ MasterPasswordDialog::MasterPasswordDialog
 
     ModalDialog( pParent, ResId( DLG_UUI_PASSWORD, pResMgr ) ),
 
-    aInfoEnterPassword      ( this, ResId( INFO_ENTER_PASSWORD ) ),
     aFTMasterPassword       ( this, ResId( FT_MASTERPASSWORD ) ),
     aEDMasterPassword       ( this, ResId( ED_MASTERPASSWORD ) ),
-    aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT ) ),
-    aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT ) ),
     aOKBtn                  ( this, ResId( BTN_MASTERPASSWORD_OK ) ),
     aCancelBtn              ( this, ResId( BTN_MASTERPASSWORD_CANCEL ) ),
     aHelpBtn                ( this, ResId( BTN_MASTERPASSWORD_HELP ) ),
     nDialogMode             ( aDialogMode ),
     pResourceMgr            ( pResMgr )
 {
-    // hide until a help is avalable
-    aHelpBtn.Hide();
-
-    if ( nDialogMode != ::com::sun::star::task::PasswordRequestMode_PASSWORD_CREATE )
+    if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
-        {
-            String aErrorMsg( ResId( STR_ERROR_PASSWORD_WRONG, pResourceMgr ));
-            ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
-            aErrorBox.Execute();
-        }
-
-        aFTMasterPasswordRepeat.Hide();
-        aEDMasterPasswordRepeat.Hide();
-
-        Size aNewSiz = GetSizePixel();
-        aNewSiz.Height() -= 20;
-        SetSizePixel( aNewSiz );
+        String aErrorMsg( ResId( STR_ERROR_PASSWORD_WRONG, pResourceMgr ));
+        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
+        aErrorBox.Execute();
     }
 
     FreeResource();
 
     aOKBtn.SetClickHdl( LINK( this, MasterPasswordDialog, OKHdl_Impl ) );
 };
+