diff options
| author | Dirk Völzke <dv@openoffice.org> | 2001-07-27 09:55:34 +0000 |
|---|---|---|
| committer | Dirk Völzke <dv@openoffice.org> | 2001-07-27 09:55:34 +0000 |
| commit | 9a85ae64dc245011eb17debb1cf264af3ab9bb7b (patch) | |
| tree | 1716bfb83ed4f8d78046bf4d52d9a7f448d5b1ff /sfx2 | |
| parent | 72dfc5a1900416894e25b88a393b1062a7d7ab29 (diff) | |
#90315# call enablePasswordBox before execute to set the status of the password box right
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 68df8aa7a99c..84368389e0e4 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: dv $ $Date: 2001-07-25 15:48:10 $ + * last change: $Author: dv $ $Date: 2001-07-27 10:55:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -381,6 +381,9 @@ void FileDialogHelper_Impl::dispose() // ------------------------------------------------------------------------ void FileDialogHelper_Impl::enablePasswordBox() { + if ( ! mbHasPassword ) + return; + Reference< XFilterManager > xFltMgr( mxFileDlg, UNO_QUERY ); OUString aFilterName = xFltMgr->getCurrentFilter(); @@ -631,7 +634,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( const short nDialogType, mnError = ERRCODE_NONE; mbHasAutoExt = sal_False; mbHasPassword = sal_False; - mbIsPwdEnabled = sal_False; + mbIsPwdEnabled = sal_True; mbHasVersions = sal_False; mbHasPreview = sal_False; mbShowPreview = sal_False; @@ -767,8 +770,8 @@ ErrCode FileDialogHelper_Impl::execute( SvStringsDtor*& rpURLList, return ERRCODE_ABORT; loadConfig(); - setDefaultValues(); + enablePasswordBox(); // show the dialog sal_Int16 nRet = mxFileDlg->execute(); @@ -889,6 +892,7 @@ ErrCode FileDialogHelper_Impl::execute() loadConfig(); setDefaultValues(); + enablePasswordBox(); // show the dialog sal_Int16 nRet = mxFileDlg->execute(); |