diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 16:08:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-08-02 16:08:44 +0000 |
| commit | 163e28dc7ce074a20e1c6357e6c107babb91ed70 (patch) | |
| tree | 95271e1bad14ae48f67eeb70cb4b719843ecd4d4 | |
| parent | 8faa72fc99638b4186373f1f78ac18358927f27f (diff) | |
INTEGRATION: CWS fwk69 (1.98.8); FILE MERGED
2007/07/18 11:31:56 mav 1.98.8.1: #i56967# preselect the password checkbox
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 250deb8eb004..6d15d8e112f9 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objserv.cxx,v $ * - * $Revision: 1.99 $ + * $Revision: 1.100 $ * - * last change: $Author: obo $ $Date: 2007-07-17 13:44:02 $ + * last change: $Author: hr $ $Date: 2007-08-02 17:08:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -713,10 +713,10 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // ======================================================================================================== - SFX_REQUEST_ARG( rReq, pPasswordItem, SfxStringItem, SID_PASSWORD, FALSE ); + sal_Bool bPreselectPassword = sal_False; SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, FALSE ); - if ( pOldPasswordItem && !pPasswordItem ) - rReq.AppendItem( SfxStringItem( SID_PASSWORD, String() ) ); + if ( pOldPasswordItem ) + bPreselectPassword = sal_True; uno::Sequence< beans::PropertyValue > aDispatchArgs; if ( rReq.GetArgs() ) @@ -735,7 +735,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( QueryHiddenInformation( bIsPDFExport ? WhenCreatingPDF : WhenSaving, NULL ) == RET_YES ) bDialogUsed = aHelper.GUIStoreModel( GetModel(), ::rtl::OUString::createFromAscii( pSlot->GetUnoName() ), - aDispatchArgs ); + aDispatchArgs, + bPreselectPassword ); // the scripting signature might be preserved // pImp->nScriptingSignatureState = SIGNATURESTATE_NOSIGNATURES; |